diff --git a/doc/contributing/submitting-changes.chapter.md b/doc/contributing/submitting-changes.chapter.md
index 6f87e015b9cf..471e45d7dfb3 100644
--- a/doc/contributing/submitting-changes.chapter.md
+++ b/doc/contributing/submitting-changes.chapter.md
@@ -227,7 +227,7 @@ digraph {
}
```
-[This GitHub Action](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/periodic-merge-6h.yml) brings changes from `master` to `staging-next` and from `staging-next` to `staging` every 6 hours.
+[This GitHub Action](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/periodic-merge-6h.yml) brings changes from `master` to `staging-next` and from `staging-next` to `staging` every 6 hours; these are the blue arrows in the diagram above. The purple arrows in the diagram above are done manually and much less frequently. You can get an idea of how often these merges occur by looking at the git history.
### Master branch {#submitting-changes-master-branch}
diff --git a/doc/using/configuration.chapter.md b/doc/using/configuration.chapter.md
index 842450ebf47f..2445aa32f2a7 100644
--- a/doc/using/configuration.chapter.md
+++ b/doc/using/configuration.chapter.md
@@ -164,14 +164,6 @@ There are several ways to tweak how Nix handles a package which has been marked
Note that `permittedInsecurePackages` is only checked if `allowInsecurePredicate` is not specified.
-### `config` Options Reference
-
-The following attributes can be passed in [`config`](#chap-packageconfig).
-
-```{=docbook}
-
-```
-
## Modify packages via `packageOverrides` {#sec-modify-via-packageOverrides}
You can define a function called `packageOverrides` in your local `~/.config/nixpkgs/config.nix` to override Nix packages. It must be a function that takes pkgs as an argument and returns a modified set of packages.
@@ -184,6 +176,15 @@ You can define a function called `packageOverrides` in your local `~/.config/nix
}
```
+## `config` Options Reference {#sec-config-options-reference}
+
+The following attributes can be passed in [`config`](#chap-packageconfig).
+
+```{=docbook}
+
+```
+
+
## Declarative Package Management {#sec-declarative-package-management}
### Build an environment {#sec-building-environment}
diff --git a/lib/modules.nix b/lib/modules.nix
index 48ddb31508f2..d8ae497fb2d8 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -113,10 +113,6 @@ rec {
args ? {}
, # This would be remove in the future, Prefer _module.check option instead.
check ? true
- # Internal variable to avoid `_key` collisions regardless
- # of `extendModules`. Used in `submoduleWith`.
- # Test case: lib/tests/modules, "168767"
- , extensionOffset ? 0
}:
let
withWarnings = x:
@@ -345,17 +341,15 @@ rec {
modules ? [],
specialArgs ? {},
prefix ? [],
- extensionOffset ? length modules,
}:
evalModules (evalModulesArgs // {
modules = regularModules ++ modules;
specialArgs = evalModulesArgs.specialArgs or {} // specialArgs;
prefix = extendArgs.prefix or evalModulesArgs.prefix or [];
- inherit extensionOffset;
});
type = lib.types.submoduleWith {
- inherit modules specialArgs extensionOffset;
+ inherit modules specialArgs;
};
result = withWarnings {
diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index 487fcd93641b..36af32ca89da 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -194,6 +194,10 @@ checkConfigOutput '^"submodule"$' options.submodule.type.description ./declare-s
## Paths should be allowed as values and work as expected
checkConfigOutput '^true$' config.submodule.enable ./declare-submoduleWith-path.nix
+# Check the file location information is propagated into submodules
+checkConfigOutput the-file.nix config.submodule.internalFiles.0 ./submoduleFiles.nix
+
+
# Check that disabledModules works recursively and correctly
checkConfigOutput '^true$' config.enable ./disable-recursive/main.nix
checkConfigOutput '^true$' config.enable ./disable-recursive/{main.nix,disable-foo.nix}
diff --git a/lib/tests/modules/submoduleFiles.nix b/lib/tests/modules/submoduleFiles.nix
new file mode 100644
index 000000000000..c0d9b2cef3e8
--- /dev/null
+++ b/lib/tests/modules/submoduleFiles.nix
@@ -0,0 +1,21 @@
+{ lib, ... }: {
+ options.submodule = lib.mkOption {
+ default = {};
+ type = lib.types.submoduleWith {
+ modules = [ ({ options, ... }: {
+ options.value = lib.mkOption {};
+
+ options.internalFiles = lib.mkOption {
+ default = options.value.files;
+ };
+ })];
+ };
+ };
+
+ imports = [
+ {
+ _file = "the-file.nix";
+ submodule.value = 10;
+ }
+ ];
+}
diff --git a/lib/types.nix b/lib/types.nix
index 147b92f784c9..caaa6dccc6d4 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -571,28 +571,14 @@ rec {
, specialArgs ? {}
, shorthandOnlyDefinesConfig ? false
, description ? null
-
- # Internal variable to avoid `_key` collisions regardless
- # of `extendModules`. Wired through by `evalModules`.
- # Test case: lib/tests/modules, "168767"
- , extensionOffset ? 0
}@attrs:
let
inherit (lib.modules) evalModules;
- shorthandToModule = if shorthandOnlyDefinesConfig == false
- then value: value
- else value: { config = value; };
-
- allModules = defs: imap1 (n: { value, file }:
- if isFunction value
- then setFunctionArgs
- (args: lib.modules.unifyModuleSyntax file "${toString file}-${toString (n + extensionOffset)}" (value args))
- (functionArgs value)
- else if isAttrs value
- then
- lib.modules.unifyModuleSyntax file "${toString file}-${toString (n + extensionOffset)}" (shorthandToModule value)
- else value
+ allModules = defs: map ({ value, file }:
+ if isAttrs value && shorthandOnlyDefinesConfig
+ then { _file = file; config = value; }
+ else { _file = file; imports = [ value ]; }
) defs;
base = evalModules {
@@ -632,7 +618,6 @@ rec {
(base.extendModules {
modules = [ { _module.args.name = last loc; } ] ++ allModules defs;
prefix = loc;
- extensionOffset = extensionOffset + length defs;
}).config;
emptyValue = { value = {}; };
getSubOptions = prefix: (base.extendModules
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 691d95e31f53..e6c8a4c55362 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6684,6 +6684,13 @@
fingerprint = "932F 3E8E 1C0F 4A98 95D7 B8B8 B0CA A28A 0295 8308";
}];
};
+ kenran = {
+ email = "johannes.maier@mailbox.org";
+ github = "kenranunderscore";
+ githubId = 5188977;
+ matrix = "@kenran_:matrix.org";
+ name = "Johannes Maier";
+ };
kentjames = {
email = "jameschristopherkent@gmail.com";
github = "kentjames";
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
index 79bba37a1358..c6eaf4624291 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
@@ -100,6 +100,17 @@
compatible.
+
+
+ ngrok has been upgraded from 2.3.40 to
+ 3.0.4. Please see
+ the
+ upgrade guide and
+ changelog.
+ Notably, breaking changes are that the config file format has
+ changed and support for single hypen arguments was dropped.
+
+
The isPowerPC predicate, found on
diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md
index 50bf15ca197d..56df3c00cb20 100644
--- a/nixos/doc/manual/release-notes/rl-2211.section.md
+++ b/nixos/doc/manual/release-notes/rl-2211.section.md
@@ -45,6 +45,10 @@ In addition to numerous new and upgraded packages, this release has the followin
`lib.systems.parse.isCompatible` still exists, but has changed semantically:
Architectures with differing endianness modes are *no longer considered compatible*.
+- `ngrok` has been upgraded from 2.3.40 to 3.0.4. Please see [the upgrade guide](https://ngrok.com/docs/guides/upgrade-v2-v3)
+ and [changelog](https://ngrok.com/docs/ngrok-agent/changelog). Notably, breaking changes are that the config file format has
+ changed and support for single hypen arguments was dropped.
+
- The `isPowerPC` predicate, found on `platform` attrsets (`hostPlatform`, `buildPlatform`, `targetPlatform`, etc) has been removed in order to reduce confusion. The predicate was was defined such that it matches only the 32-bit big-endian members of the POWER/PowerPC family, despite having a name which would imply a broader set of systems. If you were using this predicate, you can replace `foo.isPowerPC` with `(with foo; isPower && is32bit && isBigEndian)`.
- PHP 7.4 is no longer supported due to upstream not supporting this
diff --git a/nixos/modules/services/security/vaultwarden/default.nix b/nixos/modules/services/security/vaultwarden/default.nix
index 8277f493639c..756e0ee93b21 100644
--- a/nixos/modules/services/security/vaultwarden/default.nix
+++ b/nixos/modules/services/security/vaultwarden/default.nix
@@ -62,20 +62,52 @@ in {
default = {};
example = literalExpression ''
{
- domain = "https://bw.domain.tld:8443";
- signupsAllowed = true;
- rocketPort = 8222;
- rocketLog = "critical";
+ DOMAIN = "https://bitwarden.example.com";
+ SIGNUPS_ALLOWED = false;
+
+ # Vaultwarden currently recommends running behind a reverse proxy
+ # (nginx or similar) for TLS termination, see
+ # https://github.com/dani-garcia/vaultwarden/wiki/Hardening-Guide#reverse-proxying
+ # > you should avoid enabling HTTPS via vaultwarden's built-in Rocket TLS support,
+ # > especially if your instance is publicly accessible.
+ #
+ # A suitable NixOS nginx reverse proxy example config might be:
+ #
+ # services.nginx.virtualHosts."bitwarden.example.com" = {
+ # enableACME = true;
+ # forceSSL = true;
+ # locations."/" = {
+ # proxyPass = "http://127.0.0.1:''${toString config.services.vaultwarden.config.ROCKET_PORT}";
+ # };
+ # };
+ ROCKET_ADDRESS = "127.0.0.1";
+ ROCKET_PORT = 8222;
+
+ ROCKET_LOG = "critical";
+
+ # This example assumes a mailserver running on localhost,
+ # thus without transport encryption.
+ # If you use an external mail server, follow:
+ # https://github.com/dani-garcia/vaultwarden/wiki/SMTP-configuration
+ SMTP_HOST = "127.0.0.1";
+ SMTP_PORT = 25;
+ SMTP_SSL = false;
+
+ SMTP_FROM = "admin@bitwarden.example.com";
+ SMTP_FROM_NAME = "example.com Bitwarden server";
}
'';
description = ''
The configuration of vaultwarden is done through environment variables,
- therefore the names are converted from camel case (e.g. disable2FARemember)
- to upper case snake case (e.g. DISABLE_2FA_REMEMBER).
+ therefore it is recommended to use upper snake case (e.g. DISABLE_2FA_REMEMBER).
+
+ However, camel case (e.g. disable2FARemember) is also supported:
+ The NixOS module will convert it automatically to
+ upper case snake case (e.g. DISABLE_2FA_REMEMBER).
In this conversion digits (0-9) are handled just like upper case characters,
- so foo2 would be converted to FOO_2.
- Names already in this format remain unchanged, so FOO2 remains FOO2 if passed as such,
- even though foo2 would have been converted to FOO_2.
+ so foo2 would be converted to FOO_2.
+ Names already in this format remain unchanged, so FOO2 remains FOO2 if passed as such,
+ even though foo2 would have been converted to FOO_2.
This allows working around any potential future conflicting naming conventions.
Based on the attributes passed to this config option an environment file will be generated
@@ -83,13 +115,16 @@ in {
The available configuration options can be found in
the environment template file.
+
+ See for how
+ to set up access to the Admin UI to invite initial users.
'';
};
environmentFile = mkOption {
type = with types; nullOr path;
default = null;
- example = "/root/vaultwarden.env";
+ example = "/var/lib/vaultwarden.env";
description = ''
Additional environment file as defined in
systemd.exec5
@@ -100,6 +135,23 @@ in {
Note that this file needs to be available on the host on which
vaultwarden is running.
+
+ As a concrete example, to make the Admin UI available
+ (from which new users can be invited initially),
+ the secret ADMIN_TOKEN needs to be defined as described
+ here.
+ Setting environmentFile to /var/lib/vaultwarden.env
+ and ensuring permissions with e.g.
+ chown vaultwarden:vaultwarden /var/lib/vaultwarden.env
+ (the vaultwarden user will only exist after activating with
+ enable = true; before this), we can set the contents of the file to have
+ contents such as:
+
+
+# Admin secret token, see
+# https://github.com/dani-garcia/vaultwarden/wiki/Enabling-admin-page
+ADMIN_TOKEN=...copy-paste a unique generated secret token here...
+
'';
};
diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix
index 459380b86a3a..fc02833207ef 100644
--- a/pkgs/applications/audio/strawberry/default.nix
+++ b/pkgs/applications/audio/strawberry/default.nix
@@ -37,13 +37,13 @@
mkDerivation rec {
pname = "strawberry";
- version = "1.0.4";
+ version = "1.0.5";
src = fetchFromGitHub {
owner = "jonaski";
repo = pname;
rev = version;
- hash = "sha256-UjmrU/SA8gf+HwyCb6hm8IClUaEXvWGmIy3xDJPIsgE=";
+ hash = "sha256-6d7oB54IPI+G5Mhkj+PdQQY93r1SBE2R06qSGIacj8Q=";
};
# the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index f2699445dbb1..4ea3843c3f76 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -1120,6 +1120,18 @@ final: prev:
meta.homepage = "https://github.com/hrsh7th/cmp-calc/";
};
+ cmp-clippy = buildVimPluginFrom2Nix {
+ pname = "cmp-clippy";
+ version = "2021-10-24";
+ src = fetchFromGitHub {
+ owner = "vappolinario";
+ repo = "cmp-clippy";
+ rev = "9f8dd021f7b9326407a439105b0c646983191a49";
+ sha256 = "02k0zwjbd98f76f3v46lvd8wfm8wibkh703g8vxr26yv1fwghs4n";
+ };
+ meta.homepage = "https://github.com/vappolinario/cmp-clippy/";
+ };
+
cmp-cmdline = buildVimPluginFrom2Nix {
pname = "cmp-cmdline";
version = "2022-05-02";
@@ -1132,6 +1144,18 @@ final: prev:
meta.homepage = "https://github.com/hrsh7th/cmp-cmdline/";
};
+ cmp-cmdline-history = buildVimPluginFrom2Nix {
+ pname = "cmp-cmdline-history";
+ version = "2022-05-04";
+ src = fetchFromGitHub {
+ owner = "dmitmel";
+ repo = "cmp-cmdline-history";
+ rev = "003573b72d4635ce636234a826fa8c4ba2895ffe";
+ sha256 = "1v2xyspm7k9jmnzbfg0js15c6sha7ravf4lddsk85icdw16fxji1";
+ };
+ meta.homepage = "https://github.com/dmitmel/cmp-cmdline-history/";
+ };
+
cmp-conjure = buildVimPluginFrom2Nix {
pname = "cmp-conjure";
version = "2021-10-09";
@@ -1144,6 +1168,66 @@ final: prev:
meta.homepage = "https://github.com/PaterJason/cmp-conjure/";
};
+ cmp-conventionalcommits = buildVimPluginFrom2Nix {
+ pname = "cmp-conventionalcommits";
+ version = "2021-10-28";
+ src = fetchFromGitHub {
+ owner = "davidsierradz";
+ repo = "cmp-conventionalcommits";
+ rev = "5518362bc4f5dfbc9d242d9379fdec48b6278c5e";
+ sha256 = "02jvz8sjrr4xw0wg5y03gnv5sc78gqvmblmqi02y748qgsd5grb6";
+ };
+ meta.homepage = "https://github.com/davidsierradz/cmp-conventionalcommits/";
+ };
+
+ cmp-copilot = buildVimPluginFrom2Nix {
+ pname = "cmp-copilot";
+ version = "2022-04-11";
+ src = fetchFromGitHub {
+ owner = "hrsh7th";
+ repo = "cmp-copilot";
+ rev = "1f3f31c54bd71e41ed157430702bc2837ea582ab";
+ sha256 = "14nza4r8vr58s74f3fpzlmvrv9lcxzvfvizkz71p47f1zgddhgfs";
+ };
+ meta.homepage = "https://github.com/hrsh7th/cmp-copilot/";
+ };
+
+ cmp-dap = buildVimPluginFrom2Nix {
+ pname = "cmp-dap";
+ version = "2022-04-27";
+ src = fetchFromGitHub {
+ owner = "rcarriga";
+ repo = "cmp-dap";
+ rev = "69f22863739482120f9240919db1ac7d4dea3278";
+ sha256 = "03cxmnbr4sn69dzg1fg4r7rgja4invzfgpid123mhahq6sn7jir9";
+ };
+ meta.homepage = "https://github.com/rcarriga/cmp-dap/";
+ };
+
+ cmp-dictionary = buildVimPluginFrom2Nix {
+ pname = "cmp-dictionary";
+ version = "2022-05-04";
+ src = fetchFromGitHub {
+ owner = "uga-rosa";
+ repo = "cmp-dictionary";
+ rev = "0ba3df56258b48a5a6a0130d31ae3cf4908c9567";
+ sha256 = "1ny42i913w476bwyrlkwkiv14bdakvnkqx26py45f9qlzrfqj2m5";
+ };
+ meta.homepage = "https://github.com/uga-rosa/cmp-dictionary/";
+ };
+
+ cmp-digraphs = buildVimPluginFrom2Nix {
+ pname = "cmp-digraphs";
+ version = "2021-12-13";
+ src = fetchFromGitHub {
+ owner = "dmitmel";
+ repo = "cmp-digraphs";
+ rev = "5efc1f0078d7c5f3ea1c8e3aad04da3fd6e081a9";
+ sha256 = "061rf7c4lfghsryldmgk5inmwa1994imp1j0l94qgaig6s6hb0kg";
+ };
+ meta.homepage = "https://github.com/dmitmel/cmp-digraphs/";
+ };
+
cmp-emoji = buildVimPluginFrom2Nix {
pname = "cmp-emoji";
version = "2021-09-28";
@@ -1156,6 +1240,66 @@ final: prev:
meta.homepage = "https://github.com/hrsh7th/cmp-emoji/";
};
+ cmp-fish = buildVimPluginFrom2Nix {
+ pname = "cmp-fish";
+ version = "2022-02-17";
+ src = fetchFromGitHub {
+ owner = "mtoohey31";
+ repo = "cmp-fish";
+ rev = "2ce8febeff3e4600acac498b7cde72cc9d2dd7b1";
+ sha256 = "1clarmx43ygwsaxy73cgy86i33vjrfzr53z7ym29ynndb7zlzg6v";
+ };
+ meta.homepage = "https://github.com/mtoohey31/cmp-fish/";
+ };
+
+ cmp-fuzzy-buffer = buildVimPluginFrom2Nix {
+ pname = "cmp-fuzzy-buffer";
+ version = "2022-01-13";
+ src = fetchFromGitHub {
+ owner = "tzachar";
+ repo = "cmp-fuzzy-buffer";
+ rev = "c00e59019c5b3c00cb5590f9ae1fad4446fb855d";
+ sha256 = "0zax13arc36db2w1l0xyriqskknnvg1wxs809737san70gh74p0w";
+ };
+ meta.homepage = "https://github.com/tzachar/cmp-fuzzy-buffer/";
+ };
+
+ cmp-fuzzy-path = buildVimPluginFrom2Nix {
+ pname = "cmp-fuzzy-path";
+ version = "2022-05-08";
+ src = fetchFromGitHub {
+ owner = "tzachar";
+ repo = "cmp-fuzzy-path";
+ rev = "8c1ecaaf8bf16bc4af4eaaaac73ff5a29174406b";
+ sha256 = "0c607vljcf5zwxvfj4s1vmqridwpwql7zynwc38zx9lafv7l2djb";
+ };
+ meta.homepage = "https://github.com/tzachar/cmp-fuzzy-path/";
+ };
+
+ cmp-git = buildVimPluginFrom2Nix {
+ pname = "cmp-git";
+ version = "2022-05-11";
+ src = fetchFromGitHub {
+ owner = "petertriho";
+ repo = "cmp-git";
+ rev = "60e3de62b925ea05c7aa37883408859c72d498fb";
+ sha256 = "0qbfby0b7ix1x5ak130ja2h1ngq0p20jb9msr29bijfy68afpdw1";
+ };
+ meta.homepage = "https://github.com/petertriho/cmp-git/";
+ };
+
+ cmp-greek = buildVimPluginFrom2Nix {
+ pname = "cmp-greek";
+ version = "2022-01-10";
+ src = fetchFromGitHub {
+ owner = "max397574";
+ repo = "cmp-greek";
+ rev = "799110b976f9194055e9d506931ac38171bc6bcd";
+ sha256 = "049xi4ifla86fd5k68vqxwxxq5hg05y24z7yqg671hbw3lzpi0h9";
+ };
+ meta.homepage = "https://github.com/max397574/cmp-greek/";
+ };
+
cmp-latex-symbols = buildVimPluginFrom2Nix {
pname = "cmp-latex-symbols";
version = "2021-09-10";
@@ -1168,6 +1312,42 @@ final: prev:
meta.homepage = "https://github.com/kdheepak/cmp-latex-symbols/";
};
+ cmp-look = buildVimPluginFrom2Nix {
+ pname = "cmp-look";
+ version = "2022-03-21";
+ src = fetchFromGitHub {
+ owner = "octaltree";
+ repo = "cmp-look";
+ rev = "58dd22adc34d21f95b93407719aa8a894c52c235";
+ sha256 = "107nvm4xgd3bhz0sqxx4bj19xjli4c52r6jyajw50bv0my2afihq";
+ };
+ meta.homepage = "https://github.com/octaltree/cmp-look/";
+ };
+
+ cmp-neosnippet = buildVimPluginFrom2Nix {
+ pname = "cmp-neosnippet";
+ version = "2022-01-06";
+ src = fetchFromGitHub {
+ owner = "notomo";
+ repo = "cmp-neosnippet";
+ rev = "2d14526af3f02dcea738b4cea520e6ce55c09979";
+ sha256 = "0xf3nfkgbrfhac8nadkzq22pzi9gsidax4ddavqkqqivlcgllrgf";
+ };
+ meta.homepage = "https://github.com/notomo/cmp-neosnippet/";
+ };
+
+ cmp-npm = buildVimPluginFrom2Nix {
+ pname = "cmp-npm";
+ version = "2021-10-27";
+ src = fetchFromGitHub {
+ owner = "David-Kunz";
+ repo = "cmp-npm";
+ rev = "4b6166c3feeaf8dae162e33ee319dc5880e44a29";
+ sha256 = "0lkrbj5pswyb161hi424bii394qfdhm7v86x18a5fs2cmkwi0222";
+ };
+ meta.homepage = "https://github.com/David-Kunz/cmp-npm/";
+ };
+
cmp-nvim-lsp = buildVimPluginFrom2Nix {
pname = "cmp-nvim-lsp";
version = "2022-05-16";
@@ -1192,6 +1372,18 @@ final: prev:
meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp-document-symbol/";
};
+ cmp-nvim-lsp-signature-help = buildVimPluginFrom2Nix {
+ pname = "cmp-nvim-lsp-signature-help";
+ version = "2022-03-29";
+ src = fetchFromGitHub {
+ owner = "hrsh7th";
+ repo = "cmp-nvim-lsp-signature-help";
+ rev = "8014f6d120f72fe0a135025c4d41e3fe41fd411b";
+ sha256 = "1k61aw9mp012h625jqrf311vnsm2rg27k08lxa4nv8kp6nk7il29";
+ };
+ meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp-signature-help/";
+ };
+
cmp-nvim-lua = buildVimPluginFrom2Nix {
pname = "cmp-nvim-lua";
version = "2021-10-11";
@@ -1204,6 +1396,18 @@ final: prev:
meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lua/";
};
+ cmp-nvim-tags = buildVimPluginFrom2Nix {
+ pname = "cmp-nvim-tags";
+ version = "2022-03-31";
+ src = fetchFromGitHub {
+ owner = "quangnguyen30192";
+ repo = "cmp-nvim-tags";
+ rev = "98b15fee0cd64760345be3a30f1a592b5a9abb20";
+ sha256 = "19fgzaxapazrl07q0ikximgm8k77vasz5fras3xnbax7r3bln127";
+ };
+ meta.homepage = "https://github.com/quangnguyen30192/cmp-nvim-tags/";
+ };
+
cmp-nvim-ultisnips = buildVimPluginFrom2Nix {
pname = "cmp-nvim-ultisnips";
version = "2022-04-22";
@@ -1240,6 +1444,18 @@ final: prev:
meta.homepage = "https://github.com/jc-doyle/cmp-pandoc-references/";
};
+ cmp-pandoc-nvim = buildVimPluginFrom2Nix {
+ pname = "cmp-pandoc.nvim";
+ version = "2022-05-03";
+ src = fetchFromGitHub {
+ owner = "aspeddro";
+ repo = "cmp-pandoc.nvim";
+ rev = "cb2980263e14fb3c1b776edbd2c7a312b67c65ae";
+ sha256 = "0d439njzdnm1qhnig2qr9ywq3q72vpb6wqxwil9czhqzn80swrj9";
+ };
+ meta.homepage = "https://github.com/aspeddro/cmp-pandoc.nvim/";
+ };
+
cmp-path = buildVimPluginFrom2Nix {
pname = "cmp-path";
version = "2022-02-02";
@@ -1252,6 +1468,30 @@ final: prev:
meta.homepage = "https://github.com/hrsh7th/cmp-path/";
};
+ cmp-rg = buildVimPluginFrom2Nix {
+ pname = "cmp-rg";
+ version = "2022-01-13";
+ src = fetchFromGitHub {
+ owner = "lukas-reineke";
+ repo = "cmp-rg";
+ rev = "fd92d70ff36b30924401b0cf7d4ce7344c8235f7";
+ sha256 = "0z8knl4l5a7miw081h290s0g4icqqvn6qibr6jx4x71qwqb21w2y";
+ };
+ meta.homepage = "https://github.com/lukas-reineke/cmp-rg/";
+ };
+
+ cmp-snippy = buildVimPluginFrom2Nix {
+ pname = "cmp-snippy";
+ version = "2021-09-20";
+ src = fetchFromGitHub {
+ owner = "dcampos";
+ repo = "cmp-snippy";
+ rev = "9af1635fe40385ffa3dabf322039cb5ae1fd7d35";
+ sha256 = "1ag31kvd2q1awasdrc6pbbbsf0l3c99crz4h03337wj1kcssiixy";
+ };
+ meta.homepage = "https://github.com/dcampos/cmp-snippy/";
+ };
+
cmp-spell = buildVimPluginFrom2Nix {
pname = "cmp-spell";
version = "2021-10-19";
@@ -1312,6 +1552,30 @@ final: prev:
meta.homepage = "https://github.com/lukas-reineke/cmp-under-comparator/";
};
+ cmp-vim-lsp = buildVimPluginFrom2Nix {
+ pname = "cmp-vim-lsp";
+ version = "2021-10-26";
+ src = fetchFromGitHub {
+ owner = "dmitmel";
+ repo = "cmp-vim-lsp";
+ rev = "b13312a8c1a74a8747e64117f26f17390e8abfa8";
+ sha256 = "1f43qwxr8l2qj4mq1lfk5z3c0bqs8dlgyy1yj1acpnknrgi8572p";
+ };
+ meta.homepage = "https://github.com/dmitmel/cmp-vim-lsp/";
+ };
+
+ cmp-vimwiki-tags = buildVimPluginFrom2Nix {
+ pname = "cmp-vimwiki-tags";
+ version = "2022-04-25";
+ src = fetchFromGitHub {
+ owner = "pontusk";
+ repo = "cmp-vimwiki-tags";
+ rev = "a9e631c8f4d64e009d253f741b035eb5d1bd404f";
+ sha256 = "0j75bdcxbzm24mkq3lynm1crv5rqhw966aa7l27y12dlp6rbfvn0";
+ };
+ meta.homepage = "https://github.com/pontusk/cmp-vimwiki-tags/";
+ };
+
cmp-vsnip = buildVimPluginFrom2Nix {
pname = "cmp-vsnip";
version = "2021-11-10";
@@ -1324,6 +1588,18 @@ final: prev:
meta.homepage = "https://github.com/hrsh7th/cmp-vsnip/";
};
+ cmp-zsh = buildVimPluginFrom2Nix {
+ pname = "cmp-zsh";
+ version = "2022-01-18";
+ src = fetchFromGitHub {
+ owner = "tamago324";
+ repo = "cmp-zsh";
+ rev = "1d8133e5637c73b3eb392682ae9661d521738268";
+ sha256 = "0122lf44yqjp01znp7gnc682yx7fikjkzc5njp73lmys76321lz3";
+ };
+ meta.homepage = "https://github.com/tamago324/cmp-zsh/";
+ };
+
cmp_luasnip = buildVimPluginFrom2Nix {
pname = "cmp_luasnip";
version = "2022-05-01";
@@ -2662,6 +2938,18 @@ final: prev:
meta.homepage = "https://github.com/BeneCollyridam/futhark-vim/";
};
+ fuzzy-nvim = buildVimPluginFrom2Nix {
+ pname = "fuzzy.nvim";
+ version = "2022-02-20";
+ src = fetchFromGitHub {
+ owner = "tzachar";
+ repo = "fuzzy.nvim";
+ rev = "d5fee69b54ef400f0ccedf37917c4782e8929424";
+ sha256 = "1xnmwmbrjsfj3v4vk57gcf4l3wl9n8jks50ds8gaawz5bpy54yff";
+ };
+ meta.homepage = "https://github.com/tzachar/fuzzy.nvim/";
+ };
+
fwatch-nvim = buildVimPluginFrom2Nix {
pname = "fwatch.nvim";
version = "2021-07-25";
@@ -5290,6 +5578,18 @@ final: prev:
meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
};
+ nvim-snippy = buildVimPluginFrom2Nix {
+ pname = "nvim-snippy";
+ version = "2022-05-01";
+ src = fetchFromGitHub {
+ owner = "dcampos";
+ repo = "nvim-snippy";
+ rev = "a4512c9a9c0de83494fac66d02e04ff4f0805cae";
+ sha256 = "0vaabj2m84ba3ryl6n5s5rryjg06kjk571z6cmdgccff4lvq9d4v";
+ };
+ meta.homepage = "https://github.com/dcampos/nvim-snippy/";
+ };
+
nvim-solarized-lua = buildVimPluginFrom2Nix {
pname = "nvim-solarized-lua";
version = "2022-05-13";
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index fa175badfd7b..934bdfcf046a 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -19,8 +19,10 @@
, code-minimap
, dasht
, direnv
+, fish
, fzf
, gawk
+, git
, gnome
, himalaya
, jq
@@ -30,12 +32,15 @@
, meson
, nim
, nodePackages
+, pandoc
, parinfer-rust
+, ripgrep
, skim
, sqlite
, statix
, stylish-haskell
, tabnine
+, tmux
, tup
, vim
, which
@@ -45,6 +50,7 @@
, nodejs
, xdotool
, xorg
+, zsh
# test dependencies
, neovim-unwrapped
@@ -133,6 +139,74 @@ self: super: {
'';
});
+ cmp-clippy = super.cmp-clippy.overrideAttrs (old: {
+ dependencies = with self; [ nvim-cmp plenary-nvim ];
+ });
+
+ cmp-copilot = super.cmp-copilot.overrideAttrs (old: {
+ dependencies = with self; [ nvim-cmp copilot-vim ];
+ });
+
+ cmp-dap = super.cmp-dap.overrideAttrs (old: {
+ dependencies = with self; [ nvim-cmp nvim-dap ];
+ });
+
+ cmp-dictionary = super.cmp-dictionary.overrideAttrs (old: {
+ dependencies = with self; [ nvim-cmp ];
+ });
+
+ cmp-digraphs = super.cmp-digraphs.overrideAttrs (old: {
+ dependencies = with self; [ nvim-cmp ];
+ });
+
+ cmp-fish = super.cmp-fish.overrideAttrs (old: {
+ dependencies = with self; [ nvim-cmp fish ];
+ });
+
+ cmp-fuzzy-buffer = super.cmp-fuzzy-buffer.overrideAttrs (old: {
+ dependencies = with self; [ nvim-cmp fuzzy-nvim ];
+ });
+
+ cmp-fuzzy-path = super.cmp-fuzzy-path.overrideAttrs (old: {
+ dependencies = with self; [ nvim-cmp fuzzy-nvim ];
+ });
+
+ cmp-git = super.cmp-git.overrideAttrs (old: {
+ dependencies = with self; [ nvim-cmp curl git ];
+ });
+
+ cmp-greek = super.cmp-greek.overrideAttrs (old: {
+ dependencies = with self; [ nvim-cmp ];
+ });
+
+ cmp-look = super.cmp-look.overrideAttrs (old: {
+ dependencies = with self; [ nvim-cmp ];
+ });
+
+ cmp-neosnippet = super.cmp-neosnippet.overrideAttrs (old: {
+ dependencies = with self; [ nvim-cmp neosnippet-vim ];
+ });
+
+ cmp-npm = super.cmp-npm.overrideAttrs (old: {
+ dependencies = with self; [ nvim-cmp nodejs plenary-nvim ];
+ });
+
+ cmp-nvim-lsp-signature-help = super.cmp-nvim-lsp-signature-help.overrideAttrs (old: {
+ dependencies = with self; [ nvim-cmp ];
+ });
+
+ cmp-pandoc-nvim = super.cmp-pandoc-nvim.overrideAttrs (old: {
+ dependencies = with self; [ nvim-cmp pandoc plenary-nvim ];
+ });
+
+ cmp-rg = super.cmp-rg.overrideAttrs (old: {
+ dependencies = with self; [ nvim-cmp ripgrep ];
+ });
+
+ cmp-snippy = super.cmp-snippy.overrideAttrs (old: {
+ dependencies = with self; [ nvim-cmp nvim-snippy ];
+ });
+
cmp-tabnine = super.cmp-tabnine.overrideAttrs (old: {
buildInputs = [ tabnine ];
@@ -142,6 +216,26 @@ self: super: {
'';
});
+ cmp-nvim-tags = super.cmp-nvim-tags.overrideAttrs (old: {
+ dependencies = with self; [ nvim-cmp ];
+ });
+
+ cmp-tmux = super.cmp-tmux.overrideAttrs (old: {
+ dependencies = with self; [ nvim-cmp tmux ];
+ });
+
+ cmp-vimwiki-tags = super.cmp-vimwiki-tags.overrideAttrs (old: {
+ dependencies = with self; [ nvim-cmp vimwiki ];
+ });
+
+ cmp-vim-lsp = super.cmp-vim-lsp.overrideAttrs (old: {
+ dependencies = with self; [ nvim-cmp vim-lsp ];
+ });
+
+ cmp-zsh = super.cmp-zsh.overrideAttrs (old: {
+ dependencies = with self; [ nvim-cmp zsh ];
+ });
+
command-t = super.command-t.overrideAttrs (old: {
buildInputs = [ ruby rake ];
buildPhase = ''
@@ -294,6 +388,10 @@ self: super: {
'';
});
+ fuzzy-nvim = super.fuzzy-nvim.overrideAttrs (old: {
+ dependencies = with self; [ telescope-fzy-native-nvim ];
+ });
+
fzf-checkout-vim = super.fzf-checkout-vim.overrideAttrs (old: {
# The plugin has a makefile which tries to run tests in a docker container.
# This prevents it.
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index f79b420714e7..5148efdf4c4a 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -94,23 +94,46 @@ https://github.com/bbchung/clighter8/,,
https://github.com/winston0410/cmd-parser.nvim/,,
https://github.com/hrsh7th/cmp-buffer/,,
https://github.com/hrsh7th/cmp-calc/,,
+https://github.com/vappolinario/cmp-clippy/,HEAD,
https://github.com/hrsh7th/cmp-cmdline/,,
+https://github.com/dmitmel/cmp-cmdline-history/,HEAD,
https://github.com/PaterJason/cmp-conjure/,,
+https://github.com/davidsierradz/cmp-conventionalcommits/,HEAD,
+https://github.com/hrsh7th/cmp-copilot/,HEAD,
+https://github.com/rcarriga/cmp-dap/,HEAD,
+https://github.com/uga-rosa/cmp-dictionary/,HEAD,
+https://github.com/dmitmel/cmp-digraphs/,HEAD,
https://github.com/hrsh7th/cmp-emoji/,,
+https://github.com/mtoohey31/cmp-fish/,HEAD,
+https://github.com/tzachar/cmp-fuzzy-buffer/,HEAD,
+https://github.com/tzachar/cmp-fuzzy-path/,HEAD,
+https://github.com/petertriho/cmp-git/,HEAD,
+https://github.com/max397574/cmp-greek/,HEAD,
https://github.com/kdheepak/cmp-latex-symbols/,,
+https://github.com/octaltree/cmp-look/,HEAD,
+https://github.com/notomo/cmp-neosnippet/,HEAD,
+https://github.com/David-Kunz/cmp-npm/,HEAD,
https://github.com/hrsh7th/cmp-nvim-lsp/,,
https://github.com/hrsh7th/cmp-nvim-lsp-document-symbol/,,
+https://github.com/hrsh7th/cmp-nvim-lsp-signature-help/,HEAD,
https://github.com/hrsh7th/cmp-nvim-lua/,,
+https://github.com/quangnguyen30192/cmp-nvim-tags/,HEAD,
https://github.com/quangnguyen30192/cmp-nvim-ultisnips/,,
https://github.com/hrsh7th/cmp-omni/,,
https://github.com/jc-doyle/cmp-pandoc-references/,,
+https://github.com/aspeddro/cmp-pandoc.nvim/,HEAD,
https://github.com/hrsh7th/cmp-path/,,
+https://github.com/lukas-reineke/cmp-rg/,HEAD,
+https://github.com/dcampos/cmp-snippy/,HEAD,
https://github.com/f3fora/cmp-spell/,,
https://github.com/tzachar/cmp-tabnine/,,
https://github.com/andersevenrud/cmp-tmux/,,
https://github.com/ray-x/cmp-treesitter/,,
https://github.com/lukas-reineke/cmp-under-comparator/,,
+https://github.com/dmitmel/cmp-vim-lsp/,HEAD,
+https://github.com/pontusk/cmp-vimwiki-tags/,HEAD,
https://github.com/hrsh7th/cmp-vsnip/,,
+https://github.com/tamago324/cmp-zsh/,HEAD,
https://github.com/saadparwaiz1/cmp_luasnip/,,
https://github.com/vn-ki/coc-clap/,,
https://github.com/neoclide/coc-denite/,,
@@ -222,6 +245,7 @@ https://github.com/rafamadriz/friendly-snippets/,,
https://github.com/raghur/fruzzy/,,
https://github.com/shumphrey/fugitive-gitlab.vim/,,
https://github.com/BeneCollyridam/futhark-vim/,,
+https://github.com/tzachar/fuzzy.nvim/,HEAD,
https://github.com/rktjmp/fwatch.nvim/,,
https://github.com/stsewd/fzf-checkout.vim/,,
https://github.com/monkoose/fzf-hoogle.vim/,HEAD,
@@ -445,6 +469,7 @@ https://github.com/yamatsum/nvim-nonicons/,,
https://github.com/rcarriga/nvim-notify/,,
https://github.com/gennaro-tedesco/nvim-peekup/,,
https://github.com/dstein64/nvim-scrollview/,,
+https://github.com/dcampos/nvim-snippy/,HEAD,
https://github.com/ishan9299/nvim-solarized-lua/,,
https://github.com/nvim-pack/nvim-spectre/,,
https://github.com/norcalli/nvim-terminal.lua/,,
diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix
index 619e01f57847..6231e62bc2dc 100644
--- a/pkgs/applications/misc/1password/default.nix
+++ b/pkgs/applications/misc/1password/default.nix
@@ -12,12 +12,12 @@ let
if extension == "zip" then fetchzip args else fetchurl args;
pname = "1password-cli";
- version = "2.3.1";
+ version = "2.4.1";
sources = rec {
- aarch64-linux = fetch "linux_arm64" "sha256-MikzcVqlhVSKzr1ttOCAg4p57sjsalSuwcqBhVUr5Ng=" "zip";
- i686-linux = fetch "linux_386" "sha256-ElOhd3n38xAPtVePjQb8qMUCCAWqEfBKlX9Vuz5/Zns=" "zip";
- x86_64-linux = fetch "linux_amd64" "sha256-r8yl9dDiiIQBooePrq/dGw2RU9tJXmeblx+qk3qq5Ys=" "zip";
- aarch64-darwin = fetch "apple_universal" "sha256-sXdYInNBOEW/zIEPjhKbFOMxZdrMlE8pOwhmXLUJgsk=" "pkg";
+ aarch64-linux = fetch "linux_arm64" "sha256-ANRYE1BoezrcDxZrQYp/OPdtn4J+FmC/PLSIP5Amm18=" "zip";
+ i686-linux = fetch "linux_386" "sha256-w3anr76uj/Z+ilZ+LUGOB1CoKkvxcD+v8c8lVADPwRY=" "zip";
+ x86_64-linux = fetch "linux_amd64" "sha256-axZ+XDIMJlAicnYTIXgcaoT+Zcg6xvHlchl/ng7V9GY=" "zip";
+ aarch64-darwin = fetch "apple_universal" "sha256-/DnrQ4fwbc2ELtsEClvzA9kTrse3pMgGLbhiKZ3gphA=" "pkg";
x86_64-darwin = aarch64-darwin;
};
platforms = builtins.attrNames sources;
diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix
index 77419c95eb0a..c4c00d563786 100644
--- a/pkgs/applications/networking/browsers/palemoon/default.nix
+++ b/pkgs/applications/networking/browsers/palemoon/default.nix
@@ -113,6 +113,13 @@ stdenv.mkDerivation rec {
configurePhase = ''
runHook preConfigure
+ # Too many cores can lead to build flakiness
+ # https://forum.palemoon.org/viewtopic.php?f=5&t=28480
+ export jobs=$(($NIX_BUILD_CORES<=32 ? $NIX_BUILD_CORES : 32))
+ if [ -z "$enableParallelBuilding" ]; then
+ jobs=1
+ fi
+
export MOZCONFIG=$PWD/mozconfig
export MOZ_NOSPAM=1
@@ -120,7 +127,7 @@ stdenv.mkDerivation rec {
export gtkversion=${if withGTK3 then "3" else "2"}
export xlibs=${lib.makeLibraryPath [ xorg.libX11 ]}
export prefix=$out
- export mozmakeflags="-j${if enableParallelBuilding then "$NIX_BUILD_CORES" else "1"}"
+ export mozmakeflags="-j$jobs"
export autoconf=${autoconf213}/bin/autoconf
substituteAll ${./mozconfig} $MOZCONFIG
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index cba350a5d96c..c415735d2b12 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -87,7 +87,7 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
- version = "11.0.13";
+ version = "11.0.14";
lang = "en-US";
@@ -98,7 +98,7 @@ let
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
];
- sha256 = "03pzwzgikc43pm0lga61jdzg46fanmvd1wsnb2xkq0y1ny8gsqfz";
+ sha256 = "19lsxdxbdismjrv2kmvm10cmr1x5klc2khlmrybycdw2vx7r41mn";
};
i686-linux = fetchurl {
@@ -107,7 +107,7 @@ let
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
];
- sha256 = "0j8h2g404sagzjxnwf55n8hpvmwk52qhml98nyliajf1xg8v8k19";
+ sha256 = "0hkj4vn5jk3z32mdgzzwmhj5xa4mv5p1nnwqhlsbc3g5b5q8bc7q";
};
};
in
diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 3631cd1463e2..57e4d222f1c1 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -20,11 +20,11 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec {
pname = "vivaldi";
- version = "5.3.2679.38-1";
+ version = "5.3.2679.55-1";
src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
- sha256 = "0jsmk12riai8nkj6zqc1frh4fl4w4zj3mncfgrs4niy6dvpasaja";
+ sha256 = "0bsvcvf453x9rmbksczqhzrl0j9xm49rn2ngvkw0ar9di3aiqy3z";
};
unpackPhase = ''
diff --git a/pkgs/applications/networking/cluster/lens/default.nix b/pkgs/applications/networking/cluster/lens/default.nix
index 151649ba22ee..ef70e2832800 100644
--- a/pkgs/applications/networking/cluster/lens/default.nix
+++ b/pkgs/applications/networking/cluster/lens/default.nix
@@ -2,13 +2,13 @@
let
pname = "lens";
- version = "5.3.4";
- build = "${version}-latest.20220120.1";
+ version = "5.5.3";
+ build = "${version}-latest.20220602.2";
name = "${pname}-${version}";
src = fetchurl {
url = "https://api.k8slens.dev/binaries/Lens-${build}.x86_64.AppImage";
- sha256 = "sha256-9vRLQFSocVkHAfgwdKSPhSAO4G/v/ANd0WQmilcZiVw=";
+ sha256 = "sha256-lwiwyXoO+7KgDnQ2Ly0QK0oEVHR73nsMZMGOd2j48dg=";
name = "${pname}.AppImage";
};
diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index 038c6d58d13f..0a4cea628815 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -5,14 +5,14 @@
python3Packages.buildPythonApplication rec {
pname = "flexget";
- version = "3.3.16";
+ version = "3.3.17";
# Fetch from GitHub in order to use `requirements.in`
src = fetchFromGitHub {
owner = "flexget";
repo = "flexget";
rev = "refs/tags/v${version}";
- hash = "sha256-XN5KJ9GgFSDMYd6n9Mt3UARsa/ZAB61DBGMRvFz/NVA=";
+ hash = "sha256-xVHk6fQBY8EQsZJDZYoQ+WXDpLGJrRTVR6xhF1DWv0I=";
};
postPatch = ''
diff --git a/pkgs/applications/networking/newsreaders/raven-reader/default.nix b/pkgs/applications/networking/newsreaders/raven-reader/default.nix
index 0858b4690bb8..f458efd92ebd 100644
--- a/pkgs/applications/networking/newsreaders/raven-reader/default.nix
+++ b/pkgs/applications/networking/newsreaders/raven-reader/default.nix
@@ -2,10 +2,10 @@
let
pname = "raven-reader";
- version = "1.0.72";
+ version = "1.0.73";
src = fetchurl {
url = "https://github.com/hello-efficiency-inc/raven-reader/releases/download/v${version}/Raven-Reader-${version}.AppImage";
- sha256 = "sha256-Sx02VMAgmncT9f5Hvs0LugzhD6Z8cWXHx4kn8IG9seU=";
+ sha256 = "sha256-wU99+nDXHGMad94qszw5uThKckk1ToUvjNrIf/yTeTM=";
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };
diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix
index 7e6910a3ab4b..c7f1f605f249 100644
--- a/pkgs/applications/office/homebank/default.nix
+++ b/pkgs/applications/office/homebank/default.nix
@@ -3,10 +3,10 @@
stdenv.mkDerivation rec {
pname = "homebank";
- version = "5.5.4";
+ version = "5.5.5";
src = fetchurl {
url = "http://homebank.free.fr/public/homebank-${version}.tar.gz";
- sha256 = "sha256-DQZpvKCZNArlwhPqE8srkyg7/IoOTPelkCwYKTZuV2U=";
+ sha256 = "sha256-vs4F7LUjkhR0JKoeWheTiXd7gr9Gir69c+twsq+cnmc=";
};
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix
index 58db9273b83c..e818f4a71faa 100644
--- a/pkgs/applications/terminal-emulators/kitty/default.nix
+++ b/pkgs/applications/terminal-emulators/kitty/default.nix
@@ -21,21 +21,20 @@
, bashInteractive
, zsh
, fish
-, fetchpatch
, nixosTests
}:
with python3Packages;
buildPythonApplication rec {
pname = "kitty";
- version = "0.25.1";
+ version = "0.25.2";
format = "other";
src = fetchFromGitHub {
owner = "kovidgoyal";
repo = "kitty";
rev = "v${version}";
- sha256 = "sha256-wL631cbA6ffXZomi6iDHk7XerRlpIL6T2qlEiQvFSJY=";
+ sha256 = "sha256-o/vVz1lPfsgkzbYjYhIrScCAROmVdiPsNwjW/m5n7Us=";
};
buildInputs = [
@@ -78,42 +77,12 @@ buildPythonApplication rec {
outputs = [ "out" "terminfo" "shell_integration" ];
patches = [
- # Fix to ensure that files in tar files used by SSH kitten have write permissions.
- (fetchpatch {
- name = "fix-tarball-file-permissions.patch";
- url = "https://github.com/kovidgoyal/kitty/commit/8540ca399053e8d42df27283bb5dd4af562ed29b.patch";
- sha256 = "sha256-y5w+ritkR+ZEfNSRDQW9r3BU2qt98UNK7vdEX/X+mKU=";
- })
-
- # Remove upon next release. Needed because of a missing #define.
- (fetchpatch {
- name = "fontconfig-1.patch";
- url = "https://github.com/kovidgoyal/kitty/commit/bec620a8d30c36453e471b140b07483c7f875bf4.patch";
- sha256 = "sha256-r1OTcXdO+RUAXmmIqI07m+z0zXq8DXCzgBRXPpnkGGM=";
- })
- (fetchpatch {
- name = "fontconfig-2.patch";
- url = "https://github.com/kovidgoyal/kitty/commit/1283a2b7e552d30cabce9345e5c13e5f9079183d.patch";
- sha256 = "sha256-UM/OsumnfVHuHTahpRwyWZOeu6L8WOwbBf3lcjwdTj8=";
- })
- (fetchpatch {
- name = "fontconfig-3.patch";
- url = "https://github.com/kovidgoyal/kitty/commit/5c4abe749b1f50ae556a711d24ac7f3e384fac4e.patch";
- sha256 = "sha256-amvyv5cZxHGPg7dZv649WjH4MNloFbmz5D4rhjKNzYA=";
- })
-
# Needed on darwin
# Gets `test_ssh_shell_integration` to pass for `zsh` when `compinit` complains about
# permissions.
./zsh-compinit.patch
- # Skip login shell detection when login shell is set to nologin
- (fetchpatch {
- name = "skip-login-shell-detection-for-nologin.patch";
- url = "https://github.com/kovidgoyal/kitty/commit/27906ea853ce7862bcb83e324ef80f6337b5d846.patch";
- sha256 = "sha256-Zg6uWkiWvb45i4xcp9k6jy0R2IQMT4PXr7BenzZ/md8=";
- })
# Skip `test_ssh_bootstrap_with_different_launchers` when launcher is `zsh` since it causes:
# OSError: master_fd is in error condition
./disable-test_ssh_bootstrap_with_different_launchers.patch
diff --git a/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/pkgs/applications/video/jellyfin-mpv-shim/default.nix
index 827824930cb2..9642556ad132 100644
--- a/pkgs/applications/video/jellyfin-mpv-shim/default.nix
+++ b/pkgs/applications/video/jellyfin-mpv-shim/default.nix
@@ -13,11 +13,11 @@
buildPythonApplication rec {
pname = "jellyfin-mpv-shim";
- version = "2.0.2";
+ version = "2.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "yFFMsGbzMAKyXpD/vZelswYulTYe5WybjG5pD2RpLrk=";
+ sha256 = "Nh2bSmzxInZgZmmelsXih6lRartDKjbC0/CB1gYiLcQ=";
};
propagatedBuildInputs = [
diff --git a/pkgs/build-support/rust/build-rust-crate/lib.sh b/pkgs/build-support/rust/build-rust-crate/lib.sh
index d4927b025aa8..39f7d53f6f75 100644
--- a/pkgs/build-support/rust/build-rust-crate/lib.sh
+++ b/pkgs/build-support/rust/build-rust-crate/lib.sh
@@ -16,6 +16,7 @@ build_lib() {
--out-dir target/lib \
-L dependency=target/deps \
--cap-lints allow \
+ $LINK \
$LIB_RUSTC_OPTS \
$BUILD_OUT_DIR \
$EXTRA_BUILD \
@@ -97,7 +98,6 @@ setup_link_paths() {
if [[ ! -z "$i" ]]; then
for library in $i; do
echo "-l $library" >> target/link
- echo "-l $library" >> target/link.final
done
fi
done
diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix
index 2e0a29ac123a..a4536a1751c8 100644
--- a/pkgs/build-support/rust/build-rust-crate/test/default.nix
+++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix
@@ -548,6 +548,10 @@ let
};
};
brotliCrates = (callPackage ./brotli-crates.nix {});
+ rcgenCrates = callPackage ./rcgen-crates.nix {
+ # Suppress deprecation warning
+ buildRustCrate = null;
+ };
tests = lib.mapAttrs (key: value: mkTest (value // lib.optionalAttrs (!value?crateName) { crateName = key; })) cases;
in tests // rec {
@@ -645,6 +649,16 @@ let
} ''
test -e ${pkg}/bin/brotli-decompressor && touch $out
'';
+
+ rcgenTest = let
+ pkg = rcgenCrates.rootCrate.build;
+ in runCommand "run-rcgen-test-cmd" {
+ nativeBuildInputs = [ pkg ];
+ } (if stdenv.hostPlatform == stdenv.buildPlatform then ''
+ ${pkg}/bin/rcgen && touch $out
+ '' else ''
+ test -x '${pkg}/bin/rcgen' && touch $out
+ '');
};
test = releaseTools.aggregate {
name = "buildRustCrate-tests";
diff --git a/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix b/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix
new file mode 100644
index 000000000000..0f97c9b724bd
--- /dev/null
+++ b/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix
@@ -0,0 +1,3496 @@
+
+# This file was @generated by crate2nix 0.10.0 with the command:
+# "generate"
+# See https://github.com/kolloch/crate2nix for more info.
+
+{ nixpkgs ?
+, pkgs ? import nixpkgs { config = {}; }
+, lib ? pkgs.lib
+, stdenv ? pkgs.stdenv
+, buildRustCrateForPkgs ? if buildRustCrate != null
+ then lib.warn "crate2nix: Passing `buildRustCrate` as argument to Cargo.nix is deprecated. If you don't customize `buildRustCrate`, replace `callPackage ./Cargo.nix {}` by `import ./Cargo.nix { inherit pkgs; }`, and if you need to customize `buildRustCrate`, use `buildRustCrateForPkgs` instead." (_: buildRustCrate)
+ else pkgs: pkgs.buildRustCrate
+ # Deprecated
+, buildRustCrate ? null
+ # This is used as the `crateOverrides` argument for `buildRustCrate`.
+, defaultCrateOverrides ? pkgs.defaultCrateOverrides
+ # The features to enable for the root_crate or the workspace_members.
+, rootFeatures ? [ "default" ]
+ # If true, throw errors instead of issueing deprecation warnings.
+, strictDeprecation ? false
+ # Used for conditional compilation based on CPU feature detection.
+, targetFeatures ? []
+ # Whether to perform release builds: longer compile times, faster binaries.
+, release ? true
+ # Additional crate2nix configuration if it exists.
+, crateConfig
+ ? if builtins.pathExists ./crate-config.nix
+ then pkgs.callPackage ./crate-config.nix {}
+ else {}
+}:
+
+rec {
+ #
+ # "public" attributes that we attempt to keep stable with new versions of crate2nix.
+ #
+
+ rootCrate = rec {
+ packageId = "rcgen";
+
+ # Use this attribute to refer to the derivation building your root crate package.
+ # You can override the features with rootCrate.build.override { features = [ "default" "feature1" ... ]; }.
+ build = internal.buildRustCrateWithFeatures {
+ inherit packageId;
+ };
+
+ # Debug support which might change between releases.
+ # File a bug if you depend on any for non-debug work!
+ debug = internal.debugCrate { inherit packageId; };
+ };
+ # Refer your crate build derivation by name here.
+ # You can override the features with
+ # workspaceMembers."${crateName}".build.override { features = [ "default" "feature1" ... ]; }.
+ workspaceMembers = {
+ "rcgen" = rec {
+ packageId = "rcgen";
+ build = internal.buildRustCrateWithFeatures {
+ packageId = "rcgen";
+ };
+
+ # Debug support which might change between releases.
+ # File a bug if you depend on any for non-debug work!
+ debug = internal.debugCrate { inherit packageId; };
+ };
+ };
+
+ # A derivation that joins the outputs of all workspace members together.
+ allWorkspaceMembers = pkgs.symlinkJoin {
+ name = "all-workspace-members";
+ paths =
+ let members = builtins.attrValues workspaceMembers;
+ in builtins.map (m: m.build) members;
+ };
+
+ #
+ # "internal" ("private") attributes that may change in every new version of crate2nix.
+ #
+
+ internal = rec {
+ # Build and dependency information for crates.
+ # Many of the fields are passed one-to-one to buildRustCrate.
+ #
+ # Noteworthy:
+ # * `dependencies`/`buildDependencies`: similar to the corresponding fields for buildRustCrate.
+ # but with additional information which is used during dependency/feature resolution.
+ # * `resolvedDependencies`: the selected default features reported by cargo - only included for debugging.
+ # * `devDependencies` as of now not used by `buildRustCrate` but used to
+ # inject test dependencies into the build
+
+ crates = {
+ "asn1-rs" = rec {
+ crateName = "asn1-rs";
+ version = "0.3.1";
+ edition = "2018";
+ sha256 = "0czsk1nd4dx2k83f7jzkn8klx05wbmblkx1jh51i4c170akhbzrh";
+ authors = [
+ "Pierre Chifflier "
+ ];
+ dependencies = [
+ {
+ name = "asn1-rs-derive";
+ packageId = "asn1-rs-derive";
+ }
+ {
+ name = "asn1-rs-impl";
+ packageId = "asn1-rs-impl";
+ }
+ {
+ name = "displaydoc";
+ packageId = "displaydoc";
+ }
+ {
+ name = "nom";
+ packageId = "nom";
+ usesDefaultFeatures = false;
+ features = [ "std" ];
+ }
+ {
+ name = "num-traits";
+ packageId = "num-traits";
+ }
+ {
+ name = "rusticata-macros";
+ packageId = "rusticata-macros";
+ }
+ {
+ name = "thiserror";
+ packageId = "thiserror";
+ }
+ {
+ name = "time";
+ packageId = "time";
+ optional = true;
+ features = [ "macros" "parsing" "formatting" ];
+ }
+ ];
+ features = {
+ "bigint" = [ "num-bigint" ];
+ "bits" = [ "bitvec" ];
+ "bitvec" = [ "dep:bitvec" ];
+ "cookie-factory" = [ "dep:cookie-factory" ];
+ "datetime" = [ "time" ];
+ "default" = [ "std" ];
+ "num-bigint" = [ "dep:num-bigint" ];
+ "serialize" = [ "cookie-factory" ];
+ "time" = [ "dep:time" ];
+ };
+ resolvedDefaultFeatures = [ "datetime" "default" "std" "time" ];
+ };
+ "asn1-rs-derive" = rec {
+ crateName = "asn1-rs-derive";
+ version = "0.1.0";
+ edition = "2018";
+ sha256 = "1gzf9vab06lk0zjvbr07axx64fndkng2s28bnj27fnwd548pb2yv";
+ procMacro = true;
+ authors = [
+ "Pierre Chifflier "
+ ];
+ dependencies = [
+ {
+ name = "proc-macro2";
+ packageId = "proc-macro2";
+ }
+ {
+ name = "quote";
+ packageId = "quote";
+ }
+ {
+ name = "syn";
+ packageId = "syn";
+ }
+ {
+ name = "synstructure";
+ packageId = "synstructure";
+ }
+ ];
+
+ };
+ "asn1-rs-impl" = rec {
+ crateName = "asn1-rs-impl";
+ version = "0.1.0";
+ edition = "2018";
+ sha256 = "1va27bn7qxqp4wanzjlkagnynv6jnrhnwmcky2ahzb1r405p6xr7";
+ procMacro = true;
+ authors = [
+ "Pierre Chifflier "
+ ];
+ dependencies = [
+ {
+ name = "proc-macro2";
+ packageId = "proc-macro2";
+ }
+ {
+ name = "quote";
+ packageId = "quote";
+ }
+ {
+ name = "syn";
+ packageId = "syn";
+ }
+ ];
+
+ };
+ "autocfg 0.1.7" = rec {
+ crateName = "autocfg";
+ version = "0.1.7";
+ edition = "2015";
+ sha256 = "1chwgimpx5z7xbag7krr9d8asxfqbh683qhgl9kn3hxk2l0djj8x";
+ authors = [
+ "Josh Stone "
+ ];
+
+ };
+ "autocfg 1.0.1" = rec {
+ crateName = "autocfg";
+ version = "1.0.1";
+ edition = "2015";
+ sha256 = "0jj6i9zn4gjl03kjvziqdji6rwx8ykz8zk2ngpc331z2g3fk3c6d";
+ authors = [
+ "Josh Stone "
+ ];
+
+ };
+ "base64" = rec {
+ crateName = "base64";
+ version = "0.13.0";
+ edition = "2018";
+ sha256 = "1z82g23mbzjgijkpcrilc7nljpxpvpf7zxf6iyiapkgka2ngwkch";
+ authors = [
+ "Alice Maz "
+ "Marshall Pierce "
+ ];
+ features = {
+ "default" = [ "std" ];
+ };
+ resolvedDefaultFeatures = [ "default" "std" ];
+ };
+ "base64ct" = rec {
+ crateName = "base64ct";
+ version = "1.1.1";
+ edition = "2018";
+ sha256 = "0p4was874qc90q2chm2i14m9mn8zmxjis8vaxihd6a2x4aqxkd76";
+ authors = [
+ "RustCrypto Developers"
+ ];
+ features = {
+ "std" = [ "alloc" ];
+ };
+ };
+ "bitflags" = rec {
+ crateName = "bitflags";
+ version = "1.3.2";
+ edition = "2018";
+ sha256 = "12ki6w8gn1ldq7yz9y680llwk5gmrhrzszaa17g1sbrw2r2qvwxy";
+ authors = [
+ "The Rust Project Developers"
+ ];
+ features = {
+ "compiler_builtins" = [ "dep:compiler_builtins" ];
+ "core" = [ "dep:core" ];
+ "rustc-dep-of-std" = [ "core" "compiler_builtins" ];
+ };
+ resolvedDefaultFeatures = [ "default" ];
+ };
+ "botan" = rec {
+ crateName = "botan";
+ version = "0.8.1";
+ edition = "2018";
+ sha256 = "08bmiyn7c3b0dgx20w6hr28d9jcq7cj78cchr84pc686sb2s41ik";
+ authors = [
+ "Jack Lloyd "
+ ];
+ dependencies = [
+ {
+ name = "botan-sys";
+ packageId = "botan-sys";
+ }
+ {
+ name = "cty";
+ packageId = "cty";
+ }
+ ];
+ features = {
+ "cstr_core" = [ "dep:cstr_core" ];
+ "no-std" = [ "cstr_core/alloc" ];
+ "vendored" = [ "botan-sys/vendored" ];
+ };
+ resolvedDefaultFeatures = [ "default" "vendored" ];
+ };
+ "botan-src" = rec {
+ crateName = "botan-src";
+ version = "0.21703.0";
+ edition = "2018";
+ sha256 = "0s2ad9q84qsrllfsbj7hjhn7gr3hab9ng6lwzwqmimia6yvja8y8";
+ authors = [
+ "Rodolphe Breard "
+ "Jack Lloyd "
+ ];
+
+ };
+ "botan-sys" = rec {
+ crateName = "botan-sys";
+ version = "0.8.1";
+ edition = "2015";
+ sha256 = "1m11zblxfanrhl97j7z3ap7n17rr8j0rg91sr7f9j6y2bsniaz1x";
+ authors = [
+ "Jack Lloyd "
+ ];
+ dependencies = [
+ {
+ name = "cty";
+ packageId = "cty";
+ }
+ ];
+ buildDependencies = [
+ {
+ name = "botan-src";
+ packageId = "botan-src";
+ optional = true;
+ }
+ ];
+ features = {
+ "botan-src" = [ "dep:botan-src" ];
+ "vendored" = [ "botan-src" ];
+ };
+ resolvedDefaultFeatures = [ "botan-src" "default" "vendored" ];
+ };
+ "bumpalo" = rec {
+ crateName = "bumpalo";
+ version = "3.9.1";
+ edition = "2018";
+ sha256 = "1688dv6s0cbj72p9lmll8a02a85dzxvdw2is7pji490zmd35m954";
+ authors = [
+ "Nick Fitzgerald "
+ ];
+ features = {
+ };
+ resolvedDefaultFeatures = [ "default" ];
+ };
+ "byteorder" = rec {
+ crateName = "byteorder";
+ version = "1.4.3";
+ edition = "2018";
+ sha256 = "0456lv9xi1a5bcm32arknf33ikv76p3fr9yzki4lb2897p2qkh8l";
+ authors = [
+ "Andrew Gallant "
+ ];
+ features = {
+ "default" = [ "std" ];
+ };
+ };
+ "cc" = rec {
+ crateName = "cc";
+ version = "1.0.72";
+ edition = "2018";
+ crateBin = [];
+ sha256 = "1vl50h2qh0nh0iddzj6gd1pnxnxpvwmbfxc30578c1pajmxi7a92";
+ authors = [
+ "Alex Crichton "
+ ];
+ features = {
+ "jobserver" = [ "dep:jobserver" ];
+ "parallel" = [ "jobserver" ];
+ };
+ };
+ "cfg-if" = rec {
+ crateName = "cfg-if";
+ version = "1.0.0";
+ edition = "2018";
+ sha256 = "1za0vb97n4brpzpv8lsbnzmq5r8f2b0cpqqr0sy8h5bn751xxwds";
+ authors = [
+ "Alex Crichton "
+ ];
+ features = {
+ "compiler_builtins" = [ "dep:compiler_builtins" ];
+ "core" = [ "dep:core" ];
+ "rustc-dep-of-std" = [ "core" "compiler_builtins" ];
+ };
+ };
+ "const-oid" = rec {
+ crateName = "const-oid";
+ version = "0.6.2";
+ edition = "2018";
+ sha256 = "12vv7csqqjj0x1l5mf51lgqiw76k5c3mb1yzfhfcqysks2j2lvwx";
+ authors = [
+ "RustCrypto Developers"
+ ];
+ features = {
+ };
+ };
+ "crypto-bigint" = rec {
+ crateName = "crypto-bigint";
+ version = "0.2.11";
+ edition = "2018";
+ sha256 = "00qckh65nzb7s7vd60wylw6alxf9g37xh31lirb1qw0l8fxx6fzq";
+ authors = [
+ "RustCrypto Developers"
+ ];
+ dependencies = [
+ {
+ name = "generic-array";
+ packageId = "generic-array";
+ optional = true;
+ }
+ {
+ name = "rand_core";
+ packageId = "rand_core";
+ optional = true;
+ }
+ {
+ name = "subtle";
+ packageId = "subtle";
+ usesDefaultFeatures = false;
+ }
+ ];
+ features = {
+ "default" = [ "rand" ];
+ "generic-array" = [ "dep:generic-array" ];
+ "rand" = [ "rand_core" ];
+ "rand_core" = [ "dep:rand_core" ];
+ "rlp" = [ "dep:rlp" ];
+ "zeroize" = [ "dep:zeroize" ];
+ };
+ resolvedDefaultFeatures = [ "default" "generic-array" "rand" "rand_core" ];
+ };
+ "cty" = rec {
+ crateName = "cty";
+ version = "0.2.2";
+ edition = "2015";
+ sha256 = "0d8z0pbr87wgzqqb2jk5pvj0afzc6d3rb772ach6fijhg6yglrdk";
+ authors = [
+ "Jorge Aparicio "
+ ];
+
+ };
+ "data-encoding" = rec {
+ crateName = "data-encoding";
+ version = "2.3.2";
+ edition = "2018";
+ sha256 = "0mvd8bjq5mq50fcf931cff57vwmbsvs1kpxynkzrshli98y3kqiy";
+ authors = [
+ "Julien Cretin "
+ ];
+ features = {
+ "default" = [ "std" ];
+ "std" = [ "alloc" ];
+ };
+ resolvedDefaultFeatures = [ "alloc" "default" "std" ];
+ };
+ "der" = rec {
+ crateName = "der";
+ version = "0.4.5";
+ edition = "2018";
+ sha256 = "1x4k0jln8va1657cghl40l6p7hyvr1ixz71v9cd6imwmgp51rdvr";
+ authors = [
+ "RustCrypto Developers"
+ ];
+ dependencies = [
+ {
+ name = "const-oid";
+ packageId = "const-oid";
+ optional = true;
+ }
+ {
+ name = "crypto-bigint";
+ packageId = "crypto-bigint";
+ optional = true;
+ features = [ "generic-array" ];
+ }
+ ];
+ features = {
+ "bigint" = [ "crypto-bigint" ];
+ "const-oid" = [ "dep:const-oid" ];
+ "crypto-bigint" = [ "dep:crypto-bigint" ];
+ "der_derive" = [ "dep:der_derive" ];
+ "derive" = [ "der_derive" ];
+ "oid" = [ "const-oid" ];
+ "std" = [ "alloc" ];
+ };
+ resolvedDefaultFeatures = [ "alloc" "bigint" "const-oid" "crypto-bigint" "oid" "std" ];
+ };
+ "der-parser" = rec {
+ crateName = "der-parser";
+ version = "7.0.0";
+ edition = "2018";
+ sha256 = "10kfa2gzl3x20mwgrd43cyi79xgkqxyzcyrh0xylv4apa33qlfgy";
+ authors = [
+ "Pierre Chifflier "
+ ];
+ dependencies = [
+ {
+ name = "asn1-rs";
+ packageId = "asn1-rs";
+ }
+ {
+ name = "displaydoc";
+ packageId = "displaydoc";
+ usesDefaultFeatures = false;
+ }
+ {
+ name = "nom";
+ packageId = "nom";
+ }
+ {
+ name = "num-bigint";
+ packageId = "num-bigint";
+ optional = true;
+ }
+ {
+ name = "num-traits";
+ packageId = "num-traits";
+ }
+ {
+ name = "rusticata-macros";
+ packageId = "rusticata-macros";
+ }
+ ];
+ features = {
+ "bigint" = [ "num-bigint" ];
+ "cookie-factory" = [ "dep:cookie-factory" ];
+ "default" = [ "std" ];
+ "num-bigint" = [ "dep:num-bigint" ];
+ "serialize" = [ "std" "cookie-factory" ];
+ };
+ resolvedDefaultFeatures = [ "bigint" "default" "num-bigint" "std" ];
+ };
+ "digest" = rec {
+ crateName = "digest";
+ version = "0.9.0";
+ edition = "2018";
+ sha256 = "0rmhvk33rgvd6ll71z8sng91a52rw14p0drjn1da0mqa138n1pfk";
+ authors = [
+ "RustCrypto Developers"
+ ];
+ dependencies = [
+ {
+ name = "generic-array";
+ packageId = "generic-array";
+ }
+ ];
+ features = {
+ "blobby" = [ "dep:blobby" ];
+ "dev" = [ "blobby" ];
+ "std" = [ "alloc" ];
+ };
+ resolvedDefaultFeatures = [ "alloc" "std" ];
+ };
+ "displaydoc" = rec {
+ crateName = "displaydoc";
+ version = "0.2.3";
+ edition = "2018";
+ sha256 = "11i8p5snlc1hs4g5q3wiyr75dn276l6kr0si5m7xmfa6y31mvy9v";
+ procMacro = true;
+ authors = [
+ "Jane Lusby "
+ ];
+ dependencies = [
+ {
+ name = "proc-macro2";
+ packageId = "proc-macro2";
+ }
+ {
+ name = "quote";
+ packageId = "quote";
+ }
+ {
+ name = "syn";
+ packageId = "syn";
+ }
+ ];
+ features = {
+ "default" = [ "std" ];
+ };
+ resolvedDefaultFeatures = [ "default" "std" ];
+ };
+ "foreign-types" = rec {
+ crateName = "foreign-types";
+ version = "0.3.2";
+ edition = "2015";
+ sha256 = "1cgk0vyd7r45cj769jym4a6s7vwshvd0z4bqrb92q1fwibmkkwzn";
+ authors = [
+ "Steven Fackler "
+ ];
+ dependencies = [
+ {
+ name = "foreign-types-shared";
+ packageId = "foreign-types-shared";
+ }
+ ];
+
+ };
+ "foreign-types-shared" = rec {
+ crateName = "foreign-types-shared";
+ version = "0.1.1";
+ edition = "2015";
+ sha256 = "0jxgzd04ra4imjv8jgkmdq59kj8fsz6w4zxsbmlai34h26225c00";
+ authors = [
+ "Steven Fackler "
+ ];
+
+ };
+ "generic-array" = rec {
+ crateName = "generic-array";
+ version = "0.14.5";
+ edition = "2015";
+ sha256 = "00qqhls43bzvyb7s26iw6knvsz3mckbxl3rhaahvypzhqwzd6j7x";
+ libName = "generic_array";
+ authors = [
+ "Bartłomiej Kamiński "
+ "Aaron Trent "
+ ];
+ dependencies = [
+ {
+ name = "typenum";
+ packageId = "typenum";
+ }
+ ];
+ buildDependencies = [
+ {
+ name = "version_check";
+ packageId = "version_check";
+ }
+ ];
+ features = {
+ "serde" = [ "dep:serde" ];
+ };
+ };
+ "getrandom" = rec {
+ crateName = "getrandom";
+ version = "0.2.4";
+ edition = "2018";
+ sha256 = "0k0bdr1dyf4n9fvnkx4fmwxhv4hgnyf55gj86v4m69fln743g3a1";
+ authors = [
+ "The Rand Project Developers"
+ ];
+ dependencies = [
+ {
+ name = "cfg-if";
+ packageId = "cfg-if";
+ }
+ {
+ name = "libc";
+ packageId = "libc";
+ usesDefaultFeatures = false;
+ target = { target, features }: (target."unix" or false);
+ }
+ {
+ name = "wasi";
+ packageId = "wasi";
+ target = { target, features }: (target."os" == "wasi");
+ }
+ ];
+ features = {
+ "compiler_builtins" = [ "dep:compiler_builtins" ];
+ "core" = [ "dep:core" ];
+ "js" = [ "wasm-bindgen" "js-sys" ];
+ "js-sys" = [ "dep:js-sys" ];
+ "rustc-dep-of-std" = [ "compiler_builtins" "core" "libc/rustc-dep-of-std" "wasi/rustc-dep-of-std" ];
+ "wasm-bindgen" = [ "dep:wasm-bindgen" ];
+ };
+ resolvedDefaultFeatures = [ "std" ];
+ };
+ "itoa" = rec {
+ crateName = "itoa";
+ version = "1.0.1";
+ edition = "2018";
+ sha256 = "0d8wr2qf5b25a04xf10rz9r0pdbjdgb0zaw3xvf8k2sqcz1qzaqs";
+ authors = [
+ "David Tolnay "
+ ];
+
+ };
+ "js-sys" = rec {
+ crateName = "js-sys";
+ version = "0.3.56";
+ edition = "2018";
+ sha256 = "010g8jkj5avy3xd77i3cprjzzpfa6z9z2ay0fkllqmpx617c53x3";
+ authors = [
+ "The wasm-bindgen Developers"
+ ];
+ dependencies = [
+ {
+ name = "wasm-bindgen";
+ packageId = "wasm-bindgen";
+ }
+ ];
+
+ };
+ "lazy_static" = rec {
+ crateName = "lazy_static";
+ version = "1.4.0";
+ edition = "2015";
+ sha256 = "0in6ikhw8mgl33wjv6q6xfrb5b9jr16q8ygjy803fay4zcisvaz2";
+ authors = [
+ "Marvin Löbel "
+ ];
+ dependencies = [
+ {
+ name = "spin";
+ packageId = "spin";
+ optional = true;
+ }
+ ];
+ features = {
+ "spin" = [ "dep:spin" ];
+ "spin_no_std" = [ "spin" ];
+ };
+ resolvedDefaultFeatures = [ "spin" "spin_no_std" ];
+ };
+ "libc" = rec {
+ crateName = "libc";
+ version = "0.2.116";
+ edition = "2015";
+ sha256 = "0x6sk17kv2fdsqxlm23bz9x1y79w90k7ylkflk44rgidhy4bspan";
+ authors = [
+ "The Rust Project Developers"
+ ];
+ features = {
+ "default" = [ "std" ];
+ "rustc-dep-of-std" = [ "align" "rustc-std-workspace-core" ];
+ "rustc-std-workspace-core" = [ "dep:rustc-std-workspace-core" ];
+ "use_std" = [ "std" ];
+ };
+ resolvedDefaultFeatures = [ "default" "std" ];
+ };
+ "libm" = rec {
+ crateName = "libm";
+ version = "0.2.1";
+ edition = "2018";
+ sha256 = "0akh56sh51adhagmk9l84dyrlz60gv8ri05xhr13i1b18czkpmy7";
+ authors = [
+ "Jorge Aparicio "
+ ];
+ features = {
+ "musl-reference-tests" = [ "rand" ];
+ "rand" = [ "dep:rand" ];
+ };
+ resolvedDefaultFeatures = [ "default" ];
+ };
+ "log" = rec {
+ crateName = "log";
+ version = "0.4.14";
+ edition = "2015";
+ sha256 = "04175hv0v62shd82qydq58a48k3bjijmk54v38zgqlbxqkkbpfai";
+ authors = [
+ "The Rust Project Developers"
+ ];
+ dependencies = [
+ {
+ name = "cfg-if";
+ packageId = "cfg-if";
+ }
+ ];
+ features = {
+ "kv_unstable" = [ "value-bag" ];
+ "kv_unstable_serde" = [ "kv_unstable_std" "value-bag/serde" "serde" ];
+ "kv_unstable_std" = [ "std" "kv_unstable" "value-bag/error" ];
+ "kv_unstable_sval" = [ "kv_unstable" "value-bag/sval" "sval" ];
+ "serde" = [ "dep:serde" ];
+ "sval" = [ "dep:sval" ];
+ "value-bag" = [ "dep:value-bag" ];
+ };
+ };
+ "memchr" = rec {
+ crateName = "memchr";
+ version = "2.4.1";
+ edition = "2018";
+ sha256 = "0smq8xzd40njqpfzv5mghigj91fzlfrfg842iz8x0wqvw2dw731h";
+ authors = [
+ "Andrew Gallant "
+ "bluss"
+ ];
+ features = {
+ "compiler_builtins" = [ "dep:compiler_builtins" ];
+ "core" = [ "dep:core" ];
+ "default" = [ "std" ];
+ "libc" = [ "dep:libc" ];
+ "rustc-dep-of-std" = [ "core" "compiler_builtins" ];
+ "use_std" = [ "std" ];
+ };
+ resolvedDefaultFeatures = [ "std" ];
+ };
+ "minimal-lexical" = rec {
+ crateName = "minimal-lexical";
+ version = "0.2.1";
+ edition = "2018";
+ sha256 = "16ppc5g84aijpri4jzv14rvcnslvlpphbszc7zzp6vfkddf4qdb8";
+ authors = [
+ "Alex Huszagh "
+ ];
+ features = {
+ "default" = [ "std" ];
+ };
+ resolvedDefaultFeatures = [ "std" ];
+ };
+ "nom" = rec {
+ crateName = "nom";
+ version = "7.1.0";
+ edition = "2018";
+ sha256 = "0281jdx0xcyhjgs1jkj9pii8py1clcpazg41bgz7d71qxzhi278v";
+ authors = [
+ "contact@geoffroycouprie.com"
+ ];
+ dependencies = [
+ {
+ name = "memchr";
+ packageId = "memchr";
+ usesDefaultFeatures = false;
+ }
+ {
+ name = "minimal-lexical";
+ packageId = "minimal-lexical";
+ usesDefaultFeatures = false;
+ }
+ ];
+ buildDependencies = [
+ {
+ name = "version_check";
+ packageId = "version_check";
+ }
+ ];
+ features = {
+ "default" = [ "std" ];
+ "std" = [ "alloc" "memchr/std" "minimal-lexical/std" ];
+ };
+ resolvedDefaultFeatures = [ "alloc" "default" "std" ];
+ };
+ "num-bigint" = rec {
+ crateName = "num-bigint";
+ version = "0.4.3";
+ edition = "2018";
+ sha256 = "0py73wsa5j4izhd39nkqzqv260r0ma08vy30ky54ld3vkhlbcfpr";
+ authors = [
+ "The Rust Project Developers"
+ ];
+ dependencies = [
+ {
+ name = "num-integer";
+ packageId = "num-integer";
+ usesDefaultFeatures = false;
+ features = [ "i128" ];
+ }
+ {
+ name = "num-traits";
+ packageId = "num-traits";
+ usesDefaultFeatures = false;
+ features = [ "i128" ];
+ }
+ ];
+ buildDependencies = [
+ {
+ name = "autocfg";
+ packageId = "autocfg 1.0.1";
+ }
+ ];
+ features = {
+ "arbitrary" = [ "dep:arbitrary" ];
+ "default" = [ "std" ];
+ "quickcheck" = [ "dep:quickcheck" ];
+ "rand" = [ "dep:rand" ];
+ "serde" = [ "dep:serde" ];
+ "std" = [ "num-integer/std" "num-traits/std" ];
+ };
+ resolvedDefaultFeatures = [ "default" "std" ];
+ };
+ "num-bigint-dig" = rec {
+ crateName = "num-bigint-dig";
+ version = "0.7.0";
+ edition = "2015";
+ sha256 = "1004mmipvc7pvaf3kf13i1nqh3vxf789bj72d8wl51y185aywis5";
+ authors = [
+ "dignifiedquire "
+ "The Rust Project Developers"
+ ];
+ dependencies = [
+ {
+ name = "byteorder";
+ packageId = "byteorder";
+ usesDefaultFeatures = false;
+ }
+ {
+ name = "lazy_static";
+ packageId = "lazy_static";
+ usesDefaultFeatures = false;
+ features = [ "spin_no_std" ];
+ }
+ {
+ name = "libm";
+ packageId = "libm";
+ }
+ {
+ name = "num-integer";
+ packageId = "num-integer";
+ usesDefaultFeatures = false;
+ }
+ {
+ name = "num-iter";
+ packageId = "num-iter";
+ usesDefaultFeatures = false;
+ }
+ {
+ name = "num-traits";
+ packageId = "num-traits";
+ usesDefaultFeatures = false;
+ }
+ {
+ name = "rand";
+ packageId = "rand";
+ optional = true;
+ usesDefaultFeatures = false;
+ }
+ {
+ name = "smallvec";
+ packageId = "smallvec";
+ usesDefaultFeatures = false;
+ }
+ {
+ name = "zeroize";
+ packageId = "zeroize";
+ optional = true;
+ usesDefaultFeatures = false;
+ features = [ "zeroize_derive" ];
+ }
+ ];
+ buildDependencies = [
+ {
+ name = "autocfg";
+ packageId = "autocfg 0.1.7";
+ }
+ ];
+ devDependencies = [
+ {
+ name = "rand";
+ packageId = "rand";
+ features = [ "small_rng" ];
+ }
+ ];
+ features = {
+ "default" = [ "std" "i128" "u64_digit" ];
+ "i128" = [ "num-integer/i128" "num-traits/i128" ];
+ "prime" = [ "rand/std_rng" ];
+ "rand" = [ "dep:rand" ];
+ "serde" = [ "dep:serde" ];
+ "std" = [ "num-integer/std" "num-traits/std" "smallvec/write" "rand/std" "serde/std" ];
+ "zeroize" = [ "dep:zeroize" ];
+ };
+ resolvedDefaultFeatures = [ "i128" "prime" "rand" "u64_digit" "zeroize" ];
+ };
+ "num-integer" = rec {
+ crateName = "num-integer";
+ version = "0.1.44";
+ edition = "2015";
+ sha256 = "1nq152y3304as1iai95hqz8prqnc94lks1s7q05sfjdmcf56kk6j";
+ authors = [
+ "The Rust Project Developers"
+ ];
+ dependencies = [
+ {
+ name = "num-traits";
+ packageId = "num-traits";
+ usesDefaultFeatures = false;
+ }
+ ];
+ buildDependencies = [
+ {
+ name = "autocfg";
+ packageId = "autocfg 1.0.1";
+ }
+ ];
+ features = {
+ "default" = [ "std" ];
+ "i128" = [ "num-traits/i128" ];
+ "std" = [ "num-traits/std" ];
+ };
+ resolvedDefaultFeatures = [ "i128" "std" ];
+ };
+ "num-iter" = rec {
+ crateName = "num-iter";
+ version = "0.1.42";
+ edition = "2015";
+ sha256 = "0ndd9wb9qar50fdr16xm3i1zk6h2g9br56nml2n22kd56y1iq0mj";
+ authors = [
+ "The Rust Project Developers"
+ ];
+ dependencies = [
+ {
+ name = "num-integer";
+ packageId = "num-integer";
+ usesDefaultFeatures = false;
+ }
+ {
+ name = "num-traits";
+ packageId = "num-traits";
+ usesDefaultFeatures = false;
+ }
+ ];
+ buildDependencies = [
+ {
+ name = "autocfg";
+ packageId = "autocfg 1.0.1";
+ }
+ ];
+ features = {
+ "default" = [ "std" ];
+ "i128" = [ "num-integer/i128" "num-traits/i128" ];
+ "std" = [ "num-integer/std" "num-traits/std" ];
+ };
+ };
+ "num-traits" = rec {
+ crateName = "num-traits";
+ version = "0.2.14";
+ edition = "2015";
+ sha256 = "144j176s2p76azy2ngk2vkdzgwdc0bc8c93jhki8c9fsbknb2r4s";
+ authors = [
+ "The Rust Project Developers"
+ ];
+ dependencies = [
+ {
+ name = "libm";
+ packageId = "libm";
+ optional = true;
+ }
+ ];
+ buildDependencies = [
+ {
+ name = "autocfg";
+ packageId = "autocfg 1.0.1";
+ }
+ ];
+ features = {
+ "default" = [ "std" ];
+ "libm" = [ "dep:libm" ];
+ };
+ resolvedDefaultFeatures = [ "default" "i128" "libm" "std" ];
+ };
+ "num_threads" = rec {
+ crateName = "num_threads";
+ version = "0.1.3";
+ edition = "2015";
+ sha256 = "05gvsnv4k6d69iksz47i7fq1r61dj1k1nh4i8xrw7qlkcfx9kflp";
+ authors = [
+ "Jacob Pratt "
+ ];
+ dependencies = [
+ {
+ name = "libc";
+ packageId = "libc";
+ target = { target, features }: ((target."os" == "macos") || (target."os" == "freebsd"));
+ }
+ ];
+
+ };
+ "oid-registry" = rec {
+ crateName = "oid-registry";
+ version = "0.4.0";
+ edition = "2018";
+ sha256 = "0akbah3j8231ayrp2l1y5d9zmvbvqcsj0sa6s6dz6h85z8bhgqiq";
+ authors = [
+ "Pierre Chifflier "
+ ];
+ dependencies = [
+ {
+ name = "asn1-rs";
+ packageId = "asn1-rs";
+ }
+ ];
+ features = {
+ "crypto" = [ "kdf" "pkcs1" "pkcs7" "pkcs9" "pkcs12" "nist_algs" "x962" ];
+ "default" = [ "registry" ];
+ };
+ resolvedDefaultFeatures = [ "crypto" "default" "kdf" "nist_algs" "pkcs1" "pkcs12" "pkcs7" "pkcs9" "registry" "x509" "x962" ];
+ };
+ "once_cell" = rec {
+ crateName = "once_cell";
+ version = "1.9.0";
+ edition = "2018";
+ sha256 = "1mfqhrsgi368x92bwnq3vi3p5nv0n1qlrn69gfflhvkfkxfm2cns";
+ authors = [
+ "Aleksey Kladov "
+ ];
+ features = {
+ "alloc" = [ "race" ];
+ "atomic-polyfill" = [ "dep:atomic-polyfill" ];
+ "default" = [ "std" ];
+ "parking_lot" = [ "dep:parking_lot" ];
+ "std" = [ "alloc" ];
+ };
+ resolvedDefaultFeatures = [ "alloc" "default" "race" "std" ];
+ };
+ "openssl" = rec {
+ crateName = "openssl";
+ version = "0.10.38";
+ edition = "2018";
+ sha256 = "15baqlphisr1f7ddq11jnrrzz4shdh35kwal24adyc2c4cif4yhc";
+ authors = [
+ "Steven Fackler "
+ ];
+ dependencies = [
+ {
+ name = "bitflags";
+ packageId = "bitflags";
+ }
+ {
+ name = "cfg-if";
+ packageId = "cfg-if";
+ }
+ {
+ name = "foreign-types";
+ packageId = "foreign-types";
+ }
+ {
+ name = "libc";
+ packageId = "libc";
+ }
+ {
+ name = "once_cell";
+ packageId = "once_cell";
+ }
+ {
+ name = "openssl-sys";
+ packageId = "openssl-sys";
+ rename = "ffi";
+ }
+ ];
+ features = {
+ "vendored" = [ "ffi/vendored" ];
+ };
+ };
+ "openssl-sys" = rec {
+ crateName = "openssl-sys";
+ version = "0.9.72";
+ edition = "2015";
+ sha256 = "1jq3qbcvf16qn71yasdzw54b14n8nz98vr52l1gp60in72f10iky";
+ build = "build/main.rs";
+ authors = [
+ "Alex Crichton "
+ "Steven Fackler "
+ ];
+ dependencies = [
+ {
+ name = "libc";
+ packageId = "libc";
+ }
+ ];
+ buildDependencies = [
+ {
+ name = "autocfg";
+ packageId = "autocfg 1.0.1";
+ }
+ {
+ name = "cc";
+ packageId = "cc";
+ }
+ {
+ name = "pkg-config";
+ packageId = "pkg-config";
+ }
+ {
+ name = "vcpkg";
+ packageId = "vcpkg";
+ target = {target, features}: (target."env" == "msvc");
+ }
+ ];
+ features = {
+ "openssl-src" = [ "dep:openssl-src" ];
+ "vendored" = [ "openssl-src" ];
+ };
+ };
+ "pem" = rec {
+ crateName = "pem";
+ version = "1.0.2";
+ edition = "2018";
+ sha256 = "0iqrvfnm71x9pvff39d5ajwn3gc9glxlv4d4h22max7342db18z9";
+ authors = [
+ "Jonathan Creekmore "
+ ];
+ dependencies = [
+ {
+ name = "base64";
+ packageId = "base64";
+ }
+ ];
+
+ };
+ "pem-rfc7468" = rec {
+ crateName = "pem-rfc7468";
+ version = "0.2.4";
+ edition = "2018";
+ sha256 = "1m1c9jypydzabg4yscplmvff7pdcc8gg4cqg081hnlf03hxkmsc4";
+ authors = [
+ "RustCrypto Developers"
+ ];
+ dependencies = [
+ {
+ name = "base64ct";
+ packageId = "base64ct";
+ }
+ ];
+ features = {
+ "std" = [ "alloc" ];
+ };
+ resolvedDefaultFeatures = [ "alloc" ];
+ };
+ "pkcs1" = rec {
+ crateName = "pkcs1";
+ version = "0.2.4";
+ edition = "2018";
+ sha256 = "0b2f1a0lf5h53zrjvcqbxzjhh89gcfa1myhf6z7w10ypg61fwsqi";
+ authors = [
+ "RustCrypto Developers"
+ ];
+ dependencies = [
+ {
+ name = "der";
+ packageId = "der";
+ features = [ "bigint" "oid" ];
+ }
+ {
+ name = "pem-rfc7468";
+ packageId = "pem-rfc7468";
+ optional = true;
+ }
+ {
+ name = "zeroize";
+ packageId = "zeroize";
+ optional = true;
+ usesDefaultFeatures = false;
+ features = [ "alloc" ];
+ }
+ ];
+ features = {
+ "alloc" = [ "der/alloc" "zeroize" ];
+ "pem" = [ "alloc" "pem-rfc7468/alloc" ];
+ "pem-rfc7468" = [ "dep:pem-rfc7468" ];
+ "zeroize" = [ "dep:zeroize" ];
+ };
+ resolvedDefaultFeatures = [ "alloc" "pem" "pem-rfc7468" "std" "zeroize" ];
+ };
+ "pkcs8" = rec {
+ crateName = "pkcs8";
+ version = "0.7.6";
+ edition = "2018";
+ sha256 = "0iq46p6fa2b8xy6pj52zpmdy8ya3fg31dj4rc19x1fi69nvgjgpf";
+ authors = [
+ "RustCrypto Developers"
+ ];
+ dependencies = [
+ {
+ name = "der";
+ packageId = "der";
+ features = [ "oid" ];
+ }
+ {
+ name = "pem-rfc7468";
+ packageId = "pem-rfc7468";
+ optional = true;
+ }
+ {
+ name = "pkcs1";
+ packageId = "pkcs1";
+ optional = true;
+ features = [ "alloc" ];
+ }
+ {
+ name = "spki";
+ packageId = "spki";
+ }
+ {
+ name = "zeroize";
+ packageId = "zeroize";
+ optional = true;
+ usesDefaultFeatures = false;
+ features = [ "alloc" ];
+ }
+ ];
+ features = {
+ "3des" = [ "encryption" "pkcs5/3des" ];
+ "alloc" = [ "der/alloc" "zeroize" ];
+ "des-insecure" = [ "encryption" "pkcs5/des-insecure" ];
+ "encryption" = [ "alloc" "pkcs5/alloc" "pkcs5/pbes2" "rand_core" ];
+ "pem" = [ "alloc" "pem-rfc7468/alloc" ];
+ "pem-rfc7468" = [ "dep:pem-rfc7468" ];
+ "pkcs1" = [ "dep:pkcs1" ];
+ "pkcs5" = [ "dep:pkcs5" ];
+ "rand_core" = [ "dep:rand_core" ];
+ "sha1" = [ "encryption" "pkcs5/sha1" ];
+ "std" = [ "alloc" "der/std" ];
+ "zeroize" = [ "dep:zeroize" ];
+ };
+ resolvedDefaultFeatures = [ "alloc" "pem" "pem-rfc7468" "pkcs1" "std" "zeroize" ];
+ };
+ "pkg-config" = rec {
+ crateName = "pkg-config";
+ version = "0.3.24";
+ edition = "2015";
+ sha256 = "1ghcyjp5537r7qigmgl3dj62j01arlpddaq93a3i414v3iskz2aq";
+ authors = [
+ "Alex Crichton "
+ ];
+
+ };
+ "ppv-lite86" = rec {
+ crateName = "ppv-lite86";
+ version = "0.2.16";
+ edition = "2018";
+ sha256 = "0wkqwnvnfcgqlrahphl45vdlgi2f1bs7nqcsalsllp1y4dp9x7zb";
+ authors = [
+ "The CryptoCorrosion Contributors"
+ ];
+ features = {
+ "default" = [ "std" ];
+ };
+ resolvedDefaultFeatures = [ "simd" "std" ];
+ };
+ "proc-macro2" = rec {
+ crateName = "proc-macro2";
+ version = "1.0.36";
+ edition = "2018";
+ sha256 = "0adh6gvs31x6pfwmygypmzrv1jc7kjq568vsqcfaxk7vhdc2sd67";
+ authors = [
+ "David Tolnay "
+ "Alex Crichton "
+ ];
+ dependencies = [
+ {
+ name = "unicode-xid";
+ packageId = "unicode-xid";
+ }
+ ];
+ features = {
+ "default" = [ "proc-macro" ];
+ };
+ resolvedDefaultFeatures = [ "default" "proc-macro" ];
+ };
+ "quote" = rec {
+ crateName = "quote";
+ version = "1.0.15";
+ edition = "2018";
+ sha256 = "0id1q0875pvhkg0mlb5z8gzdm2g2rbbz76bfzhv331lrm2b3wkc6";
+ authors = [
+ "David Tolnay "
+ ];
+ dependencies = [
+ {
+ name = "proc-macro2";
+ packageId = "proc-macro2";
+ usesDefaultFeatures = false;
+ }
+ ];
+ features = {
+ "default" = [ "proc-macro" ];
+ "proc-macro" = [ "proc-macro2/proc-macro" ];
+ };
+ resolvedDefaultFeatures = [ "default" "proc-macro" ];
+ };
+ "rand" = rec {
+ crateName = "rand";
+ version = "0.8.4";
+ edition = "2018";
+ sha256 = "1n5wska2fbfj4dsfz8mc0pd0dgjlrb6c9anpk5mwym345rip6x9f";
+ authors = [
+ "The Rand Project Developers"
+ "The Rust Project Developers"
+ ];
+ dependencies = [
+ {
+ name = "libc";
+ packageId = "libc";
+ optional = true;
+ usesDefaultFeatures = false;
+ target = { target, features }: (target."unix" or false);
+ }
+ {
+ name = "rand_chacha";
+ packageId = "rand_chacha";
+ optional = true;
+ usesDefaultFeatures = false;
+ target = { target, features }: (!(target."os" == "emscripten"));
+ }
+ {
+ name = "rand_core";
+ packageId = "rand_core";
+ }
+ {
+ name = "rand_hc";
+ packageId = "rand_hc";
+ optional = true;
+ target = { target, features }: (target."os" == "emscripten");
+ }
+ ];
+ devDependencies = [
+ {
+ name = "rand_hc";
+ packageId = "rand_hc";
+ }
+ ];
+ features = {
+ "alloc" = [ "rand_core/alloc" ];
+ "default" = [ "std" "std_rng" ];
+ "getrandom" = [ "rand_core/getrandom" ];
+ "libc" = [ "dep:libc" ];
+ "log" = [ "dep:log" ];
+ "packed_simd" = [ "dep:packed_simd" ];
+ "rand_chacha" = [ "dep:rand_chacha" ];
+ "rand_hc" = [ "dep:rand_hc" ];
+ "serde" = [ "dep:serde" ];
+ "serde1" = [ "serde" "rand_core/serde1" ];
+ "simd_support" = [ "packed_simd" ];
+ "std" = [ "rand_core/std" "rand_chacha/std" "alloc" "getrandom" "libc" ];
+ "std_rng" = [ "rand_chacha" "rand_hc" ];
+ };
+ resolvedDefaultFeatures = [ "alloc" "default" "getrandom" "libc" "rand_chacha" "rand_hc" "std" "std_rng" ];
+ };
+ "rand_chacha" = rec {
+ crateName = "rand_chacha";
+ version = "0.3.1";
+ edition = "2018";
+ sha256 = "123x2adin558xbhvqb8w4f6syjsdkmqff8cxwhmjacpsl1ihmhg6";
+ authors = [
+ "The Rand Project Developers"
+ "The Rust Project Developers"
+ "The CryptoCorrosion Contributors"
+ ];
+ dependencies = [
+ {
+ name = "ppv-lite86";
+ packageId = "ppv-lite86";
+ usesDefaultFeatures = false;
+ features = [ "simd" ];
+ }
+ {
+ name = "rand_core";
+ packageId = "rand_core";
+ }
+ ];
+ features = {
+ "default" = [ "std" ];
+ "serde" = [ "dep:serde" ];
+ "serde1" = [ "serde" ];
+ "std" = [ "ppv-lite86/std" ];
+ };
+ resolvedDefaultFeatures = [ "std" ];
+ };
+ "rand_core" = rec {
+ crateName = "rand_core";
+ version = "0.6.3";
+ edition = "2018";
+ sha256 = "1rxlxc3bpzgwphcg9c9yasvv9idipcg2z2y4j0vlb52jyl418kyk";
+ authors = [
+ "The Rand Project Developers"
+ "The Rust Project Developers"
+ ];
+ dependencies = [
+ {
+ name = "getrandom";
+ packageId = "getrandom";
+ optional = true;
+ }
+ ];
+ features = {
+ "getrandom" = [ "dep:getrandom" ];
+ "serde" = [ "dep:serde" ];
+ "serde1" = [ "serde" ];
+ "std" = [ "alloc" "getrandom" "getrandom/std" ];
+ };
+ resolvedDefaultFeatures = [ "alloc" "getrandom" "std" ];
+ };
+ "rand_hc" = rec {
+ crateName = "rand_hc";
+ version = "0.3.1";
+ edition = "2018";
+ sha256 = "1rwpykyvhkxs4jvqdja3mzp9dqaqamzn113cxaigs9z2dmcry7nm";
+ authors = [
+ "The Rand Project Developers"
+ ];
+ dependencies = [
+ {
+ name = "rand_core";
+ packageId = "rand_core";
+ }
+ ];
+
+ };
+ "rcgen" = rec {
+ crateName = "rcgen";
+ version = "0.9.2";
+ edition = "2018";
+ crateBin = [
+ { name = "rcgen"; path = "src/main.rs"; }
+ ];
+ sha256 = "0ppwfl9g504x2qwk7m7mag8c3l70w9mcfha93013nlzqdlw2vynp";
+ authors = [
+ "est31 "
+ ];
+ dependencies = [
+ {
+ name = "pem";
+ packageId = "pem";
+ optional = true;
+ }
+ {
+ name = "ring";
+ packageId = "ring";
+ }
+ {
+ name = "time";
+ packageId = "time";
+ usesDefaultFeatures = false;
+ }
+ {
+ name = "x509-parser";
+ packageId = "x509-parser";
+ optional = true;
+ features = [ "verify" ];
+ }
+ {
+ name = "yasna";
+ packageId = "yasna";
+ features = [ "time" "std" ];
+ }
+ {
+ name = "zeroize";
+ packageId = "zeroize";
+ optional = true;
+ }
+ ];
+ devDependencies = [
+ {
+ name = "botan";
+ packageId = "botan";
+ features = [ "vendored" ];
+ }
+ {
+ name = "openssl";
+ packageId = "openssl";
+ }
+ {
+ name = "rand";
+ packageId = "rand";
+ }
+ {
+ name = "rsa";
+ packageId = "rsa";
+ }
+ {
+ name = "webpki";
+ packageId = "webpki";
+ features = [ "std" ];
+ }
+ {
+ name = "x509-parser";
+ packageId = "x509-parser";
+ features = [ "verify" ];
+ }
+ ];
+ features = {
+ "default" = [ "pem" ];
+ "pem" = [ "dep:pem" ];
+ "x509-parser" = [ "dep:x509-parser" ];
+ "zeroize" = [ "dep:zeroize" ];
+ };
+ resolvedDefaultFeatures = [ "default" "pem" "x509-parser" "zeroize" ];
+ };
+ "ring" = rec {
+ crateName = "ring";
+ version = "0.16.20";
+ edition = "2018";
+ sha256 = "1z682xp7v38ayq9g9nkbhhfpj6ygralmlx7wdmsfv8rnw99cylrh";
+ authors = [
+ "Brian Smith "
+ ];
+ dependencies = [
+ {
+ name = "libc";
+ packageId = "libc";
+ usesDefaultFeatures = false;
+ target = { target, features }: ((target."os" == "android") || (target."os" == "linux"));
+ }
+ {
+ name = "once_cell";
+ packageId = "once_cell";
+ optional = true;
+ usesDefaultFeatures = false;
+ target = { target, features }: ((target."os" == "android") || (target."os" == "linux"));
+ features = [ "std" ];
+ }
+ {
+ name = "once_cell";
+ packageId = "once_cell";
+ usesDefaultFeatures = false;
+ target = { target, features }: ((target."os" == "dragonfly") || (target."os" == "freebsd") || (target."os" == "illumos") || (target."os" == "netbsd") || (target."os" == "openbsd") || (target."os" == "solaris"));
+ features = [ "std" ];
+ }
+ {
+ name = "spin";
+ packageId = "spin";
+ usesDefaultFeatures = false;
+ target = { target, features }: ((target."arch" == "x86") || (target."arch" == "x86_64") || (((target."arch" == "aarch64") || (target."arch" == "arm")) && ((target."os" == "android") || (target."os" == "fuchsia") || (target."os" == "linux"))));
+ }
+ {
+ name = "untrusted";
+ packageId = "untrusted";
+ }
+ {
+ name = "web-sys";
+ packageId = "web-sys";
+ usesDefaultFeatures = false;
+ target = { target, features }: ((target."arch" == "wasm32") && (target."vendor" == "unknown") && (target."os" == "unknown") && (target."env" == ""));
+ features = [ "Crypto" "Window" ];
+ }
+ {
+ name = "winapi";
+ packageId = "winapi";
+ usesDefaultFeatures = false;
+ target = { target, features }: (target."os" == "windows");
+ features = [ "ntsecapi" "wtypesbase" ];
+ }
+ ];
+ buildDependencies = [
+ {
+ name = "cc";
+ packageId = "cc";
+ usesDefaultFeatures = false;
+ }
+ ];
+ devDependencies = [
+ {
+ name = "libc";
+ packageId = "libc";
+ usesDefaultFeatures = false;
+ target = {target, features}: ((target."unix" or false) || (target."windows" or false));
+ }
+ ];
+ features = {
+ "default" = [ "alloc" "dev_urandom_fallback" ];
+ "dev_urandom_fallback" = [ "once_cell" ];
+ "once_cell" = [ "dep:once_cell" ];
+ "std" = [ "alloc" ];
+ };
+ resolvedDefaultFeatures = [ "alloc" "default" "dev_urandom_fallback" "once_cell" ];
+ };
+ "rsa" = rec {
+ crateName = "rsa";
+ version = "0.5.0";
+ edition = "2018";
+ sha256 = "039676a4mj0875phdi7vc0bd37hv84dh0dql6fmk8dl2w81jcp70";
+ authors = [
+ "RustCrypto Developers"
+ "dignifiedquire "
+ ];
+ dependencies = [
+ {
+ name = "byteorder";
+ packageId = "byteorder";
+ usesDefaultFeatures = false;
+ }
+ {
+ name = "digest";
+ packageId = "digest";
+ usesDefaultFeatures = false;
+ }
+ {
+ name = "lazy_static";
+ packageId = "lazy_static";
+ features = [ "spin_no_std" ];
+ }
+ {
+ name = "num-bigint-dig";
+ packageId = "num-bigint-dig";
+ rename = "num-bigint";
+ usesDefaultFeatures = false;
+ features = [ "i128" "u64_digit" "prime" "zeroize" ];
+ }
+ {
+ name = "num-integer";
+ packageId = "num-integer";
+ usesDefaultFeatures = false;
+ }
+ {
+ name = "num-iter";
+ packageId = "num-iter";
+ usesDefaultFeatures = false;
+ }
+ {
+ name = "num-traits";
+ packageId = "num-traits";
+ usesDefaultFeatures = false;
+ features = [ "libm" ];
+ }
+ {
+ name = "pkcs1";
+ packageId = "pkcs1";
+ usesDefaultFeatures = false;
+ }
+ {
+ name = "pkcs8";
+ packageId = "pkcs8";
+ usesDefaultFeatures = false;
+ }
+ {
+ name = "rand";
+ packageId = "rand";
+ usesDefaultFeatures = false;
+ features = [ "std_rng" ];
+ }
+ {
+ name = "subtle";
+ packageId = "subtle";
+ usesDefaultFeatures = false;
+ }
+ {
+ name = "zeroize";
+ packageId = "zeroize";
+ features = [ "alloc" "zeroize_derive" ];
+ }
+ ];
+ features = {
+ "alloc" = [ "digest/alloc" "pkcs1/alloc" "pkcs8/alloc" "pkcs8/pkcs1" ];
+ "default" = [ "std" "pem" ];
+ "nightly" = [ "subtle/nightly" "num-bigint/nightly" ];
+ "pem" = [ "alloc" "pkcs1/pem" "pkcs8/pem" ];
+ "pkcs5" = [ "pkcs8/encryption" ];
+ "serde" = [ "num-bigint/serde" "serde_crate" ];
+ "serde_crate" = [ "dep:serde_crate" ];
+ "std" = [ "alloc" "digest/std" "pkcs1/std" "pkcs8/std" "rand/std" ];
+ };
+ resolvedDefaultFeatures = [ "alloc" "default" "pem" "std" ];
+ };
+ "rusticata-macros" = rec {
+ crateName = "rusticata-macros";
+ version = "4.0.0";
+ edition = "2018";
+ sha256 = "03dmfxhgwzpm1360iwcpcg3y18ddgya0i0hc599am212pdvj7ib5";
+ authors = [
+ "Pierre Chifflier "
+ ];
+ dependencies = [
+ {
+ name = "nom";
+ packageId = "nom";
+ usesDefaultFeatures = false;
+ features = [ "std" ];
+ }
+ ];
+
+ };
+ "smallvec" = rec {
+ crateName = "smallvec";
+ version = "1.8.0";
+ edition = "2018";
+ sha256 = "10zf4fn63p2d6sx8qap3jvyarcfw563308x3431hd4c34r35gpgj";
+ authors = [
+ "The Servo Project Developers"
+ ];
+ features = {
+ "arbitrary" = [ "dep:arbitrary" ];
+ "const_new" = [ "const_generics" ];
+ "serde" = [ "dep:serde" ];
+ };
+ };
+ "spin" = rec {
+ crateName = "spin";
+ version = "0.5.2";
+ edition = "2015";
+ sha256 = "0b84m6dbzrwf2kxylnw82d3dr8w06av7rfkr8s85fb5f43rwyqvf";
+ authors = [
+ "Mathijs van de Nes "
+ "John Ericson "
+ ];
+
+ };
+ "spki" = rec {
+ crateName = "spki";
+ version = "0.4.1";
+ edition = "2018";
+ sha256 = "0ckgkcg6db5y94dqhmyikgn8yrsah6pyf4j197hv1c51bp0s00aw";
+ authors = [
+ "RustCrypto Developers"
+ ];
+ dependencies = [
+ {
+ name = "der";
+ packageId = "der";
+ features = [ "oid" ];
+ }
+ ];
+ features = {
+ "std" = [ "der/std" ];
+ };
+ };
+ "subtle" = rec {
+ crateName = "subtle";
+ version = "2.4.1";
+ edition = "2015";
+ sha256 = "00b6jzh9gzb0h9n25g06nqr90z3xzqppfhhb260s1hjhh4pg7pkb";
+ authors = [
+ "Isis Lovecruft "
+ "Henry de Valence "
+ ];
+ features = {
+ "default" = [ "std" "i128" ];
+ };
+ };
+ "syn" = rec {
+ crateName = "syn";
+ version = "1.0.86";
+ edition = "2018";
+ sha256 = "0sqwa4nqxzm89nj8xd8sk4iz0hbrw3mb17b6hyc2w2d0zzsb6rca";
+ authors = [
+ "David Tolnay "
+ ];
+ dependencies = [
+ {
+ name = "proc-macro2";
+ packageId = "proc-macro2";
+ usesDefaultFeatures = false;
+ }
+ {
+ name = "quote";
+ packageId = "quote";
+ optional = true;
+ usesDefaultFeatures = false;
+ }
+ {
+ name = "unicode-xid";
+ packageId = "unicode-xid";
+ }
+ ];
+ features = {
+ "default" = [ "derive" "parsing" "printing" "clone-impls" "proc-macro" ];
+ "printing" = [ "quote" ];
+ "proc-macro" = [ "proc-macro2/proc-macro" "quote/proc-macro" ];
+ "quote" = [ "dep:quote" ];
+ "test" = [ "syn-test-suite/all-features" ];
+ };
+ resolvedDefaultFeatures = [ "clone-impls" "default" "derive" "extra-traits" "full" "parsing" "printing" "proc-macro" "quote" "visit" ];
+ };
+ "synstructure" = rec {
+ crateName = "synstructure";
+ version = "0.12.6";
+ edition = "2018";
+ sha256 = "03r1lydbf3japnlpc4wka7y90pmz1i0danaj3f9a7b431akdlszk";
+ authors = [
+ "Nika Layzell "
+ ];
+ dependencies = [
+ {
+ name = "proc-macro2";
+ packageId = "proc-macro2";
+ usesDefaultFeatures = false;
+ }
+ {
+ name = "quote";
+ packageId = "quote";
+ usesDefaultFeatures = false;
+ }
+ {
+ name = "syn";
+ packageId = "syn";
+ usesDefaultFeatures = false;
+ features = [ "derive" "parsing" "printing" "clone-impls" "visit" "extra-traits" ];
+ }
+ {
+ name = "unicode-xid";
+ packageId = "unicode-xid";
+ }
+ ];
+ features = {
+ "default" = [ "proc-macro" ];
+ "proc-macro" = [ "proc-macro2/proc-macro" "syn/proc-macro" "quote/proc-macro" ];
+ };
+ resolvedDefaultFeatures = [ "default" "proc-macro" ];
+ };
+ "thiserror" = rec {
+ crateName = "thiserror";
+ version = "1.0.30";
+ edition = "2018";
+ sha256 = "05y4wm29ck8flwq5k1q6nhwh00a3b30cz3xr0qvnbwad5vjsnjw5";
+ authors = [
+ "David Tolnay "
+ ];
+ dependencies = [
+ {
+ name = "thiserror-impl";
+ packageId = "thiserror-impl";
+ }
+ ];
+
+ };
+ "thiserror-impl" = rec {
+ crateName = "thiserror-impl";
+ version = "1.0.30";
+ edition = "2018";
+ sha256 = "0jviwmvx6wzawsj6c9msic7h419wmsbjagl9dzhpydkzc8zzscma";
+ procMacro = true;
+ authors = [
+ "David Tolnay "
+ ];
+ dependencies = [
+ {
+ name = "proc-macro2";
+ packageId = "proc-macro2";
+ }
+ {
+ name = "quote";
+ packageId = "quote";
+ }
+ {
+ name = "syn";
+ packageId = "syn";
+ }
+ ];
+
+ };
+ "time" = rec {
+ crateName = "time";
+ version = "0.3.7";
+ edition = "2018";
+ sha256 = "0gbmwlkj15dfhbqvxlzji1ffc1lidblpgg1q3b3378hgyfcbqk00";
+ authors = [
+ "Jacob Pratt "
+ "Time contributors"
+ ];
+ dependencies = [
+ {
+ name = "itoa";
+ packageId = "itoa";
+ optional = true;
+ }
+ {
+ name = "libc";
+ packageId = "libc";
+ target = { target, features }: (target."family" == "unix");
+ }
+ {
+ name = "num_threads";
+ packageId = "num_threads";
+ target = { target, features }: (target."family" == "unix");
+ }
+ {
+ name = "time-macros";
+ packageId = "time-macros";
+ optional = true;
+ }
+ ];
+ features = {
+ "default" = [ "std" ];
+ "formatting" = [ "itoa" "std" ];
+ "itoa" = [ "dep:itoa" ];
+ "large-dates" = [ "time-macros/large-dates" ];
+ "local-offset" = [ "std" ];
+ "macros" = [ "time-macros" ];
+ "quickcheck" = [ "quickcheck-dep" "alloc" ];
+ "quickcheck-dep" = [ "dep:quickcheck-dep" ];
+ "rand" = [ "dep:rand" ];
+ "serde" = [ "dep:serde" ];
+ "serde-human-readable" = [ "serde" "formatting" "parsing" ];
+ "serde-well-known" = [ "serde/alloc" "formatting" "parsing" ];
+ "std" = [ "alloc" ];
+ "time-macros" = [ "dep:time-macros" ];
+ };
+ resolvedDefaultFeatures = [ "alloc" "default" "formatting" "itoa" "macros" "parsing" "std" "time-macros" ];
+ };
+ "time-macros" = rec {
+ crateName = "time-macros";
+ version = "0.2.3";
+ edition = "2018";
+ sha256 = "1mj7pv8y9j2csrh1l8aabras36pgysbnfy18330srh4g8sihrsr5";
+ procMacro = true;
+ authors = [
+ "Jacob Pratt "
+ "Time contributors"
+ ];
+ features = {
+ };
+ };
+ "typenum" = rec {
+ crateName = "typenum";
+ version = "1.15.0";
+ edition = "2018";
+ sha256 = "11yrvz1vd43gqv738yw1v75rzngjbs7iwcgzjy3cq5ywkv2imy6w";
+ build = "build/main.rs";
+ authors = [
+ "Paho Lurie-Gregg "
+ "Andre Bogus "
+ ];
+ features = {
+ "scale-info" = [ "dep:scale-info" ];
+ "scale_info" = [ "scale-info/derive" ];
+ };
+ };
+ "unicode-xid" = rec {
+ crateName = "unicode-xid";
+ version = "0.2.2";
+ edition = "2015";
+ sha256 = "1wrkgcw557v311dkdb6n2hrix9dm2qdsb1zpw7pn79l03zb85jwc";
+ authors = [
+ "erick.tryzelaar "
+ "kwantam "
+ "Manish Goregaokar "
+ ];
+ features = {
+ };
+ resolvedDefaultFeatures = [ "default" ];
+ };
+ "untrusted" = rec {
+ crateName = "untrusted";
+ version = "0.7.1";
+ edition = "2018";
+ sha256 = "0jkbqaj9d3v5a91pp3wp9mffvng1nhycx6sh4qkdd9qyr62ccmm1";
+ libPath = "src/untrusted.rs";
+ authors = [
+ "Brian Smith "
+ ];
+
+ };
+ "vcpkg" = rec {
+ crateName = "vcpkg";
+ version = "0.2.15";
+ edition = "2015";
+ sha256 = "09i4nf5y8lig6xgj3f7fyrvzd3nlaw4znrihw8psidvv5yk4xkdc";
+ authors = [
+ "Jim McGrath "
+ ];
+
+ };
+ "version_check" = rec {
+ crateName = "version_check";
+ version = "0.9.4";
+ edition = "2015";
+ sha256 = "0gs8grwdlgh0xq660d7wr80x14vxbizmd8dbp29p2pdncx8lp1s9";
+ authors = [
+ "Sergio Benitez "
+ ];
+
+ };
+ "wasi" = rec {
+ crateName = "wasi";
+ version = "0.10.2+wasi-snapshot-preview1";
+ edition = "2018";
+ sha256 = "1ii7nff4y1mpcrxzzvbpgxm7a1nn3szjf1n21jnx37c2g6dbsvzx";
+ authors = [
+ "The Cranelift Project Developers"
+ ];
+ features = {
+ "compiler_builtins" = [ "dep:compiler_builtins" ];
+ "core" = [ "dep:core" ];
+ "default" = [ "std" ];
+ "rustc-dep-of-std" = [ "compiler_builtins" "core" "rustc-std-workspace-alloc" ];
+ "rustc-std-workspace-alloc" = [ "dep:rustc-std-workspace-alloc" ];
+ };
+ resolvedDefaultFeatures = [ "default" "std" ];
+ };
+ "wasm-bindgen" = rec {
+ crateName = "wasm-bindgen";
+ version = "0.2.79";
+ edition = "2018";
+ sha256 = "01kc4lj2vlf0ra2w63izrgdlv8p6f8p15086hhyqln6q4dsazw95";
+ authors = [
+ "The wasm-bindgen Developers"
+ ];
+ dependencies = [
+ {
+ name = "cfg-if";
+ packageId = "cfg-if";
+ }
+ {
+ name = "wasm-bindgen-macro";
+ packageId = "wasm-bindgen-macro";
+ }
+ ];
+ features = {
+ "default" = [ "spans" "std" ];
+ "enable-interning" = [ "std" ];
+ "serde" = [ "dep:serde" ];
+ "serde-serialize" = [ "serde" "serde_json" "std" ];
+ "serde_json" = [ "dep:serde_json" ];
+ "spans" = [ "wasm-bindgen-macro/spans" ];
+ "strict-macro" = [ "wasm-bindgen-macro/strict-macro" ];
+ "xxx_debug_only_print_generated_code" = [ "wasm-bindgen-macro/xxx_debug_only_print_generated_code" ];
+ };
+ resolvedDefaultFeatures = [ "default" "spans" "std" ];
+ };
+ "wasm-bindgen-backend" = rec {
+ crateName = "wasm-bindgen-backend";
+ version = "0.2.79";
+ edition = "2018";
+ sha256 = "1jpdrl5jj01961jxhmvj7v25ws928fyfj8ms7izifnhg0ggw08cb";
+ authors = [
+ "The wasm-bindgen Developers"
+ ];
+ dependencies = [
+ {
+ name = "bumpalo";
+ packageId = "bumpalo";
+ }
+ {
+ name = "lazy_static";
+ packageId = "lazy_static";
+ }
+ {
+ name = "log";
+ packageId = "log";
+ }
+ {
+ name = "proc-macro2";
+ packageId = "proc-macro2";
+ }
+ {
+ name = "quote";
+ packageId = "quote";
+ }
+ {
+ name = "syn";
+ packageId = "syn";
+ features = [ "full" ];
+ }
+ {
+ name = "wasm-bindgen-shared";
+ packageId = "wasm-bindgen-shared";
+ }
+ ];
+ features = {
+ "extra-traits" = [ "syn/extra-traits" ];
+ };
+ resolvedDefaultFeatures = [ "spans" ];
+ };
+ "wasm-bindgen-macro" = rec {
+ crateName = "wasm-bindgen-macro";
+ version = "0.2.79";
+ edition = "2018";
+ sha256 = "00gdh0dlf2r77mxwh08q0z01vz2z7mvrllmj4gjjx9a0kvb06hig";
+ procMacro = true;
+ authors = [
+ "The wasm-bindgen Developers"
+ ];
+ dependencies = [
+ {
+ name = "quote";
+ packageId = "quote";
+ }
+ {
+ name = "wasm-bindgen-macro-support";
+ packageId = "wasm-bindgen-macro-support";
+ }
+ ];
+ features = {
+ "spans" = [ "wasm-bindgen-macro-support/spans" ];
+ "strict-macro" = [ "wasm-bindgen-macro-support/strict-macro" ];
+ };
+ resolvedDefaultFeatures = [ "spans" ];
+ };
+ "wasm-bindgen-macro-support" = rec {
+ crateName = "wasm-bindgen-macro-support";
+ version = "0.2.79";
+ edition = "2018";
+ sha256 = "1g1fjqvrkrf3j20z8nxsf60cypxg9dfvpbachl2b53908q6s7a5z";
+ authors = [
+ "The wasm-bindgen Developers"
+ ];
+ dependencies = [
+ {
+ name = "proc-macro2";
+ packageId = "proc-macro2";
+ }
+ {
+ name = "quote";
+ packageId = "quote";
+ }
+ {
+ name = "syn";
+ packageId = "syn";
+ features = [ "visit" "full" ];
+ }
+ {
+ name = "wasm-bindgen-backend";
+ packageId = "wasm-bindgen-backend";
+ }
+ {
+ name = "wasm-bindgen-shared";
+ packageId = "wasm-bindgen-shared";
+ }
+ ];
+ features = {
+ "extra-traits" = [ "syn/extra-traits" ];
+ "spans" = [ "wasm-bindgen-backend/spans" ];
+ };
+ resolvedDefaultFeatures = [ "spans" ];
+ };
+ "wasm-bindgen-shared" = rec {
+ crateName = "wasm-bindgen-shared";
+ version = "0.2.79";
+ edition = "2018";
+ sha256 = "18h67l9b9jn06iw9r2p7bh9i0brh24lilcp4f26f4f24bh1qv59x";
+ authors = [
+ "The wasm-bindgen Developers"
+ ];
+
+ };
+ "web-sys" = rec {
+ crateName = "web-sys";
+ version = "0.3.56";
+ edition = "2018";
+ sha256 = "1sxqmwq773ss5m6vz7z95fdm6bqlix0s2awsy0j5gllxy8cv6q60";
+ authors = [
+ "The wasm-bindgen Developers"
+ ];
+ dependencies = [
+ {
+ name = "js-sys";
+ packageId = "js-sys";
+ }
+ {
+ name = "wasm-bindgen";
+ packageId = "wasm-bindgen";
+ }
+ ];
+ features = {
+ "AbortSignal" = [ "EventTarget" ];
+ "AnalyserNode" = [ "AudioNode" "EventTarget" ];
+ "Animation" = [ "EventTarget" ];
+ "AnimationEvent" = [ "Event" ];
+ "AnimationPlaybackEvent" = [ "Event" ];
+ "Attr" = [ "EventTarget" "Node" ];
+ "AudioBufferSourceNode" = [ "AudioNode" "AudioScheduledSourceNode" "EventTarget" ];
+ "AudioContext" = [ "BaseAudioContext" "EventTarget" ];
+ "AudioDestinationNode" = [ "AudioNode" "EventTarget" ];
+ "AudioNode" = [ "EventTarget" ];
+ "AudioProcessingEvent" = [ "Event" ];
+ "AudioScheduledSourceNode" = [ "AudioNode" "EventTarget" ];
+ "AudioStreamTrack" = [ "EventTarget" "MediaStreamTrack" ];
+ "AudioTrackList" = [ "EventTarget" ];
+ "AudioWorklet" = [ "Worklet" ];
+ "AudioWorkletGlobalScope" = [ "WorkletGlobalScope" ];
+ "AudioWorkletNode" = [ "AudioNode" "EventTarget" ];
+ "AuthenticatorAssertionResponse" = [ "AuthenticatorResponse" ];
+ "AuthenticatorAttestationResponse" = [ "AuthenticatorResponse" ];
+ "BaseAudioContext" = [ "EventTarget" ];
+ "BatteryManager" = [ "EventTarget" ];
+ "BeforeUnloadEvent" = [ "Event" ];
+ "BiquadFilterNode" = [ "AudioNode" "EventTarget" ];
+ "BlobEvent" = [ "Event" ];
+ "Bluetooth" = [ "EventTarget" ];
+ "BluetoothAdvertisingEvent" = [ "Event" ];
+ "BluetoothDevice" = [ "EventTarget" ];
+ "BluetoothPermissionResult" = [ "EventTarget" "PermissionStatus" ];
+ "BluetoothRemoteGattCharacteristic" = [ "EventTarget" ];
+ "BluetoothRemoteGattService" = [ "EventTarget" ];
+ "BroadcastChannel" = [ "EventTarget" ];
+ "CanvasCaptureMediaStream" = [ "EventTarget" "MediaStream" ];
+ "CdataSection" = [ "CharacterData" "EventTarget" "Node" "Text" ];
+ "ChannelMergerNode" = [ "AudioNode" "EventTarget" ];
+ "ChannelSplitterNode" = [ "AudioNode" "EventTarget" ];
+ "CharacterData" = [ "EventTarget" "Node" ];
+ "ChromeWorker" = [ "EventTarget" "Worker" ];
+ "Clipboard" = [ "EventTarget" ];
+ "ClipboardEvent" = [ "Event" ];
+ "CloseEvent" = [ "Event" ];
+ "Comment" = [ "CharacterData" "EventTarget" "Node" ];
+ "CompositionEvent" = [ "Event" "UiEvent" ];
+ "ConstantSourceNode" = [ "AudioNode" "AudioScheduledSourceNode" "EventTarget" ];
+ "ConvolverNode" = [ "AudioNode" "EventTarget" ];
+ "CssAnimation" = [ "Animation" "EventTarget" ];
+ "CssConditionRule" = [ "CssGroupingRule" "CssRule" ];
+ "CssCounterStyleRule" = [ "CssRule" ];
+ "CssFontFaceRule" = [ "CssRule" ];
+ "CssFontFeatureValuesRule" = [ "CssRule" ];
+ "CssGroupingRule" = [ "CssRule" ];
+ "CssImportRule" = [ "CssRule" ];
+ "CssKeyframeRule" = [ "CssRule" ];
+ "CssKeyframesRule" = [ "CssRule" ];
+ "CssMediaRule" = [ "CssConditionRule" "CssGroupingRule" "CssRule" ];
+ "CssNamespaceRule" = [ "CssRule" ];
+ "CssPageRule" = [ "CssRule" ];
+ "CssStyleRule" = [ "CssRule" ];
+ "CssStyleSheet" = [ "StyleSheet" ];
+ "CssSupportsRule" = [ "CssConditionRule" "CssGroupingRule" "CssRule" ];
+ "CssTransition" = [ "Animation" "EventTarget" ];
+ "CustomEvent" = [ "Event" ];
+ "DedicatedWorkerGlobalScope" = [ "EventTarget" "WorkerGlobalScope" ];
+ "DelayNode" = [ "AudioNode" "EventTarget" ];
+ "DeviceLightEvent" = [ "Event" ];
+ "DeviceMotionEvent" = [ "Event" ];
+ "DeviceOrientationEvent" = [ "Event" ];
+ "DeviceProximityEvent" = [ "Event" ];
+ "Document" = [ "EventTarget" "Node" ];
+ "DocumentFragment" = [ "EventTarget" "Node" ];
+ "DocumentTimeline" = [ "AnimationTimeline" ];
+ "DocumentType" = [ "EventTarget" "Node" ];
+ "DomMatrix" = [ "DomMatrixReadOnly" ];
+ "DomPoint" = [ "DomPointReadOnly" ];
+ "DomRect" = [ "DomRectReadOnly" ];
+ "DomRequest" = [ "EventTarget" ];
+ "DragEvent" = [ "Event" "MouseEvent" "UiEvent" ];
+ "DynamicsCompressorNode" = [ "AudioNode" "EventTarget" ];
+ "Element" = [ "EventTarget" "Node" ];
+ "ErrorEvent" = [ "Event" ];
+ "EventSource" = [ "EventTarget" ];
+ "ExtendableEvent" = [ "Event" ];
+ "ExtendableMessageEvent" = [ "Event" "ExtendableEvent" ];
+ "FetchEvent" = [ "Event" "ExtendableEvent" ];
+ "FetchObserver" = [ "EventTarget" ];
+ "File" = [ "Blob" ];
+ "FileReader" = [ "EventTarget" ];
+ "FileSystemDirectoryEntry" = [ "FileSystemEntry" ];
+ "FileSystemFileEntry" = [ "FileSystemEntry" ];
+ "FocusEvent" = [ "Event" "UiEvent" ];
+ "FontFaceSet" = [ "EventTarget" ];
+ "FontFaceSetLoadEvent" = [ "Event" ];
+ "GainNode" = [ "AudioNode" "EventTarget" ];
+ "GamepadAxisMoveEvent" = [ "Event" "GamepadEvent" ];
+ "GamepadButtonEvent" = [ "Event" "GamepadEvent" ];
+ "GamepadEvent" = [ "Event" ];
+ "GpuDevice" = [ "EventTarget" ];
+ "GpuUncapturedErrorEvent" = [ "Event" ];
+ "HashChangeEvent" = [ "Event" ];
+ "Hid" = [ "EventTarget" ];
+ "HidConnectionEvent" = [ "Event" ];
+ "HidDevice" = [ "EventTarget" ];
+ "HidInputReportEvent" = [ "Event" ];
+ "HtmlAnchorElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlAreaElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlAudioElement" = [ "Element" "EventTarget" "HtmlElement" "HtmlMediaElement" "Node" ];
+ "HtmlBaseElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlBodyElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlBrElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlButtonElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlCanvasElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlDListElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlDataElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlDataListElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlDetailsElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlDialogElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlDirectoryElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlDivElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlDocument" = [ "Document" "EventTarget" "Node" ];
+ "HtmlElement" = [ "Element" "EventTarget" "Node" ];
+ "HtmlEmbedElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlFieldSetElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlFontElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlFormControlsCollection" = [ "HtmlCollection" ];
+ "HtmlFormElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlFrameElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlFrameSetElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlHeadElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlHeadingElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlHrElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlHtmlElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlIFrameElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlImageElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlInputElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlLabelElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlLegendElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlLiElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlLinkElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlMapElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlMediaElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlMenuElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlMenuItemElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlMetaElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlMeterElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlModElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlOListElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlObjectElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlOptGroupElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlOptionElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlOptionsCollection" = [ "HtmlCollection" ];
+ "HtmlOutputElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlParagraphElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlParamElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlPictureElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlPreElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlProgressElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlQuoteElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlScriptElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlSelectElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlSlotElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlSourceElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlSpanElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlStyleElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlTableCaptionElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlTableCellElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlTableColElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlTableElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlTableRowElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlTableSectionElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlTemplateElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlTextAreaElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlTimeElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlTitleElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlTrackElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlUListElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlUnknownElement" = [ "Element" "EventTarget" "HtmlElement" "Node" ];
+ "HtmlVideoElement" = [ "Element" "EventTarget" "HtmlElement" "HtmlMediaElement" "Node" ];
+ "IdbCursorWithValue" = [ "IdbCursor" ];
+ "IdbDatabase" = [ "EventTarget" ];
+ "IdbFileHandle" = [ "EventTarget" ];
+ "IdbFileRequest" = [ "DomRequest" "EventTarget" ];
+ "IdbLocaleAwareKeyRange" = [ "IdbKeyRange" ];
+ "IdbMutableFile" = [ "EventTarget" ];
+ "IdbOpenDbRequest" = [ "EventTarget" "IdbRequest" ];
+ "IdbRequest" = [ "EventTarget" ];
+ "IdbTransaction" = [ "EventTarget" ];
+ "IdbVersionChangeEvent" = [ "Event" ];
+ "IirFilterNode" = [ "AudioNode" "EventTarget" ];
+ "ImageCaptureErrorEvent" = [ "Event" ];
+ "InputEvent" = [ "Event" "UiEvent" ];
+ "KeyboardEvent" = [ "Event" "UiEvent" ];
+ "KeyframeEffect" = [ "AnimationEffect" ];
+ "LocalMediaStream" = [ "EventTarget" "MediaStream" ];
+ "MediaDevices" = [ "EventTarget" ];
+ "MediaElementAudioSourceNode" = [ "AudioNode" "EventTarget" ];
+ "MediaEncryptedEvent" = [ "Event" ];
+ "MediaKeyError" = [ "Event" ];
+ "MediaKeyMessageEvent" = [ "Event" ];
+ "MediaKeySession" = [ "EventTarget" ];
+ "MediaQueryList" = [ "EventTarget" ];
+ "MediaQueryListEvent" = [ "Event" ];
+ "MediaRecorder" = [ "EventTarget" ];
+ "MediaRecorderErrorEvent" = [ "Event" ];
+ "MediaSource" = [ "EventTarget" ];
+ "MediaStream" = [ "EventTarget" ];
+ "MediaStreamAudioDestinationNode" = [ "AudioNode" "EventTarget" ];
+ "MediaStreamAudioSourceNode" = [ "AudioNode" "EventTarget" ];
+ "MediaStreamEvent" = [ "Event" ];
+ "MediaStreamTrack" = [ "EventTarget" ];
+ "MediaStreamTrackEvent" = [ "Event" ];
+ "MessageEvent" = [ "Event" ];
+ "MessagePort" = [ "EventTarget" ];
+ "MidiAccess" = [ "EventTarget" ];
+ "MidiConnectionEvent" = [ "Event" ];
+ "MidiInput" = [ "EventTarget" "MidiPort" ];
+ "MidiMessageEvent" = [ "Event" ];
+ "MidiOutput" = [ "EventTarget" "MidiPort" ];
+ "MidiPort" = [ "EventTarget" ];
+ "MouseEvent" = [ "Event" "UiEvent" ];
+ "MouseScrollEvent" = [ "Event" "MouseEvent" "UiEvent" ];
+ "MutationEvent" = [ "Event" ];
+ "NetworkInformation" = [ "EventTarget" ];
+ "Node" = [ "EventTarget" ];
+ "Notification" = [ "EventTarget" ];
+ "NotificationEvent" = [ "Event" "ExtendableEvent" ];
+ "OfflineAudioCompletionEvent" = [ "Event" ];
+ "OfflineAudioContext" = [ "BaseAudioContext" "EventTarget" ];
+ "OfflineResourceList" = [ "EventTarget" ];
+ "OffscreenCanvas" = [ "EventTarget" ];
+ "OscillatorNode" = [ "AudioNode" "AudioScheduledSourceNode" "EventTarget" ];
+ "PageTransitionEvent" = [ "Event" ];
+ "PaintWorkletGlobalScope" = [ "WorkletGlobalScope" ];
+ "PannerNode" = [ "AudioNode" "EventTarget" ];
+ "PaymentMethodChangeEvent" = [ "Event" "PaymentRequestUpdateEvent" ];
+ "PaymentRequestUpdateEvent" = [ "Event" ];
+ "Performance" = [ "EventTarget" ];
+ "PerformanceMark" = [ "PerformanceEntry" ];
+ "PerformanceMeasure" = [ "PerformanceEntry" ];
+ "PerformanceNavigationTiming" = [ "PerformanceEntry" "PerformanceResourceTiming" ];
+ "PerformanceResourceTiming" = [ "PerformanceEntry" ];
+ "PermissionStatus" = [ "EventTarget" ];
+ "PointerEvent" = [ "Event" "MouseEvent" "UiEvent" ];
+ "PopStateEvent" = [ "Event" ];
+ "PopupBlockedEvent" = [ "Event" ];
+ "PresentationAvailability" = [ "EventTarget" ];
+ "PresentationConnection" = [ "EventTarget" ];
+ "PresentationConnectionAvailableEvent" = [ "Event" ];
+ "PresentationConnectionCloseEvent" = [ "Event" ];
+ "PresentationConnectionList" = [ "EventTarget" ];
+ "PresentationRequest" = [ "EventTarget" ];
+ "ProcessingInstruction" = [ "CharacterData" "EventTarget" "Node" ];
+ "ProgressEvent" = [ "Event" ];
+ "PromiseRejectionEvent" = [ "Event" ];
+ "PublicKeyCredential" = [ "Credential" ];
+ "PushEvent" = [ "Event" "ExtendableEvent" ];
+ "RadioNodeList" = [ "NodeList" ];
+ "RtcDataChannel" = [ "EventTarget" ];
+ "RtcDataChannelEvent" = [ "Event" ];
+ "RtcPeerConnection" = [ "EventTarget" ];
+ "RtcPeerConnectionIceEvent" = [ "Event" ];
+ "RtcTrackEvent" = [ "Event" ];
+ "RtcdtmfSender" = [ "EventTarget" ];
+ "RtcdtmfToneChangeEvent" = [ "Event" ];
+ "Screen" = [ "EventTarget" ];
+ "ScreenOrientation" = [ "EventTarget" ];
+ "ScriptProcessorNode" = [ "AudioNode" "EventTarget" ];
+ "ScrollAreaEvent" = [ "Event" "UiEvent" ];
+ "SecurityPolicyViolationEvent" = [ "Event" ];
+ "ServiceWorker" = [ "EventTarget" ];
+ "ServiceWorkerContainer" = [ "EventTarget" ];
+ "ServiceWorkerGlobalScope" = [ "EventTarget" "WorkerGlobalScope" ];
+ "ServiceWorkerRegistration" = [ "EventTarget" ];
+ "ShadowRoot" = [ "DocumentFragment" "EventTarget" "Node" ];
+ "SharedWorker" = [ "EventTarget" ];
+ "SharedWorkerGlobalScope" = [ "EventTarget" "WorkerGlobalScope" ];
+ "SourceBuffer" = [ "EventTarget" ];
+ "SourceBufferList" = [ "EventTarget" ];
+ "SpeechRecognition" = [ "EventTarget" ];
+ "SpeechRecognitionError" = [ "Event" ];
+ "SpeechRecognitionEvent" = [ "Event" ];
+ "SpeechSynthesis" = [ "EventTarget" ];
+ "SpeechSynthesisErrorEvent" = [ "Event" "SpeechSynthesisEvent" ];
+ "SpeechSynthesisEvent" = [ "Event" ];
+ "SpeechSynthesisUtterance" = [ "EventTarget" ];
+ "StereoPannerNode" = [ "AudioNode" "EventTarget" ];
+ "StorageEvent" = [ "Event" ];
+ "SvgAnimateElement" = [ "Element" "EventTarget" "Node" "SvgAnimationElement" "SvgElement" ];
+ "SvgAnimateMotionElement" = [ "Element" "EventTarget" "Node" "SvgAnimationElement" "SvgElement" ];
+ "SvgAnimateTransformElement" = [ "Element" "EventTarget" "Node" "SvgAnimationElement" "SvgElement" ];
+ "SvgAnimationElement" = [ "Element" "EventTarget" "Node" "SvgElement" ];
+ "SvgCircleElement" = [ "Element" "EventTarget" "Node" "SvgElement" "SvgGeometryElement" "SvgGraphicsElement" ];
+ "SvgClipPathElement" = [ "Element" "EventTarget" "Node" "SvgElement" ];
+ "SvgComponentTransferFunctionElement" = [ "Element" "EventTarget" "Node" "SvgElement" ];
+ "SvgDefsElement" = [ "Element" "EventTarget" "Node" "SvgElement" "SvgGraphicsElement" ];
+ "SvgDescElement" = [ "Element" "EventTarget" "Node" "SvgElement" ];
+ "SvgElement" = [ "Element" "EventTarget" "Node" ];
+ "SvgEllipseElement" = [ "Element" "EventTarget" "Node" "SvgElement" "SvgGeometryElement" "SvgGraphicsElement" ];
+ "SvgFilterElement" = [ "Element" "EventTarget" "Node" "SvgElement" ];
+ "SvgForeignObjectElement" = [ "Element" "EventTarget" "Node" "SvgElement" "SvgGraphicsElement" ];
+ "SvgGeometryElement" = [ "Element" "EventTarget" "Node" "SvgElement" "SvgGraphicsElement" ];
+ "SvgGradientElement" = [ "Element" "EventTarget" "Node" "SvgElement" ];
+ "SvgGraphicsElement" = [ "Element" "EventTarget" "Node" "SvgElement" ];
+ "SvgImageElement" = [ "Element" "EventTarget" "Node" "SvgElement" "SvgGraphicsElement" ];
+ "SvgLineElement" = [ "Element" "EventTarget" "Node" "SvgElement" "SvgGeometryElement" "SvgGraphicsElement" ];
+ "SvgLinearGradientElement" = [ "Element" "EventTarget" "Node" "SvgElement" "SvgGradientElement" ];
+ "SvgMarkerElement" = [ "Element" "EventTarget" "Node" "SvgElement" ];
+ "SvgMaskElement" = [ "Element" "EventTarget" "Node" "SvgElement" ];
+ "SvgMetadataElement" = [ "Element" "EventTarget" "Node" "SvgElement" ];
+ "SvgPathElement" = [ "Element" "EventTarget" "Node" "SvgElement" "SvgGeometryElement" "SvgGraphicsElement" ];
+ "SvgPathSegArcAbs" = [ "SvgPathSeg" ];
+ "SvgPathSegArcRel" = [ "SvgPathSeg" ];
+ "SvgPathSegClosePath" = [ "SvgPathSeg" ];
+ "SvgPathSegCurvetoCubicAbs" = [ "SvgPathSeg" ];
+ "SvgPathSegCurvetoCubicRel" = [ "SvgPathSeg" ];
+ "SvgPathSegCurvetoCubicSmoothAbs" = [ "SvgPathSeg" ];
+ "SvgPathSegCurvetoCubicSmoothRel" = [ "SvgPathSeg" ];
+ "SvgPathSegCurvetoQuadraticAbs" = [ "SvgPathSeg" ];
+ "SvgPathSegCurvetoQuadraticRel" = [ "SvgPathSeg" ];
+ "SvgPathSegCurvetoQuadraticSmoothAbs" = [ "SvgPathSeg" ];
+ "SvgPathSegCurvetoQuadraticSmoothRel" = [ "SvgPathSeg" ];
+ "SvgPathSegLinetoAbs" = [ "SvgPathSeg" ];
+ "SvgPathSegLinetoHorizontalAbs" = [ "SvgPathSeg" ];
+ "SvgPathSegLinetoHorizontalRel" = [ "SvgPathSeg" ];
+ "SvgPathSegLinetoRel" = [ "SvgPathSeg" ];
+ "SvgPathSegLinetoVerticalAbs" = [ "SvgPathSeg" ];
+ "SvgPathSegLinetoVerticalRel" = [ "SvgPathSeg" ];
+ "SvgPathSegMovetoAbs" = [ "SvgPathSeg" ];
+ "SvgPathSegMovetoRel" = [ "SvgPathSeg" ];
+ "SvgPatternElement" = [ "Element" "EventTarget" "Node" "SvgElement" ];
+ "SvgPolygonElement" = [ "Element" "EventTarget" "Node" "SvgElement" "SvgGeometryElement" "SvgGraphicsElement" ];
+ "SvgPolylineElement" = [ "Element" "EventTarget" "Node" "SvgElement" "SvgGeometryElement" "SvgGraphicsElement" ];
+ "SvgRadialGradientElement" = [ "Element" "EventTarget" "Node" "SvgElement" "SvgGradientElement" ];
+ "SvgRectElement" = [ "Element" "EventTarget" "Node" "SvgElement" "SvgGeometryElement" "SvgGraphicsElement" ];
+ "SvgScriptElement" = [ "Element" "EventTarget" "Node" "SvgElement" ];
+ "SvgSetElement" = [ "Element" "EventTarget" "Node" "SvgAnimationElement" "SvgElement" ];
+ "SvgStopElement" = [ "Element" "EventTarget" "Node" "SvgElement" ];
+ "SvgStyleElement" = [ "Element" "EventTarget" "Node" "SvgElement" ];
+ "SvgSwitchElement" = [ "Element" "EventTarget" "Node" "SvgElement" "SvgGraphicsElement" ];
+ "SvgSymbolElement" = [ "Element" "EventTarget" "Node" "SvgElement" ];
+ "SvgTextContentElement" = [ "Element" "EventTarget" "Node" "SvgElement" "SvgGraphicsElement" ];
+ "SvgTextElement" = [ "Element" "EventTarget" "Node" "SvgElement" "SvgGraphicsElement" "SvgTextContentElement" "SvgTextPositioningElement" ];
+ "SvgTextPathElement" = [ "Element" "EventTarget" "Node" "SvgElement" "SvgGraphicsElement" "SvgTextContentElement" ];
+ "SvgTextPositioningElement" = [ "Element" "EventTarget" "Node" "SvgElement" "SvgGraphicsElement" "SvgTextContentElement" ];
+ "SvgTitleElement" = [ "Element" "EventTarget" "Node" "SvgElement" ];
+ "SvgUseElement" = [ "Element" "EventTarget" "Node" "SvgElement" "SvgGraphicsElement" ];
+ "SvgViewElement" = [ "Element" "EventTarget" "Node" "SvgElement" ];
+ "SvgaElement" = [ "Element" "EventTarget" "Node" "SvgElement" "SvgGraphicsElement" ];
+ "SvgfeBlendElement" = [ "Element" "EventTarget" "Node" "SvgElement" ];
+ "SvgfeColorMatrixElement" = [ "Element" "EventTarget" "Node" "SvgElement" ];
+ "SvgfeComponentTransferElement" = [ "Element" "EventTarget" "Node" "SvgElement" ];
+ "SvgfeCompositeElement" = [ "Element" "EventTarget" "Node" "SvgElement" ];
+ "SvgfeConvolveMatrixElement" = [ "Element" "EventTarget" "Node" "SvgElement" ];
+ "SvgfeDiffuseLightingElement" = [ "Element" "EventTarget" "Node" "SvgElement" ];
+ "SvgfeDisplacementMapElement" = [ "Element" "EventTarget" "Node" "SvgElement" ];
+ "SvgfeDistantLightElement" = [ "Element" "EventTarget" "Node" "SvgElement" ];
+ "SvgfeDropShadowElement" = [ "Element" "EventTarget" "Node" "SvgElement" ];
+ "SvgfeFloodElement" = [ "Element" "EventTarget" "Node" "SvgElement" ];
+ "SvgfeFuncAElement" = [ "Element" "EventTarget" "Node" "SvgComponentTransferFunctionElement" "SvgElement" ];
+ "SvgfeFuncBElement" = [ "Element" "EventTarget" "Node" "SvgComponentTransferFunctionElement" "SvgElement" ];
+ "SvgfeFuncGElement" = [ "Element" "EventTarget" "Node" "SvgComponentTransferFunctionElement" "SvgElement" ];
+ "SvgfeFuncRElement" = [ "Element" "EventTarget" "Node" "SvgComponentTransferFunctionElement" "SvgElement" ];
+ "SvgfeGaussianBlurElement" = [ "Element" "EventTarget" "Node" "SvgElement" ];
+ "SvgfeImageElement" = [ "Element" "EventTarget" "Node" "SvgElement" ];
+ "SvgfeMergeElement" = [ "Element" "EventTarget" "Node" "SvgElement" ];
+ "SvgfeMergeNodeElement" = [ "Element" "EventTarget" "Node" "SvgElement" ];
+ "SvgfeMorphologyElement" = [ "Element" "EventTarget" "Node" "SvgElement" ];
+ "SvgfeOffsetElement" = [ "Element" "EventTarget" "Node" "SvgElement" ];
+ "SvgfePointLightElement" = [ "Element" "EventTarget" "Node" "SvgElement" ];
+ "SvgfeSpecularLightingElement" = [ "Element" "EventTarget" "Node" "SvgElement" ];
+ "SvgfeSpotLightElement" = [ "Element" "EventTarget" "Node" "SvgElement" ];
+ "SvgfeTileElement" = [ "Element" "EventTarget" "Node" "SvgElement" ];
+ "SvgfeTurbulenceElement" = [ "Element" "EventTarget" "Node" "SvgElement" ];
+ "SvggElement" = [ "Element" "EventTarget" "Node" "SvgElement" "SvgGraphicsElement" ];
+ "SvgmPathElement" = [ "Element" "EventTarget" "Node" "SvgElement" ];
+ "SvgsvgElement" = [ "Element" "EventTarget" "Node" "SvgElement" "SvgGraphicsElement" ];
+ "SvgtSpanElement" = [ "Element" "EventTarget" "Node" "SvgElement" "SvgGraphicsElement" "SvgTextContentElement" "SvgTextPositioningElement" ];
+ "TcpServerSocket" = [ "EventTarget" ];
+ "TcpServerSocketEvent" = [ "Event" ];
+ "TcpSocket" = [ "EventTarget" ];
+ "TcpSocketErrorEvent" = [ "Event" ];
+ "TcpSocketEvent" = [ "Event" ];
+ "Text" = [ "CharacterData" "EventTarget" "Node" ];
+ "TextTrack" = [ "EventTarget" ];
+ "TextTrackCue" = [ "EventTarget" ];
+ "TextTrackList" = [ "EventTarget" ];
+ "TimeEvent" = [ "Event" ];
+ "TouchEvent" = [ "Event" "UiEvent" ];
+ "TrackEvent" = [ "Event" ];
+ "TransitionEvent" = [ "Event" ];
+ "UiEvent" = [ "Event" ];
+ "Usb" = [ "EventTarget" ];
+ "UsbConnectionEvent" = [ "Event" ];
+ "UsbPermissionResult" = [ "EventTarget" "PermissionStatus" ];
+ "UserProximityEvent" = [ "Event" ];
+ "ValueEvent" = [ "Event" ];
+ "VideoStreamTrack" = [ "EventTarget" "MediaStreamTrack" ];
+ "VideoTrackList" = [ "EventTarget" ];
+ "VrDisplay" = [ "EventTarget" ];
+ "VttCue" = [ "EventTarget" "TextTrackCue" ];
+ "WakeLockSentinel" = [ "EventTarget" ];
+ "WaveShaperNode" = [ "AudioNode" "EventTarget" ];
+ "WebGlContextEvent" = [ "Event" ];
+ "WebKitCssMatrix" = [ "DomMatrix" "DomMatrixReadOnly" ];
+ "WebSocket" = [ "EventTarget" ];
+ "WheelEvent" = [ "Event" "MouseEvent" "UiEvent" ];
+ "Window" = [ "EventTarget" ];
+ "WindowClient" = [ "Client" ];
+ "Worker" = [ "EventTarget" ];
+ "WorkerDebuggerGlobalScope" = [ "EventTarget" ];
+ "WorkerGlobalScope" = [ "EventTarget" ];
+ "XmlDocument" = [ "Document" "EventTarget" "Node" ];
+ "XmlHttpRequest" = [ "EventTarget" "XmlHttpRequestEventTarget" ];
+ "XmlHttpRequestEventTarget" = [ "EventTarget" ];
+ "XmlHttpRequestUpload" = [ "EventTarget" "XmlHttpRequestEventTarget" ];
+ "Xr" = [ "EventTarget" ];
+ "XrBoundedReferenceSpace" = [ "EventTarget" "XrReferenceSpace" "XrSpace" ];
+ "XrInputSourceEvent" = [ "Event" ];
+ "XrInputSourcesChangeEvent" = [ "Event" ];
+ "XrReferenceSpace" = [ "EventTarget" "XrSpace" ];
+ "XrReferenceSpaceEvent" = [ "Event" ];
+ "XrSession" = [ "EventTarget" ];
+ "XrSessionEvent" = [ "Event" ];
+ "XrSpace" = [ "EventTarget" ];
+ "XrViewerPose" = [ "XrPose" ];
+ };
+ resolvedDefaultFeatures = [ "Crypto" "EventTarget" "Window" ];
+ };
+ "webpki" = rec {
+ crateName = "webpki";
+ version = "0.22.0";
+ edition = "2018";
+ sha256 = "1gd1gxip5kgdwmrvhj5gjxij2mgg2mavq1ych4q1h272ja0xg5gh";
+ authors = [
+ "Brian Smith "
+ ];
+ dependencies = [
+ {
+ name = "ring";
+ packageId = "ring";
+ usesDefaultFeatures = false;
+ }
+ {
+ name = "untrusted";
+ packageId = "untrusted";
+ }
+ ];
+ features = {
+ "alloc" = [ "ring/alloc" ];
+ "std" = [ "alloc" ];
+ };
+ resolvedDefaultFeatures = [ "alloc" "std" ];
+ };
+ "winapi" = rec {
+ crateName = "winapi";
+ version = "0.3.9";
+ edition = "2015";
+ sha256 = "06gl025x418lchw1wxj64ycr7gha83m44cjr5sarhynd9xkrm0sw";
+ authors = [
+ "Peter Atashian "
+ ];
+ dependencies = [
+ {
+ name = "winapi-i686-pc-windows-gnu";
+ packageId = "winapi-i686-pc-windows-gnu";
+ target = { target, features }: (stdenv.hostPlatform.config == "i686-pc-windows-gnu");
+ }
+ {
+ name = "winapi-x86_64-pc-windows-gnu";
+ packageId = "winapi-x86_64-pc-windows-gnu";
+ target = { target, features }: (stdenv.hostPlatform.config == "x86_64-pc-windows-gnu");
+ }
+ ];
+ features = {
+ "debug" = [ "impl-debug" ];
+ };
+ resolvedDefaultFeatures = [ "ntsecapi" "wtypesbase" ];
+ };
+ "winapi-i686-pc-windows-gnu" = rec {
+ crateName = "winapi-i686-pc-windows-gnu";
+ version = "0.4.0";
+ edition = "2015";
+ sha256 = "1dmpa6mvcvzz16zg6d5vrfy4bxgg541wxrcip7cnshi06v38ffxc";
+ authors = [
+ "Peter Atashian "
+ ];
+
+ };
+ "winapi-x86_64-pc-windows-gnu" = rec {
+ crateName = "winapi-x86_64-pc-windows-gnu";
+ version = "0.4.0";
+ edition = "2015";
+ sha256 = "0gqq64czqb64kskjryj8isp62m2sgvx25yyj3kpc2myh85w24bki";
+ authors = [
+ "Peter Atashian "
+ ];
+
+ };
+ "x509-parser" = rec {
+ crateName = "x509-parser";
+ version = "0.13.0";
+ edition = "2018";
+ sha256 = "0f3fqbv92q3a3s51md94sw3vgzs934agl4ii5a6ym364mkdlpwg5";
+ authors = [
+ "Pierre Chifflier "
+ ];
+ dependencies = [
+ {
+ name = "asn1-rs";
+ packageId = "asn1-rs";
+ features = [ "datetime" ];
+ }
+ {
+ name = "base64";
+ packageId = "base64";
+ }
+ {
+ name = "data-encoding";
+ packageId = "data-encoding";
+ }
+ {
+ name = "der-parser";
+ packageId = "der-parser";
+ features = [ "bigint" ];
+ }
+ {
+ name = "lazy_static";
+ packageId = "lazy_static";
+ }
+ {
+ name = "nom";
+ packageId = "nom";
+ }
+ {
+ name = "oid-registry";
+ packageId = "oid-registry";
+ features = [ "crypto" "x509" ];
+ }
+ {
+ name = "ring";
+ packageId = "ring";
+ optional = true;
+ }
+ {
+ name = "rusticata-macros";
+ packageId = "rusticata-macros";
+ }
+ {
+ name = "thiserror";
+ packageId = "thiserror";
+ }
+ {
+ name = "time";
+ packageId = "time";
+ features = [ "formatting" ];
+ }
+ ];
+ features = {
+ "ring" = [ "dep:ring" ];
+ "verify" = [ "ring" ];
+ };
+ resolvedDefaultFeatures = [ "default" "ring" "verify" ];
+ };
+ "yasna" = rec {
+ crateName = "yasna";
+ version = "0.5.0";
+ edition = "2018";
+ sha256 = "0k1gk11hq4rwlppv9f50bz8bnmgr73r66idpp7rybly96si38v9l";
+ authors = [
+ "Masaki Hara "
+ ];
+ dependencies = [
+ {
+ name = "time";
+ packageId = "time";
+ optional = true;
+ usesDefaultFeatures = false;
+ features = [ "std" ];
+ }
+ ];
+ features = {
+ "bit-vec" = [ "dep:bit-vec" ];
+ "num-bigint" = [ "dep:num-bigint" ];
+ "time" = [ "dep:time" ];
+ };
+ resolvedDefaultFeatures = [ "default" "std" "time" ];
+ };
+ "zeroize" = rec {
+ crateName = "zeroize";
+ version = "1.4.3";
+ edition = "2018";
+ sha256 = "068nvl3n5hk6lfn5y24grf2c7anzzqfzjjccscq3md7rqp79v3fn";
+ authors = [
+ "The RustCrypto Project Developers"
+ ];
+ dependencies = [
+ {
+ name = "zeroize_derive";
+ packageId = "zeroize_derive";
+ optional = true;
+ }
+ ];
+ features = {
+ "default" = [ "alloc" ];
+ "zeroize_derive" = [ "dep:zeroize_derive" ];
+ };
+ resolvedDefaultFeatures = [ "alloc" "default" "zeroize_derive" ];
+ };
+ "zeroize_derive" = rec {
+ crateName = "zeroize_derive";
+ version = "1.3.1";
+ edition = "2018";
+ sha256 = "1nzdqyryjnqcrqz0vhddpkd8sybhn0bd8rbd6l33rdhhxwzz3s41";
+ procMacro = true;
+ authors = [
+ "The RustCrypto Project Developers"
+ ];
+ dependencies = [
+ {
+ name = "proc-macro2";
+ packageId = "proc-macro2";
+ }
+ {
+ name = "quote";
+ packageId = "quote";
+ }
+ {
+ name = "syn";
+ packageId = "syn";
+ }
+ {
+ name = "synstructure";
+ packageId = "synstructure";
+ }
+ ];
+
+ };
+ };
+
+ #
+# crate2nix/default.nix (excerpt start)
+#
+
+ /* Target (platform) data for conditional dependencies.
+ This corresponds roughly to what buildRustCrate is setting.
+ */
+ defaultTarget = {
+ unix = true;
+ windows = false;
+ fuchsia = true;
+ test = false;
+
+ # This doesn't appear to be officially documented anywhere yet.
+ # See https://github.com/rust-lang-nursery/rust-forge/issues/101.
+ os =
+ if stdenv.hostPlatform.isDarwin
+ then "macos"
+ else stdenv.hostPlatform.parsed.kernel.name;
+ arch = stdenv.hostPlatform.parsed.cpu.name;
+ family = "unix";
+ env = "gnu";
+ endian =
+ if stdenv.hostPlatform.parsed.cpu.significantByte.name == "littleEndian"
+ then "little" else "big";
+ pointer_width = toString stdenv.hostPlatform.parsed.cpu.bits;
+ vendor = stdenv.hostPlatform.parsed.vendor.name;
+ debug_assertions = false;
+ };
+
+ /* Filters common temp files and build files. */
+ # TODO(pkolloch): Substitute with gitignore filter
+ sourceFilter = name: type:
+ let
+ baseName = builtins.baseNameOf (builtins.toString name);
+ in
+ ! (
+ # Filter out git
+ baseName == ".gitignore"
+ || (type == "directory" && baseName == ".git")
+
+ # Filter out build results
+ || (
+ type == "directory" && (
+ baseName == "target"
+ || baseName == "_site"
+ || baseName == ".sass-cache"
+ || baseName == ".jekyll-metadata"
+ || baseName == "build-artifacts"
+ )
+ )
+
+ # Filter out nix-build result symlinks
+ || (
+ type == "symlink" && lib.hasPrefix "result" baseName
+ )
+
+ # Filter out IDE config
+ || (
+ type == "directory" && (
+ baseName == ".idea" || baseName == ".vscode"
+ )
+ ) || lib.hasSuffix ".iml" baseName
+
+ # Filter out nix build files
+ || baseName == "Cargo.nix"
+
+ # Filter out editor backup / swap files.
+ || lib.hasSuffix "~" baseName
+ || builtins.match "^\\.sw[a-z]$$" baseName != null
+ || builtins.match "^\\..*\\.sw[a-z]$$" baseName != null
+ || lib.hasSuffix ".tmp" baseName
+ || lib.hasSuffix ".bak" baseName
+ || baseName == "tests.nix"
+ );
+
+ /* Returns a crate which depends on successful test execution
+ of crate given as the second argument.
+
+ testCrateFlags: list of flags to pass to the test exectuable
+ testInputs: list of packages that should be available during test execution
+ */
+ crateWithTest = { crate, testCrate, testCrateFlags, testInputs, testPreRun, testPostRun }:
+ assert builtins.typeOf testCrateFlags == "list";
+ assert builtins.typeOf testInputs == "list";
+ assert builtins.typeOf testPreRun == "string";
+ assert builtins.typeOf testPostRun == "string";
+ let
+ # override the `crate` so that it will build and execute tests instead of
+ # building the actual lib and bin targets We just have to pass `--test`
+ # to rustc and it will do the right thing. We execute the tests and copy
+ # their log and the test executables to $out for later inspection.
+ test =
+ let
+ drv = testCrate.override
+ (
+ _: {
+ buildTests = true;
+ }
+ );
+ # If the user hasn't set any pre/post commands, we don't want to
+ # insert empty lines. This means that any existing users of crate2nix
+ # don't get a spurious rebuild unless they set these explicitly.
+ testCommand = pkgs.lib.concatStringsSep "\n"
+ (pkgs.lib.filter (s: s != "") [
+ testPreRun
+ "$f $testCrateFlags 2>&1 | tee -a $out"
+ testPostRun
+ ]);
+ in
+ pkgs.runCommand "run-tests-${testCrate.name}"
+ {
+ inherit testCrateFlags;
+ buildInputs = testInputs;
+ } ''
+ set -ex
+
+ export RUST_BACKTRACE=1
+
+ # recreate a file hierarchy as when running tests with cargo
+
+ # the source for test data
+ ${pkgs.xorg.lndir}/bin/lndir ${crate.src}
+
+ # build outputs
+ testRoot=target/debug
+ mkdir -p $testRoot
+
+ # executables of the crate
+ # we copy to prevent std::env::current_exe() to resolve to a store location
+ for i in ${crate}/bin/*; do
+ cp "$i" "$testRoot"
+ done
+ chmod +w -R .
+
+ # test harness executables are suffixed with a hash, like cargo does
+ # this allows to prevent name collision with the main
+ # executables of the crate
+ hash=$(basename $out)
+ for file in ${drv}/tests/*; do
+ f=$testRoot/$(basename $file)-$hash
+ cp $file $f
+ ${testCommand}
+ done
+ '';
+ in
+ pkgs.runCommand "${crate.name}-linked"
+ {
+ inherit (crate) outputs crateName;
+ passthru = (crate.passthru or { }) // {
+ inherit test;
+ };
+ } ''
+ echo tested by ${test}
+ ${lib.concatMapStringsSep "\n" (output: "ln -s ${crate.${output}} ${"$"}${output}") crate.outputs}
+ '';
+
+ /* A restricted overridable version of builtRustCratesWithFeatures. */
+ buildRustCrateWithFeatures =
+ { packageId
+ , features ? rootFeatures
+ , crateOverrides ? defaultCrateOverrides
+ , buildRustCrateForPkgsFunc ? null
+ , runTests ? false
+ , testCrateFlags ? [ ]
+ , testInputs ? [ ]
+ # Any command to run immediatelly before a test is executed.
+ , testPreRun ? ""
+ # Any command run immediatelly after a test is executed.
+ , testPostRun ? ""
+ }:
+ lib.makeOverridable
+ (
+ { features
+ , crateOverrides
+ , runTests
+ , testCrateFlags
+ , testInputs
+ , testPreRun
+ , testPostRun
+ }:
+ let
+ buildRustCrateForPkgsFuncOverriden =
+ if buildRustCrateForPkgsFunc != null
+ then buildRustCrateForPkgsFunc
+ else
+ (
+ if crateOverrides == pkgs.defaultCrateOverrides
+ then buildRustCrateForPkgs
+ else
+ pkgs: (buildRustCrateForPkgs pkgs).override {
+ defaultCrateOverrides = crateOverrides;
+ }
+ );
+ builtRustCrates = builtRustCratesWithFeatures {
+ inherit packageId features;
+ buildRustCrateForPkgsFunc = buildRustCrateForPkgsFuncOverriden;
+ runTests = false;
+ };
+ builtTestRustCrates = builtRustCratesWithFeatures {
+ inherit packageId features;
+ buildRustCrateForPkgsFunc = buildRustCrateForPkgsFuncOverriden;
+ runTests = true;
+ };
+ drv = builtRustCrates.crates.${packageId};
+ testDrv = builtTestRustCrates.crates.${packageId};
+ derivation =
+ if runTests then
+ crateWithTest
+ {
+ crate = drv;
+ testCrate = testDrv;
+ inherit testCrateFlags testInputs testPreRun testPostRun;
+ }
+ else drv;
+ in
+ derivation
+ )
+ { inherit features crateOverrides runTests testCrateFlags testInputs testPreRun testPostRun; };
+
+ /* Returns an attr set with packageId mapped to the result of buildRustCrateForPkgsFunc
+ for the corresponding crate.
+ */
+ builtRustCratesWithFeatures =
+ { packageId
+ , features
+ , crateConfigs ? crates
+ , buildRustCrateForPkgsFunc
+ , runTests
+ , target ? defaultTarget
+ } @ args:
+ assert (builtins.isAttrs crateConfigs);
+ assert (builtins.isString packageId);
+ assert (builtins.isList features);
+ assert (builtins.isAttrs target);
+ assert (builtins.isBool runTests);
+ let
+ rootPackageId = packageId;
+ mergedFeatures = mergePackageFeatures
+ (
+ args // {
+ inherit rootPackageId;
+ target = target // { test = runTests; };
+ }
+ );
+ # Memoize built packages so that reappearing packages are only built once.
+ builtByPackageIdByPkgs = mkBuiltByPackageIdByPkgs pkgs;
+ mkBuiltByPackageIdByPkgs = pkgs:
+ let
+ self = {
+ crates = lib.mapAttrs (packageId: value: buildByPackageIdForPkgsImpl self pkgs packageId) crateConfigs;
+ build = mkBuiltByPackageIdByPkgs pkgs.buildPackages;
+ };
+ in
+ self;
+ buildByPackageIdForPkgsImpl = self: pkgs: packageId:
+ let
+ features = mergedFeatures."${packageId}" or [ ];
+ crateConfig' = crateConfigs."${packageId}";
+ crateConfig =
+ builtins.removeAttrs crateConfig' [ "resolvedDefaultFeatures" "devDependencies" ];
+ devDependencies =
+ lib.optionals
+ (runTests && packageId == rootPackageId)
+ (crateConfig'.devDependencies or [ ]);
+ dependencies =
+ dependencyDerivations {
+ inherit features target;
+ buildByPackageId = depPackageId:
+ # proc_macro crates must be compiled for the build architecture
+ if crateConfigs.${depPackageId}.procMacro or false
+ then self.build.crates.${depPackageId}
+ else self.crates.${depPackageId};
+ dependencies =
+ (crateConfig.dependencies or [ ])
+ ++ devDependencies;
+ };
+ buildDependencies =
+ dependencyDerivations {
+ inherit features target;
+ buildByPackageId = depPackageId:
+ self.build.crates.${depPackageId};
+ dependencies = crateConfig.buildDependencies or [ ];
+ };
+ filterEnabledDependenciesForThis = dependencies: filterEnabledDependencies {
+ inherit dependencies features target;
+ };
+ dependenciesWithRenames =
+ lib.filter (d: d ? "rename")
+ (
+ filterEnabledDependenciesForThis
+ (
+ (crateConfig.buildDependencies or [ ])
+ ++ (crateConfig.dependencies or [ ])
+ ++ devDependencies
+ )
+ );
+ # Crate renames have the form:
+ #
+ # {
+ # crate_name = [
+ # { version = "1.2.3"; rename = "crate_name01"; }
+ # ];
+ # # ...
+ # }
+ crateRenames =
+ let
+ grouped =
+ lib.groupBy
+ (dependency: dependency.name)
+ dependenciesWithRenames;
+ versionAndRename = dep:
+ let
+ package = crateConfigs."${dep.packageId}";
+ in
+ { inherit (dep) rename; version = package.version; };
+ in
+ lib.mapAttrs (name: choices: builtins.map versionAndRename choices) grouped;
+ in
+ buildRustCrateForPkgsFunc pkgs
+ (
+ crateConfig // {
+ src = crateConfig.src or (
+ pkgs.fetchurl rec {
+ name = "${crateConfig.crateName}-${crateConfig.version}.tar.gz";
+ # https://www.pietroalbini.org/blog/downloading-crates-io/
+ # Not rate-limited, CDN URL.
+ url = "https://static.crates.io/crates/${crateConfig.crateName}/${crateConfig.crateName}-${crateConfig.version}.crate";
+ sha256 =
+ assert (lib.assertMsg (crateConfig ? sha256) "Missing sha256 for ${name}");
+ crateConfig.sha256;
+ }
+ );
+ extraRustcOpts = lib.lists.optional (targetFeatures != [ ]) "-C target-feature=${lib.concatMapStringsSep "," (x: "+${x}") targetFeatures}";
+ inherit features dependencies buildDependencies crateRenames release;
+ }
+ );
+ in
+ builtByPackageIdByPkgs;
+
+ /* Returns the actual derivations for the given dependencies. */
+ dependencyDerivations =
+ { buildByPackageId
+ , features
+ , dependencies
+ , target
+ }:
+ assert (builtins.isList features);
+ assert (builtins.isList dependencies);
+ assert (builtins.isAttrs target);
+ let
+ enabledDependencies = filterEnabledDependencies {
+ inherit dependencies features target;
+ };
+ depDerivation = dependency: buildByPackageId dependency.packageId;
+ in
+ map depDerivation enabledDependencies;
+
+ /* Returns a sanitized version of val with all values substituted that cannot
+ be serialized as JSON.
+ */
+ sanitizeForJson = val:
+ if builtins.isAttrs val
+ then lib.mapAttrs (n: v: sanitizeForJson v) val
+ else if builtins.isList val
+ then builtins.map sanitizeForJson val
+ else if builtins.isFunction val
+ then "function"
+ else val;
+
+ /* Returns various tools to debug a crate. */
+ debugCrate = { packageId, target ? defaultTarget }:
+ assert (builtins.isString packageId);
+ let
+ debug = rec {
+ # The built tree as passed to buildRustCrate.
+ buildTree = buildRustCrateWithFeatures {
+ buildRustCrateForPkgsFunc = _: lib.id;
+ inherit packageId;
+ };
+ sanitizedBuildTree = sanitizeForJson buildTree;
+ dependencyTree = sanitizeForJson
+ (
+ buildRustCrateWithFeatures {
+ buildRustCrateForPkgsFunc = _: crate: {
+ "01_crateName" = crate.crateName or false;
+ "02_features" = crate.features or [ ];
+ "03_dependencies" = crate.dependencies or [ ];
+ };
+ inherit packageId;
+ }
+ );
+ mergedPackageFeatures = mergePackageFeatures {
+ features = rootFeatures;
+ inherit packageId target;
+ };
+ diffedDefaultPackageFeatures = diffDefaultPackageFeatures {
+ inherit packageId target;
+ };
+ };
+ in
+ { internal = debug; };
+
+ /* Returns differences between cargo default features and crate2nix default
+ features.
+
+ This is useful for verifying the feature resolution in crate2nix.
+ */
+ diffDefaultPackageFeatures =
+ { crateConfigs ? crates
+ , packageId
+ , target
+ }:
+ assert (builtins.isAttrs crateConfigs);
+ let
+ prefixValues = prefix: lib.mapAttrs (n: v: { "${prefix}" = v; });
+ mergedFeatures =
+ prefixValues
+ "crate2nix"
+ (mergePackageFeatures { inherit crateConfigs packageId target; features = [ "default" ]; });
+ configs = prefixValues "cargo" crateConfigs;
+ combined = lib.foldAttrs (a: b: a // b) { } [ mergedFeatures configs ];
+ onlyInCargo =
+ builtins.attrNames
+ (lib.filterAttrs (n: v: !(v ? "crate2nix") && (v ? "cargo")) combined);
+ onlyInCrate2Nix =
+ builtins.attrNames
+ (lib.filterAttrs (n: v: (v ? "crate2nix") && !(v ? "cargo")) combined);
+ differentFeatures = lib.filterAttrs
+ (
+ n: v:
+ (v ? "crate2nix")
+ && (v ? "cargo")
+ && (v.crate2nix.features or [ ]) != (v."cargo".resolved_default_features or [ ])
+ )
+ combined;
+ in
+ builtins.toJSON {
+ inherit onlyInCargo onlyInCrate2Nix differentFeatures;
+ };
+
+ /* Returns an attrset mapping packageId to the list of enabled features.
+
+ If multiple paths to a dependency enable different features, the
+ corresponding feature sets are merged. Features in rust are additive.
+ */
+ mergePackageFeatures =
+ { crateConfigs ? crates
+ , packageId
+ , rootPackageId ? packageId
+ , features ? rootFeatures
+ , dependencyPath ? [ crates.${packageId}.crateName ]
+ , featuresByPackageId ? { }
+ , target
+ # Adds devDependencies to the crate with rootPackageId.
+ , runTests ? false
+ , ...
+ } @ args:
+ assert (builtins.isAttrs crateConfigs);
+ assert (builtins.isString packageId);
+ assert (builtins.isString rootPackageId);
+ assert (builtins.isList features);
+ assert (builtins.isList dependencyPath);
+ assert (builtins.isAttrs featuresByPackageId);
+ assert (builtins.isAttrs target);
+ assert (builtins.isBool runTests);
+ let
+ crateConfig = crateConfigs."${packageId}" or (builtins.throw "Package not found: ${packageId}");
+ expandedFeatures = expandFeatures (crateConfig.features or { }) features;
+ enabledFeatures = enableFeatures (crateConfig.dependencies or [ ]) expandedFeatures;
+ depWithResolvedFeatures = dependency:
+ let
+ packageId = dependency.packageId;
+ features = dependencyFeatures enabledFeatures dependency;
+ in
+ { inherit packageId features; };
+ resolveDependencies = cache: path: dependencies:
+ assert (builtins.isAttrs cache);
+ assert (builtins.isList dependencies);
+ let
+ enabledDependencies = filterEnabledDependencies {
+ inherit dependencies target;
+ features = enabledFeatures;
+ };
+ directDependencies = map depWithResolvedFeatures enabledDependencies;
+ foldOverCache = op: lib.foldl op cache directDependencies;
+ in
+ foldOverCache
+ (
+ cache: { packageId, features }:
+ let
+ cacheFeatures = cache.${packageId} or [ ];
+ combinedFeatures = sortedUnique (cacheFeatures ++ features);
+ in
+ if cache ? ${packageId} && cache.${packageId} == combinedFeatures
+ then cache
+ else
+ mergePackageFeatures {
+ features = combinedFeatures;
+ featuresByPackageId = cache;
+ inherit crateConfigs packageId target runTests rootPackageId;
+ }
+ );
+ cacheWithSelf =
+ let
+ cacheFeatures = featuresByPackageId.${packageId} or [ ];
+ combinedFeatures = sortedUnique (cacheFeatures ++ enabledFeatures);
+ in
+ featuresByPackageId // {
+ "${packageId}" = combinedFeatures;
+ };
+ cacheWithDependencies =
+ resolveDependencies cacheWithSelf "dep"
+ (
+ crateConfig.dependencies or [ ]
+ ++ lib.optionals
+ (runTests && packageId == rootPackageId)
+ (crateConfig.devDependencies or [ ])
+ );
+ cacheWithAll =
+ resolveDependencies
+ cacheWithDependencies "build"
+ (crateConfig.buildDependencies or [ ]);
+ in
+ cacheWithAll;
+
+ /* Returns the enabled dependencies given the enabled features. */
+ filterEnabledDependencies = { dependencies, features, target }:
+ assert (builtins.isList dependencies);
+ assert (builtins.isList features);
+ assert (builtins.isAttrs target);
+
+ lib.filter
+ (
+ dep:
+ let
+ targetFunc = dep.target or (features: true);
+ in
+ targetFunc { inherit features target; }
+ && (
+ !(dep.optional or false)
+ || builtins.any (doesFeatureEnableDependency dep) features
+ )
+ )
+ dependencies;
+
+ /* Returns whether the given feature should enable the given dependency. */
+ doesFeatureEnableDependency = dependency: feature:
+ let
+ name = dependency.rename or dependency.name;
+ prefix = "${name}/";
+ len = builtins.stringLength prefix;
+ startsWithPrefix = builtins.substring 0 len feature == prefix;
+ in
+ feature == name || startsWithPrefix;
+
+ /* Returns the expanded features for the given inputFeatures by applying the
+ rules in featureMap.
+
+ featureMap is an attribute set which maps feature names to lists of further
+ feature names to enable in case this feature is selected.
+ */
+ expandFeatures = featureMap: inputFeatures:
+ assert (builtins.isAttrs featureMap);
+ assert (builtins.isList inputFeatures);
+ let
+ expandFeature = feature:
+ assert (builtins.isString feature);
+ [ feature ] ++ (expandFeatures featureMap (featureMap."${feature}" or [ ]));
+ outFeatures = lib.concatMap expandFeature inputFeatures;
+ in
+ sortedUnique outFeatures;
+
+ /* This function adds optional dependencies as features if they are enabled
+ indirectly by dependency features. This function mimics Cargo's behavior
+ described in a note at:
+ https://doc.rust-lang.org/nightly/cargo/reference/features.html#dependency-features
+ */
+ enableFeatures = dependencies: features:
+ assert (builtins.isList features);
+ assert (builtins.isList dependencies);
+ let
+ additionalFeatures = lib.concatMap
+ (
+ dependency:
+ assert (builtins.isAttrs dependency);
+ let
+ enabled = builtins.any (doesFeatureEnableDependency dependency) features;
+ in
+ if (dependency.optional or false) && enabled
+ then [ (dependency.rename or dependency.name) ]
+ else [ ]
+ )
+ dependencies;
+ in
+ sortedUnique (features ++ additionalFeatures);
+
+ /*
+ Returns the actual features for the given dependency.
+
+ features: The features of the crate that refers this dependency.
+ */
+ dependencyFeatures = features: dependency:
+ assert (builtins.isList features);
+ assert (builtins.isAttrs dependency);
+ let
+ defaultOrNil =
+ if dependency.usesDefaultFeatures or true
+ then [ "default" ]
+ else [ ];
+ explicitFeatures = dependency.features or [ ];
+ additionalDependencyFeatures =
+ let
+ dependencyPrefix = (dependency.rename or dependency.name) + "/";
+ dependencyFeatures =
+ builtins.filter (f: lib.hasPrefix dependencyPrefix f) features;
+ in
+ builtins.map (lib.removePrefix dependencyPrefix) dependencyFeatures;
+ in
+ defaultOrNil ++ explicitFeatures ++ additionalDependencyFeatures;
+
+ /* Sorts and removes duplicates from a list of strings. */
+ sortedUnique = features:
+ assert (builtins.isList features);
+ assert (builtins.all builtins.isString features);
+ let
+ outFeaturesSet = lib.foldl (set: feature: set // { "${feature}" = 1; }) { } features;
+ outFeaturesUnique = builtins.attrNames outFeaturesSet;
+ in
+ builtins.sort (a: b: a < b) outFeaturesUnique;
+
+ deprecationWarning = message: value:
+ if strictDeprecation
+ then builtins.throw "strictDeprecation enabled, aborting: ${message}"
+ else builtins.trace message value;
+
+ #
+ # crate2nix/default.nix (excerpt end)
+ #
+ };
+}
+
diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix
index 4d59a03313a4..dcf6988f5939 100644
--- a/pkgs/data/themes/matcha/default.nix
+++ b/pkgs/data/themes/matcha/default.nix
@@ -1,33 +1,50 @@
-{ lib, stdenv, fetchFromGitHub, gdk-pixbuf, librsvg, gtk-engine-murrine }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, gdk-pixbuf
+, gtk-engine-murrine
+, librsvg
+, gitUpdater
+}:
stdenv.mkDerivation rec {
pname = "matcha-gtk-theme";
- version = "2021-12-25";
+ version = "2022-06-07";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
- sha256 = "1wgq1aypm4cjv7yavlfmqcwahlddvh2gbg2f5ca0djgnpy9vha1g";
+ sha256 = "26xa9EGo2hci08Zw+X/A0Pn0VHxU8yfvRMiRusml+tc=";
};
- buildInputs = [ gdk-pixbuf librsvg ];
+ buildInputs = [
+ gdk-pixbuf
+ librsvg
+ ];
- propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+ propagatedUserEnvPkgs = [
+ gtk-engine-murrine
+ ];
+
+ postPatch = ''
+ patchShebangs install.sh
+ '';
installPhase = ''
runHook preInstall
- patchShebangs .
mkdir -p $out/share/themes
- name= ./install.sh -d $out/share/themes
+ name= ./install.sh --dest $out/share/themes
install -D -t $out/share/gtksourceview-3.0/styles src/extra/gedit/matcha.xml
mkdir -p $out/share/doc/${pname}
cp -a src/extra/firefox $out/share/doc/${pname}
runHook postInstall
'';
+ passthru.updateScript = gitUpdater {inherit pname version; };
+
meta = with lib; {
- description = "A stylish flat design theme for GTK based desktop environments";
+ description = "A stylish flat Design theme for GTK based desktop environments";
homepage = "https://vinceliuice.github.io/theme-matcha";
license = licenses.gpl3Only;
platforms = platforms.unix;
diff --git a/pkgs/data/themes/mojave/default.nix b/pkgs/data/themes/mojave/default.nix
index e8e98ab0ebfe..4fc9b0ab8c02 100644
--- a/pkgs/data/themes/mojave/default.nix
+++ b/pkgs/data/themes/mojave/default.nix
@@ -3,6 +3,7 @@
, fetchFromGitHub
, fetchurl
, glib
+, gnome-shell
, gtk-engine-murrine
, gtk_engines
, inkscape
@@ -30,14 +31,14 @@ lib.checkListOfEnum "${pname}: theme variants" [ "default" "blue" "purple" "pink
stdenv.mkDerivation rec {
inherit pname;
- version = "2022-05-12";
+ version = "2022-06-07";
srcs = [
(fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
- sha256 = "sha256-VrrxW16J+S21qBoAeVCWs0Q6bRL1jXAK7MOBpdSMJZY=";
+ sha256 = "sha256-OEqB2PSZ5KoxXAUhlyT1PRUzckVz+jTCIoAqP8gVqTk=";
})
]
++
@@ -52,6 +53,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
glib
+ gnome-shell
inkscape
jdupes
optipng
@@ -72,7 +74,10 @@ stdenv.mkDerivation rec {
dontRewriteSymlinks = true;
postPatch = ''
- patchShebangs .
+ patchShebangs \
+ install.sh \
+ src/main/gtk-3.0/make_gresource_xml.sh \
+ src/main/gtk-4.0/make_gresource_xml.sh
for f in \
render-assets.sh \
@@ -87,6 +92,7 @@ stdenv.mkDerivation rec {
src/assets/metacity-1/render-assets.sh \
src/assets/xfwm4/render-assets.sh
do
+ patchShebangs $f
substituteInPlace $f \
--replace /usr/bin/inkscape ${inkscape}/bin/inkscape \
--replace /usr/bin/optipng ${optipng}/bin/optipng
diff --git a/pkgs/development/compilers/go/go-1.9-skip-flaky-20072.patch b/pkgs/development/compilers/go/go-1.9-skip-flaky-20072.patch
deleted file mode 100644
index 13db40ababc3..000000000000
--- a/pkgs/development/compilers/go/go-1.9-skip-flaky-20072.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/src/sync/waitgroup_test.go b/src/sync/waitgroup_test.go
-index e3e3096..f80d1e2 100644
---- a/src/sync/waitgroup_test.go
-+++ b/src/sync/waitgroup_test.go
-@@ -6,6 +6,7 @@ package sync_test
-
- import (
- "internal/race"
-+ "internal/testenv"
- "runtime"
- . "sync"
- "sync/atomic"
-@@ -73,6 +74,7 @@ func TestWaitGroupMisuse2(t *testing.T) {
- if runtime.NumCPU() <= 4 {
- t.Skip("NumCPU<=4, skipping: this test requires parallelism")
- }
-+ testenv.SkipFlaky(t, 20072)
- defer func() {
- err := recover()
- if err != "sync: negative WaitGroup counter" &&
diff --git a/pkgs/development/compilers/mlton/20210107-binary.nix b/pkgs/development/compilers/mlton/20210107-binary.nix
new file mode 100644
index 000000000000..26a20db0d391
--- /dev/null
+++ b/pkgs/development/compilers/mlton/20210107-binary.nix
@@ -0,0 +1,60 @@
+{ lib, stdenv, fetchurl, patchelf, gmp }:
+let
+ dynamic-linker = stdenv.cc.bintools.dynamicLinker;
+in
+stdenv.mkDerivation rec {
+ pname = "mlton";
+ version = "20210107";
+
+ src =
+ if stdenv.hostPlatform.system == "x86_64-linux" then
+ (fetchurl {
+ url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${pname}-${version}-1.amd64-linux-glibc2.31.tgz.tgz";
+ sha256 = "0f4q575yfm5dpg4a2wsnqn4l2zrar96p6rlsk0dw10ggyfwvsjlf";
+ })
+ else if stdenv.hostPlatform.system == "x86_64-darwin" then
+ (fetchurl {
+ url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${pname}-${version}-1.amd64-darwin-19.6.gmp-static.tgz";
+ sha256 = "1cw7yhw48qp12q0adwf8srpjzrgkp84kmlkqw3pz8vkxz4p9hbdv";
+ })
+ else
+ throw "Architecture not supported";
+
+ buildInputs = [ gmp ];
+ nativeBuildInputs = lib.optional stdenv.isLinux patchelf;
+
+ buildPhase = ''
+ make update \
+ CC="$(type -p cc)" \
+ WITH_GMP_INC_DIR="${gmp.dev}/include" \
+ WITH_GMP_LIB_DIR="${gmp}/lib"
+ '';
+
+ installPhase = ''
+ make install PREFIX=$out
+ '';
+
+ postFixup = lib.optionalString stdenv.isLinux ''
+ patchelf --set-interpreter ${dynamic-linker} $out/lib/mlton/mlton-compile
+ patchelf --set-rpath ${gmp}/lib $out/lib/mlton/mlton-compile
+
+ for e in mllex mlnlffigen mlprof mlyacc; do
+ patchelf --set-interpreter ${dynamic-linker} $out/bin/$e
+ patchelf --set-rpath ${gmp}/lib $out/bin/$e
+ done
+ '' + lib.optionalString stdenv.isDarwin ''
+ install_name_tool -change \
+ /opt/local/lib/libgmp.10.dylib \
+ ${gmp}/lib/libgmp.10.dylib \
+ $out/lib/mlton/mlton-compile
+
+ for e in mllex mlnlffigen mlprof mlyacc; do
+ install_name_tool -change \
+ /opt/local/lib/libgmp.10.dylib \
+ ${gmp}/lib/libgmp.10.dylib \
+ $out/bin/$e
+ done
+ '';
+
+ meta = import ./meta.nix;
+}
diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix
index e4381774781c..1caeecccaadb 100644
--- a/pkgs/development/compilers/mlton/default.nix
+++ b/pkgs/development/compilers/mlton/default.nix
@@ -1,9 +1,9 @@
{ callPackage }:
rec {
- mlton20130715 = callPackage ./20130715.nix {};
+ mlton20130715 = callPackage ./20130715.nix { };
- mlton20180207Binary = callPackage ./20180207-binary.nix {};
+ mlton20180207Binary = callPackage ./20180207-binary.nix { };
mlton20180207 = callPackage ./from-git-source.nix {
mltonBootstrap = mlton20180207Binary;
@@ -12,10 +12,19 @@ rec {
sha256 = "00rdd2di5x1dzac64il9z05m3fdzicjd3226wwjyynv631jj3q2a";
};
+ mlton20210107Binary = callPackage ./20210107-binary.nix { };
+
+ mlton20210107 = callPackage ./from-git-source.nix {
+ mltonBootstrap = mlton20180207Binary;
+ version = "20210107";
+ rev = "on-20210117-release";
+ sha256 = "sha256-rqL8lnzVVR+5Hc7sWXK8dCXN92dU76qSoii3/4StODM=";
+ };
+
mltonHEAD = callPackage ./from-git-source.nix {
mltonBootstrap = mlton20180207Binary;
version = "HEAD";
- rev = "e149c9917cfbfe6aba5c986a958ed76d5cc6cfde";
- sha256 = "0a0j1i0f0fxw2my1309srq5j3vz0kawrrln01gxms2m5hy5dl50d";
+ rev = "875f7912a0b135a9a7e86a04ecac9cacf0bfe5e5";
+ sha256 = "sha256-/MIoVqqv8qrJPehU7VRFpXtAAo8UUzE3waEvB7WnS9A=";
};
}
diff --git a/pkgs/development/interpreters/python/cpython/3.11/darwin-libutil.patch b/pkgs/development/interpreters/python/cpython/3.11/darwin-libutil.patch
new file mode 100644
index 000000000000..92b846be0002
--- /dev/null
+++ b/pkgs/development/interpreters/python/cpython/3.11/darwin-libutil.patch
@@ -0,0 +1,13 @@
+diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
+index 40229bce0f..3cc604930e 100644
+--- a/Modules/posixmodule.c
++++ b/Modules/posixmodule.c
+@@ -7258,7 +7258,7 @@ os_sched_getaffinity_impl(PyObject *module, pid_t pid)
+ #ifdef HAVE_UTMP_H
+ #include
+ #endif /* HAVE_UTMP_H */
+-#elif defined(HAVE_LIBUTIL_H)
++#elif defined(HAVE_LIBUTIL_H) && !defined(__APPLE__)
+ #include
+ #elif defined(HAVE_UTIL_H)
+ #include
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 1218f2eb24e0..72fd4df385d2 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -225,9 +225,11 @@ in with passthru; stdenv.mkDerivation {
# * https://bugs.python.org/issue35523
# * https://github.com/python/cpython/commit/e6b247c8e524
./3.7/no-win64-workaround.patch
- ] ++ optionals (pythonAtLeast "3.7") [
+ ] ++ optionals (pythonAtLeast "3.7" && pythonOlder "3.11") [
# Fix darwin build https://bugs.python.org/issue34027
./3.7/darwin-libutil.patch
+ ] ++ optionals (pythonAtLeast "3.11") [
+ ./3.11/darwin-libutil.patch
] ++ optionals (pythonOlder "3.8") [
# Backport from CPython 3.8 of a good list of tests to run for PGO.
(
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index 518bb0ec0f86..0eb066503656 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -199,9 +199,9 @@ in {
major = "3";
minor = "11";
patch = "0";
- suffix = "a7";
+ suffix = "b3";
};
- sha256 = "sha256-t8Vt10wvRy1Ja1qNNWvWrZ75sD8mKIwyN9P/aYqwPXQ=";
+ sha256 = "sha256-ybmfUxXqMPjp/LzmgHo3Oeh1SA0pEk5tmUD2+ry3yQI=";
inherit (darwin) configd;
inherit passthruFun;
};
diff --git a/pkgs/development/libraries/catch2/3.nix b/pkgs/development/libraries/catch2/3.nix
new file mode 100644
index 000000000000..aaf8c5d5d057
--- /dev/null
+++ b/pkgs/development/libraries/catch2/3.nix
@@ -0,0 +1,42 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, python3
+}:
+
+stdenv.mkDerivation rec {
+ pname = "catch2";
+ version = "3.0.1";
+
+ src = fetchFromGitHub {
+ owner = "catchorg";
+ repo = "Catch2";
+ rev = "v${version}";
+ hash = "sha256-GcMkAgSfQnWs8wQeQD4ZMxJZED8V7FWBU04qMCutlPo=";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ ];
+
+ cmakeFlags = [
+ "-DCATCH_DEVELOPMENT_BUILD=ON"
+ "-DCATCH_BUILD_TESTING=${if doCheck then "ON" else "OFF"}"
+ ];
+
+ doCheck = true;
+
+ checkInputs = [
+ python3
+ ];
+
+ meta = {
+ description = "Modern, C++-native, test framework for unit-tests";
+ homepage = "https://github.com/catchorg/Catch2";
+ changelog = "https://github.com/catchorg/Catch2/blob/${src.rev}/docs/release-notes.md";
+ license = lib.licenses.boost;
+ maintainers = with lib.maintainers; [ dotlambda ];
+ platforms = lib.platforms.unix;
+ };
+}
diff --git a/pkgs/development/libraries/jarowinkler-cpp/default.nix b/pkgs/development/libraries/jarowinkler-cpp/default.nix
index f89c54121ca1..6ddb86299365 100644
--- a/pkgs/development/libraries/jarowinkler-cpp/default.nix
+++ b/pkgs/development/libraries/jarowinkler-cpp/default.nix
@@ -2,18 +2,18 @@
, stdenv
, fetchFromGitHub
, cmake
-, catch2
+, catch2_3
}:
stdenv.mkDerivation rec {
pname = "jarowinkler-cpp";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchFromGitHub {
owner = "maxbachmann";
repo = "jarowinkler-cpp";
rev = "v${version}";
- hash = "sha256-6dIyCyoPs/2wHyGqlE+NC0pwz5ggS5edhN4Jbltx0jg=";
+ hash = "sha256-3/x0fyaDJTouBKbif0ALgMzht6HMEGHNw8g8zQlUcNk=";
};
nativeBuildInputs = [
@@ -21,15 +21,14 @@ stdenv.mkDerivation rec {
];
cmakeFlags = lib.optionals doCheck [
- "-DRAPIDFUZZ_BUILD_TESTING=ON"
+ "-DJARO_WINKLER_BUILD_TESTING=ON"
];
checkInputs = [
- catch2
+ catch2_3
];
- # uses unreleased Catch2 version 3
- doCheck = false;
+ doCheck = true;
meta = {
description = "Fast Jaro and Jaro-Winkler distance";
diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix
index 6f630eedf5b9..32e58c9be0b2 100644
--- a/pkgs/development/libraries/liblouis/default.nix
+++ b/pkgs/development/libraries/liblouis/default.nix
@@ -1,7 +1,6 @@
{ fetchFromGitHub
, lib
, stdenv
-, fetchpatch
, autoreconfHook
, pkg-config
, gettext
@@ -14,25 +13,17 @@
stdenv.mkDerivation rec {
pname = "liblouis";
- version = "3.21.0";
+ version = "3.22.0";
+
+ outputs = [ "out" "dev" "man" "info" "doc" ];
src = fetchFromGitHub {
owner = "liblouis";
repo = "liblouis";
rev = "v${version}";
- sha256 = "sha256-Hfn0dfXihtUfO3R+qJaetrPwupcIwblvi1DQdHCF1s8=";
+ sha256 = "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=";
};
- patches = [
- (fetchpatch {
- name = "parenthesize-memcpy-calls-clang.patch";
- url = "https://github.com/liblouis/liblouis/commit/528f38938e9f539a251d9de92ad1c1b90401c4d0.patch";
- sha256 = "0hlhqsvd5wflg70bd7bmssnchk8znzbr93in0zpspzbyap6xz112";
- })
- ];
-
- outputs = [ "out" "dev" "man" "info" "doc" ];
-
nativeBuildInputs = [
autoreconfHook
pkg-config
@@ -71,7 +62,10 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Open-source braille translator and back-translator";
homepage = "http://liblouis.org/";
- license = licenses.lgpl21;
+ license = with licenses; [
+ lgpl21Plus # library
+ gpl3Plus # tools
+ ];
maintainers = with maintainers; [ jtojnar ];
platforms = platforms.unix;
};
diff --git a/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/pkgs/development/libraries/rapidfuzz-cpp/default.nix
index 2e1ad8080fa4..99c3059c7a51 100644
--- a/pkgs/development/libraries/rapidfuzz-cpp/default.nix
+++ b/pkgs/development/libraries/rapidfuzz-cpp/default.nix
@@ -2,20 +2,29 @@
, stdenv
, fetchFromGitHub
, cmake
-, catch2
+, catch2_3
}:
stdenv.mkDerivation rec {
pname = "rapidfuzz-cpp";
- version = "1.0.1";
+ version = "1.0.2";
src = fetchFromGitHub {
owner = "maxbachmann";
repo = "rapidfuzz-cpp";
rev = "v${version}";
- hash = "sha256-331iW0nu5MlxuKNTgMkRSASnglxn+hEWBhRMnw0lY2Y=";
+ hash = "sha256-Tf7nEMXiem21cvQHPnYnCvOOLg0KBBnNQDaYIcHcm2g=";
};
+ patches = lib.optionals doCheck [
+ ./dont-fetch-project-options.patch
+ ];
+
+ postPatch = ''
+ substituteInPlace test/CMakeLists.txt \
+ --replace WARNINGS_AS_ERRORS ""
+ '';
+
nativeBuildInputs = [
cmake
];
@@ -25,11 +34,10 @@ stdenv.mkDerivation rec {
];
checkInputs = [
- catch2
+ catch2_3
];
- # uses unreleased Catch2 version 3
- doCheck = false;
+ doCheck = true;
meta = {
description = "Rapid fuzzy string matching in C++ using the Levenshtein Distance";
diff --git a/pkgs/development/libraries/rapidfuzz-cpp/dont-fetch-project-options.patch b/pkgs/development/libraries/rapidfuzz-cpp/dont-fetch-project-options.patch
new file mode 100644
index 000000000000..ab88c530d400
--- /dev/null
+++ b/pkgs/development/libraries/rapidfuzz-cpp/dont-fetch-project-options.patch
@@ -0,0 +1,58 @@
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index 5ba4464..ad72319 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -12,39 +12,10 @@ else()
+ FetchContent_MakeAvailable(Catch2)
+ endif()
+
+-# include aminya & jason turner's C++ best practices recommended cmake project utilities
+-include(FetchContent)
+-FetchContent_Declare(_project_options URL https://github.com/aminya/project_options/archive/refs/tags/v0.20.0.zip)
+-FetchContent_MakeAvailable(_project_options)
+-include(${_project_options_SOURCE_DIR}/Index.cmake)
+-
+-project_options(
+- # ENABLE_CACHE
+- # ENABLE_CONAN
+- WARNINGS_AS_ERRORS
+- # ENABLE_CPPCHECK
+- # ENABLE_CLANG_TIDY
+- # ENABLE_INCLUDE_WHAT_YOU_USE
+- # ENABLE_COVERAGE
+- # ENABLE_PCH
+- # PCH_HEADERS
+- # ENABLE_DOXYGEN
+- # ENABLE_IPO
+- # ENABLE_USER_LINKER
+- # ENABLE_BUILD_WITH_TIME_TRACE
+- # ENABLE_UNITY
+- # ENABLE_SANITIZER_ADDRESS
+- # ENABLE_SANITIZER_LEAK
+- # ENABLE_SANITIZER_UNDEFINED_BEHAVIOR
+- # ENABLE_SANITIZER_THREAD
+- # ENABLE_SANITIZER_MEMORY
+- # CLANG_WARNINGS "-Weverything"
+-)
+-
+ function(rapidfuzz_add_test test)
+ add_executable(test_${test} tests-${test}.cpp)
+ target_link_libraries(test_${test} ${PROJECT_NAME})
+- target_link_libraries(test_${test} Catch2::Catch2WithMain project_warnings)
++ target_link_libraries(test_${test} Catch2::Catch2WithMain)
+ add_test(NAME ${test} COMMAND test_${test})
+ endfunction()
+
+diff --git a/test/distance/CMakeLists.txt b/test/distance/CMakeLists.txt
+index 2a70054..7a43c88 100644
+--- a/test/distance/CMakeLists.txt
++++ b/test/distance/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ function(rapidfuzz_add_test test)
+ add_executable(test_${test} tests-${test}.cpp)
+ target_link_libraries(test_${test} ${PROJECT_NAME})
+- target_link_libraries(test_${test} Catch2::Catch2WithMain project_warnings)
++ target_link_libraries(test_${test} Catch2::Catch2WithMain)
+ add_test(NAME ${test} COMMAND test_${test})
+ endfunction()
+
diff --git a/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix b/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix
index a8450b414e54..5ccd9d6fa49e 100644
--- a/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix
+++ b/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix
@@ -1,20 +1,35 @@
-{ lib, stdenv, fetchFromGitHub, makeWrapper
-, meson, ninja, pkg-config, wayland-protocols
-, pipewire, wayland, systemd, libdrm, inih, scdoc, grim, slurp }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, makeWrapper
+, meson
+, ninja
+, pkg-config
+, wayland-protocols
+, grim
+, inih
+, libdrm
+, mesa
+, pipewire
+, scdoc
+, slurp
+, systemd
+, wayland
+}:
stdenv.mkDerivation rec {
pname = "xdg-desktop-portal-wlr";
- version = "0.5.0";
+ version = "0.6.0";
src = fetchFromGitHub {
owner = "emersion";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-weePlNcLmZ3R0IDQ95p0wQvsKTYp+sVlTENJtF8Z78Y=";
+ sha256 = "sha256-UztkfvMIbslPd/d262NZFb6WfESc9nBsSSH96BA4Aqw=";
};
nativeBuildInputs = [ meson ninja pkg-config wayland-protocols makeWrapper ];
- buildInputs = [ pipewire wayland systemd libdrm inih scdoc ];
+ buildInputs = [ inih libdrm mesa pipewire scdoc systemd wayland ];
mesonFlags = [
"-Dsd-bus-provider=libsystemd"
diff --git a/pkgs/development/python-modules/atom/default.nix b/pkgs/development/python-modules/atom/default.nix
index 88cfc818e3b9..aead82a488d0 100644
--- a/pkgs/development/python-modules/atom/default.nix
+++ b/pkgs/development/python-modules/atom/default.nix
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "atom";
- version = "0.8.0";
+ version = "0.8.1";
format = "pyproject";
src = fetchFromGitHub {
owner = "nucleic";
repo = pname;
- rev = version;
- hash = "sha256-Xby3QopKw7teShMi80RMG8YdhOOvfQb5vwOuFEUTxHQ=";
+ rev = "refs/tags/${version}";
+ hash = "sha256-odthydKmgbOXYT8YAIn5MlFfH/BD8MMkuRYaiI8OZD4=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix
index 3b2963f7d693..7f79f99e3a67 100644
--- a/pkgs/development/python-modules/aws-adfs/default.nix
+++ b/pkgs/development/python-modules/aws-adfs/default.nix
@@ -5,6 +5,7 @@
, click
, configparser
, fetchFromGitHub
+, fetchpatch
, fido2
, lxml
, poetry-core
@@ -46,6 +47,14 @@ buildPythonPackage rec {
requests-kerberos
];
+ patches = [
+ # Apply new fido2 api (See: venth/aws-adfs#243)
+ (fetchpatch {
+ url = "https://github.com/venth/aws-adfs/commit/09836d89256f3537270d760d8aa30ab9284725a8.diff";
+ hash = "sha256-pAAJvOa43BXtyWvV8hsLe2xqd5oI+vzndckRTRol61s=";
+ })
+ ];
+
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'boto3 = "^1.20.50"' 'boto3 = "*"' \
diff --git a/pkgs/development/python-modules/enaml/default.nix b/pkgs/development/python-modules/enaml/default.nix
index ccd8bb497d10..61ae38930fe1 100644
--- a/pkgs/development/python-modules/enaml/default.nix
+++ b/pkgs/development/python-modules/enaml/default.nix
@@ -13,13 +13,13 @@
buildPythonPackage rec {
pname = "enaml";
- version = "0.15.0";
+ version = "0.15.1";
src = fetchFromGitHub {
owner = "nucleic";
repo = pname;
rev = "refs/tags/${version}";
- sha256 = "sha256-xSMgT8VooDS5kvf4BCcVbv/MNfRDTVnPKU3Ou+/Gq7I=";
+ sha256 = "sha256-kS15x7fZsHlARh1ILsQpJnwozutuoIysTCCKwkNCa7Y=";
};
# qt bindings cannot be found during tests
diff --git a/pkgs/development/python-modules/ghapi/default.nix b/pkgs/development/python-modules/ghapi/default.nix
index 3c648b4a4560..002dbeaa0c8d 100644
--- a/pkgs/development/python-modules/ghapi/default.nix
+++ b/pkgs/development/python-modules/ghapi/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "ghapi";
- version = "0.1.20";
+ version = "0.1.21";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -17,8 +17,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "fastai";
repo = "ghapi";
- rev = version;
- sha256 = "sha256-Pry+qCHCt+c+uwkLaoTVUY1KblESj6kcNtMfGwK1rfk=";
+ rev = "refs/tags/${version}";
+ sha256 = "sha256-6VcsIcRhIHByd1aPZLIJ+g4o1einHpyJuSamwh1Ag5M=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/igraph/default.nix b/pkgs/development/python-modules/igraph/default.nix
index 32b471a83ce2..6afa32d35bfb 100644
--- a/pkgs/development/python-modules/igraph/default.nix
+++ b/pkgs/development/python-modules/igraph/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "igraph";
- version = "0.9.10";
+ version = "0.9.11";
disabled = pythonOlder "3.6";
@@ -18,16 +18,19 @@ buildPythonPackage rec {
owner = "igraph";
repo = "python-igraph";
rev = version;
- hash = "sha256-c20N8BtbQGxAK7ykQvyfqWYu7wVOlYfeGpNOwWPlGxs=";
+ hash = "sha256-tvkV5ve9X+LXx3LOdHIPljQKZc1v6yts0juo4SwDmfY=";
};
+ postPatch = ''
+ rm -r vendor
+ '';
+
nativeBuildInputs = [
pkg-config
];
buildInputs = [
igraph
- igraph.dev
];
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix
index 0e3ada8d8be5..41d910279e56 100644
--- a/pkgs/development/python-modules/peaqevcore/default.nix
+++ b/pkgs/development/python-modules/peaqevcore/default.nix
@@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "peaqevcore";
- version = "1.0.11";
+ version = "1.0.14";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-cY2+H6FiojUEOHuA+wuIubtJKjNQlgten1edWgkoLb0=";
+ hash = "sha256-zHVi950iUultt66amL22d/7INglJtSOHvWCPUSaw5h4=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix
index 29a54e1eac1f..87609b30d80b 100644
--- a/pkgs/development/python-modules/pikepdf/default.nix
+++ b/pkgs/development/python-modules/pikepdf/default.nix
@@ -8,6 +8,7 @@
, jbig2dec
, lxml
, mupdf
+, packaging
, pillow
, psutil
, pybind11
@@ -22,7 +23,7 @@
buildPythonPackage rec {
pname = "pikepdf";
- version = "5.1.4";
+ version = "5.1.5";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -37,7 +38,7 @@ buildPythonPackage rec {
postFetch = ''
rm "$out/.git_archival.txt"
'';
- hash = "sha256-nCzG1QYwERKo/T16hEGIG//PwSrpWRmKLXdj42WGyls=";
+ hash = "sha256-DEgxdMVX5gQOsV9EyJtO/MO7padYMZrekanpp+nNvek=";
};
patches = [
@@ -78,6 +79,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
lxml
+ packaging
pillow
] ++ lib.optionals (pythonOlder "3.8") [
importlib-metadata
diff --git a/pkgs/development/python-modules/pyroute2-core/default.nix b/pkgs/development/python-modules/pyroute2-core/default.nix
index 096085a27103..085e0059a9d5 100644
--- a/pkgs/development/python-modules/pyroute2-core/default.nix
+++ b/pkgs/development/python-modules/pyroute2-core/default.nix
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pyroute2-core";
- version = "0.6.11";
+ version = "0.6.12";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "pyroute2.core";
inherit version;
- hash = "sha256-9Odxls1lje7pUCu0UkhfQIgbL2dOZQkiV1J/kgfgxGw=";
+ hash = "sha256-uzb8nlAOHNtNq205/sJPoJtvMoo7uCFfrRQas/rv8p8=";
};
# pyroute2 sub-modules have no tests
diff --git a/pkgs/development/python-modules/pyroute2-ethtool/default.nix b/pkgs/development/python-modules/pyroute2-ethtool/default.nix
index ba0f2a054e11..93699e161b81 100644
--- a/pkgs/development/python-modules/pyroute2-ethtool/default.nix
+++ b/pkgs/development/python-modules/pyroute2-ethtool/default.nix
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pyroute2-ethtool";
- version = "0.6.11";
+ version = "0.6.12";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "pyroute2.ethtool";
inherit version;
- hash = "sha256-3xFsK50WtnRS8ImEWU4Hke9Ndp1Asm4wPEBfQT1rYXU=";
+ hash = "sha256-MwIRm/DezL7yCN682Yckxd23+iri2V6HCokF4G36apU=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyroute2-ipdb/default.nix b/pkgs/development/python-modules/pyroute2-ipdb/default.nix
index 944b1ab4cfc1..0c11d6f85ced 100644
--- a/pkgs/development/python-modules/pyroute2-ipdb/default.nix
+++ b/pkgs/development/python-modules/pyroute2-ipdb/default.nix
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pyroute2-ipdb";
- version = "0.6.11";
+ version = "0.6.12";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "pyroute2.ipdb";
inherit version;
- hash = "sha256-UTP5LuZbBukfDpQPJ+N5ZFtKGFJppZfpsISnsm9eabs=";
+ hash = "sha256-hKh5SFFMdhECeMyA3Quzqp7h+iQMMmCYBJEuLEq5dVs=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyroute2-ipset/default.nix b/pkgs/development/python-modules/pyroute2-ipset/default.nix
index 967b232cd234..6b21283aa907 100644
--- a/pkgs/development/python-modules/pyroute2-ipset/default.nix
+++ b/pkgs/development/python-modules/pyroute2-ipset/default.nix
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pyroute2-ipset";
- version = "0.6.11";
+ version = "0.6.12";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "pyroute2.ipset";
inherit version;
- hash = "sha256-uIfclrm1tujUickd5R4uyDHvPExyC2M9mpm5NLF1rts=";
+ hash = "sha256-nvj7b6HF/XhzqmFg6aOQKMFDEFwAcyOnoJXi/coNvG4=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyroute2-ndb/default.nix b/pkgs/development/python-modules/pyroute2-ndb/default.nix
index 9bf7414c79ff..6965dfaf8a5a 100644
--- a/pkgs/development/python-modules/pyroute2-ndb/default.nix
+++ b/pkgs/development/python-modules/pyroute2-ndb/default.nix
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pyroute2-ndb";
- version = "0.6.11";
+ version = "0.6.12";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "pyroute2.ndb";
inherit version;
- hash = "sha256-jz956VgO9Z9ZPlMQobB34wd04Og/XV7IP+J58htdk+Y=";
+ hash = "sha256-Oc+uaqftRH6Dw3Sa2G1rZ3Mx2u81ErKIyz8xhnA1QgI=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyroute2-nftables/default.nix b/pkgs/development/python-modules/pyroute2-nftables/default.nix
index a251c34a8b28..19850bb9f2fb 100644
--- a/pkgs/development/python-modules/pyroute2-nftables/default.nix
+++ b/pkgs/development/python-modules/pyroute2-nftables/default.nix
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "pyroute2-nftables";
- version = "0.6.11";
+ version = "0.6.12";
src = fetchPypi {
pname = "pyroute2.nftables";
inherit version;
- sha256 = "sha256-2SHAH4HBcXknCa2rdHk1s+ju+IN5ndcLPD8dgSGagqU=";
+ sha256 = "sha256-jy04M73r49LxfbHAuDgSaoFWmkc0O/jPJwdDlW8YCSc=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyroute2-nslink/default.nix b/pkgs/development/python-modules/pyroute2-nslink/default.nix
index af4d6a7a01d1..7213556ea950 100644
--- a/pkgs/development/python-modules/pyroute2-nslink/default.nix
+++ b/pkgs/development/python-modules/pyroute2-nslink/default.nix
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pyroute2-nslink";
- version = "0.6.11";
+ version = "0.6.12";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "pyroute2.nslink";
inherit version;
- hash = "sha256-R94n1UEceOMmXXbCCkgq6N2JLnp2eqAW4qweIpNI2CI=";
+ hash = "sha256-c66rD7CyHdyYACIiq1Nfu6rmUsIL9YmFp4Z1gxOFik4=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyroute2-protocols/default.nix b/pkgs/development/python-modules/pyroute2-protocols/default.nix
index 9cf62994c3a1..700abb2266da 100644
--- a/pkgs/development/python-modules/pyroute2-protocols/default.nix
+++ b/pkgs/development/python-modules/pyroute2-protocols/default.nix
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pyroute2-protocols";
- version = "0.6.11";
+ version = "0.6.12";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "pyroute2.protocols";
inherit version;
- hash = "sha256-AnmW9ILlcZh2mwO5fbhY4ZazWSAy2wHJgLp5Anlmxk4=";
+ hash = "sha256-j83UNlQVjxIyKhOqDsx6yhvMZEfAh54gRjniacCpSxY=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix
index a95356d58199..96835a1be1f8 100644
--- a/pkgs/development/python-modules/pyroute2/default.nix
+++ b/pkgs/development/python-modules/pyroute2/default.nix
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "pyroute2";
- version = "0.6.11";
+ version = "0.6.12";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-E2NGvmbVUuRUHQZ52/+say4SN9/TnuGpUGL4UCRJF70=";
+ hash = "sha256-cnUvmx9R+4oUGgf6LpbMlAadVh/EYcNX1ep88gtPTn4=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyspcwebgw/default.nix b/pkgs/development/python-modules/pyspcwebgw/default.nix
index e1a04a9a469d..bc11a30334da 100644
--- a/pkgs/development/python-modules/pyspcwebgw/default.nix
+++ b/pkgs/development/python-modules/pyspcwebgw/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pyspcwebgw";
- version = "0.5.0";
+ version = "0.6.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -19,8 +19,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "mbrrg";
repo = pname;
- rev = "v${version}";
- sha256 = "0pc25myjc2adqcx2lbns9kw0gy17x1qjgicmfj46n6fn0c786p9v";
+ rev = "refs/tags/v${version}";
+ sha256 = "sha256-Pjv8AxXuwi48Z8U+LSZZ+OhXrE3KlX7jlmnXTBLxXOs=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix
index 45929e3c991d..9012473f0645 100644
--- a/pkgs/development/python-modules/rapidfuzz/default.nix
+++ b/pkgs/development/python-modules/rapidfuzz/default.nix
@@ -4,6 +4,7 @@
, fetchFromGitHub
, cmake
, cython_3
+, ninja
, rapidfuzz-capi
, scikit-build
, jarowinkler
@@ -32,6 +33,7 @@ buildPythonPackage rec {
nativeBuildInputs = [
cmake
cython_3
+ ninja
rapidfuzz-capi
scikit-build
];
diff --git a/pkgs/development/python-modules/rpi-gpio/default.nix b/pkgs/development/python-modules/rpi-gpio/default.nix
new file mode 100644
index 000000000000..2618f9f0ea91
--- /dev/null
+++ b/pkgs/development/python-modules/rpi-gpio/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+ pname = "rpi-gpio";
+ version = "0.7.1";
+
+ src = fetchPypi {
+ pname = "RPi.GPIO";
+ inherit version;
+ sha256 = "sha256-zWHEsDw3tiu6SlrP6phidJwzxhjgKV5+kKpHE/s3O3A=";
+ };
+
+ # Tests disable because they do a platform check which requires running on a
+ # Raspberry Pi
+ doCheck = false;
+
+ meta = with lib; {
+ homepage = "https://sourceforge.net/p/raspberry-gpio-python";
+ description = "Python module to control the GPIO on a Raspberry Pi";
+ license = licenses.mit;
+ maintainers = with maintainers; [ onny ];
+ };
+}
diff --git a/pkgs/development/python-modules/social-auth-core/default.nix b/pkgs/development/python-modules/social-auth-core/default.nix
index 667c4ec4245a..b00e5044c64f 100644
--- a/pkgs/development/python-modules/social-auth-core/default.nix
+++ b/pkgs/development/python-modules/social-auth-core/default.nix
@@ -1,30 +1,65 @@
{ lib
, buildPythonPackage
-, fetchFromGitHub
-, requests
-, oauthlib
-, requests-oauthlib
-, pyjwt
, cryptography
, defusedxml
-, python3-openid
-, python-jose
-, python3-saml
-, pytestCheckHook
+, fetchFromGitHub
, httpretty
+, lxml
+, oauthlib
+, pyjwt
+, pytestCheckHook
+, python-jose
+, python3-openid
+, python3-saml
+, pythonOlder
+, requests
+, requests-oauthlib
}:
buildPythonPackage rec {
pname = "social-auth-core";
- version = "4.2.0";
+ version = "4.3.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "python-social-auth";
repo = "social-core";
- rev = version;
- sha256 = "sha256-kaL6sfAyQlzxszCEbhW7sns/mcOv0U+QgplmUd6oegQ=";
+ rev = "refs/tags/${version}";
+ hash = "sha256-P9IWnu1/PWVNl/tZZ4bqz0WnruKu/jXASZBoaWXWeYI=";
};
+ propagatedBuildInputs = [
+ cryptography
+ defusedxml
+ oauthlib
+ pyjwt
+ python3-openid
+ requests
+ requests-oauthlib
+ ];
+
+ passthru.optional-dependencies = {
+ openidconnect = [
+ python-jose
+ ];
+ saml = [
+ lxml
+ python3-saml
+ ];
+ azuread = [
+ cryptography
+ ];
+ };
+
+ checkInputs = [
+ pytestCheckHook
+ httpretty
+ ] ++ passthru.optional-dependencies.openidconnect
+ ++ passthru.optional-dependencies.saml
+ ++ passthru.optional-dependencies.azuread;
+
# Disable checking the code coverage
prePatch = ''
substituteInPlace social_core/tests/requirements.txt \
@@ -35,28 +70,13 @@ buildPythonPackage rec {
--replace "{posargs:-v --cov=social_core}" "{posargs:-v}"
'';
- propagatedBuildInputs = [
- requests
- oauthlib
- requests-oauthlib
- pyjwt
- cryptography
- defusedxml
- python3-openid
- python-jose
- python3-saml
+ pythonImportsCheck = [
+ "social_core"
];
- checkInputs = [
- pytestCheckHook
- httpretty
- ];
-
- pythonImportsCheck = [ "social_core" ];
-
meta = with lib; {
+ description = "Module for social authentication/registration mechanisms";
homepage = "https://github.com/python-social-auth/social-core";
- description = "Python Social Auth - Core";
license = licenses.bsd3;
maintainers = with maintainers; [ n0emis ];
};
diff --git a/pkgs/development/python-modules/unifi-discovery/default.nix b/pkgs/development/python-modules/unifi-discovery/default.nix
index 511fd26132b7..309c87f8b32b 100644
--- a/pkgs/development/python-modules/unifi-discovery/default.nix
+++ b/pkgs/development/python-modules/unifi-discovery/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "unifi-discovery";
- version = "1.1.3";
+ version = "1.1.4";
format = "pyproject";
disabled = pythonOlder "3.9";
@@ -20,8 +20,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "bdraco";
repo = pname;
- rev = "v${version}";
- hash = "sha256-++5Rg3cCyH4h6zzEXbsQM5tRnUsnV3RCzuOctcjA/x4=";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-+af1boeJtTI89ZJqgXXsxXQXGDhG4ewgukfKDdhWl9g=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/velbus-aio/default.nix b/pkgs/development/python-modules/velbus-aio/default.nix
index 2196d9b71f2c..b31af8f36f52 100644
--- a/pkgs/development/python-modules/velbus-aio/default.nix
+++ b/pkgs/development/python-modules/velbus-aio/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "velbus-aio";
- version = "2022.6.1";
+ version = "20212.6.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "Cereal2nd";
repo = pname;
rev = version;
- sha256 = "sha256-YHq194H7T4IxyCvPgA92vkWf7MX+ulXyw/uxo4WRupU=";
+ sha256 = "sha256-MqSqwyfNICEU6h7+HAep3z1Uak30rlQ6noWEB3awVpA=";
fetchSubmodules = true;
};
diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix
index 096312a407a3..830403293021 100644
--- a/pkgs/development/python-modules/wandb/default.nix
+++ b/pkgs/development/python-modules/wandb/default.nix
@@ -25,6 +25,7 @@
, pytestCheckHook
, python-dateutil
, pythonOlder
+, pytorch
, pyyaml
, requests
, scikit-learn
@@ -38,7 +39,7 @@
buildPythonPackage rec {
pname = "wandb";
- version = "0.12.17";
+ version = "0.12.18";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -47,7 +48,7 @@ buildPythonPackage rec {
owner = pname;
repo = "client";
rev = "v${version}";
- hash = "sha256-hY01cql/j3ieL1zJoPOM/QZiF0X/ivekFRfX+TvZhyM=";
+ hash = "sha256-9++CFoC8p3cACPyjRbb6i8MdJp8iD9GUh0uHpTiufdg=";
};
patches = [
@@ -93,12 +94,15 @@ buildPythonPackage rec {
pytest-mock
pytest-xdist
pytestCheckHook
+ pytorch
scikit-learn
tqdm
];
disabledTestPaths = [
# Tests that try to get chatty over sockets or spin up servers, not possible in the nix build environment.
+ "tests/integrations/test_keras.py"
+ "tests/integrations/test_torch.py"
"tests/test_cli.py"
"tests/test_data_types.py"
"tests/test_file_stream.py"
@@ -111,6 +115,7 @@ buildPythonPackage rec {
"tests/test_metric_full.py"
"tests/test_metric_internal.py"
"tests/test_mode_disabled.py"
+ "tests/test_model_workflows.py"
"tests/test_mp_full.py"
"tests/test_public_api.py"
"tests/test_redir.py"
@@ -119,14 +124,18 @@ buildPythonPackage rec {
"tests/test_start_method.py"
"tests/test_tb_watcher.py"
"tests/test_telemetry_full.py"
+ "tests/test_util.py"
"tests/wandb_agent_test.py"
"tests/wandb_artifacts_test.py"
"tests/wandb_integration_test.py"
"tests/wandb_run_test.py"
"tests/wandb_settings_test.py"
"tests/wandb_sweep_test.py"
+ "tests/wandb_tensorflow_test.py"
"tests/wandb_verify_test.py"
- "tests/test_model_workflows.py"
+
+ # Requires metaflow, which is not yet packaged.
+ "tests/integrations/test_metaflow.py"
# Fails and borks the pytest runner as well.
"tests/wandb_test.py"
diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix
index 73771c8e8757..9dc35bcb7895 100644
--- a/pkgs/development/tools/analysis/tfsec/default.nix
+++ b/pkgs/development/tools/analysis/tfsec/default.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "tfsec";
- version = "1.23.3";
+ version = "1.24.0";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-7NpnEuvYjffxapVKs9pYiLVWGyUBwFwvz/GVKURa95Y=";
+ sha256 = "sha256-puH8MoY04OokEcHMn93i/7jBIYbXtYBh2BcBwmBZJVs=";
};
ldflags = [
diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix
index ad9752872738..0efeb6dccf55 100644
--- a/pkgs/development/tools/continuous-integration/fly/default.nix
+++ b/pkgs/development/tools/continuous-integration/fly/default.nix
@@ -1,36 +1,39 @@
-{ buildGoModule, fetchFromGitHub, stdenv, lib }:
+{ buildGoModule, fetchFromGitHub, stdenv, lib, installShellFiles }:
buildGoModule rec {
pname = "fly";
- version = "7.7.1";
+ version = "7.8.0";
src = fetchFromGitHub {
owner = "concourse";
repo = "concourse";
rev = "v${version}";
- sha256 = "sha256-AJvD9re4jj+ixvZKWHDJM0QEv5EPFv3VFJus3lnm2LI=";
+ sha256 = "sha256-CYQQ44Yx97PvhFHrTzUM2RooNCh5Sdg8SXsV4BOzzPE=";
};
- vendorSha256 = "sha256-G9HdhPi4iezUR6SIVYnjL0fznOfiusY4T9ClLPr1w5c=";
-
- doCheck = false;
+ vendorSha256 = "sha256-aYu5K6pK6Q0Fmagr91i6nc3t55nUjn5vasIO+kUXWrs=";
subPackages = [ "fly" ];
ldflags = [
- "-X github.com/concourse/concourse.Version=${version}"
+ "-s" "-w" "-X github.com/concourse/concourse.Version=${version}"
];
+ nativeBuildInputs = [ installShellFiles ];
+
+ doCheck = false;
+
postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
- mkdir -p $out/share/{bash-completion/completions,zsh/site-functions}
- $out/bin/fly completion --shell bash > $out/share/bash-completion/completions/fly
- $out/bin/fly completion --shell zsh > $out/share/zsh/site-functions/_fly
+ installShellCompletion --cmd fly \
+ --bash <($out/bin/fly completion --shell bash) \
+ --fish <($out/bin/fly completion --shell fish) \
+ --zsh <($out/bin/fly completion --shell zsh)
'';
meta = with lib; {
- description = "A command line interface to Concourse CI";
+ description = "Command line interface to Concourse CI";
homepage = "https://concourse-ci.org";
license = licenses.asl20;
- maintainers = with maintainers; [ ivanbrennan ];
+ maintainers = with maintainers; [ ivanbrennan SuperSandro2000 ];
};
}
diff --git a/pkgs/development/tools/kube-prompt/default.nix b/pkgs/development/tools/kube-prompt/default.nix
index 1c6e8d56a6ac..ad8749b57871 100644
--- a/pkgs/development/tools/kube-prompt/default.nix
+++ b/pkgs/development/tools/kube-prompt/default.nix
@@ -1,26 +1,25 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
-buildGoPackage rec {
+buildGoModule rec {
pname = "kube-prompt";
version = "1.0.11";
- rev = "v${version}";
-
- goPackagePath = "github.com/c-bata/kube-prompt";
src = fetchFromGitHub {
- inherit rev;
owner = "c-bata";
repo = "kube-prompt";
+ rev = "v${version}";
sha256 = "sha256-9OWsITbC7YO51QzsRwDWvojU54DiuGJhkSGwmesEj9w=";
};
- subPackages = ["."];
- goDeps = ./deps.nix;
+ vendorSha256 = "sha256-wou5inOX8vadEBCIBccwSRjtzf0GH1abwNdUu4JBvyM=";
- meta = {
- description = "An interactive kubernetes client featuring auto-complete using go-prompt";
- license = lib.licenses.mit;
+ meta = with lib; {
+ description = "An interactive kubernetes client featuring auto-complete";
+ license = licenses.mit;
homepage = "https://github.com/c-bata/kube-prompt";
- maintainers = [ lib.maintainers.vdemeester ];
+ maintainers = with maintainers; [ vdemeester ];
};
}
diff --git a/pkgs/development/tools/kube-prompt/deps.nix b/pkgs/development/tools/kube-prompt/deps.nix
deleted file mode 100644
index a6c4bbd445c4..000000000000
--- a/pkgs/development/tools/kube-prompt/deps.nix
+++ /dev/null
@@ -1,993 +0,0 @@
-# file generated from go.mod using vgo2nix (https://github.com/nix-community/vgo2nix)
-[
- {
- goPackagePath = "cloud.google.com/go";
- fetch = {
- type = "git";
- url = "https://github.com/googleapis/google-cloud-go";
- rev = "v0.38.0";
- sha256 = "0n6n13b7lri2fmc4bn4ifszyawj31dpbzvyv0xafsf81440z8cyh";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/Azure/go-autorest/autorest";
- fetch = {
- type = "git";
- url = "https://github.com/Azure/go-autorest";
- rev = "autorest/v0.9.0";
- sha256 = "01fg6x3a6as2kh0km8kvjzjalq7xiqa17hnsdwawzlpnfpqgslvq";
- moduleDir = "autorest";
- };
- }
- {
- goPackagePath = "github.com/Azure/go-autorest/autorest/adal";
- fetch = {
- type = "git";
- url = "https://github.com/Azure/go-autorest";
- rev = "autorest/adal/v0.5.0";
- sha256 = "07zbbshyz1s9fj9ifa6zzks4wq7455rna50z1ahpgin92jk0s6la";
- moduleDir = "autorest/adal";
- };
- }
- {
- goPackagePath = "github.com/Azure/go-autorest/autorest/date";
- fetch = {
- type = "git";
- url = "https://github.com/Azure/go-autorest";
- rev = "autorest/date/v0.1.0";
- sha256 = "1w94wxjjkiv8m44rcdm1af9h0ap2r8kpp9198cxpxj8d5xxkaxpz";
- moduleDir = "autorest/date";
- };
- }
- {
- goPackagePath = "github.com/Azure/go-autorest/autorest/mocks";
- fetch = {
- type = "git";
- url = "https://github.com/Azure/go-autorest";
- rev = "autorest/mocks/v0.2.0";
- sha256 = "04jsq3bnz9s27kp45n7q5wj2fi3bxwvxrxcmiswrhqz4pj35b561";
- moduleDir = "autorest/mocks";
- };
- }
- {
- goPackagePath = "github.com/Azure/go-autorest/logger";
- fetch = {
- type = "git";
- url = "https://github.com/Azure/go-autorest";
- rev = "logger/v0.1.0";
- sha256 = "1w94wxjjkiv8m44rcdm1af9h0ap2r8kpp9198cxpxj8d5xxkaxpz";
- moduleDir = "logger";
- };
- }
- {
- goPackagePath = "github.com/Azure/go-autorest/tracing";
- fetch = {
- type = "git";
- url = "https://github.com/Azure/go-autorest";
- rev = "tracing/v0.5.0";
- sha256 = "0n482cjr2pk6ql6awcnn6llrnygjzakihbjaahgmylf3znwil7jp";
- moduleDir = "tracing";
- };
- }
- {
- goPackagePath = "github.com/BurntSushi/toml";
- fetch = {
- type = "git";
- url = "https://github.com/BurntSushi/toml";
- rev = "v0.3.1";
- sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/NYTimes/gziphandler";
- fetch = {
- type = "git";
- url = "https://github.com/NYTimes/gziphandler";
- rev = "56545f4a5d46";
- sha256 = "1fwk9wz6vrvq72f2gq8jhvd1nvv6grqgwrjq66vjpm0726pxar72";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/PuerkitoBio/purell";
- fetch = {
- type = "git";
- url = "https://github.com/PuerkitoBio/purell";
- rev = "v1.0.0";
- sha256 = "1qhsy1nm96b9kb63svkvkqmmw15xg6irwcysisxdgzk64adfwqv1";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/PuerkitoBio/urlesc";
- fetch = {
- type = "git";
- url = "https://github.com/PuerkitoBio/urlesc";
- rev = "5bd2802263f2";
- sha256 = "15y5r3asvm7196m3nza5xvdvlc2k11p6lfs6hi917hl7r9vgi6mp";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/c-bata/go-prompt";
- fetch = {
- type = "git";
- url = "https://github.com/c-bata/go-prompt";
- rev = "v0.2.5";
- sha256 = "1ny9a1cshl9h6rddk3j0ar6iya1iahaw623g7qbsrbdbx38xlip3";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/client9/misspell";
- fetch = {
- type = "git";
- url = "https://github.com/client9/misspell";
- rev = "v0.3.4";
- sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/davecgh/go-spew";
- fetch = {
- type = "git";
- url = "https://github.com/davecgh/go-spew";
- rev = "v1.1.1";
- sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/dgrijalva/jwt-go";
- fetch = {
- type = "git";
- url = "https://github.com/dgrijalva/jwt-go";
- rev = "v3.2.0";
- sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/docker/spdystream";
- fetch = {
- type = "git";
- url = "https://github.com/docker/spdystream";
- rev = "449fdfce4d96";
- sha256 = "1412cpiis971iq1kxrirzirhj2708ispjh0x0dh879b66x8507sl";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/elazarl/goproxy";
- fetch = {
- type = "git";
- url = "https://github.com/elazarl/goproxy";
- rev = "c4fc26588b6e";
- sha256 = "1s3v02px61a3hmvb47rqk598z5visayxq46k3c8dcrayhhngv2fw";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/emicklei/go-restful";
- fetch = {
- type = "git";
- url = "https://github.com/emicklei/go-restful";
- rev = "ff4f55a20633";
- sha256 = "1v5lj5142abz3gvbygp6xghpdx4ps2lwswl8559ivaidahwnc21c";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/evanphx/json-patch";
- fetch = {
- type = "git";
- url = "https://github.com/evanphx/json-patch";
- rev = "v4.2.0";
- sha256 = "0cfvyhl3hjfc4z8hbkfc40yafv6r7y513zgp3jwf88isbd13r7a6";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/fsnotify/fsnotify";
- fetch = {
- type = "git";
- url = "https://github.com/fsnotify/fsnotify";
- rev = "v1.4.7";
- sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/ghodss/yaml";
- fetch = {
- type = "git";
- url = "https://github.com/ghodss/yaml";
- rev = "73d445a93680";
- sha256 = "0pg53ky4sy3sp9j4n7vgf1p3gw4nbckwqfldcmmi9rf13kjh0mr7";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/go-logr/logr";
- fetch = {
- type = "git";
- url = "https://github.com/go-logr/logr";
- rev = "v0.1.0";
- sha256 = "0fhijjhxz4n2j5i24ckzv8r9kri3v44jdyklgbqjfq0xm7izqg14";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/go-openapi/jsonpointer";
- fetch = {
- type = "git";
- url = "https://github.com/go-openapi/jsonpointer";
- rev = "46af16f9f7b1";
- sha256 = "0w0fphmdycjzbsm1vppdcjc9aqinkcdzcq3pxikdvdqh5p791gsc";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/go-openapi/jsonreference";
- fetch = {
- type = "git";
- url = "https://github.com/go-openapi/jsonreference";
- rev = "13c6e3589ad9";
- sha256 = "1fh4xcl9ijww4bdq656sx981d57w2c9zx5148jsxlsg4bsvxmwis";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/go-openapi/spec";
- fetch = {
- type = "git";
- url = "https://github.com/go-openapi/spec";
- rev = "6aced65f8501";
- sha256 = "0yf0nw7167yjpiqrikns5djarjpf2r07q6xnq9xb1cfsc4m7ynm4";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/go-openapi/swag";
- fetch = {
- type = "git";
- url = "https://github.com/go-openapi/swag";
- rev = "1d0bd113de87";
- sha256 = "0fmk42chj20679n87n6sig3czs25lavyj6w208000n6kccv1ns3c";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/gogo/protobuf";
- fetch = {
- type = "git";
- url = "https://github.com/gogo/protobuf";
- rev = "65acae22fc9d";
- sha256 = "0700alky9z0g9akhrzn20wf4jr1600d0clhs32sm8chnlbvidy46";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/golang/glog";
- fetch = {
- type = "git";
- url = "https://github.com/golang/glog";
- rev = "23def4e6c14b";
- sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/golang/groupcache";
- fetch = {
- type = "git";
- url = "https://github.com/golang/groupcache";
- rev = "02826c3e7903";
- sha256 = "0w46bsllddfij66nrg8jbfjsr54birvfww8a2fj9fmgyig5syn2x";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/golang/mock";
- fetch = {
- type = "git";
- url = "https://github.com/golang/mock";
- rev = "v1.2.0";
- sha256 = "12ddj2g8ab87id6n2n67vnbhq6p8dvgsq1pzpqfriym4dk8w54fg";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/golang/protobuf";
- fetch = {
- type = "git";
- url = "https://github.com/golang/protobuf";
- rev = "v1.3.2";
- sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/google/btree";
- fetch = {
- type = "git";
- url = "https://github.com/google/btree";
- rev = "v1.0.0";
- sha256 = "0ba430m9fbnagacp57krgidsyrgp3ycw5r7dj71brgp5r52g82p6";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/google/go-cmp";
- fetch = {
- type = "git";
- url = "https://github.com/google/go-cmp";
- rev = "v0.3.0";
- sha256 = "1hyxx3434zshl2m9ja78gwlkg1rx9yl6diqa7dnjb31xz5x4gbjj";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/google/gofuzz";
- fetch = {
- type = "git";
- url = "https://github.com/google/gofuzz";
- rev = "v1.0.0";
- sha256 = "0qz439qvccm91w0mmjz4fqgx48clxdwagkvvx89cr43q1d4iry36";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/google/martian";
- fetch = {
- type = "git";
- url = "https://github.com/google/martian";
- rev = "v2.1.0";
- sha256 = "197hil6vrjk50b9wvwyzf61csid83whsjj6ik8mc9r2lryxlyyrp";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/google/pprof";
- fetch = {
- type = "git";
- url = "https://github.com/google/pprof";
- rev = "3ea8567a2e57";
- sha256 = "09rhjn3ms0a72dw0yzbp237p7yhqma772zspddn6mgkh3gi3kn4c";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/google/uuid";
- fetch = {
- type = "git";
- url = "https://github.com/google/uuid";
- rev = "v1.1.1";
- sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/googleapis/gax-go/v2";
- fetch = {
- type = "git";
- url = "https://github.com/googleapis/gax-go";
- rev = "v2.0.4";
- sha256 = "1iwnm6ky1x53lgs44mw3hpdkjzrm5qd0kfs50m0qcq2ml5m1cwdm";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/googleapis/gnostic";
- fetch = {
- type = "git";
- url = "https://github.com/googleapis/gnostic";
- rev = "v0.2.0";
- sha256 = "0yh3ckd7m0r9h50wmxxvba837d0wb1k5yd439zq4p1kpp4390z12";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/gophercloud/gophercloud";
- fetch = {
- type = "git";
- url = "https://github.com/gophercloud/gophercloud";
- rev = "v0.1.0";
- sha256 = "0794s9c144gphm4dh1wgba6ydsb4zdwgglj1p9im43jv0lvh6p81";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/gregjones/httpcache";
- fetch = {
- type = "git";
- url = "https://github.com/gregjones/httpcache";
- rev = "9cad4c3443a7";
- sha256 = "0wjdwcwqqcx2d5y68qvhg6qyj977il5ijmnn9h9cd6wjbdy0ay6s";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/hashicorp/golang-lru";
- fetch = {
- type = "git";
- url = "https://github.com/hashicorp/golang-lru";
- rev = "v0.5.1";
- sha256 = "13f870cvk161bzjj6x41l45r5x9i1z9r2ymwmvm7768kg08zznpy";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/hpcloud/tail";
- fetch = {
- type = "git";
- url = "https://github.com/hpcloud/tail";
- rev = "v1.0.0";
- sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/imdario/mergo";
- fetch = {
- type = "git";
- url = "https://github.com/imdario/mergo";
- rev = "v0.3.5";
- sha256 = "1mvgn89vp39gcpvhiq4n7nw5ipj7fk6h03jgc6fjwgvwvss213pb";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/json-iterator/go";
- fetch = {
- type = "git";
- url = "https://github.com/json-iterator/go";
- rev = "v1.1.8";
- sha256 = "1kbp9fj6fxfql0ir59zb6v68l4bpwlmk76xm8vaikw1hp6y9bcss";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/jstemmer/go-junit-report";
- fetch = {
- type = "git";
- url = "https://github.com/jstemmer/go-junit-report";
- rev = "af01ea7f8024";
- sha256 = "1lp3n94ris12hac02wi31f3whs88lcrzwgdg43a5j6cafg9p1d0s";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/kisielk/errcheck";
- fetch = {
- type = "git";
- url = "https://github.com/kisielk/errcheck";
- rev = "v1.2.0";
- sha256 = "0am6g10ipdxw84byscm7shda654882wjcbinq5c4696m6mhi2qrd";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/kisielk/gotool";
- fetch = {
- type = "git";
- url = "https://github.com/kisielk/gotool";
- rev = "v1.0.0";
- sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/kr/pretty";
- fetch = {
- type = "git";
- url = "https://github.com/kr/pretty";
- rev = "v0.1.0";
- sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/kr/pty";
- fetch = {
- type = "git";
- url = "https://github.com/kr/pty";
- rev = "v1.1.1";
- sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/kr/text";
- fetch = {
- type = "git";
- url = "https://github.com/kr/text";
- rev = "v0.1.0";
- sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/mailru/easyjson";
- fetch = {
- type = "git";
- url = "https://github.com/mailru/easyjson";
- rev = "d5b7844b561a";
- sha256 = "1g84l4wns28xjpn6nl1g33dcj3sfgxlkqqsa6w8fbq2kwyd50xka";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/mattn/go-colorable";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-colorable";
- rev = "v0.1.7";
- sha256 = "08y5c01bvyqxraj3wc0di80gbp87178rsshb74x0p3m7wwfv82l3";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/mattn/go-isatty";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-isatty";
- rev = "v0.0.12";
- sha256 = "1dfsh27d52wmz0nmmzm2382pfrs2fcijvh6cgir7jbb4pnigr5w4";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/mattn/go-runewidth";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-runewidth";
- rev = "v0.0.9";
- sha256 = "1mvlxcdwr0vwp8b2wqs6y7hk72y28sqh03dz5x0xkg48d4y9cplj";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/mattn/go-tty";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-tty";
- rev = "v0.0.3";
- sha256 = "0d1d63q02pc5k5ga8bw4yjbkrli2769vg237psajsskjirjy53vf";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/modern-go/concurrent";
- fetch = {
- type = "git";
- url = "https://github.com/modern-go/concurrent";
- rev = "bacd9c7ef1dd";
- sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/modern-go/reflect2";
- fetch = {
- type = "git";
- url = "https://github.com/modern-go/reflect2";
- rev = "v1.0.1";
- sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/munnerz/goautoneg";
- fetch = {
- type = "git";
- url = "https://github.com/munnerz/goautoneg";
- rev = "a547fc61f48d";
- sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/mxk/go-flowrate";
- fetch = {
- type = "git";
- url = "https://github.com/mxk/go-flowrate";
- rev = "cca7078d478f";
- sha256 = "0zqs39923ja0yypdmiqk6x8pgmfs3ms5x5sl1dqv9z6zyx2xy541";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/onsi/ginkgo";
- fetch = {
- type = "git";
- url = "https://github.com/onsi/ginkgo";
- rev = "v1.10.1";
- sha256 = "033a42h1wzmji57p86igg9whvsbp6nvfdsypskw738ys903n3z4d";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/onsi/gomega";
- fetch = {
- type = "git";
- url = "https://github.com/onsi/gomega";
- rev = "v1.7.0";
- sha256 = "09j6wq425wgzzsbwm9ckhfgl2capv3yyqbrf45qyrjwkzm49i02y";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/peterbourgon/diskv";
- fetch = {
- type = "git";
- url = "https://github.com/peterbourgon/diskv";
- rev = "v2.0.1";
- sha256 = "1mxpa5aad08x30qcbffzk80g9540wvbca4blc1r2qyzl65b8929b";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/pkg/term";
- fetch = {
- type = "git";
- url = "https://github.com/pkg/term";
- rev = "v1.1.0";
- sha256 = "0flyj256zv5qc7z3m3s147k46p9whr7hl06zzwgvy2dkjp90ff73";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/pmezard/go-difflib";
- fetch = {
- type = "git";
- url = "https://github.com/pmezard/go-difflib";
- rev = "v1.0.0";
- sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/spf13/afero";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/afero";
- rev = "v1.2.2";
- sha256 = "0j9r65qgd58324m85lkl49vk9dgwd62g7dwvkfcm3k6i9dc555a9";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/spf13/pflag";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/pflag";
- rev = "v1.0.5";
- sha256 = "0gpmacngd0gpslnbkzi263f5ishigzgh6pbdv9hp092rnjl4nd31";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/stretchr/objx";
- fetch = {
- type = "git";
- url = "https://github.com/stretchr/objx";
- rev = "v0.1.0";
- sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "github.com/stretchr/testify";
- fetch = {
- type = "git";
- url = "https://github.com/stretchr/testify";
- rev = "v1.4.0";
- sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "go.opencensus.io";
- fetch = {
- type = "git";
- url = "https://github.com/census-instrumentation/opencensus-go";
- rev = "v0.21.0";
- sha256 = "14s0a12xdzjvad0dgksgv8m3hh7nc585abvjkvyk6r67a29lxj6x";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "golang.org/x/crypto";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/crypto";
- rev = "60c769a6c586";
- sha256 = "1wy2pg38dz29vf1h48yfqf8m3jqvwnbdw8vkk3ldlj5d8fbbbmv8";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "golang.org/x/exp";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/exp";
- rev = "509febef88a4";
- sha256 = "02isrh39z8znrp5znplzy0dip2gnrl3jm1355raliyvhnhg04j6q";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "golang.org/x/lint";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/lint";
- rev = "5614ed5bae6f";
- sha256 = "0fzn0zjv0x92xvfdq3a0v9w5sgkhr7hxkfy9zaqi8i57807z8bnx";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "golang.org/x/net";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/net";
- rev = "13f9640d40b9";
- sha256 = "1ba2767lvklnmfvb9jkwvd4m7z6326gaiz3rgylh795g88hy34g1";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "golang.org/x/oauth2";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/oauth2";
- rev = "0f29369cfe45";
- sha256 = "06jwpvx0x2gjn2y959drbcir5kd7vg87k0r1216abk6rrdzzrzi2";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "golang.org/x/sync";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sync";
- rev = "cd5d95a43a6e";
- sha256 = "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "golang.org/x/sys";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sys";
- rev = "af09f7315aff";
- sha256 = "0kr94lzr8ngrc6913j5xh6g4r7g087dbdgnpzi6rjcl0bf8nsr22";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "golang.org/x/text";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/text";
- rev = "v0.3.2";
- sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "golang.org/x/time";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/time";
- rev = "9d24e82272b4";
- sha256 = "1f5nkr4vys2vbd8wrwyiq2f5wcaahhpxmia85d1gshcbqjqf8dkb";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "golang.org/x/tools";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/tools";
- rev = "e65039ee4138";
- sha256 = "0c094599cf70wdrms49a3879qkq122pqlp2av444gs2pvc8apdcx";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "google.golang.org/api";
- fetch = {
- type = "git";
- url = "https://github.com/googleapis/google-api-go-client";
- rev = "v0.4.0";
- sha256 = "1hzgrw5wasmcjlqpxsmryddzzw4cwyzf2vx14i9z51v1plwssijm";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "google.golang.org/appengine";
- fetch = {
- type = "git";
- url = "https://github.com/golang/appengine";
- rev = "v1.5.0";
- sha256 = "0l7mkdnwhidv8m686x432vmx8z5nqcrr9f46ddgvrxbh4wvyfcll";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "google.golang.org/genproto";
- fetch = {
- type = "git";
- url = "https://github.com/googleapis/go-genproto";
- rev = "e7d98fc518a7";
- sha256 = "1cnavkyawwvfc5yl097ygnfy1ac69v4zc02gdfnq1bvgcvgmvnbi";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "google.golang.org/grpc";
- fetch = {
- type = "git";
- url = "https://github.com/grpc/grpc-go";
- rev = "v1.19.0";
- sha256 = "1znqwpj7ix3dpzx4zch0q70sdl3z5lvbb7v3q4i8sf8kas3yv71v";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "gopkg.in/check.v1";
- fetch = {
- type = "git";
- url = "https://gopkg.in/check.v1";
- rev = "788fd7840127";
- sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "gopkg.in/fsnotify.v1";
- fetch = {
- type = "git";
- url = "https://gopkg.in/fsnotify.v1";
- rev = "v1.4.7";
- sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "gopkg.in/inf.v0";
- fetch = {
- type = "git";
- url = "https://gopkg.in/inf.v0";
- rev = "v0.9.1";
- sha256 = "00k5iqjcp371fllqxncv7jkf80hn1zww92zm78cclbcn4ybigkng";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "gopkg.in/tomb.v1";
- fetch = {
- type = "git";
- url = "https://gopkg.in/tomb.v1";
- rev = "dd632973f1e7";
- sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "gopkg.in/yaml.v2";
- fetch = {
- type = "git";
- url = "https://gopkg.in/yaml.v2";
- rev = "v2.2.4";
- sha256 = "11bwj757wi8kdrcnlgfqb8vv2d2xdhlghmyagd19i62khrkchsg2";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "honnef.co/go/tools";
- fetch = {
- type = "git";
- url = "https://github.com/dominikh/go-tools";
- rev = "3f1c8253044a";
- sha256 = "0d3vgh0fgfj1z7i648g1s6x2pwxd07sxfjwg1xn3yagr9h06jh3h";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "k8s.io/api";
- fetch = {
- type = "git";
- url = "https://github.com/kubernetes/api";
- rev = "v0.17.0";
- sha256 = "180gijj7nl6pgfgqg6h7rcpxissmq9c3axph8ld7llx0cwmsxdrb";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "k8s.io/apimachinery";
- fetch = {
- type = "git";
- url = "https://github.com/kubernetes/apimachinery";
- rev = "v0.17.0";
- sha256 = "1418y3p2fx7zsf1anpwcma1fqnaymal12d6x33j600jf1y0j9g8i";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "k8s.io/client-go";
- fetch = {
- type = "git";
- url = "https://github.com/kubernetes/client-go";
- rev = "v0.17.0";
- sha256 = "1v8n92g18xb6b1wvl3p2slm0hbpf8agwdyslqn2wgnwyhhgi0rfg";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "k8s.io/gengo";
- fetch = {
- type = "git";
- url = "https://github.com/kubernetes/gengo";
- rev = "0689ccc1d7d6";
- sha256 = "10c0kbm07pzxwdxpsmcgqkcxqxaijyywvwj1rciw6ssfcgx7kdc5";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "k8s.io/klog";
- fetch = {
- type = "git";
- url = "https://github.com/kubernetes/klog";
- rev = "v1.0.0";
- sha256 = "1cgannfmldcrcksb2wqdn2b5qabqyxl9r25w9y4qbljw24hhnlvn";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "k8s.io/kube-openapi";
- fetch = {
- type = "git";
- url = "https://github.com/kubernetes/kube-openapi";
- rev = "30be4d16710a";
- sha256 = "13pksn2xzyhrz569zihqy78y9ckn4sf4f4x31w1czfwbs87n00gf";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "k8s.io/utils";
- fetch = {
- type = "git";
- url = "https://github.com/kubernetes/utils";
- rev = "e782cd3c129f";
- sha256 = "19dp1cfqmgwy4m4yyxzbmmzklxnff4ipqknsp7y9yi02q6h4gj7r";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "sigs.k8s.io/structured-merge-diff";
- fetch = {
- type = "git";
- url = "https://github.com/kubernetes-sigs/structured-merge-diff";
- rev = "15d366b2352e";
- sha256 = "1anrx09ksgrwjwmbrcrk3hx8wyzjaakzmmn36nd23if36nv1xg11";
- moduleDir = "";
- };
- }
- {
- goPackagePath = "sigs.k8s.io/yaml";
- fetch = {
- type = "git";
- url = "https://github.com/kubernetes-sigs/yaml";
- rev = "v1.1.0";
- sha256 = "1p7hvjdr5jsyk7nys1g1pmgnf3ys6n320i6hds85afppk81k01kb";
- moduleDir = "";
- };
- }
-]
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
index 05964496ea87..d50106166c50 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
@@ -30,6 +30,7 @@
tree-sitter-glimmer = lib.importJSON ./tree-sitter-glimmer.json;
tree-sitter-glsl = lib.importJSON ./tree-sitter-glsl.json;
tree-sitter-go = lib.importJSON ./tree-sitter-go.json;
+ tree-sitter-gowork = lib.importJSON ./tree-sitter-gowork.json;
tree-sitter-godot-resource = lib.importJSON ./tree-sitter-godot-resource.json;
tree-sitter-gomod = lib.importJSON ./tree-sitter-gomod.json;
tree-sitter-graphql = lib.importJSON ./tree-sitter-graphql.json;
@@ -68,6 +69,7 @@
tree-sitter-query = lib.importJSON ./tree-sitter-query.json;
tree-sitter-r = lib.importJSON ./tree-sitter-r.json;
tree-sitter-regex = lib.importJSON ./tree-sitter-regex.json;
+ tree-sitter-rego = lib.importJSON ./tree-sitter-rego.json;
tree-sitter-rst = lib.importJSON ./tree-sitter-rst.json;
tree-sitter-ruby = lib.importJSON ./tree-sitter-ruby.json;
tree-sitter-rust = lib.importJSON ./tree-sitter-rust.json;
@@ -75,6 +77,7 @@
tree-sitter-scheme = lib.importJSON ./tree-sitter-scheme.json;
tree-sitter-scss = lib.importJSON ./tree-sitter-scss.json;
tree-sitter-sparql = lib.importJSON ./tree-sitter-sparql.json;
+ tree-sitter-sql = lib.importJSON ./tree-sitter-sql.json;
tree-sitter-supercollider = lib.importJSON ./tree-sitter-supercollider.json;
tree-sitter-surface = lib.importJSON ./tree-sitter-surface.json;
tree-sitter-svelte = lib.importJSON ./tree-sitter-svelte.json;
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json
index 292b7c032666..abc1625810a5 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/sogaiu/tree-sitter-clojure",
- "rev": "879f0e726295807d917d576fcf9e1e432c4c20fc",
- "date": "2022-04-11T22:46:47+09:00",
- "path": "/nix/store/19bcj8f61w958njvksnqzm5r5s8szzz2-tree-sitter-clojure",
- "sha256": "16g7s819gjgdc4wlp7rnvyv5i5dqa1yawxs8l4ggnz8n8acqza9n",
+ "rev": "e57c569ae332ca365da623712ae1f50f84daeae2",
+ "date": "2022-06-03T17:55:54+09:00",
+ "path": "/nix/store/fx58zcfxr983yczijs6cgdfa3158bl0s-tree-sitter-clojure",
+ "sha256": "0hq8rv4s0gzbfv3qj4gsrm87baiy6k1hyfbhbbpwbrcpd8jl7gdn",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json
index 19129d053a05..bdb451c69ec9 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/elm-tooling/tree-sitter-elm",
- "rev": "5128296ba8542853d59e6b7c8dfe3d1fb9a637ea",
- "date": "2022-02-04T13:10:25+01:00",
- "path": "/nix/store/8brpvn8y88x3f3dsbgqql57kp9bygj3w-tree-sitter-elm",
- "sha256": "10hbi4vyj4hjixqswdcbvzl60prldczz29mlp02if61wvwiwvqrw",
+ "rev": "a9a8efad446f78db3989d7ed8517987daf510c83",
+ "date": "2022-06-07T23:23:33+02:00",
+ "path": "/nix/store/rqmldb72cml0qm7p8kpjlj064f5miprc-tree-sitter-elm",
+ "sha256": "11d9lrybhqi85lxr7gf8s4zxgbclnjiwn0w1mga3lsh9nnf50a4a",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gowork.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gowork.json
new file mode 100644
index 000000000000..590d0c77d614
--- /dev/null
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gowork.json
@@ -0,0 +1,11 @@
+{
+ "url": "https://github.com/omertuc/tree-sitter-go-work",
+ "rev": "6dd9dd79fb51e9f2abc829d5e97b15015b6a8ae2",
+ "date": "2021-12-18T20:13:22+01:00",
+ "path": "/nix/store/7a4raw2gi4xgbg858cs0davbplj7m8rq-tree-sitter-gowork",
+ "sha256": "1kzrs4rpby3b0h87rbr02k55k3mmkmdy7rvl11q95b3ym0smmyqb",
+ "fetchLFS": false,
+ "fetchSubmodules": false,
+ "deepClone": false,
+ "leaveDotGit": false
+}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json
index 7ebbb5d4df0c..89a249a68cb0 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-haskell",
- "rev": "1b54c3f39436bbded6593ac9e0103f9115bbbd2e",
- "date": "2022-05-19T19:09:09+02:00",
- "path": "/nix/store/d9825wx3mjjj76pcbbz4pd6fz5h0c2ag-tree-sitter-haskell",
- "sha256": "11brbizaw5m77hrmg6i5s437y4f1xgvfvjddfy1n39zpyf5x6nad",
+ "rev": "ca0a13f1acb60cf32e74cced3cb623b6c70fa77c",
+ "date": "2022-06-06T23:15:37+02:00",
+ "path": "/nix/store/dmq8mc361rkhrpa5s06h1z9k8khkvi78-tree-sitter-haskell",
+ "sha256": "1r3mfnj1f6p2cqriay22jjfggrmyywimidzmzw8h5q84flngdg2s",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hcl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hcl.json
index 24d731be7a2d..89a328038338 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hcl.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hcl.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/MichaHoffmann/tree-sitter-hcl",
- "rev": "3cb7fc28247efbcb2973b97e71c78838ad98a583",
- "date": "2021-09-20T21:50:41+02:00",
- "path": "/nix/store/rgd0p162smlfn90ggyq3y6y4q9sgybwh-tree-sitter-hcl",
- "sha256": "0hg7w3hsvxjwz1rb1izknn46msm4mkjx2cnq603lzn7i9mb1pbyr",
+ "rev": "4ff21306a71269c4ac814769b90b0ecf3194d21d",
+ "date": "2022-06-02T20:13:06+02:00",
+ "path": "/nix/store/jsn5dixjqqvwagcgwgjdr91igic2r42w-tree-sitter-hcl",
+ "sha256": "1gvpl6kw83ywwd64ssz5xs4idc8ip2jmiz2mfy9xlkjbl9nfngci",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json
index 1a067f18d14c..0220be6596c9 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/connorlay/tree-sitter-heex",
- "rev": "57e46b4b002d5fb5c1f2706fe42380e544ecab5f",
- "date": "2022-04-17T10:39:01-07:00",
- "path": "/nix/store/afmvzkh237ikn0b9fw51crzhyk4ys1d2-tree-sitter-heex",
- "sha256": "0gfxqph5j3n3dlpnyw85lrwhgjh4zm7mdrnf0qyv0f2basayfabm",
+ "rev": "4d8d646bba27ec11bbf76ea37410a604d2e18bfc",
+ "date": "2022-06-09T17:09:44-05:00",
+ "path": "/nix/store/hcn9zl21asz1h6h2abqjpcc37sr56s6s-tree-sitter-heex",
+ "sha256": "0s38g23npq4k2yfwijmp14wmk7klhlycr4jl9a1hnh8qqihxjbj1",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json
index 12c26b133ca7..43badeec1219 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/latex-lsp/tree-sitter-latex",
- "rev": "104a5dea952d5f00150afd6a8436e6cad95ef718",
- "date": "2022-06-01T18:13:32+00:00",
- "path": "/nix/store/7y5r30ylv51rqn3d8wk088ni7k58nzpm-tree-sitter-latex",
- "sha256": "0b78hpp76hkpjd38zjfc2z98ipnazk2aza83k4r754gj8yshhsqx",
+ "rev": "9cbe0c6be9455b6d3be19f51daef6d08732abab1",
+ "date": "2022-06-05T08:50:52+02:00",
+ "path": "/nix/store/63i0iskmn862l0rm8gdkgs1bsxxpxw54-tree-sitter-latex",
+ "sha256": "1ahij4lwg59xvzy2jn8i4rpp6bjz8pl7sqwn6a3rwal3d2x89b3d",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json
index 1bf9fe3c6c74..d7b8f83ef50a 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-php",
- "rev": "fdbef3621b62e098d7c9a34669cbe8a8bd807bf2",
- "date": "2022-06-01T15:02:43+02:00",
- "path": "/nix/store/rq8rljxmmnii1w2bw3n7224vmwnm0j1n-tree-sitter-php",
- "sha256": "1bsdls8icmh6wnyhdibmxxignmdx3wh0bkcrwcwc7mc0xac5r4z2",
+ "rev": "866e4a155739a1374da5247b876e70f8639005f6",
+ "date": "2022-06-06T09:18:54+02:00",
+ "path": "/nix/store/23f9s4z321mnjnqfxjdj75rkcvwv2xpa-tree-sitter-php",
+ "sha256": "11nagsvq2jsinrhsfpnylz1lkp6hiw3jndshnjvzvkjmmpavm1gr",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json
index 9688a1d2b7c7..0e0d0adde497 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/victorhqc/tree-sitter-prisma",
- "rev": "0ac307e4be0409d4327082ddc737ed432a49dfc3",
- "date": "2022-04-20T10:52:00+02:00",
- "path": "/nix/store/24vp6k2ijg832c95hx2x0j8x4i6pxffz-tree-sitter-prisma",
- "sha256": "13rcwlkxv9dns7mgxrb34vzhq32c854bna6gsyczvs6vishm6i9l",
+ "rev": "17a59236ac25413b81b1613ea6ba5d8d52d7cd6c",
+ "date": "2022-06-11T23:04:44+02:00",
+ "path": "/nix/store/qdkwinjdy495z59wvxhifk8caksndswj-tree-sitter-prisma",
+ "sha256": "1pw9mi6hhvww4i7gf7snl893b3hwnfwp18rhbcsf7z52cr78mmqi",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json
new file mode 100644
index 000000000000..7540751ab7ab
--- /dev/null
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json
@@ -0,0 +1,11 @@
+{
+ "url": "https://github.com/FallenAngel97/tree-sitter-rego",
+ "rev": "6bf5f8878bef2fb760508bff1ce0262a31925018",
+ "date": "2022-04-23T19:59:01+03:00",
+ "path": "/nix/store/gnbksy85s2z7b8c02im8liaa1d7g07my-tree-sitter-rego",
+ "sha256": "1ly2lhk4mfqmsg3pzv21ikzsxaz39bah3sgd3lcbaiqd0zzgbzks",
+ "fetchLFS": false,
+ "fetchSubmodules": false,
+ "deepClone": false,
+ "leaveDotGit": false
+}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json
index 4cdaa55dd286..5650370f589a 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-scala",
- "rev": "8599058ef292e82203a1b23d10734dcbaf4d1b5c",
- "date": "2022-05-09T16:17:13-07:00",
- "path": "/nix/store/q802q124fq79wwr6m4xfcdmgw6fzjigw-tree-sitter-scala",
- "sha256": "0i6qkgyv722jwma2rs0nf02jzl5dvml5m1whb7580qnza95x7py1",
+ "rev": "140c96cf398693189d4e50f76d19ddfcd8a018f8",
+ "date": "2022-06-06T08:54:55+02:00",
+ "path": "/nix/store/a1pi2xyaq2jjllbkj44xhi5cp0vnlnm4-tree-sitter-scala",
+ "sha256": "1hfx696x5pfww6zsfv36wkmxld14f02krmx55fy5rgzlz1m3xgja",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json
index 5201d477c286..d54329b9aae7 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/6cdh/tree-sitter-scheme",
- "rev": "1448396b310486e7d15e5e056713457cb0413bc2",
- "date": "2022-05-17T11:34:51+08:00",
- "path": "/nix/store/bhwsjp4salwmfq5cyvr0dd3al5s9xhsl-tree-sitter-scheme",
- "sha256": "1m9pzlzrmphx6162dq2nxry30wpjbsi1zhl4asjvmc0zy4r3427f",
+ "rev": "5bb5b2de83d548243fbcc77e76224882ffb4ce68",
+ "date": "2022-06-07T22:14:20+08:00",
+ "path": "/nix/store/jy8z2s9zmgxm8ziv39cqkkia52mq7mbx-tree-sitter-scheme",
+ "sha256": "1cdbzmgkz3f1zbhgps9q1zvy1hnwwj5rlr5fp4jbvbnwp13pd04a",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json
new file mode 100644
index 000000000000..d8413f75d7d5
--- /dev/null
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json
@@ -0,0 +1,11 @@
+{
+ "url": "https://github.com/m-novikov/tree-sitter-sql",
+ "rev": "2ec2fedbb38d09737e2a1cdd207f6416dc1cb109",
+ "date": "2022-06-11T22:57:56+02:00",
+ "path": "/nix/store/zzx4b5cnsrrdzkb5rbmx5d8vzbyr0rbi-tree-sitter-sql",
+ "sha256": "0dcpdshymyszsr1dflsr3j6ynrnrq0g4qdxqcz7d0anpwh3xw4cs",
+ "fetchLFS": false,
+ "fetchSubmodules": false,
+ "deepClone": false,
+ "leaveDotGit": false
+}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
index 44477aa24d3c..df1e810151ff 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-typescript",
- "rev": "8e9dba7bd7cf089838a036a98be94db53ba2d0a9",
- "date": "2022-04-13T09:44:02-07:00",
- "path": "/nix/store/188d0ki07nhmihrl2b868vmb9rd4hf4q-tree-sitter-typescript",
- "sha256": "010nnihmaw1a1l9mzjd1nmrb0z6j2h3pr872dzpdq7ajg0j3j1wl",
+ "rev": "1b3ba31c7538825b05815f4f5bffcca6394edc63",
+ "date": "2022-06-02T09:10:56-07:00",
+ "path": "/nix/store/g3q8azmyclcdns0ihwl5im46qlsfxbfj-tree-sitter-typescript",
+ "sha256": "1iw6823zh2m95gjmly34j49ixga07fhax7z6g2q6px06gj4fm5df",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix
index 1512f985fa42..61f80ce376e5 100644
--- a/pkgs/development/tools/parsing/tree-sitter/update.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/update.nix
@@ -122,6 +122,10 @@ let
orga = "MDeiml";
repo = "tree-sitter-markdown";
};
+ "tree-sitter-rego" = {
+ orga = "FallenAngel97";
+ repo = "tree-sitter-rego";
+ };
"tree-sitter-rst" = {
orga = "stsewd";
repo = "tree-sitter-rst";
@@ -130,6 +134,10 @@ let
orga = "Himujjal";
repo = "tree-sitter-svelte";
};
+ "tree-sitter-sql" = {
+ orga = "m-novikov";
+ repo = "tree-sitter-sql";
+ };
"tree-sitter-vim" = {
orga = "vigoux";
repo = "tree-sitter-viml";
@@ -178,6 +186,10 @@ let
orga = "camdencheek";
repo = "tree-sitter-go-mod";
};
+ "tree-sitter-gowork" = {
+ orga = "omertuc";
+ repo = "tree-sitter-go-work";
+ };
"tree-sitter-graphql" = {
orga = "bkegley";
repo = "tree-sitter-graphql";
diff --git a/pkgs/development/tools/rbspy/default.nix b/pkgs/development/tools/rbspy/default.nix
index beb4df0f1683..fbd97882428f 100644
--- a/pkgs/development/tools/rbspy/default.nix
+++ b/pkgs/development/tools/rbspy/default.nix
@@ -1,18 +1,32 @@
-{ stdenv, rustPlatform, fetchFromGitHub, lib}:
+{ stdenv, rustPlatform, fetchFromGitHub, lib, ruby, which}:
rustPlatform.buildRustPackage rec {
pname = "rbspy";
- version = "0.11.1";
+ version = "0.12.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "sha256-9BeQHwwnirK5Wquj6Tal8yCU/NXZGaPjXZe3cy5m98s=";
+ sha256 = "FnUUX7qQWVZMHtWvneTLzBL1YYwF8v4e1913Op4Lvbw=";
};
- cargoSha256 = "sha256-DHdfv6210wAkL9vXxLr76ejFWU/eV/q3lmgsYa5Rn54=";
+ cargoSha256 = "98vmUoWSehX/9rMlHNSvKHJvJxW99pOhS08FI3OeLGo=";
doCheck = true;
+ # Tests in initialize.rs rely on specific PIDs being queried and attaching
+ # tracing to forked processes, which don't work well with the isolated build.
+ preCheck = ''
+ substituteInPlace src/core/process.rs \
+ --replace /usr/bin/which '${which}/bin/which'
+ substituteInPlace src/sampler/mod.rs \
+ --replace /usr/bin/which '${which}/bin/which'
+ substituteInPlace src/core/initialize.rs \
+ --replace 'fn test_initialize_with_disallowed_process(' '#[ignore] fn test_initialize_with_disallowed_process(' \
+ --replace 'fn test_get_exec_trace(' '#[ignore] fn test_get_exec_trace(' \
+ '';
+
+ nativeBuildInputs = [ ruby which ];
+
meta = with lib; {
broken = (stdenv.isLinux && stdenv.isAarch64);
homepage = "https://rbspy.github.io/";
diff --git a/pkgs/development/tools/rnix-lsp/default.nix b/pkgs/development/tools/rnix-lsp/default.nix
index ccc8e88dec8b..a587f87b3da7 100644
--- a/pkgs/development/tools/rnix-lsp/default.nix
+++ b/pkgs/development/tools/rnix-lsp/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "rnix-lsp";
- version = "0.2.4";
+ version = "0.2.5";
src = fetchFromGitHub {
owner = "nix-community";
repo = "rnix-lsp";
rev = "v${version}";
- sha256 = "sha256-MfD07ugYYbcRaNoLxOcH9+SPbRewNxbHJA5blCSb4EM=";
+ sha256 = "sha256-WXpj2fgduYlF4t0QEvdfV1Eft8/nFXWF2zyEBKMUEIk=";
};
- cargoSha256 = "sha256-23TJrJyfCuoOOOjZeWQnF/Ac0Xv2k6tZduuzapKvsgg=";
+ cargoSha256 = "sha256-LfbmOhZJVthsLm8lnzHvEt7Vy27y4w4wpPfrf/s3s84=";
checkInputs = lib.optional (!stdenv.isDarwin) nix;
diff --git a/pkgs/games/polymc/default.nix b/pkgs/games/polymc/default.nix
index a0f4abc1e7ce..2fa5ce7cf06f 100644
--- a/pkgs/games/polymc/default.nix
+++ b/pkgs/games/polymc/default.nix
@@ -1,12 +1,12 @@
{ lib
-, mkDerivation
+, stdenv
, fetchFromGitHub
, cmake
, jdk8
, jdk
, zlib
, file
-, makeWrapper
+, wrapQtAppsHook
, xorg
, libpulseaudio
, qtbase
@@ -15,32 +15,25 @@
, glfw
, openal
, msaClientID ? ""
+, jdks ? [ jdk jdk8 ]
}:
-mkDerivation rec {
+stdenv.mkDerivation rec {
pname = "polymc";
- version = "1.3.1";
+ version = "1.3.2";
src = fetchFromGitHub {
owner = "PolyMC";
repo = "PolyMC";
rev = version;
- sha256 = "sha256-oTzhKGDi1Kr3JXY9dYQf1rVDPFr52tJ7L+rb5LCbtBE=";
+ sha256 = "sha256-hqsyS82UzgCUZ9HjoPKjOLE49fwLntRAh3mVrTsmi3o=";
fetchSubmodules = true;
};
- nativeBuildInputs = [ cmake file jdk makeWrapper ];
+ nativeBuildInputs = [ cmake file jdk wrapQtAppsHook ];
buildInputs = [ qtbase zlib quazip ];
- postPatch = ''
- # hardcode jdk paths
- substituteInPlace launcher/java/JavaUtils.cpp \
- --replace 'scanJavaDir("/usr/lib/jvm")' 'javas.append("${jdk}/lib/openjdk/bin/java")' \
- --replace 'scanJavaDir("/usr/lib32/jvm")' 'javas.append("${jdk8}/lib/openjdk/bin/java")'
- '';
-
- cmakeFlags = [ "-DLauncher_PORTABLE=0" ] ++
- lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ];
+ cmakeFlags = lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ];
dontWrapQtApps = true;
@@ -58,9 +51,9 @@ mkDerivation rec {
];
in ''
# xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
- wrapProgram $out/bin/polymc \
- "''${qtWrapperArgs[@]}" \
+ wrapQtApp $out/bin/polymc \
--set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} \
+ --prefix POLYMC_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks} \
--prefix PATH : ${lib.makeBinPath [ xorg.xrandr ]}
'';
diff --git a/pkgs/games/sil-q/default.nix b/pkgs/games/sil-q/default.nix
new file mode 100644
index 000000000000..1676f8da55a9
--- /dev/null
+++ b/pkgs/games/sil-q/default.nix
@@ -0,0 +1,66 @@
+{ lib, stdenv, fetchFromGitHub, writeScript, makeWrapper, ncurses, libX11 }:
+
+let
+ setup = writeScript "setup" ''
+ mkdir -p "$ANGBAND_PATH"
+ # copy all the data files into place
+ cp -ar $1/* "$ANGBAND_PATH"
+ # the copied files need to be writable
+ chmod +w -R "$ANGBAND_PATH"
+ '';
+in stdenv.mkDerivation rec {
+ pname = "sil-q";
+ version = "1.5.0";
+
+ src = fetchFromGitHub {
+ owner = "sil-quirk";
+ repo = "sil-q";
+ rev = "v${version}";
+ sha256 = "sha256-v/sWhPWF9cCKD8N0RHpwzChMM1t9G2yrMDmi1cZxdOs=";
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ ncurses libX11 ];
+
+ # Makefile(s) and config are not top-level
+ sourceRoot = "source/src";
+
+ postPatch = ''
+ # allow usage of ANGBAND_PATH
+ substituteInPlace config.h --replace "#define FIXED_PATHS" ""
+
+ # change Makefile.std for ncurses according to its own comment
+ substituteInPlace Makefile.std --replace "-lcurses" "-lncurses"
+ '';
+
+ makefile = "Makefile.std";
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/bin
+ cp sil $out/bin/sil-q
+ wrapProgram $out/bin/sil-q \
+ --run "export ANGBAND_PATH=\$HOME/.sil" \
+ --run "${setup} ${src}/lib"
+
+ runHook postInstall
+ '';
+
+ meta = {
+ description = "A roguelike game set in the First Age of Middle-earth";
+ longDescription = ''
+ A game of adventure set in the First Age of Middle-earth, when the world still
+ rang with Elven song and gleamed with Dwarven mail.
+
+ Walk the dark halls of Angband. Slay creatures black and fell. Wrest a shining
+ Silmaril from Morgoth’s iron crown.
+
+ A fork of Sil that's still actively developed.
+ '';
+ homepage = "https://github.com/sil-quirk/sil-q";
+ license = lib.licenses.gpl2;
+ maintainers = [ lib.maintainers.kenran ];
+ platforms = lib.platforms.linux;
+ };
+}
diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix
index fada305c3720..1bdd4cf5f677 100644
--- a/pkgs/os-specific/linux/checksec/default.nix
+++ b/pkgs/os-specific/linux/checksec/default.nix
@@ -1,39 +1,59 @@
-{ lib, stdenv, fetchFromGitHub, makeWrapper, file, findutils
-, binutils-unwrapped, glibc, coreutils, sysctl, openssl
+{ lib
+, stdenv
+, fetchFromGitHub
+, makeWrapper
+, file
+, findutils
+, binutils-unwrapped
+, glibc
+, coreutils
+, sysctl
+, openssl
}:
stdenv.mkDerivation rec {
pname = "checksec";
- version = "2.5.0";
+ version = "2.6.0";
src = fetchFromGitHub {
owner = "slimm609";
repo = "checksec.sh";
rev = version;
- sha256 = "sha256-GxWXocz+GCEssRrIQP6E9hjVIhVh2EmZrefELxQlV1Q=";
+ hash = "sha256-BWtchWXukIDSLJkFX8M/NZBvfi7vUE2j4yFfS0KEZDo=";
};
- patches = [ ./0001-attempt-to-modprobe-config-before-checking-kernel.patch ];
- nativeBuildInputs = [ makeWrapper ];
+ patches = [
+ ./0001-attempt-to-modprobe-config-before-checking-kernel.patch
+ ];
- installPhase = let
- path = lib.makeBinPath [
- findutils file binutils-unwrapped sysctl openssl
- ];
- in ''
- mkdir -p $out/bin
- install checksec $out/bin
- substituteInPlace $out/bin/checksec --replace /lib/libc.so.6 ${glibc.out}/lib/libc.so.6
- substituteInPlace $out/bin/checksec --replace "/usr/bin/id -" "${coreutils}/bin/id -"
- wrapProgram $out/bin/checksec \
- --prefix PATH : ${path}
- '';
+ nativeBuildInputs = [
+ makeWrapper
+ ];
+
+ installPhase =
+ let
+ path = lib.makeBinPath [
+ findutils
+ file
+ binutils-unwrapped
+ sysctl
+ openssl
+ ];
+ in
+ ''
+ mkdir -p $out/bin
+ install checksec $out/bin
+ substituteInPlace $out/bin/checksec --replace /lib/libc.so.6 ${glibc.out}/lib/libc.so.6
+ substituteInPlace $out/bin/checksec --replace "/usr/bin/id -" "${coreutils}/bin/id -"
+ wrapProgram $out/bin/checksec \
+ --prefix PATH : ${path}
+ '';
meta = with lib; {
- description = "A tool for checking security bits on executables";
- homepage = "https://www.trapkit.de/tools/checksec/";
- license = licenses.bsd3;
- platforms = platforms.linux;
+ description = "Tool for checking security bits on executables";
+ homepage = "https://www.trapkit.de/tools/checksec/";
+ license = licenses.bsd3;
+ platforms = platforms.linux;
maintainers = with maintainers; [ thoughtpolice globin ];
};
}
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 4d6152abffd8..4acf3aa87ad7 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
# Do not edit!
{
- version = "2022.6.5";
+ version = "2022.6.6";
components = {
"abode" = ps: with ps; [
abodepy
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index f2da36f9f63f..87e7ce1281c8 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -166,7 +166,7 @@ let
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
# Don't forget to run parse-requirements.py after updating
- hassVersion = "2022.6.5";
+ hassVersion = "2022.6.6";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@@ -184,7 +184,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
- hash = "sha256-ZGdA5AvNqx3TBZfbr8r5l3MXEt+LAodZFOsn+GeslC0=";
+ hash = "sha256-scwj3VrSoFk/pSVzfwvGFM5fRci3+7iqr7TAwLantFQ=";
};
# leave this in, so users don't have to constantly update their downstream patch handling
diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix
index da4c2b04eb4c..834844f96741 100644
--- a/pkgs/servers/mail/dovecot/default.nix
+++ b/pkgs/servers/mail/dovecot/default.nix
@@ -11,7 +11,7 @@
stdenv.mkDerivation rec {
pname = "dovecot";
- version = "2.3.19";
+ version = "2.3.19.1";
nativeBuildInputs = [ perl pkg-config ];
buildInputs =
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://dovecot.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz";
- hash = "sha256:0ys3zq9b1rgj1cz6a0i9l421y6h2j3b5zak2ia5j9dj1sj9zcwq1";
+ hash = "sha256-21q82H1zCWWeprRbLLbunF+XSGsrcZpd0Fp1nh9qXFE=";
};
enableParallelBuilding = true;
diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix
index a99523cfd703..5483dece905e 100644
--- a/pkgs/servers/nosql/redis/default.nix
+++ b/pkgs/servers/nosql/redis/default.nix
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "redis";
- version = "7.0.0";
+ version = "7.0.2";
src = fetchurl {
url = "https://download.redis.io/releases/${pname}-${version}.tar.gz";
- sha256 = "sha256-KE2L0f2F1qVaBe5OfDHDGXetVsvzRO2DeQvusUi6pyA=";
+ sha256 = "sha256-Xlfq/n1Kxey2p9ZNa2Hbd1YW2/kDKTs/zGYHFtvaXus=";
};
# Cross-compiling fixes
diff --git a/pkgs/tools/filesystems/httm/default.nix b/pkgs/tools/filesystems/httm/default.nix
index c44e75724c09..f4cfdc46e9b4 100644
--- a/pkgs/tools/filesystems/httm/default.nix
+++ b/pkgs/tools/filesystems/httm/default.nix
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "httm";
- version = "0.11.1";
+ version = "0.11.6";
src = fetchFromGitHub {
owner = "kimono-koans";
repo = pname;
rev = version;
- sha256 = "GNiqWm6MsgLYjrkrbIHgKxtLmE4IJntcLd9GVRu1v2A=";
+ sha256 = "5jeCENAas7i/eBySSBjwmdc3MEHVhWWH7/RZGS8g1Y4=";
};
- cargoSha256 = "87BkVAZ3BPtnuNUBTzdR4oiE0ZLIr5CacdYenU4V9qU=";
+ cargoSha256 = "x4qfi3Wm5r0HNqDgmJBXNvS1xQDU7MQ/H2+zNpHon+s=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/tools/graphics/resvg/default.nix b/pkgs/tools/graphics/resvg/default.nix
index 431814047147..245fc07cdb2d 100644
--- a/pkgs/tools/graphics/resvg/default.nix
+++ b/pkgs/tools/graphics/resvg/default.nix
@@ -1,21 +1,17 @@
-{ stdenv, lib, rustPlatform, fetchFromGitHub, libiconv }:
+{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "resvg";
- version = "0.22.0";
+ version = "0.23.0";
src = fetchFromGitHub {
owner = "RazrFalcon";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-3WFzLyg6335twcAMIjzza9r45ljcFlAzvTqyqXOfs1A=";
+ sha256 = "sha256-GiRLunAfDBqJtaq2ccQ3tvPDfmTg5OklkI6apAiMYL0=";
};
- cargoSha256 = "sha256-twKiuxRpsiJu+hHrg6kUclX9+BWPUop492C+CkwQF2k=";
-
- buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
-
- doCheck = false;
+ cargoSha256 = "sha256-rFhmR3H2u5LBBUCK5mCfHvIevFjbIe+CQLS535mJ53w=";
meta = with lib; {
description = "An SVG rendering library";
diff --git a/pkgs/tools/misc/asciinema/default.nix b/pkgs/tools/misc/asciinema/default.nix
index e08d0b5d3f70..11ad6b8b36af 100644
--- a/pkgs/tools/misc/asciinema/default.nix
+++ b/pkgs/tools/misc/asciinema/default.nix
@@ -1,26 +1,39 @@
-{ lib, python3Packages, fetchFromGitHub, glibcLocales }:
+{ lib
+, python3Packages
+, fetchFromGitHub
+, glibcLocales
+}:
python3Packages.buildPythonApplication rec {
pname = "asciinema";
- version = "2.1.0";
+ version = "2.2.0";
+ format = "pyproject";
src = fetchFromGitHub {
owner = "asciinema";
repo = "asciinema";
rev = "v${version}";
- sha256 = "1alcz018jrrpasrmgs8nw775a6pf62xq2xgs54c4mb396prdqy4x";
+ hash = "sha256-ioSNd0Fjk2Fp05lk3HeokIjNYGU0jQEaIDfcFB18mV0=";
};
- checkInputs = [ glibcLocales python3Packages.nose ];
+ postPatch = ''
+ substituteInPlace tests/pty_test.py \
+ --replace "python3" "${python3Packages.python}/bin/python"
+ '';
+
+ checkInputs = [
+ glibcLocales
+ python3Packages.nose
+ ];
checkPhase = ''
LC_ALL=en_US.UTF-8 nosetests
'';
- meta = {
+ meta = with lib; {
description = "Terminal session recorder and the best companion of asciinema.org";
homepage = "https://asciinema.org/";
- license = with lib.licenses; [ gpl3 ];
+ license = with licenses; [ gpl3Plus ];
+ maintainers = with maintainers; [ ];
};
}
-
diff --git a/pkgs/tools/misc/logstash/7.x.nix b/pkgs/tools/misc/logstash/7.x.nix
index 69729b3f9578..f0a760e42f28 100644
--- a/pkgs/tools/misc/logstash/7.x.nix
+++ b/pkgs/tools/misc/logstash/7.x.nix
@@ -17,8 +17,8 @@ let
shas =
if enableUnfree
then {
- x86_64-linux = "698b6000788e123b647c988993f710c6d9bc44eb8c8e6f97d6b18a695a61f0a6";
- x86_64-darwin = "35e50e05fba0240aa5b138bc1c81f67addaf557701f8df41c682b5bc708f7455";
+ x86_64-linux = "35e50e05fba0240aa5b138bc1c81f67addaf557701f8df41c682b5bc708f7455";
+ x86_64-darwin = "698b6000788e123b647c988993f710c6d9bc44eb8c8e6f97d6b18a695a61f0a6";
aarch64-linux = "69694856fde11836eb1613bf3a2ba31fbdc933f58c8527b6180f6122c8bb528b";
}
else {
diff --git a/pkgs/tools/networking/ngrok-2/versions.json b/pkgs/tools/networking/ngrok-2/versions.json
deleted file mode 100644
index 85b0e47168a2..000000000000
--- a/pkgs/tools/networking/ngrok-2/versions.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "linux-386": {
- "sys": "linux-386",
- "url": "https://bin.equinox.io/a/c4ZY6f7svn7/ngrok-2.3.40-linux-386",
- "sha256": "1b645ff0abbb28ca7c0f6a2109653be2dc281860b582b4de6927fde12c99da26",
- "version": "2.3.40"
- },
- "linux-amd64": {
- "sys": "linux-amd64",
- "url": "https://bin.equinox.io/a/b5PAmc6L9z2/ngrok-2.3.40-linux-amd64",
- "sha256": "218d267cd1195334718bafac14bfdf1c19dc95dcf8a24aaa6a1383c21dc86e76",
- "version": "2.3.40"
- },
- "linux-arm": {
- "sys": "linux-arm",
- "url": "https://bin.equinox.io/a/aRh9rdUAJyf/ngrok-2.3.40-linux-arm",
- "sha256": "538a7431df141a929a250eaf6ed7afdcce817bcd8cfe60b61f4c6d7a289b1d1c",
- "version": "2.3.40"
- },
- "linux-arm64": {
- "sys": "linux-arm64",
- "url": "https://bin.equinox.io/a/2gpRjDRBpJv/ngrok-2.3.40-linux-arm64",
- "sha256": "dc7b4465ef95f6d04d1b1996111b3a2631e5f464d7dca7f4994f59ea4edbe21f",
- "version": "2.3.40"
- },
- "darwin-amd64": {
- "sys": "darwin-amd64",
- "url": "https://bin.equinox.io/a/fcZQXtHSDgM/ngrok-2.3.40-darwin-amd64",
- "sha256": "80c8fb121d6c93350d84351d9516674f4e20a3e003cdd7dcb4c3e7c48b9c5b07",
- "version": "2.3.40"
- },
- "darwin-arm64": {
- "sys": "darwin-arm64",
- "url": "https://bin.equinox.io/a/3TEKdZeyAnt/ngrok-2.3.40-darwin-arm64",
- "sha256": "c9e6dfec454f9faec92a13dfd3f3857de982007e3b85987bb875aa0d74ca8101",
- "version": "2.3.40"
- }
-}
diff --git a/pkgs/tools/networking/ngrok-2/default.nix b/pkgs/tools/networking/ngrok/default.nix
similarity index 94%
rename from pkgs/tools/networking/ngrok-2/default.nix
rename to pkgs/tools/networking/ngrok/default.nix
index 6093cea40f07..774f2dad456c 100644
--- a/pkgs/tools/networking/ngrok-2/default.nix
+++ b/pkgs/tools/networking/ngrok/default.nix
@@ -42,6 +42,6 @@ stdenv.mkDerivation {
homepage = "https://ngrok.com/";
license = licenses.unfree;
platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
- maintainers = [ maintainers.bobvanderlinden ];
+ maintainers = with maintainers; [ bobvanderlinden brodes ];
};
}
diff --git a/pkgs/tools/networking/ngrok-2/update.sh b/pkgs/tools/networking/ngrok/update.sh
similarity index 90%
rename from pkgs/tools/networking/ngrok-2/update.sh
rename to pkgs/tools/networking/ngrok/update.sh
index 4e2aaf4e5596..ed2d975bee2f 100755
--- a/pkgs/tools/networking/ngrok-2/update.sh
+++ b/pkgs/tools/networking/ngrok/update.sh
@@ -10,7 +10,7 @@ get_download_info() {
https://update.equinox.io/check \
'Accept:application/json; q=1; version=1; charset=utf-8' \
'Content-Type:application/json; charset=utf-8' \
- app_id=app_goVRodbMVm \
+ app_id=app_c3U4eZcDbjV \
channel=stable \
os=$1 \
goarm= \
@@ -31,4 +31,4 @@ get_download_info() {
get_download_info darwin amd64
get_download_info darwin arm64
) | jq --slurp 'map ({ (.sys): . }) | add' \
- > pkgs/tools/networking/ngrok-2/versions.json
+ > pkgs/tools/networking/ngrok/versions.json
diff --git a/pkgs/tools/networking/ngrok/versions.json b/pkgs/tools/networking/ngrok/versions.json
new file mode 100644
index 000000000000..0ee279a88826
--- /dev/null
+++ b/pkgs/tools/networking/ngrok/versions.json
@@ -0,0 +1,38 @@
+{
+ "linux-386": {
+ "sys": "linux-386",
+ "url": "https://bin.equinox.io/a/fZXabEBxqTt/ngrok-v3-3.0.4-linux-386",
+ "sha256": "94c106392171a537d45ff5db749ce064d721b7c2204c7c951b9e9bfd96fd41f5",
+ "version": "3.0.4"
+ },
+ "linux-amd64": {
+ "sys": "linux-amd64",
+ "url": "https://bin.equinox.io/a/fydLsfbG16K/ngrok-v3-3.0.4-linux-amd64",
+ "sha256": "1d93dfcbcf8f1be3a21460022b5644228f9dcc2e71012bd61fcfb39ddf2a7a89",
+ "version": "3.0.4"
+ },
+ "linux-arm": {
+ "sys": "linux-arm",
+ "url": "https://bin.equinox.io/a/8Fzm6mvbW6H/ngrok-v3-3.0.4-linux-arm",
+ "sha256": "d9bf182808f254bea7f177f7dc814dbfa0f3a5ee2aea18cfabac7975a9c6397e",
+ "version": "3.0.4"
+ },
+ "linux-arm64": {
+ "sys": "linux-arm64",
+ "url": "https://bin.equinox.io/a/NGErr1qsBJ/ngrok-v3-3.0.4-linux-arm64",
+ "sha256": "26174fa2a0c22cf44fff118658348d6e4bfa8d60e4cfc092dedc4a0223427916",
+ "version": "3.0.4"
+ },
+ "darwin-amd64": {
+ "sys": "darwin-amd64",
+ "url": "https://bin.equinox.io/a/RZEPEGHd2t/ngrok-v3-3.0.4-darwin-amd64",
+ "sha256": "a7eca7635e6174174880a79d51e2d9c4ec32e15752751d5427f70ecf59f9f8e2",
+ "version": "3.0.4"
+ },
+ "darwin-arm64": {
+ "sys": "darwin-arm64",
+ "url": "https://bin.equinox.io/a/dxEFAXR7WZr/ngrok-v3-3.0.4-darwin-arm64",
+ "sha256": "6db91466407e9538a4f598cc362e8be292d4621f8b331e0d0818e1c672decc66",
+ "version": "3.0.4"
+ }
+}
diff --git a/pkgs/tools/networking/norouter/default.nix b/pkgs/tools/networking/norouter/default.nix
new file mode 100644
index 000000000000..e0f6a8f3aee2
--- /dev/null
+++ b/pkgs/tools/networking/norouter/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule rec {
+ pname = "norouter";
+ version = "0.6.4";
+
+ src = fetchFromGitHub {
+ owner = "norouter";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0h5jzxm4fw50781zj76r5ksnxkzsnrygrykpa913v9nd24c09c7m";
+ };
+
+ vendorSha256 = "sha256-DZ2kcNV8AzNogAUTaeus4rz9gCFo0wm306jcz/cAj0M=";
+
+ subPackages = [ "cmd/norouter" ];
+ doInstallCheck = true;
+ installCheckPhase = ''
+ runHook preInstallCheck
+
+ $out/bin/norouter --version | grep ${version} > /dev/null
+
+ runHook postInstallCheck
+ '';
+
+ meta = with lib; {
+ description = "Tool to handle unprivileged networking by using multiple loopback addresses";
+ homepage = "https://github.com/norouter/norouter";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ blaggacao ];
+ };
+}
diff --git a/pkgs/tools/security/gowitness/default.nix b/pkgs/tools/security/gowitness/default.nix
new file mode 100644
index 000000000000..ef0d25783c09
--- /dev/null
+++ b/pkgs/tools/security/gowitness/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule rec {
+ pname = "gowitness";
+ version = "2.4.0";
+
+ src = fetchFromGitHub {
+ owner = "sensepost";
+ repo = pname;
+ rev = version;
+ hash = "sha256-6O4pGsUu9tG3VAIGaD9aauXaVMhvK+HpEjByE0AwVnE=";
+ };
+
+ vendorSha256 = "sha256-6FgYDiz050ZlC1XBz7dKkVFKY7gkGhIm0ND23tMwxC8=";
+
+ meta = with lib; {
+ description = "Web screenshot utility";
+ homepage = "https://github.com/sensepost/gowitness";
+ license = licenses.gpl3Only;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/tools/security/hash-slinger/default.nix b/pkgs/tools/security/hash-slinger/default.nix
index e51d93e9d7fa..d639c1aa211c 100644
--- a/pkgs/tools/security/hash-slinger/default.nix
+++ b/pkgs/tools/security/hash-slinger/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "hash-slinger";
- version = "3.1";
+ version = "3.2";
src = fetchFromGitHub {
owner = "letoams";
repo = pname;
rev = version;
- sha256 = "sha256-mhMUdZt846QjwRIh2m/4EE+93fUcCKc2FFeoFpzKYvk=";
+ sha256 = "sha256-PfOEGqPMGLixoqHENZnxOv9nK+dYMqe6P0k+ZiJMik0=";
};
pythonPath = with python3.pkgs; [
diff --git a/pkgs/tools/security/haveged/default.nix b/pkgs/tools/security/haveged/default.nix
index 2386bb90d1ac..c28ae465e0eb 100644
--- a/pkgs/tools/security/haveged/default.nix
+++ b/pkgs/tools/security/haveged/default.nix
@@ -1,14 +1,17 @@
-{ lib, stdenv, fetchFromGitHub }:
+{ lib
+, stdenv
+, fetchFromGitHub
+}:
stdenv.mkDerivation rec {
pname = "haveged";
- version = "1.9.17";
+ version = "1.9.18";
src = fetchFromGitHub {
owner = "jirka-h";
repo = "haveged";
rev = "v${version}";
- sha256 = "sha256-uVl+TZVMsf+9aRATQndYMK4l4JfOBvstd1O2nTHyMYU=";
+ hash = "sha256-fyL/J2A13ap582j4gdC8u63Ah67Old+BaO/CLyEeN/g=";
};
strictDeps = true;
diff --git a/pkgs/tools/security/ldapmonitor/default.nix b/pkgs/tools/security/ldapmonitor/default.nix
new file mode 100644
index 000000000000..83035de4d20c
--- /dev/null
+++ b/pkgs/tools/security/ldapmonitor/default.nix
@@ -0,0 +1,40 @@
+{ lib
+, fetchFromGitHub
+, python3
+}:
+
+python3.pkgs.buildPythonApplication rec {
+ pname = "ldapmonitor";
+ version = "1.3";
+ format = "other";
+
+ src = fetchFromGitHub {
+ owner = "p0dalirius";
+ repo = pname;
+ rev = version;
+ hash = "sha256-lwTXvrnOVodCUQtR8FmCXiPuZ1Wx1ySfDKghpLXNuI4=";
+ };
+
+ sourceRoot = "${src.name}/python";
+
+ propagatedBuildInputs = with python3.pkgs; [
+ impacket
+ ldap
+ ldap3
+ ];
+
+ installPhase = ''
+ runHook preInstall
+
+ install -vD pyLDAPmonitor.py $out/bin/ldapmonitor
+
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "Tool to monitor creation, deletion and changes to LDAP objects";
+ homepage = "https://github.com/p0dalirius/LDAPmonitor";
+ license = with licenses; [ gpl3Only ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/tools/security/minica/default.nix b/pkgs/tools/security/minica/default.nix
index 29574e39cd92..b984221bec36 100644
--- a/pkgs/tools/security/minica/default.nix
+++ b/pkgs/tools/security/minica/default.nix
@@ -1,33 +1,34 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
-buildGoPackage rec {
+buildGoModule rec {
pname = "minica";
version = "1.0.2";
- goPackagePath = "github.com/jsha/minica";
-
src = fetchFromGitHub {
owner = "jsha";
repo = "minica";
rev = "v${version}";
- sha256 = "18518wp3dcjhf3mdkg5iwxqr3326n6jwcnqhyibphnb2a58ap7ny";
+ sha256 = "sha256-3p6rUFFiWXhX9BBbxqWxRoyRceexvNnqcFCyNi5HoaA=";
};
- ldflags = [
- "-X main.BuildVersion=${version}"
- ];
+ vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
+
+ ldflags = [ "-s" "-w" ];
meta = with lib; {
description = "A simple tool for generating self signed certificates";
longDescription = ''
- Minica is a simple CA intended for use in situations where the CA
- operator also operates each host where a certificate will be used. It
- automatically generates both a key and a certificate when asked to
- produce a certificate.
+ Minica is a simple CA intended for use in situations where the CA operator
+ also operates each host where a certificate will be used. It automatically
+ generates both a key and a certificate when asked to produce a
+ certificate.
'';
homepage = "https://github.com/jsha/minica/";
+ changelog = "https://github.com/jsha/minica/releases/tag/${src.rev}";
license = licenses.mit;
maintainers = with maintainers; [ m1cr0man ];
- platforms = platforms.linux ++ platforms.darwin;
};
}
diff --git a/pkgs/tools/security/webanalyze/default.nix b/pkgs/tools/security/webanalyze/default.nix
new file mode 100644
index 000000000000..b61afb16fb67
--- /dev/null
+++ b/pkgs/tools/security/webanalyze/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule rec {
+ pname = "webanalyze";
+ version = "0.3.6";
+
+ src = fetchFromGitHub {
+ owner = "rverton";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-r5HIXh0mKCZmzOOAKThNUPtJLsTYvnVE8FYA6vV5xjg=";
+ };
+
+ vendorSha256 = "sha256-kXtWYGsZUUhBNvkTOah3Z+ta118k6PXfpBx6MLr/pq0=";
+
+ meta = with lib; {
+ description = "Tool to uncover technologies used on websites";
+ homepage = "https://github.com/rverton/webanalyze";
+ license = licenses.mit;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix
index f53816c46f20..a4d62af5b67a 100644
--- a/pkgs/tools/text/vale/default.nix
+++ b/pkgs/tools/text/vale/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "vale";
- version = "2.17.0";
+ version = "2.18.0";
subPackages = [ "cmd/vale" ];
outputs = [ "out" "data" ];
@@ -11,7 +11,7 @@ buildGoModule rec {
owner = "errata-ai";
repo = "vale";
rev = "v${version}";
- sha256 = "sha256-PUaIx6rEaLz0HUxkglsVHw0Kx/ovI2f4Yhknuysr5Gs=";
+ sha256 = "sha256-hstjE3+1QQSeS1z8fNhxTJI81liW77CdkEP+aS3c2zM=";
};
vendorSha256 = "sha256-zdgLWEArmtHTDM844LoSJwKp0UGoAR8bHnFOSlrrjdg=";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 50f97085e478..fefbd6281b6f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2959,6 +2959,8 @@ with pkgs;
catch2 = callPackage ../development/libraries/catch2 { };
+ catch2_3 = callPackage ../development/libraries/catch2/3.nix { };
+
catdoc = callPackage ../tools/text/catdoc { };
catdocx = callPackage ../tools/text/catdocx { };
@@ -7934,6 +7936,8 @@ with pkgs;
lcdf-typetools = callPackage ../tools/misc/lcdf-typetools { };
+ ldapmonitor = callPackage ../tools/security/ldapmonitor { };
+
ldapvi = callPackage ../tools/misc/ldapvi { };
ldeep = python3Packages.callPackage ../tools/security/ldeep { };
@@ -8673,9 +8677,7 @@ with pkgs;
neuron-notes = haskell.lib.compose.justStaticExecutables (haskell.lib.compose.generateOptparseApplicativeCompletion "neuron" haskellPackages.neuron);
- ngrok = ngrok-2;
-
- ngrok-2 = callPackage ../tools/networking/ngrok-2 { };
+ ngrok = callPackage ../tools/networking/ngrok { };
nifi = callPackage ../servers/web-apps/nifi { };
@@ -13597,9 +13599,10 @@ with pkgs;
mlton20130715
mlton20180207Binary
mlton20180207
+ mlton20210107
mltonHEAD;
- mlton = mlton20180207;
+ mlton = mlton20210107;
mono = mono6;
@@ -24664,7 +24667,9 @@ with pkgs;
mobile-broadband-provider-info = callPackage ../data/misc/mobile-broadband-provider-info { };
- mojave-gtk-theme = callPackage ../data/themes/mojave { };
+ mojave-gtk-theme = callPackage ../data/themes/mojave {
+ inherit (gnome) gnome-shell;
+ };
moka-icon-theme = callPackage ../data/icons/moka-icon-theme { };
@@ -28386,6 +28391,8 @@ with pkgs;
normalize = callPackage ../applications/audio/normalize { };
+ norouter = callPackage ../tools/networking/norouter { };
+
mailspring = callPackage ../applications/networking/mailreaders/mailspring {};
mm = callPackage ../applications/networking/instant-messengers/mm { };
@@ -30625,6 +30632,8 @@ with pkgs;
wayvnc = callPackage ../applications/networking/remote/wayvnc { };
+ webanalyze = callPackage ../tools/security/webanalyze { };
+
webcamoid = libsForQt5.callPackage ../applications/video/webcamoid { };
webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs {};
@@ -32308,6 +32317,8 @@ with pkgs;
sil = callPackage ../games/sil { };
+ sil-q = callPackage ../games/sil-q { };
+
simutrans = callPackage ../games/simutrans { };
# get binaries without data built by Hydra
simutrans_binaries = lowPrio simutrans.binaries;
@@ -34109,6 +34120,8 @@ with pkgs;
gotestwaf = callPackage ../tools/security/gotestwaf { };
+ gowitness = callPackage ../tools/security/gowitness { };
+
guetzli = callPackage ../applications/graphics/guetzli { };
gummi = callPackage ../applications/misc/gummi { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 47d7a2f9d0c5..8e834eb39e7c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9340,6 +9340,8 @@ in {
rpi-bad-power = callPackage ../development/python-modules/rpi-bad-power { };
+ rpi-gpio = callPackage ../development/python-modules/rpi-gpio { };
+
rply = callPackage ../development/python-modules/rply { };
rpm = toPythonModule (pkgs.rpm.override {