diff --git a/.github/workflows/nixos-manual.yml b/.github/workflows/nixos-manual.yml
index a77b90260424..5453513a53a6 100644
--- a/.github/workflows/nixos-manual.yml
+++ b/.github/workflows/nixos-manual.yml
@@ -23,4 +23,12 @@ jobs:
- name: Check DocBook files generated from Markdown are consistent
run: |
nixos/doc/manual/md-to-db.sh
- git diff --exit-code
+ git diff --exit-code || {
+ echo
+ echo 'Generated manual files are out of date.'
+ echo 'Please run'
+ echo
+ echo ' nixos/doc/manual/md-to-db.sh'
+ echo
+ exit 1
+ }
diff --git a/doc/builders/images/dockertools.section.md b/doc/builders/images/dockertools.section.md
index d7f8741437cc..2a41d48cf134 100644
--- a/doc/builders/images/dockertools.section.md
+++ b/doc/builders/images/dockertools.section.md
@@ -20,7 +20,12 @@ buildImage {
fromImageName = null;
fromImageTag = "latest";
- contents = pkgs.redis;
+ copyToRoot = pkgs.buildEnv {
+ name = "image-root";
+ paths = [ pkgs.redis ];
+ pathsToLink = [ "/bin" ];
+ };
+
runAsRoot = ''
#!${pkgs.runtimeShell}
mkdir -p /data
@@ -46,7 +51,7 @@ The above example will build a Docker image `redis/latest` from the given base i
- `fromImageTag` can be used to further specify the tag of the base image within the repository, in case an image contains multiple tags. By default it's `null`, in which case `buildImage` will peek the first tag available for the base image.
-- `contents` is a derivation that will be copied in the new layer of the resulting image. This can be similarly seen as `ADD contents/ /` in a `Dockerfile`. By default it's `null`.
+- `copyToRoot` is a derivation that will be copied in the new layer of the resulting image. This can be similarly seen as `ADD contents/ /` in a `Dockerfile`. By default it's `null`.
- `runAsRoot` is a bash script that will run as root in an environment that overlays the existing layers of the base image with the new resulting layer, including the previously copied `contents` derivation. This can be similarly seen as `RUN ...` in a `Dockerfile`.
@@ -81,7 +86,11 @@ pkgs.dockerTools.buildImage {
name = "hello";
tag = "latest";
created = "now";
- contents = pkgs.hello;
+ copyToRoot = pkgs.buildEnv {
+ name = "image-root";
+ paths = [ pkgs.hello ];
+ pathsToLink = [ "/bin" ];
+ };
config.Cmd = [ "/bin/hello" ];
}
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 37f33173be1f..18de6217e348 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -11918,7 +11918,7 @@
name = "Spencer Whitt";
};
squalus = {
- email = "squalus@tuta.io";
+ email = "squalus@squalus.net";
github = "squalus";
githubId = 36899624;
name = "squalus";
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 201b80aeaf4d..2aa88d4bd93d 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
@@ -303,6 +303,15 @@
and require manual remediation.
+
+
+ dockerTools.buildImage deprecates the
+ misunderstood contents parameter, in favor
+ of copyToRoot. Use
+ copyToRoot = buildEnv { ... }; or similar
+ if you intend to add packages to /bin.
+
+
memtest86+ was updated from 5.00-coreboot-002 to 6.00-beta2.
diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md
index a818b6d82eb4..15c95c9206b2 100644
--- a/nixos/doc/manual/release-notes/rl-2211.section.md
+++ b/nixos/doc/manual/release-notes/rl-2211.section.md
@@ -114,6 +114,9 @@ Use `configure.packages` instead.
- Matrix Synapse now requires entries in the `state_group_edges` table to be unique, in order to prevent accidentally introducing duplicate information (for example, because a database backup was restored multiple times). If your Synapse database already has duplicate rows in this table, this could fail with an error and require manual remediation.
+- `dockerTools.buildImage` deprecates the misunderstood `contents` parameter, in favor of `copyToRoot`.
+ Use `copyToRoot = buildEnv { ... };` or similar if you intend to add packages to `/bin`.
+
- memtest86+ was updated from 5.00-coreboot-002 to 6.00-beta2. It is now the upstream version from https://www.memtest.org/, as coreboot's fork is no longer available.
- Add udev rules for the Teensy family of microcontrollers.
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 223705609e14..d04a4f93555f 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1047,7 +1047,6 @@
./services/web-apps/code-server.nix
./services/web-apps/baget.nix
./services/web-apps/convos.nix
- ./services/web-apps/cryptpad.nix
./services/web-apps/dex.nix
./services/web-apps/discourse.nix
./services/web-apps/documize.nix
@@ -1275,7 +1274,6 @@
./virtualisation/parallels-guest.nix
./virtualisation/podman/default.nix
./virtualisation/qemu-guest-agent.nix
- ./virtualisation/railcar.nix
./virtualisation/spice-usb-redirection.nix
./virtualisation/virtualbox-guest.nix
./virtualisation/virtualbox-host.nix
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 7a6a6b5ed30b..22fcb72e9ff4 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -68,6 +68,7 @@ with lib;
prey-bash-client is deprecated upstream
'')
(mkRemovedOptionModule [ "services" "quagga" ] "the corresponding package has been removed from nixpkgs")
+ (mkRemovedOptionModule [ "services" "railcar" ] "the corresponding package has been removed from nixpkgs")
(mkRemovedOptionModule [ "services" "seeks" ] "")
(mkRemovedOptionModule [ "services" "ssmtp" ] ''
The ssmtp package and the corresponding module have been removed due to
@@ -98,6 +99,7 @@ with lib;
(mkRemovedOptionModule [ "services" "virtuoso" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "openfire" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "riak" ] "The corresponding package was removed from nixpkgs.")
+ (mkRemovedOptionModule [ "services" "cryptpad" ] "The corresponding package was removed from nixpkgs.")
# Do NOT add any option renames here, see top of the file
];
diff --git a/nixos/modules/services/web-apps/cryptpad.nix b/nixos/modules/services/web-apps/cryptpad.nix
deleted file mode 100644
index e6772de768e0..000000000000
--- a/nixos/modules/services/web-apps/cryptpad.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
- cfg = config.services.cryptpad;
-in
-{
- options.services.cryptpad = {
- enable = mkEnableOption "the Cryptpad service";
-
- package = mkOption {
- default = pkgs.cryptpad;
- defaultText = literalExpression "pkgs.cryptpad";
- type = types.package;
- description = "
- Cryptpad package to use.
- ";
- };
-
- configFile = mkOption {
- type = types.path;
- default = "${cfg.package}/lib/node_modules/cryptpad/config/config.example.js";
- defaultText = literalExpression ''"''${package}/lib/node_modules/cryptpad/config/config.example.js"'';
- description = ''
- Path to the JavaScript configuration file.
-
- See
- for a configuration example.
- '';
- };
- };
-
- config = mkIf cfg.enable {
- systemd.services.cryptpad = {
- description = "Cryptpad Service";
- wantedBy = [ "multi-user.target" ];
- after = [ "networking.target" ];
- serviceConfig = {
- DynamicUser = true;
- Environment = [
- "CRYPTPAD_CONFIG=${cfg.configFile}"
- "HOME=%S/cryptpad"
- ];
- ExecStart = "${cfg.package}/bin/cryptpad";
- PrivateTmp = true;
- Restart = "always";
- StateDirectory = "cryptpad";
- WorkingDirectory = "%S/cryptpad";
- };
- };
- };
-}
diff --git a/nixos/modules/virtualisation/railcar.nix b/nixos/modules/virtualisation/railcar.nix
deleted file mode 100644
index e719e25650d3..000000000000
--- a/nixos/modules/virtualisation/railcar.nix
+++ /dev/null
@@ -1,124 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
- cfg = config.services.railcar;
- generateUnit = name: containerConfig:
- let
- container = pkgs.ociTools.buildContainer {
- args = [
- (pkgs.writeShellScript "run.sh" containerConfig.cmd).outPath
- ];
- };
- in
- nameValuePair "railcar-${name}" {
- enable = true;
- wantedBy = [ "multi-user.target" ];
- serviceConfig = {
- ExecStart = ''
- ${cfg.package}/bin/railcar -r ${cfg.stateDir} run ${name} -b ${container}
- '';
- Type = containerConfig.runType;
- };
- };
- mount = with types; (submodule {
- options = {
- type = mkOption {
- type = str;
- default = "none";
- description = ''
- The type of the filesystem to be mounted.
- Linux: filesystem types supported by the kernel as listed in
- `/proc/filesystems` (e.g., "minix", "ext2", "ext3", "jfs", "xfs",
- "reiserfs", "msdos", "proc", "nfs", "iso9660"). For bind mounts
- (when options include either bind or rbind), the type is a dummy,
- often "none" (not listed in /proc/filesystems).
- '';
- };
- source = mkOption {
- type = str;
- description = "Source for the in-container mount";
- };
- options = mkOption {
- type = listOf str;
- default = [ "bind" ];
- description = ''
- Mount options of the filesystem to be used.
-
- Support options are listed in the mount(8) man page. Note that
- both filesystem-independent and filesystem-specific options
- are listed.
- '';
- };
- };
- });
-in
-{
- options.services.railcar = {
- enable = mkEnableOption "railcar";
-
- containers = mkOption {
- default = {};
- description = "Declarative container configuration";
- type = with types; attrsOf (submodule ({ name, config, ... }: {
- options = {
- cmd = mkOption {
- type = types.lines;
- description = "Command or script to run inside the container";
- };
-
- mounts = mkOption {
- type = with types; attrsOf mount;
- default = {};
- description = ''
- A set of mounts inside the container.
-
- The defaults have been chosen for simple bindmounts, meaning
- that you only need to provide the "source" parameter.
- '';
- example = { "/data" = { source = "/var/lib/data"; }; };
- };
-
- runType = mkOption {
- type = types.str;
- default = "oneshot";
- description = "The systemd service run type";
- };
-
- os = mkOption {
- type = types.str;
- default = "linux";
- description = "OS type of the container";
- };
-
- arch = mkOption {
- type = types.str;
- default = "x86_64";
- description = "Computer architecture type of the container";
- };
- };
- }));
- };
-
- stateDir = mkOption {
- type = types.path;
- default = "/var/railcar";
- description = "Railcar persistent state directory";
- };
-
- package = mkOption {
- type = types.package;
- default = pkgs.railcar;
- defaultText = literalExpression "pkgs.railcar";
- description = "Railcar package to use";
- };
- };
-
- config = mkIf cfg.enable {
- systemd.services = flip mapAttrs' cfg.containers (name: containerConfig:
- generateUnit name containerConfig
- );
- };
-}
-
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index e08be48db24f..d596db8ab746 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -110,7 +110,6 @@ in {
cri-o = handleTestOn ["x86_64-linux"] ./cri-o.nix {};
custom-ca = handleTest ./custom-ca.nix {};
croc = handleTest ./croc.nix {};
- cryptpad = handleTest ./cryptpad.nix {};
deluge = handleTest ./deluge.nix {};
dendrite = handleTest ./matrix/dendrite.nix {};
dex-oidc = handleTest ./dex-oidc.nix {};
diff --git a/nixos/tests/cryptpad.nix b/nixos/tests/cryptpad.nix
deleted file mode 100644
index db271f937ef4..000000000000
--- a/nixos/tests/cryptpad.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-import ./make-test-python.nix ({ lib, ... }:
-
-with lib;
-
-{
- name = "cryptpad";
- meta.maintainers = with maintainers; [ davhau ];
-
- nodes.machine =
- { pkgs, ... }:
- { services.cryptpad.enable = true; };
-
- testScript = ''
- machine.wait_for_unit("cryptpad.service")
- machine.wait_for_open_port(3000)
- machine.succeed("curl -L --fail http://localhost:3000/sheet")
- '';
-})
diff --git a/nixos/tests/docker-tools-cross.nix b/nixos/tests/docker-tools-cross.nix
index 8791ec258127..14cb14ceeaea 100644
--- a/nixos/tests/docker-tools-cross.nix
+++ b/nixos/tests/docker-tools-cross.nix
@@ -24,7 +24,11 @@ let
hello1 = remoteCrossPkgs.dockerTools.buildImage {
name = "hello1";
tag = "latest";
- contents = remoteCrossPkgs.hello;
+ copyToRoot = remoteCrossPkgs.buildEnv {
+ name = "image-root";
+ pathsToLink = [ "/bin" ];
+ paths = [ remoteCrossPkgs.hello ];
+ };
};
hello2 = remoteCrossPkgs.dockerTools.buildLayeredImage {
diff --git a/pkgs/applications/audio/LibreArp/default.nix b/pkgs/applications/audio/LibreArp/default.nix
index 2374059e95a8..0736745aaaf4 100644
--- a/pkgs/applications/audio/LibreArp/default.nix
+++ b/pkgs/applications/audio/LibreArp/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "LibreArp";
- version = "2.2";
+ version = "2.4";
src = fetchFromGitLab {
owner = "LibreArp";
repo = "LibreArp";
rev = version;
- hash = "sha256-jCUT/sflO9L57xRTqNR90RbwJ0uZ+xJVXnB3n+FhWBo=";
+ hash = "sha256-jEpES68NuHhelUq/L46CxEeadk3LbuPZ72JaGDbw8fg=";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/audio/LibreArp/lv2.nix b/pkgs/applications/audio/LibreArp/lv2.nix
index ce70fd112f2f..b723683b7ec6 100644
--- a/pkgs/applications/audio/LibreArp/lv2.nix
+++ b/pkgs/applications/audio/LibreArp/lv2.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "LibreArp-lv2";
- version = "2.2";
+ version = "2.4";
src = fetchFromGitLab {
owner = "LibreArp";
repo = "LibreArp";
rev = "${version}-lv2";
- hash = "sha256-j5SksuhC4ZXXILfOpwXNqIu5fO07a/6tiZ5qUo+p0Ug=";
+ hash = "sha256-x+ZPiU/ZFzrXb8szMS9Ts4JEEyXYpM8CLZHT4lNJWY8=";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/audio/cardinal/default.nix b/pkgs/applications/audio/cardinal/default.nix
index 2d99fb5d40ef..f09a9169c947 100644
--- a/pkgs/applications/audio/cardinal/default.nix
+++ b/pkgs/applications/audio/cardinal/default.nix
@@ -1,9 +1,7 @@
{
stdenv
, fetchFromGitHub
-, fetchpatch
, fetchurl
-, fetchzip
, freetype
, jansson
, lib
@@ -23,12 +21,12 @@
stdenv.mkDerivation rec {
pname = "cardinal";
- version = "22.04";
+ version = "22.06";
src = fetchurl {
url =
- "https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal-${version}.tar.xz";
- sha256 = "sha256-7As4CckwByrTynOOpwAXa1R9Bpp/ft537f+PvAgz/BE=";
+ "https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal+deps-${version}.tar.xz";
+ sha256 = "sha256-h7pNoLpB7XkWHZUCQfvJsSnOn37DcP9xuH9kxtfmCos=";
};
prePatch = ''
@@ -55,6 +53,7 @@ stdenv.mkDerivation rec {
speexdsp
];
+ hardeningDisable = [ "format" ];
makeFlags = [ "SYSDEPS=true" "PREFIX=$(out)" ];
meta = {
@@ -63,8 +62,5 @@ stdenv.mkDerivation rec {
license = lib.licenses.gpl3;
maintainers = [ lib.maintainers.magnetophon ];
platforms = lib.platforms.all;
- # ../../utils/CarlaPluginUI.cpp:31:10: fatal error: 'Cocoa/Cocoa.h' file not found
- # # import
- broken = stdenv.isDarwin;
};
}
diff --git a/pkgs/applications/audio/furnace/default.nix b/pkgs/applications/audio/furnace/default.nix
index 115c5b7767d2..cbd15248fee6 100644
--- a/pkgs/applications/audio/furnace/default.nix
+++ b/pkgs/applications/audio/furnace/default.nix
@@ -7,8 +7,10 @@
, cmake
, pkg-config
, makeWrapper
+, fftw
, fmt_8
, libsndfile
+, rtmidi
, SDL2
, zlib
, withJACK ? stdenv.hostPlatform.isUnix
@@ -19,21 +21,16 @@
stdenv.mkDerivation rec {
pname = "furnace";
- version = "0.5.8";
+ version = "0.6pre1";
src = fetchFromGitHub {
owner = "tildearrow";
repo = "furnace";
rev = "v${version}";
fetchSubmodules = true;
- sha256 = "103ymd3wa1sfsr6qg15vpcs53j350i7zidv3azlf7cynk6k28xim";
+ sha256 = "sha256-7MrzSC8PYQ4X8fyX1hB8mOoSCtLpY+o1x42v9HLdoao=";
};
- postPatch = ''
- # rtmidi is not used yet
- sed -i -e '/add_subdirectory(extern\/rtmidi/d' -e '/DEPENDENCIES_LIBRARIES rtmidi/d' CMakeLists.txt
- '';
-
nativeBuildInputs = [
cmake
pkg-config
@@ -42,8 +39,10 @@ stdenv.mkDerivation rec {
];
buildInputs = [
+ fftw
fmt_8
libsndfile
+ rtmidi
SDL2
zlib
] ++ lib.optionals withJACK [
@@ -54,10 +53,12 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DBUILD_GUI=${if withGUI then "ON" else "OFF"}"
+ "-DSYSTEM_FFTW=ON"
"-DSYSTEM_FMT=ON"
"-DSYSTEM_LIBSNDFILE=ON"
- "-DSYSTEM_ZLIB=ON"
+ "-DSYSTEM_RTMIDI=ON"
"-DSYSTEM_SDL2=ON"
+ "-DSYSTEM_ZLIB=ON"
"-DWITH_JACK=${if withJACK then "ON" else "OFF"}"
"-DWARNINGS_ARE_ERRORS=ON"
];
@@ -85,8 +86,6 @@ stdenv.mkDerivation rec {
};
tests.version = testers.testVersion {
package = furnace;
- # The command always exits with code 1
- command = "(furnace --version || [ $? -eq 1 ])";
};
};
diff --git a/pkgs/applications/audio/musescore/darwin.nix b/pkgs/applications/audio/musescore/darwin.nix
index 2cf1b9ff68de..add56f99d9b3 100644
--- a/pkgs/applications/audio/musescore/darwin.nix
+++ b/pkgs/applications/audio/musescore/darwin.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, undmg }:
let
- versionComponents = [ "2" "1" ];
+ versionComponents = [ "3" "6" "2" "548020600" ];
appName = "MuseScore ${builtins.head versionComponents}";
in
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
sourceRoot = "${appName}.app";
src = fetchurl {
- url = "ftp://ftp.osuosl.org/pub/musescore/releases/MuseScore-${concatStringsSep "." (take 3 versionComponents)}/MuseScore-${version}.dmg";
- sha256 = "19xkaxlkbrhvfip6n3iw6q7463ngr6y5gfisrpjqg2xl2igyl795";
+ url = "https://github.com/musescore/MuseScore/releases/download/v${concatStringsSep "." (take 3 versionComponents)}/MuseScore-${version}.dmg";
+ sha256 = "sha256-lHckfhTTrDzaGwlbnZ5w0O1gMPbRmrmgATIGMY517l0=";
};
buildInputs = [ undmg ];
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Music notation and composition software";
homepage = "https://musescore.org/";
- license = licenses.gpl2;
+ license = licenses.gpl3Only;
platforms = platforms.darwin;
maintainers = [];
};
diff --git a/pkgs/applications/audio/pyradio/default.nix b/pkgs/applications/audio/pyradio/default.nix
index 3a2037de32d5..9309ea2f8152 100644
--- a/pkgs/applications/audio/pyradio/default.nix
+++ b/pkgs/applications/audio/pyradio/default.nix
@@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "pyradio";
- version = "0.8.9.21";
+ version = "0.8.9.22";
src = fetchFromGitHub {
owner = "coderholic";
repo = pname;
rev = "refs/tags/${version}";
- sha256 = "sha256-uaQG840R4twPkE3GYLpcF0MHVH5JaLn5CSAd1DrNOvQ=";
+ sha256 = "sha256-QBgXg2SNEQX1ngY+cEWqStC0zsFZ0Er81tuhTszbHWM=";
};
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix
index b41bea58453c..26825f2dcc70 100644
--- a/pkgs/applications/audio/sonic-pi/default.nix
+++ b/pkgs/applications/audio/sonic-pi/default.nix
@@ -2,7 +2,6 @@
, lib
, qtbase
, fetchFromGitHub
-, fftwSinglePrec
, ruby
, erlang
, aubio
@@ -14,14 +13,11 @@
, boost
, bash
, jack2
-, supercollider
+, supercollider-with-sc3-plugins
, qwt
}:
let
-
- supercollider_single_prec = supercollider.override { fftw = fftwSinglePrec; };
-
pname = "sonic-pi";
version = "3.3.1";
src = fetchFromGitHub {
@@ -62,7 +58,7 @@ mkDerivation rec {
qwt
ruby
aubio
- supercollider_single_prec
+ supercollider-with-sc3-plugins
boost
erlang
alsa-lib
@@ -122,18 +118,18 @@ mkDerivation rec {
dontWrapQtApps = true;
preFixup = ''
wrapQtApp "$out/bin/sonic-pi" \
- --prefix PATH : ${lib.makeBinPath [ bash jack2 ruby supercollider erlang] }
+ --prefix PATH : ${lib.makeBinPath [ bash jack2 ruby supercollider-with-sc3-plugins erlang] }
makeWrapper \
$out/app/server/ruby/bin/sonic-pi-server.rb \
$out/bin/sonic-pi-server \
- --prefix PATH : ${lib.makeBinPath [ bash jack2 ruby supercollider erlang ] }
+ --prefix PATH : ${lib.makeBinPath [ bash jack2 ruby supercollider-with-sc3-plugins erlang ] }
'';
meta = {
homepage = "https://sonic-pi.net/";
description = "Free live coding synth for everyone originally designed to support computing and music lessons within schools";
license = lib.licenses.mit;
- maintainers = with lib.maintainers; [ Phlogistique kamilchm c0deaddict sohalt ];
+ maintainers = with lib.maintainers; [ Phlogistique kamilchm c0deaddict sohalt lilyinstarlight ];
platforms = lib.platforms.linux;
};
}
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 06be5e03f7fa..e78c3e6b5567 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -161,12 +161,12 @@ final: prev:
LeaderF = buildVimPluginFrom2Nix {
pname = "LeaderF";
- version = "2022-05-20";
+ version = "2022-06-29";
src = fetchFromGitHub {
owner = "Yggdroot";
repo = "LeaderF";
- rev = "6792bddf02d536a5555fd0dc5ac2de94b2539e14";
- sha256 = "1dynwdc4681c2zxa3y8w4r462zff55l30fw02zargpffx4dg8dni";
+ rev = "ec37183a3ad41dc3cb58bde8693ad355488fda53";
+ sha256 = "10a34fmdfw8b9sbcbr0fpz1rgldn9z588jqs2psqaf0m9a9p0qib";
};
meta.homepage = "https://github.com/Yggdroot/LeaderF/";
};
@@ -281,12 +281,12 @@ final: prev:
SchemaStore-nvim = buildVimPluginFrom2Nix {
pname = "SchemaStore.nvim";
- version = "2022-06-21";
+ version = "2022-06-30";
src = fetchFromGitHub {
owner = "b0o";
repo = "SchemaStore.nvim";
- rev = "7561d31e5e668333d7e453c063ded5a2805f0e41";
- sha256 = "0850akn3ik044dnz53d2ikdgw8b7yk6vhy58a346ac9cq1damz7r";
+ rev = "e936d016c448388f88ff7ae46b96cf0687304776";
+ sha256 = "01438v20ryfg239sg13f7m337fil6pcaw0vb47wz6khhiz719w1q";
};
meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
};
@@ -341,12 +341,12 @@ final: prev:
SpaceVim = buildVimPluginFrom2Nix {
pname = "SpaceVim";
- version = "2022-06-21";
+ version = "2022-07-02";
src = fetchFromGitHub {
owner = "SpaceVim";
repo = "SpaceVim";
- rev = "b7e45f2b1db2bb7b1ec8d9713607c3579f43207c";
- sha256 = "12wkzf821fglinwacs2va28my5s8bf0xs9xzxifvcvbf5kp7k55x";
+ rev = "5b9ae1e1684440a15fb6b2401b426d55f82c74ee";
+ sha256 = "1hqpa24b74k2bxn3szdhm8i9n50xfy1rkjvmys6vsfdb0zfmq80b";
};
meta.homepage = "https://github.com/SpaceVim/SpaceVim/";
};
@@ -377,12 +377,12 @@ final: prev:
TrueZen-nvim = buildVimPluginFrom2Nix {
pname = "TrueZen.nvim";
- version = "2021-10-12";
+ version = "2022-07-01";
src = fetchFromGitHub {
owner = "Pocco81";
repo = "TrueZen.nvim";
- rev = "508b977d71650da5c9243698614a9a1416f116d4";
- sha256 = "0sr4y1mg83l28l5ias2pv0gxkcgwailfjn2skx35z63f2il3zkbx";
+ rev = "fd0af396aa06c4aaa7c021cffca3a64a66a4b11f";
+ sha256 = "1q88knxcasjn17yx93lmhlynvrmybg2gxy7933ii49r36nqk0hqi";
};
meta.homepage = "https://github.com/Pocco81/TrueZen.nvim/";
};
@@ -498,12 +498,12 @@ final: prev:
aerial-nvim = buildVimPluginFrom2Nix {
pname = "aerial.nvim";
- version = "2022-06-19";
+ version = "2022-06-27";
src = fetchFromGitHub {
owner = "stevearc";
repo = "aerial.nvim";
- rev = "dd35fd75c480da0e0239d69a607aac1347c395c6";
- sha256 = "02mqp20vc5jjrf8d1padldnp3fdks0wjanwd22zr56y8zphcaxvc";
+ rev = "bd6de885a03df4b4fe9d2cadb5e4674a2bdf5cd3";
+ sha256 = "1ln6wr0r4wygz8wn59p8pdxz7bi7x4clx390pxk1c0l20siidk6x";
};
meta.homepage = "https://github.com/stevearc/aerial.nvim/";
};
@@ -546,12 +546,12 @@ final: prev:
ale = buildVimPluginFrom2Nix {
pname = "ale";
- version = "2022-06-16";
+ version = "2022-07-02";
src = fetchFromGitHub {
owner = "dense-analysis";
repo = "ale";
- rev = "91e8422d6d67f1b1139b57b8707945ea2531443e";
- sha256 = "1fwvxs7ifshdpvzkfqld66cdlhvbrp76bpm603w1qaskm88fj2pf";
+ rev = "d6f3d4976d21e516193da5907db3f06e56d3e5c8";
+ sha256 = "1qxcwpmzagxq7c4lkf5gy7lby7cy2q34gwx9vr7ply2n307994zp";
};
meta.homepage = "https://github.com/dense-analysis/ale/";
};
@@ -798,12 +798,12 @@ final: prev:
barbar-nvim = buildVimPluginFrom2Nix {
pname = "barbar.nvim";
- version = "2022-06-17";
+ version = "2022-06-29";
src = fetchFromGitHub {
owner = "romgrk";
repo = "barbar.nvim";
- rev = "d7123f0368aa7fdd10f587176ad60aedcdfa44de";
- sha256 = "1mqhhfaqd07ck0m6izqrf97a1vlkjcwvmjz5c5z2xssjlmcrx8pg";
+ rev = "b3695e9825e33cd534d142383271557755370f3f";
+ sha256 = "016yh81z1h49c9wn7ls6fzzimx24qdacwfz7b30fw2g1d0cvnmzg";
};
meta.homepage = "https://github.com/romgrk/barbar.nvim/";
};
@@ -930,12 +930,12 @@ final: prev:
bufferline-nvim = buildVimPluginFrom2Nix {
pname = "bufferline.nvim";
- version = "2022-06-18";
+ version = "2022-06-23";
src = fetchFromGitHub {
owner = "akinsho";
repo = "bufferline.nvim";
- rev = "88c742f4af988c98aee5ac1c92f056905c636aae";
- sha256 = "1nlxsg2nzkpxwj5jiwksg1hqp25g6hzj075zjvxbix72xdiv98lq";
+ rev = "68839d62785edfb4ff7a7b3c1e9f4b64d55749e8";
+ sha256 = "0my620rnl3c6d22rgwm824bgflhbhjjk7ryvggbfaap2rw98alq3";
};
meta.homepage = "https://github.com/akinsho/bufferline.nvim/";
};
@@ -954,12 +954,12 @@ final: prev:
calendar-vim = buildVimPluginFrom2Nix {
pname = "calendar.vim";
- version = "2022-03-21";
+ version = "2022-06-25";
src = fetchFromGitHub {
owner = "itchyny";
repo = "calendar.vim";
- rev = "896360bfd9d5347b2726dd247df2d2cbdb8cf1d6";
- sha256 = "06xvggyq0saf9mj330vnlh0q4176w46w09335iwhc3fp999vl07p";
+ rev = "3fbe34e21e5847fb40314eb0848faabfa609301a";
+ sha256 = "0qgs27ms71zsmp0sx7prvsq3j4qfiw2nigvykdd90931ssb089s6";
};
meta.homepage = "https://github.com/itchyny/calendar.vim/";
};
@@ -1242,12 +1242,12 @@ final: prev:
cmp-fish = buildVimPluginFrom2Nix {
pname = "cmp-fish";
- version = "2022-02-17";
+ version = "2022-06-23";
src = fetchFromGitHub {
owner = "mtoohey31";
repo = "cmp-fish";
- rev = "2ce8febeff3e4600acac498b7cde72cc9d2dd7b1";
- sha256 = "1clarmx43ygwsaxy73cgy86i33vjrfzr53z7ym29ynndb7zlzg6v";
+ rev = "8ce7517d74c11a55bf2d0e52e4649e49cea6c7a1";
+ sha256 = "0nlcx39hycl15bw1vn35lcw0lmgckn396m2pwfk22lyijdqdgnlk";
};
meta.homepage = "https://github.com/mtoohey31/cmp-fish/";
};
@@ -1266,12 +1266,12 @@ final: prev:
cmp-fuzzy-path = buildVimPluginFrom2Nix {
pname = "cmp-fuzzy-path";
- version = "2022-05-08";
+ version = "2022-06-30";
src = fetchFromGitHub {
owner = "tzachar";
repo = "cmp-fuzzy-path";
- rev = "8c1ecaaf8bf16bc4af4eaaaac73ff5a29174406b";
- sha256 = "0c607vljcf5zwxvfj4s1vmqridwpwql7zynwc38zx9lafv7l2djb";
+ rev = "b5f137ccee80b6c1f9b9243bb56c943d278b7166";
+ sha256 = "1szhcbj31xndf1pi9ra8ikdp7r8qnj3llg96xjak60biw266sbbd";
};
meta.homepage = "https://github.com/tzachar/cmp-fuzzy-path/";
};
@@ -1314,12 +1314,12 @@ final: prev:
cmp-look = buildVimPluginFrom2Nix {
pname = "cmp-look";
- version = "2022-03-21";
+ version = "2022-06-26";
src = fetchFromGitHub {
owner = "octaltree";
repo = "cmp-look";
- rev = "58dd22adc34d21f95b93407719aa8a894c52c235";
- sha256 = "107nvm4xgd3bhz0sqxx4bj19xjli4c52r6jyajw50bv0my2afihq";
+ rev = "b39c50bcdf6199dddda56adc466c2bd9c951a960";
+ sha256 = "10526mczd6l68zikd78qs2hlxbhaz7x3v9z1y83palx3aby0ihvq";
};
meta.homepage = "https://github.com/octaltree/cmp-look/";
};
@@ -1458,12 +1458,12 @@ final: prev:
cmp-path = buildVimPluginFrom2Nix {
pname = "cmp-path";
- version = "2022-02-02";
+ version = "2022-06-29";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "cmp-path";
- rev = "466b6b8270f7ba89abd59f402c73f63c7331ff6e";
- sha256 = "15ksxnwxssv1yr1ss66mbl5w0layq0f4baisd9ki192alnkd7365";
+ rev = "981baf9525257ac3269e1b6701e376d6fbff6921";
+ sha256 = "14i80iajwnjnnb6c5cmrhcvjdy1p8zvy0hn4gr7qm5pivfh88n74";
};
meta.homepage = "https://github.com/hrsh7th/cmp-path/";
};
@@ -1506,12 +1506,12 @@ final: prev:
cmp-tabnine = buildVimPluginFrom2Nix {
pname = "cmp-tabnine";
- version = "2022-06-06";
+ version = "2022-06-25";
src = fetchFromGitHub {
owner = "tzachar";
repo = "cmp-tabnine";
- rev = "e23d32a76304496aade4e4b285751a6a8b505491";
- sha256 = "0dir6h437wszhsmgq0xv1n6y88wsmqs2gvw35l3259xmm4z8ssna";
+ rev = "a5081776185e3c7f406e7fc3dd5f0a0ae0288e59";
+ sha256 = "0sccxvdsgy8n57cs6h8mh5inhgl4x6r7pqpp29ms88f4wz5z15p2";
};
meta.homepage = "https://github.com/tzachar/cmp-tabnine/";
};
@@ -1650,12 +1650,12 @@ final: prev:
coc-lua = buildVimPluginFrom2Nix {
pname = "coc-lua";
- version = "2022-06-16";
+ version = "2022-07-02";
src = fetchFromGitHub {
owner = "josa42";
repo = "coc-lua";
- rev = "e956ff8a94bc73f5a315f0b103b7202fccedd848";
- sha256 = "0s7jq8xfvb8g24gpzc3s9wcy91l2fs1hl8h7kz79r4mljmqppzs8";
+ rev = "48a8755e6432b8eb6447e4d51d3a9c8c13fdf33a";
+ sha256 = "04mbrl0fars2mcy7ihwdvcb59a136yqm11pczy7r77gbzjm50agq";
};
meta.homepage = "https://github.com/josa42/coc-lua/";
};
@@ -1795,12 +1795,12 @@ final: prev:
comment-nvim = buildVimPluginFrom2Nix {
pname = "comment.nvim";
- version = "2022-06-15";
+ version = "2022-06-29";
src = fetchFromGitHub {
owner = "numtostr";
repo = "comment.nvim";
- rev = "2c26a00f32b190390b664e56e32fd5347613b9e2";
- sha256 = "1ii8vjmi73i7vq9w3g13b5m0g5z0sivivkr4mav831yq7qbxvgm2";
+ rev = "4086630ce2aaf76b2652516ee3169f0b558f6be1";
+ sha256 = "0pzjvwfbd9zlzvwf5k4nrfl64vlrwhahks0nkqjmwqijqyrrbl1q";
};
meta.homepage = "https://github.com/numtostr/comment.nvim/";
};
@@ -1939,12 +1939,12 @@ final: prev:
conjure = buildVimPluginFrom2Nix {
pname = "conjure";
- version = "2022-05-28";
+ version = "2022-07-02";
src = fetchFromGitHub {
owner = "Olical";
repo = "conjure";
- rev = "d88a3c8f911b92db5bf34b3b0e7a9e10692bafcb";
- sha256 = "17rw8zlv4pq2cswfmicrd7fwrh9yb7j4jrazzkns30zk9m09vri4";
+ rev = "2e7f449d06753f2996e186954e96afc60edd5862";
+ sha256 = "0p2c1dcircd30gmln6rx83x8xs1fxfx9fdnc4bvry8wri0yjypb5";
};
meta.homepage = "https://github.com/Olical/conjure/";
};
@@ -1975,24 +1975,24 @@ final: prev:
coq-artifacts = buildVimPluginFrom2Nix {
pname = "coq.artifacts";
- version = "2022-06-21";
+ version = "2022-07-02";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq.artifacts";
- rev = "78d1c7e607ee8aa417c989f1c811ac73ee5dab9c";
- sha256 = "128ajrr8zj3mpimvapn0i1g34sp42wammh83gkhvf8xrfrwbd1l1";
+ rev = "d88505eae803d35851d6259b4da48eccc96867ce";
+ sha256 = "1lfccvjgcxqz84i0h4ll0mi7s6sdakc1kdv3gvjgrra7mz2i6b6a";
};
meta.homepage = "https://github.com/ms-jpq/coq.artifacts/";
};
coq-thirdparty = buildVimPluginFrom2Nix {
pname = "coq.thirdparty";
- version = "2022-06-21";
+ version = "2022-07-02";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq.thirdparty";
- rev = "3c17b7a8806e809e1707774cf56a459dc914e309";
- sha256 = "136lizq5hvvq99n23gjsjnhv8q3kkjx70axasva49abpjnbpaxms";
+ rev = "1cb8859284beb6d281ed8db18f34453afa15894a";
+ sha256 = "08dnz5w0gca4hx89cni7qdi09gqc41mb166vgc73zxq159gahlmc";
};
meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/";
};
@@ -2011,12 +2011,12 @@ final: prev:
coq_nvim = buildVimPluginFrom2Nix {
pname = "coq_nvim";
- version = "2022-06-21";
+ version = "2022-07-02";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq_nvim";
- rev = "83a03e23da4bc52b8cf2fa13bcace18c192a32f8";
- sha256 = "0dz24pk9dr4wmm58iyvhr3iwcbv6pvwc04s3gmp26hzds37phws2";
+ rev = "2f0c723b619c481bf5777b06a086cb6104d8ba67";
+ sha256 = "0m98w1dj8ir82m42xllk8yp231l7ycm57k5xbdh35l2x3p720q3d";
};
meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
};
@@ -2047,12 +2047,12 @@ final: prev:
crates-nvim = buildVimPluginFrom2Nix {
pname = "crates.nvim";
- version = "2022-05-30";
+ version = "2022-06-27";
src = fetchFromGitHub {
owner = "saecki";
repo = "crates.nvim";
- rev = "cceea1a4f2d0131f43b6d17ad5c793aded19443b";
- sha256 = "1hx53p8zgpaa6ql9z50gfcjlspsdd3p2hz1yak9r5qp9j94fk1as";
+ rev = "eb34985d420d8f5dffc1de8c428772e73d95ecee";
+ sha256 = "0m32565wz3643kad8j7sz04rzlw5p4p4sp8s8l6x9qfin7928y5x";
};
meta.homepage = "https://github.com/saecki/crates.nvim/";
};
@@ -2155,12 +2155,12 @@ final: prev:
dashboard-nvim = buildVimPluginFrom2Nix {
pname = "dashboard-nvim";
- version = "2022-06-20";
+ version = "2022-06-28";
src = fetchFromGitHub {
owner = "glepnir";
repo = "dashboard-nvim";
- rev = "6f5cb262141f41d4c603cc987cdb64bf1ea3b216";
- sha256 = "12lv8kwlb6bmk4bbp6vnym4w6ivasp3k9xgyhcm752wbf56zgzqy";
+ rev = "88a6077812b1f54819a941d824896f3a75fe5ce4";
+ sha256 = "1v4x5rhjs766j33wz20ws94fc4qii299jw377mpbswkbzjxvf6j6";
};
meta.homepage = "https://github.com/glepnir/dashboard-nvim/";
};
@@ -2373,12 +2373,12 @@ final: prev:
deoplete-lsp = buildVimPluginFrom2Nix {
pname = "deoplete-lsp";
- version = "2022-03-12";
+ version = "2022-06-30";
src = fetchFromGitHub {
owner = "deoplete-plugins";
repo = "deoplete-lsp";
- rev = "c466c955e85d995984a8135e16da71463712e5e5";
- sha256 = "0s14m5k1vw5pfgi9wc9jhvwfwv57hdcrji24vspid8yjzgfjf5yd";
+ rev = "21a873f2d84e5316108ac1b3ebd766f8fc99f18f";
+ sha256 = "0ps6dhl4wxx25xrww2zhxd1xygpkwcps5id2izwdzv8zam1xwvnk";
};
meta.homepage = "https://github.com/deoplete-plugins/deoplete-lsp/";
};
@@ -2529,12 +2529,12 @@ final: prev:
diffview-nvim = buildVimPluginFrom2Nix {
pname = "diffview.nvim";
- version = "2022-06-21";
+ version = "2022-06-25";
src = fetchFromGitHub {
owner = "sindrets";
repo = "diffview.nvim";
- rev = "2e77bedfe11f52621fad1d8c20ffbddd8e36d137";
- sha256 = "0661163vkaqnsy49ha0vgx0wjy71zwi14j80q58mfgvmacc31zj9";
+ rev = "a1ab9602ee1d4c78e81bc6032edca6df480aa296";
+ sha256 = "11cqcd0jgqxbqqygx1grgwmwx3xpvvr9zb2s9ivmx24hmj8d6gwc";
};
meta.homepage = "https://github.com/sindrets/diffview.nvim/";
};
@@ -2553,12 +2553,12 @@ final: prev:
doki-theme-vim = buildVimPluginFrom2Nix {
pname = "doki-theme-vim";
- version = "2022-06-05";
+ version = "2022-06-27";
src = fetchFromGitHub {
owner = "doki-theme";
repo = "doki-theme-vim";
- rev = "6f7f48527a2615809b0677d8370faf6dd2244d57";
- sha256 = "1h5yzjpdg67612rwpryz9ck0fn8d16kd6jn2vjnb6hyygqn8gdb2";
+ rev = "da277b3a52c7c2de42c30ed09ce1987ba2105499";
+ sha256 = "11z064q6bc9rcpf66dwshz1ak0y98d5jq609cm4jdwg3c6gdahm6";
};
meta.homepage = "https://github.com/doki-theme/doki-theme-vim/";
};
@@ -2589,12 +2589,12 @@ final: prev:
edge = buildVimPluginFrom2Nix {
pname = "edge";
- version = "2022-06-12";
+ version = "2022-06-29";
src = fetchFromGitHub {
owner = "sainnhe";
repo = "edge";
- rev = "91ce1f39311ad74c1e3bcad1e78efcd4fa3bceaa";
- sha256 = "0gjqyvp8xfndgh6yljgm1cfvkgcayjxh07ljq14yijhmg86q00x2";
+ rev = "b5f94a1edb63956d3897f60d67d33a64f5f018ae";
+ sha256 = "1yzpjzhiqa8mn57wy9ami9v9p0lpydlgp85r58adrbfd0fplr5qw";
};
meta.homepage = "https://github.com/sainnhe/edge/";
};
@@ -2614,12 +2614,12 @@ final: prev:
editorconfig-nvim = buildVimPluginFrom2Nix {
pname = "editorconfig.nvim";
- version = "2022-06-06";
+ version = "2022-06-30";
src = fetchFromGitHub {
owner = "gpanders";
repo = "editorconfig.nvim";
- rev = "73ee7090373c279bb49ae9d87a0cd217c4010701";
- sha256 = "1y5gqqj03ch6f8kcwfdbbj2bcaz9c4kxdyphfpfzsicmw989gqmb";
+ rev = "b96a75a470e5c26caf4e57c594e85ee5d0dc7bf1";
+ sha256 = "0xbb0d4m1m8a406kpia71bnnjkk5w5yfp8ra1s8jj66c3j1hp3d7";
};
meta.homepage = "https://github.com/gpanders/editorconfig.nvim/";
};
@@ -2675,12 +2675,12 @@ final: prev:
everforest = buildVimPluginFrom2Nix {
pname = "everforest";
- version = "2022-06-12";
+ version = "2022-06-29";
src = fetchFromGitHub {
owner = "sainnhe";
repo = "everforest";
- rev = "65ea4a8325d5d4f09bb76ddec7f2148314067eee";
- sha256 = "1ma7iq103k4gij070wi0wa2s9c92vxrg0nkmslryvc2l8rwqc4id";
+ rev = "933f827d75620b4f65c53a671f4178dd92d27cbd";
+ sha256 = "0a0sglmkz773f9qlzn8ppzl06088w0083scqkgrf5926qi17vbf6";
};
meta.homepage = "https://github.com/sainnhe/everforest/";
};
@@ -2856,24 +2856,24 @@ final: prev:
flutter-tools-nvim = buildVimPluginFrom2Nix {
pname = "flutter-tools.nvim";
- version = "2022-06-21";
+ version = "2022-06-26";
src = fetchFromGitHub {
owner = "akinsho";
repo = "flutter-tools.nvim";
- rev = "b17546f502c23447f462340ee126b1ce0023e943";
- sha256 = "1y8xgdflp0gpq97an6ichf5sl8w75hq363x697z3fdryfsa1ldfq";
+ rev = "6b13345dd7ffe3b0a08536b8fadfa288af137616";
+ sha256 = "15nz011qqkbkphkk7vky2mgxxbgr07ffqr33sn9w5xkgg0nb55ll";
};
meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/";
};
formatter-nvim = buildVimPluginFrom2Nix {
pname = "formatter.nvim";
- version = "2022-05-16";
+ version = "2022-06-29";
src = fetchFromGitHub {
owner = "mhartington";
repo = "formatter.nvim";
- rev = "028cba8fab292be956344ca853e92824295ed182";
- sha256 = "0aq3d06rcxp13pbaw4cs8s973rk2kzjk4nxaacnla0akm7vz0ba8";
+ rev = "27ea7a8cf689e0b5dd742bada416c00f64450360";
+ sha256 = "1dw240wxrqm8i3mijb5bynsy2gfr360x8jwf8nyra7sr4gdd2pcj";
};
meta.homepage = "https://github.com/mhartington/formatter.nvim/";
};
@@ -2892,12 +2892,12 @@ final: prev:
friendly-snippets = buildVimPluginFrom2Nix {
pname = "friendly-snippets";
- version = "2022-06-09";
+ version = "2022-07-02";
src = fetchFromGitHub {
owner = "rafamadriz";
repo = "friendly-snippets";
- rev = "d27a83a363e61009278b6598703a763ce9c8e617";
- sha256 = "1l1swsdn601dbmmpp5fz5r0aqr2bq9fmhmrx33dfph946x3flafs";
+ rev = "688691050074f39e6ec987321738494e08ba562e";
+ sha256 = "0bc22z4iml7v1myj92c6rbpnzwl43s98fsalxhsh3fkqk46qq9y4";
};
meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
};
@@ -2916,12 +2916,12 @@ final: prev:
fugitive-gitlab-vim = buildVimPluginFrom2Nix {
pname = "fugitive-gitlab.vim";
- version = "2021-09-20";
+ version = "2022-07-02";
src = fetchFromGitHub {
owner = "shumphrey";
repo = "fugitive-gitlab.vim";
- rev = "85d4e16e03b05964560514afe53bc74f9d445b02";
- sha256 = "1zvn4rz765yjxyhv71dxly9lzdp9r94762jprff0srpnsyjiypz2";
+ rev = "b73a8e97de95d26280082abb7f51465a3d3b239e";
+ sha256 = "1iimamr8b5vv988x6zz5hv508md485i48vclahrm5y3m41pi7g5a";
};
meta.homepage = "https://github.com/shumphrey/fugitive-gitlab.vim/";
};
@@ -3000,24 +3000,24 @@ final: prev:
fzf-lua = buildVimPluginFrom2Nix {
pname = "fzf-lua";
- version = "2022-06-19";
+ version = "2022-07-01";
src = fetchFromGitHub {
owner = "ibhagwan";
repo = "fzf-lua";
- rev = "6a4392564b818061731c6a39fcc116ff9fc97dd0";
- sha256 = "02pidn8w9gkglmsmjqy8lp8wq0s91rxpj96bgpwq6f09hci8mazg";
+ rev = "786d06bc51de2dba9ccf5b80571ad03c65080f80";
+ sha256 = "07nv0cjk4h0m0i1p4qhd0cwxlxbrxp55gw8gkpny8clqaj7ii9g9";
};
meta.homepage = "https://github.com/ibhagwan/fzf-lua/";
};
fzf-vim = buildVimPluginFrom2Nix {
pname = "fzf.vim";
- version = "2022-04-07";
+ version = "2022-06-28";
src = fetchFromGitHub {
owner = "junegunn";
repo = "fzf.vim";
- rev = "d5f1f8641b24c0fd5b10a299824362a2a1b20ae0";
- sha256 = "19yidjybsp41yj1yvdq5b01yph7sbd976bfq476hh7920ij6zqh2";
+ rev = "c311c0a95fc2529c26ab36a8f530e9dd4426304c";
+ sha256 = "12mxrvvvq6dkka0dp1kipmf6dncl0mx4169amkwxk62a18a894q2";
};
meta.homepage = "https://github.com/junegunn/fzf.vim/";
};
@@ -3144,24 +3144,24 @@ final: prev:
gitlinker-nvim = buildVimPluginFrom2Nix {
pname = "gitlinker.nvim";
- version = "2022-01-29";
+ version = "2022-06-28";
src = fetchFromGitHub {
owner = "ruifm";
repo = "gitlinker.nvim";
- rev = "ff33d07bb64e104b387fff7d91650a35274f81ea";
- sha256 = "1sxhcbww0f780lp0zda1iaiyp89c6cirs0ncihjxr106a47zpya4";
+ rev = "782e98dd1f8f2c97186b13b5c59a472b585a4504";
+ sha256 = "10fwbq6pwcxlvg2xlp1qd5k4miri0d4a2f7q1a26bc41pcw8s22n";
};
meta.homepage = "https://github.com/ruifm/gitlinker.nvim/";
};
gitsigns-nvim = buildNeovimPluginFrom2Nix {
pname = "gitsigns.nvim";
- version = "2022-06-20";
+ version = "2022-06-23";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
- rev = "3543443eb3856fbe4a9d70f3fe8dc73e007199a1";
- sha256 = "00mrf5qwbzgh280lq2lc7xgqmgh8g18j2f46796lbwpcb4ciawh4";
+ rev = "4883988cf8b623f63cc8c7d3f11b18b7e81f06ff";
+ sha256 = "1ljqm90vmam9zisq4z8js4z1nqg3ybmib1y3x0s6g6b2kyyfy1dv";
};
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
};
@@ -3204,12 +3204,12 @@ final: prev:
golden-ratio = buildVimPluginFrom2Nix {
pname = "golden-ratio";
- version = "2022-04-21";
+ version = "2022-06-28";
src = fetchFromGitHub {
owner = "roman";
repo = "golden-ratio";
- rev = "7df80253680e4755b82955425da31d8c1f8e23b6";
- sha256 = "0ds2slbg03b8dcgvi1svyn391mr2zaabb4x80wrmyxkrnfzr1rsq";
+ rev = "636b8a1ea6bfe18296e61a8ac271b0101cb2ad3b";
+ sha256 = "0fqczgbfqxbchmp4kqs6n0d1pvhgkx7aw3y9fb9fmy31dqc9fi6b";
};
meta.homepage = "https://github.com/roman/golden-ratio/";
};
@@ -3228,12 +3228,12 @@ final: prev:
goto-preview = buildVimPluginFrom2Nix {
pname = "goto-preview";
- version = "2022-06-03";
+ version = "2022-06-30";
src = fetchFromGitHub {
owner = "rmagatti";
repo = "goto-preview";
- rev = "37116fb5167d2a93cada8db9135c5032a25348a7";
- sha256 = "0mrayyzc4z70rr9c66iwpdqk475pbmgvqanq5nakx1a19blqkkzj";
+ rev = "99407d8e63305a5c68627cee156ca3991a75fd19";
+ sha256 = "12izx7nl094ydi0bdxb4bh4w83gg36jrl024givqqh74i659p2am";
};
meta.homepage = "https://github.com/rmagatti/goto-preview/";
};
@@ -3300,24 +3300,24 @@ final: prev:
gruvbox-material = buildVimPluginFrom2Nix {
pname = "gruvbox-material";
- version = "2022-06-12";
+ version = "2022-06-29";
src = fetchFromGitHub {
owner = "sainnhe";
repo = "gruvbox-material";
- rev = "5d2cec690bfa56b863a7b9d482152d873da7ba7a";
- sha256 = "0rhhxmpjml0w9rmvph1wn70yrybnai4w71x35gn8ig6dn446q4wb";
+ rev = "14310c87ba290f74eaae7d221255298f482a9672";
+ sha256 = "1ly97qjggwiwpkm9nxlbyw3ahjz7cxa44hkm3pcpq9rabsz7im5n";
};
meta.homepage = "https://github.com/sainnhe/gruvbox-material/";
};
gruvbox-nvim = buildVimPluginFrom2Nix {
pname = "gruvbox.nvim";
- version = "2022-06-19";
+ version = "2022-06-30";
src = fetchFromGitHub {
owner = "ellisonleao";
repo = "gruvbox.nvim";
- rev = "3352c12c083d0ab6285a9738b7679e24e7602411";
- sha256 = "044dvp03yw5r745qbs6kp2lni1psfn63807dsd6fw8k2z6m6sbx3";
+ rev = "79419f9313192d238c58feccac887dacb4db9276";
+ sha256 = "0a2rxbb8s77qdhjii8q8716ll4mi2zb8qciz1jngmih0k3a4p83k";
};
meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/";
};
@@ -3432,12 +3432,12 @@ final: prev:
hop-nvim = buildVimPluginFrom2Nix {
pname = "hop.nvim";
- version = "2022-06-21";
+ version = "2022-07-01";
src = fetchFromGitHub {
owner = "phaazon";
repo = "hop.nvim";
- rev = "a3cf6684bcb9fc974609ae81424f285f05280d90";
- sha256 = "0inrri38bkxsi936z2xa8n9lvzm9b7vl2wajyp8i6wr4byhprml3";
+ rev = "86e03769392f824ed8ed08de5b6afe6acc7fbdb3";
+ sha256 = "0rx41cdrsbwh4p96ylb5agmjd9a3ry8jvl380schij89sdsbms16";
};
meta.homepage = "https://github.com/phaazon/hop.nvim/";
};
@@ -3552,12 +3552,12 @@ final: prev:
indent-blankline-nvim = buildVimPluginFrom2Nix {
pname = "indent-blankline.nvim";
- version = "2022-05-24";
+ version = "2022-06-29";
src = fetchFromGitHub {
owner = "lukas-reineke";
repo = "indent-blankline.nvim";
- rev = "6177a59552e35dfb69e1493fd68194e673dc3ee2";
- sha256 = "1bsyzbcj9jmpx6sl6mf2f5k1a60lhgq7vmsrpqab2wc0vm4v8kap";
+ rev = "4a58fe6e9854ccfe6c6b0f59abb7cb8301e23025";
+ sha256 = "1wppsqpi5h0qb1vhxryjw0sn0g8yhkpald47cwnr5r3ix5w99wfa";
};
meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/";
};
@@ -3733,12 +3733,12 @@ final: prev:
kanagawa-nvim = buildVimPluginFrom2Nix {
pname = "kanagawa.nvim";
- version = "2022-06-11";
+ version = "2022-07-01";
src = fetchFromGitHub {
owner = "rebelot";
repo = "kanagawa.nvim";
- rev = "76df2251e813fdec244b2b593be62accea930119";
- sha256 = "0cnrnf44gm51jpmkf8kx9zfk6qxcg7725aav31n2w81zm1rr8d2s";
+ rev = "dd13260478149f787753b72689076b34c6a4ded9";
+ sha256 = "15f816yq0igh6lgf3zrp7sk1drxsa88lhpg0pk41f5369yjvf09r";
};
meta.homepage = "https://github.com/rebelot/kanagawa.nvim/";
};
@@ -3757,12 +3757,12 @@ final: prev:
kotlin-vim = buildVimPluginFrom2Nix {
pname = "kotlin-vim";
- version = "2021-11-08";
+ version = "2022-06-27";
src = fetchFromGitHub {
owner = "udalov";
repo = "kotlin-vim";
- rev = "6fec676fe552cb30165dc8977dab9353c4c3ab26";
- sha256 = "08sz0fmlk4bzzkg5j0zbjd1dki1ykigar4rzyc05xfynvkcxh4fg";
+ rev = "1261f851e5fb2192b3a5e1691650597c71dfce2f";
+ sha256 = "0ly58dcxgwyfv5wdbi5i4g187zv6gw3bzxck0402jwadvxnq7x6d";
};
meta.homepage = "https://github.com/udalov/kotlin-vim/";
};
@@ -3817,12 +3817,12 @@ final: prev:
lean-nvim = buildVimPluginFrom2Nix {
pname = "lean.nvim";
- version = "2022-06-20";
+ version = "2022-07-01";
src = fetchFromGitHub {
owner = "Julian";
repo = "lean.nvim";
- rev = "9abfeae95ae8f51a21e384b97e006f139aeb4333";
- sha256 = "0lcxjr3n5g55i5brw0skvy9m1kp64wggah5j97mcl0r9x4h508lv";
+ rev = "ac7eeddcd0ed45d9f18611107df076e494c3fa39";
+ sha256 = "0w8zwsc85chfmpkx1j6cixlmd870f94dnkmbp29j79chzwwhwi5d";
};
meta.homepage = "https://github.com/Julian/lean.nvim/";
};
@@ -3925,12 +3925,12 @@ final: prev:
lightline-bufferline = buildVimPluginFrom2Nix {
pname = "lightline-bufferline";
- version = "2022-04-28";
+ version = "2022-06-24";
src = fetchFromGitHub {
owner = "mengelbrecht";
repo = "lightline-bufferline";
- rev = "fda87ff20e3b9c6a058cfbb6ca3c1f25877f4cab";
- sha256 = "0apd1fm59plqhnc65zs5ayx2sijlhbcsrci2s674nr4w4w5rhvsj";
+ rev = "3a8a4efba81f6c65b94510e93160e0e4061bf03d";
+ sha256 = "0h6g99092cnkcnvx65gzppf68p9x0gxy6rp4gf077ci9xc010kyl";
};
meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/";
};
@@ -3973,12 +3973,12 @@ final: prev:
lightspeed-nvim = buildVimPluginFrom2Nix {
pname = "lightspeed.nvim";
- version = "2022-06-17";
+ version = "2022-06-22";
src = fetchFromGitHub {
owner = "ggandor";
repo = "lightspeed.nvim";
- rev = "8fb5ebb2c18db13bc17556376526068dce0803b5";
- sha256 = "1mrj4x0bd68qp2g4hsmxnqr1dfv5d7c2kajkir8q78pq2csdci8j";
+ rev = "79519bfae95741bc99872582ef0f268fd842115b";
+ sha256 = "043ldfhd7b5c3f016rsf9hy9ha27w97d7cmbw8klvddpxg6kxyvs";
};
meta.homepage = "https://github.com/ggandor/lightspeed.nvim/";
};
@@ -4129,35 +4129,35 @@ final: prev:
lsp_lines-nvim = buildVimPluginFrom2Nix {
pname = "lsp_lines.nvim";
- version = "2022-01-14";
+ version = "2022-06-29";
src = fetchgit {
url = "https://git.sr.ht/~whynothugo/lsp_lines.nvim";
- rev = "6267f4234b559f756ec22dade7e8d50eb7325135";
- sha256 = "02gzhvhsd76jx09fnqf0i67k79zygikkplhj25p36qcc0rgw1abf";
+ rev = "ec98ce50102a843f34d4895d5af0e60f8cc1d83f";
+ sha256 = "12i9v3vnbl0djx43y46xli3f5nbf2yly4c7d0mcq8682yxfq149b";
};
meta.homepage = "https://git.sr.ht/~whynothugo/lsp_lines.nvim";
};
lsp_signature-nvim = buildVimPluginFrom2Nix {
pname = "lsp_signature.nvim";
- version = "2022-06-21";
+ version = "2022-06-29";
src = fetchFromGitHub {
owner = "ray-x";
repo = "lsp_signature.nvim";
- rev = "49837977e210959c552bf357dc40ce18fadca501";
- sha256 = "07rywxx31wqxnw8i4irl2mq8di5dwj12bv0vqwi80vxhpvjqn1jk";
+ rev = "6c65bc81dd041e7f4e49662bb8fb54cacc66efad";
+ sha256 = "1hzf83wf86lb762xb8g4ygvnr68h87504cv9cfnwnb4hqbb386im";
};
meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";
};
lspcontainers-nvim = buildVimPluginFrom2Nix {
pname = "lspcontainers.nvim";
- version = "2022-06-17";
+ version = "2022-06-25";
src = fetchFromGitHub {
owner = "lspcontainers";
repo = "lspcontainers.nvim";
- rev = "ed5ee65f7c71a7963b18cfd1644134f1a65b3d4b";
- sha256 = "01sh8jawp8k73l17zvs374pmciyjqqgll89bb228jls9vhqvwkdr";
+ rev = "ea430ff6e155dc26f971573eb21422d77cf9d8f0";
+ sha256 = "0rv3prk475f8hzhmf888j7kyvc37pmhi3w4xmgmpqqj486jplz39";
};
meta.homepage = "https://github.com/lspcontainers/lspcontainers.nvim/";
};
@@ -4224,12 +4224,12 @@ final: prev:
luasnip = buildVimPluginFrom2Nix {
pname = "luasnip";
- version = "2022-06-20";
+ version = "2022-07-02";
src = fetchFromGitHub {
owner = "l3mon4d3";
repo = "luasnip";
- rev = "a12441e0598e93e67235eba67c8e6fbffc896f06";
- sha256 = "055y9bm8npn8n1xysk83l7ghf0760f8037jm32zf9fc8zk1ki98d";
+ rev = "295cc9e422060b3200234b42cbee6dde1dfee765";
+ sha256 = "1cpqq5miskc87az6ckcgbcpi8acb6hvj57mp7kfddq6s4414svz5";
};
meta.homepage = "https://github.com/l3mon4d3/luasnip/";
};
@@ -4248,12 +4248,12 @@ final: prev:
lush-nvim = buildVimPluginFrom2Nix {
pname = "lush.nvim";
- version = "2022-06-16";
+ version = "2022-06-25";
src = fetchFromGitHub {
owner = "rktjmp";
repo = "lush.nvim";
- rev = "6923ccef17c5276bc5d3cca907082e19ee165d55";
- sha256 = "0jyq8dszbncrqfbsajbwb3j59jj8gyngi2nmz0hg902kaif4cjib";
+ rev = "c3d90d9cac74442069247505a538873b772550cb";
+ sha256 = "1kz9y4dvq6g3yg03bvv51vmq1dyyh4f403iawfxz1bdg8bv1ia3x";
};
meta.homepage = "https://github.com/rktjmp/lush.nvim/";
};
@@ -4308,12 +4308,12 @@ final: prev:
material-nvim = buildVimPluginFrom2Nix {
pname = "material.nvim";
- version = "2022-06-17";
+ version = "2022-06-28";
src = fetchFromGitHub {
owner = "marko-cerovac";
repo = "material.nvim";
- rev = "33d764439816ad80ded0f60b4bd8c038c9f96f43";
- sha256 = "154hhvh44408m8n7vy9js7xakqv62qh0m8ffnvb65w63k1fjmwhs";
+ rev = "5417c7ebd5cff06045172f5ea5666cb67b07ca76";
+ sha256 = "1plf17p72spx8sfgprw114mzdp32b07v9j1yjfjy33f5kmwka6k7";
};
meta.homepage = "https://github.com/marko-cerovac/material.nvim/";
};
@@ -4332,12 +4332,12 @@ final: prev:
mini-nvim = buildVimPluginFrom2Nix {
pname = "mini.nvim";
- version = "2022-06-14";
+ version = "2022-07-02";
src = fetchFromGitHub {
owner = "echasnovski";
repo = "mini.nvim";
- rev = "cc8fb168b95620ec1611916a6d2a74e6a5cdcbdb";
- sha256 = "1v7j8s19r20ljlyha9d10vpaarxlqsfn6ns4qc2p3z2ihbcaapq5";
+ rev = "1ec280c1d000813a268b16028d040824285a043f";
+ sha256 = "0anafgqcrdg6ryb47aa3w3k8liw906dk601xgfnsvg46g2yss37p";
};
meta.homepage = "https://github.com/echasnovski/mini.nvim/";
};
@@ -4380,12 +4380,12 @@ final: prev:
mkdx = buildVimPluginFrom2Nix {
pname = "mkdx";
- version = "2022-04-29";
+ version = "2022-06-24";
src = fetchFromGitHub {
owner = "SidOfc";
repo = "mkdx";
- rev = "d8e29b48f959aef96df2cb2ff5875ee02970f2a7";
- sha256 = "0rv2x96l5gcbj969ki6y1c0l468sibjcph5rqzavv6naizmwi8ql";
+ rev = "1717c7a5e90d6485386b5d239d55a7a775ce8dfb";
+ sha256 = "1ljh3hp1salkk3qmisykm5yy8dc9349r7aj631z8agqvr2hngiak";
};
meta.homepage = "https://github.com/SidOfc/mkdx/";
};
@@ -4680,24 +4680,24 @@ final: prev:
neoformat = buildVimPluginFrom2Nix {
pname = "neoformat";
- version = "2022-06-02";
+ version = "2022-06-30";
src = fetchFromGitHub {
owner = "sbdchd";
repo = "neoformat";
- rev = "e8ce68ba5b57df18b54b96adb80ad533c7a2eb3d";
- sha256 = "09ylazsa933dqhx0x9qc4v2ackqvr22dpzbgyhkvqfs476fj5pn4";
+ rev = "c94f230943d9559056bb1157ccda27fb6ac1b649";
+ sha256 = "1i0hxjqiqj3s5lni2sz7dmg7srrcvh4ncp7gkml93drz3nj9hyfv";
};
meta.homepage = "https://github.com/sbdchd/neoformat/";
};
neogit = buildVimPluginFrom2Nix {
pname = "neogit";
- version = "2022-06-16";
+ version = "2022-07-01";
src = fetchFromGitHub {
owner = "TimUntersberger";
repo = "neogit";
- rev = "2b33d2edba011799c496a2dc7c77ebbe1b3c5b76";
- sha256 = "10si9k7ybf1spw5jf8iizisx5xivzljk12ixarjrx359d9nzbi46";
+ rev = "585251902917f33b3574f2bc7670f68543bd3481";
+ sha256 = "14fpqhh98kq4fh2sf4rvns8ffrk9zx44k8p5d6z9l39jygwl8xy1";
};
meta.homepage = "https://github.com/TimUntersberger/neogit/";
};
@@ -4752,12 +4752,12 @@ final: prev:
neorg = buildVimPluginFrom2Nix {
pname = "neorg";
- version = "2022-06-20";
+ version = "2022-06-25";
src = fetchFromGitHub {
owner = "nvim-neorg";
repo = "neorg";
- rev = "efc10f915ec53bbc8179ae591397b61aecf8f393";
- sha256 = "0cdrpmlx9riz1gkpgfnnk1hry19l2iggdkmf6c1zsdmbjs56c45s";
+ rev = "b66bbbf6c951410c91720ab707dc31214c100b82";
+ sha256 = "185db1nqx9kzh7xsqjni002dd0c4qzagq6k82b0w5ccg4n850qw9";
};
meta.homepage = "https://github.com/nvim-neorg/neorg/";
};
@@ -4812,12 +4812,12 @@ final: prev:
neovim-ayu = buildVimPluginFrom2Nix {
pname = "neovim-ayu";
- version = "2022-06-19";
+ version = "2022-06-29";
src = fetchFromGitHub {
owner = "Shatur";
repo = "neovim-ayu";
- rev = "ad1e6b8cc25062ee426cd8690d28f82cfe840f58";
- sha256 = "1khn5kvmjh42i17hsvjs03bz4523kvshdw2mwa5g4jn7292lf4z8";
+ rev = "596caf119426b2d88ced6b41904611e025d54045";
+ sha256 = "07jkxjjp7nn44574c76r17dj7svp0xj8k69z2m9yq0ihcsdfnjaf";
};
meta.homepage = "https://github.com/Shatur/neovim-ayu/";
};
@@ -4932,12 +4932,12 @@ final: prev:
nightfox-nvim = buildVimPluginFrom2Nix {
pname = "nightfox.nvim";
- version = "2022-06-08";
+ version = "2022-07-01";
src = fetchFromGitHub {
owner = "EdenEast";
repo = "nightfox.nvim";
- rev = "b85c5c3a0e3b309ffa7d0a6ca33e430c91532ba0";
- sha256 = "18q8w946qy37n0zv0hj1nr2w1p1xrfyikg7s5g372d083v0rqv9f";
+ rev = "01bab5495d51500b08e80532ca0ed3c0f5c493cd";
+ sha256 = "0996y1ffh8h78yjvdbiqh9gij57n9jvcazvdbksf47qj4d7xvsza";
};
meta.homepage = "https://github.com/EdenEast/nightfox.nvim/";
};
@@ -4968,12 +4968,12 @@ final: prev:
nnn-vim = buildVimPluginFrom2Nix {
pname = "nnn.vim";
- version = "2022-01-03";
+ version = "2022-06-25";
src = fetchFromGitHub {
owner = "mcchrish";
repo = "nnn.vim";
- rev = "169951733371abd152d76d1ce65e2dd867156e2d";
- sha256 = "15prh70imjikmgnk4b161phcfqqz8jfqdq3l3nzhz80b597d6sv5";
+ rev = "bc6e2e34d9114c93ce50782949d260b4d4f0e2b6";
+ sha256 = "0qhblwqvkxnjjw4jrya6xkcbm4lv8fjajmrasl76mn19mh14dgv5";
};
meta.homepage = "https://github.com/mcchrish/nnn.vim/";
};
@@ -5028,24 +5028,24 @@ final: prev:
nui-nvim = buildVimPluginFrom2Nix {
pname = "nui.nvim";
- version = "2022-06-20";
+ version = "2022-07-02";
src = fetchFromGitHub {
owner = "MunifTanjim";
repo = "nui.nvim";
- rev = "0f590b762416bcf2c93621f77a21aa8b8e23d7d1";
- sha256 = "16z5fqw606ngkbvscw2cpxwm3lki5igqkslyc0hxdagnwiqm1p7p";
+ rev = "acb7287c4a07efbc48bb8b6e6a2cc0baa872d35c";
+ sha256 = "1xnaxk0blpika1v3cmr84n0gs24q3gmy72r824yr3sjgiqf2q4xl";
};
meta.homepage = "https://github.com/MunifTanjim/nui.nvim/";
};
null-ls-nvim = buildVimPluginFrom2Nix {
pname = "null-ls.nvim";
- version = "2022-06-13";
+ version = "2022-06-28";
src = fetchFromGitHub {
owner = "jose-elias-alvarez";
repo = "null-ls.nvim";
- rev = "ff40739e5be6581899b43385997e39eecdbf9465";
- sha256 = "1snnh6fsn89fx7l5bjbfg1kh3cbadg2qg1rin889f4xka1yqa4x6";
+ rev = "a2b7bf89663c78d58a5494efbb791819a24bb025";
+ sha256 = "1vmkvllfkf6l5lpcdpaxlx15wrkmm03122a5qymmfcbw863m6p13";
};
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
};
@@ -5100,36 +5100,36 @@ final: prev:
nvim-base16 = buildVimPluginFrom2Nix {
pname = "nvim-base16";
- version = "2022-05-27";
+ version = "2022-06-29";
src = fetchFromGitHub {
owner = "RRethy";
repo = "nvim-base16";
- rev = "d8c6c19d87b2d8489bb4bbc532c5036c843e2fd9";
- sha256 = "1km8sgx5ckkway7hca3z3814b35z1alw72h87nwra28v3imc0i27";
+ rev = "584c63759e0341a8512ba847c7f1459809f47a16";
+ sha256 = "1szla0xfxxlg4ignjws5g5rd1jk4vbxi95fpk4pcp6xkm8a30spp";
};
meta.homepage = "https://github.com/RRethy/nvim-base16/";
};
nvim-biscuits = buildVimPluginFrom2Nix {
pname = "nvim-biscuits";
- version = "2022-05-31";
+ version = "2022-06-26";
src = fetchFromGitHub {
owner = "code-biscuits";
repo = "nvim-biscuits";
- rev = "ed33933c1b4098f11ef61c06e2db76974490044d";
- sha256 = "17pd72djkmqivdkpx9awr9irwysmgsimh9mabd4dha4kjh1ar32j";
+ rev = "75f5e457b97ac0ac11cd94f2f861eceae05b19b0";
+ sha256 = "0yhiq2ad0jlw1c252fqbxr4ghy6dndyk4gnx30kyqmirsja0dwdv";
};
meta.homepage = "https://github.com/code-biscuits/nvim-biscuits/";
};
nvim-bqf = buildVimPluginFrom2Nix {
pname = "nvim-bqf";
- version = "2022-06-20";
+ version = "2022-06-28";
src = fetchFromGitHub {
owner = "kevinhwang91";
repo = "nvim-bqf";
- rev = "d4bc26ce482bd980fb90b7171fe7dece7411b01b";
- sha256 = "05m1607rycqfwd23gr92ds5bkvcr68cjdpqxzma5wrac0cssdx6x";
+ rev = "4b0d20a019420ffc28173906e3183a39f9cc2656";
+ sha256 = "1arr5ysycysjs7gqcnpp5p8p7ylq08cds5xd7njgqzvsk0gxk8wb";
};
meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/";
};
@@ -5160,12 +5160,12 @@ final: prev:
nvim-cmp = buildVimPluginFrom2Nix {
pname = "nvim-cmp";
- version = "2022-06-15";
+ version = "2022-06-29";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "nvim-cmp";
- rev = "df6734aa018d6feb4d76ba6bda94b1aeac2b378a";
- sha256 = "0i6icap7x0p8f6i0vgrnqz2rhwc05qgsiflwndmca5dxarmxysxx";
+ rev = "9897465a7663997b7b42372164ffc3635321a2fe";
+ sha256 = "1ic1h8h1h4v5f9f76vahl7yz7smq55x59r7j5h9gdmj97n0p0fp4";
};
meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";
};
@@ -5256,36 +5256,36 @@ final: prev:
nvim-dap = buildVimPluginFrom2Nix {
pname = "nvim-dap";
- version = "2022-06-10";
+ version = "2022-06-29";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-dap";
- rev = "014ebd53612cfd42ac8c131e6cec7c194572f21d";
- sha256 = "0qp15ihgwxamnly9ng6qmf051rz6yjg86p00dz39ffy02f8fvr60";
+ rev = "f4a3be57f61893cffa1e22aa5e1e7bded495fcf2";
+ sha256 = "0s86y4x1rxkimaz76mbbxavwakmp317fzimn5gypqi36liwv81zq";
};
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
};
nvim-dap-ui = buildVimPluginFrom2Nix {
pname = "nvim-dap-ui";
- version = "2022-06-18";
+ version = "2022-07-02";
src = fetchFromGitHub {
owner = "rcarriga";
repo = "nvim-dap-ui";
- rev = "52f4840cb95e6638f18a74b71b536c3bd12e9fd8";
- sha256 = "1vbhmz5hkgbb9z03g1552wbmzmnfgyr3x45qhrlnv50fkl2rrj8v";
+ rev = "d33b905770f9c674468b0b83bed3aeab41cf9bb0";
+ sha256 = "1a1dpfjkr0pssc3vymzcfwyjnh90qhh7cg3s5qgk2vjvgadixvrg";
};
meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/";
};
nvim-dap-virtual-text = buildVimPluginFrom2Nix {
pname = "nvim-dap-virtual-text";
- version = "2022-04-30";
+ version = "2022-06-26";
src = fetchFromGitHub {
owner = "theHamsta";
repo = "nvim-dap-virtual-text";
- rev = "9b731b9748d243b60e61eecbe2d114c39554486e";
- sha256 = "14a66zdys50ifhfz4vls7b6grg69iwndailxdcamal7xafvy1dw9";
+ rev = "a36982259216afd710f55bcdc220477c74b5bc35";
+ sha256 = "1liw94g5hi7nvki3kjxyp90y9lrp24wa4df8p54nmpkdxwd38kz4";
};
meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/";
};
@@ -5388,12 +5388,12 @@ final: prev:
nvim-jdtls = buildVimPluginFrom2Nix {
pname = "nvim-jdtls";
- version = "2022-06-17";
+ version = "2022-06-30";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-jdtls";
- rev = "3a148dac526396678f141a033270961d0d9ccb88";
- sha256 = "1fbxgssd9s0vfa6w00hhvqzmc48dgk271z0rchnch0b317q88vr2";
+ rev = "703268d5b8479de4e0c27af93b203d56c1b53d2b";
+ sha256 = "1r55jkvrkx7drfs170801nw4ldh96654fg4nr8zay71i1nyb81w8";
};
meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
};
@@ -5448,12 +5448,12 @@ final: prev:
nvim-lint = buildVimPluginFrom2Nix {
pname = "nvim-lint";
- version = "2022-06-18";
+ version = "2022-06-23";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-lint";
- rev = "14f12733599d8feb4b3c6b9fc9e945e0bede59c2";
- sha256 = "1prhnjk78pl3cvaydv9i4jyz8j8y7za0lwkyhwax1n0qgv1m9kq6";
+ rev = "5249977a585c3c17d94afdc8f0255a689d3a0057";
+ sha256 = "0d5gh1n2r0knhmlqpgqx2f67fg5828p6pwhpf7zi89jap53skrwn";
};
meta.homepage = "https://github.com/mfussenegger/nvim-lint/";
};
@@ -5472,12 +5472,12 @@ final: prev:
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
- version = "2022-06-19";
+ version = "2022-07-02";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
- rev = "c55e830aa18bd15f36f7534947ec7471f2b43af7";
- sha256 = "0625rsaw5ba92fszk5bvkcg5misj7bacrlma9k8i09hbg81f3w28";
+ rev = "83dceed599b1236de4c18e31db3e0a0878b6fb59";
+ sha256 = "06hvmjk1qizr8vq0sz86vjy03pa2d04i7y6h1cxk064zx74kmvvn";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@@ -5508,12 +5508,12 @@ final: prev:
nvim-metals = buildVimPluginFrom2Nix {
pname = "nvim-metals";
- version = "2022-06-11";
+ version = "2022-07-02";
src = fetchFromGitHub {
owner = "scalameta";
repo = "nvim-metals";
- rev = "58ecfb61e4617139d3954138ccccc4c0befa89e0";
- sha256 = "0qcz1ijm62ys0d7gzbgq9h537pcfyzqmnmm3gv6gxzvfbqr4mcwq";
+ rev = "9e68fd2cae91ec8361b4e60ec89adb9a745b91c7";
+ sha256 = "0ggl7pi0ak2xjmxg8d98dcf1sqqbgxh59ii33v37gpkwskpfgh5h";
};
meta.homepage = "https://github.com/scalameta/nvim-metals/";
};
@@ -5544,12 +5544,12 @@ final: prev:
nvim-notify = buildVimPluginFrom2Nix {
pname = "nvim-notify";
- version = "2022-06-18";
+ version = "2022-07-02";
src = fetchFromGitHub {
owner = "rcarriga";
repo = "nvim-notify";
- rev = "7caeaaef257ecbe95473ec79e5a82757b544f1fd";
- sha256 = "1k4p358hasbcwihx4prm7arz3frvj0s17imqx865nm2bsh0gpf3j";
+ rev = "74ba257b6cf7fe2b7bb0f6813088ed488baa4a2a";
+ sha256 = "0k27isyrsdqf9is943m51wvvkkh7kw5qxm4c5rbbxd2gzb3ykyn4";
};
meta.homepage = "https://github.com/rcarriga/nvim-notify/";
};
@@ -5580,12 +5580,12 @@ final: prev:
nvim-snippy = buildVimPluginFrom2Nix {
pname = "nvim-snippy";
- version = "2022-05-29";
+ version = "2022-06-25";
src = fetchFromGitHub {
owner = "dcampos";
repo = "nvim-snippy";
- rev = "b13352f259c383cb1c921a1d5f2f98b072e53539";
- sha256 = "0cs0ir8xhivkqij25y4gf6zddq3c4j0qcdmv81k8lr1awfbr3017";
+ rev = "0eff6e2826d92e4b37be6711a1e5bbc945ec3b9f";
+ sha256 = "0i5702amdvrcs7xw0alny8nvm8s1fxq4f9syf9ck3j997x1kfayy";
};
meta.homepage = "https://github.com/dcampos/nvim-snippy/";
};
@@ -5604,12 +5604,12 @@ final: prev:
nvim-spectre = buildVimPluginFrom2Nix {
pname = "nvim-spectre";
- version = "2022-04-07";
+ version = "2022-07-02";
src = fetchFromGitHub {
owner = "nvim-pack";
repo = "nvim-spectre";
- rev = "345e5dd57773e2b4b425a2515c831108b9808a0f";
- sha256 = "1lyqzzl1722hdx0cwry8659dbd679nilx5lb1w52ym3sixz4a9hy";
+ rev = "a52139da068ee4d0860810af7c6b6d48d3cde603";
+ sha256 = "1h78va3w6x9xppdn63vq4jfrn86807cnw0dgpxsgc73aqi3m3i24";
};
meta.homepage = "https://github.com/nvim-pack/nvim-spectre/";
};
@@ -5628,36 +5628,36 @@ final: prev:
nvim-tree-lua = buildVimPluginFrom2Nix {
pname = "nvim-tree.lua";
- version = "2022-06-20";
+ version = "2022-07-02";
src = fetchFromGitHub {
owner = "kyazdani42";
repo = "nvim-tree.lua";
- rev = "79258f1d670277016523e13c0a88daa25070879f";
- sha256 = "1wrq3g6n82lyxzgbkfgpsi908ghwzp773fslrfyxk3mwgvdj396s";
+ rev = "21516f447baf42f6f11421a017cd69306d5d5ff3";
+ sha256 = "13zsr6vpsmbaxzwd6hi5ng2n2ny6qhvzkwsi0srkc84xpw7ndp4m";
};
meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
};
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
- version = "2022-06-20";
+ version = "2022-07-02";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
- rev = "8eccd820afb012df6ae22678aa01d4053ab84365";
- sha256 = "0465y4c7i33rn5yq921viik1kmv22pii9fr7nm678hkmhwi2qhwx";
+ rev = "78931d8bf15468d8f11f0c7910d470e88493b36b";
+ sha256 = "0839l52dj58splghn4m11as0nb00sjx9avhnlwcf54r2nf1afjsc";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
nvim-treesitter-context = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-context";
- version = "2022-06-20";
+ version = "2022-06-30";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter-context";
- rev = "b05cd9cbb972f48b583b581615a046f814ccaca0";
- sha256 = "07pxlms3j4kcd7ybmyjjkvjkkjxz084g3lm6kfv015pnca78wjj2";
+ rev = "50bde20c86238f853520a570208f7e01f1584b74";
+ sha256 = "12hzrs14n1mcvlz3lgxi1am0h54jsknr2bv374a8h7dnhxshh5xs";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/";
};
@@ -5688,12 +5688,12 @@ final: prev:
nvim-treesitter-textobjects = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-textobjects";
- version = "2022-05-23";
+ version = "2022-06-28";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter-textobjects";
- rev = "b1e850b77e57b2720c06d523d6fc4776ad6a5608";
- sha256 = "070ldvra2xmg76nvx1xa5wx2pmfrfmjqbhxy2qpr6nyj0cbb5ndg";
+ rev = "c8a393ecb6251d15e76dce8d8da522062090497d";
+ sha256 = "101ph3wm3cgg5j4ai85p64rkaipq0zs785bpf2gfhjjb5qg9isa0";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
};
@@ -5784,12 +5784,12 @@ final: prev:
nvimdev-nvim = buildVimPluginFrom2Nix {
pname = "nvimdev.nvim";
- version = "2022-05-04";
+ version = "2022-06-23";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvimdev.nvim";
- rev = "ef38441a7149087366bfc05654e7cc21a83df60e";
- sha256 = "0chdbsixjw3l6bvqdhf2na2hdwm94lzb66mssafbhgpq328y97wk";
+ rev = "4c261a74ec44dc7ca62b0ceb5106f752208b24b3";
+ sha256 = "18a0p52c70m8d624frpp8b9hvjrcf1kd1hgxism075mb5nm5rs3s";
};
meta.homepage = "https://github.com/neovim/nvimdev.nvim/";
};
@@ -5820,12 +5820,12 @@ final: prev:
octo-nvim = buildVimPluginFrom2Nix {
pname = "octo.nvim";
- version = "2022-06-20";
+ version = "2022-06-30";
src = fetchFromGitHub {
owner = "pwntester";
repo = "octo.nvim";
- rev = "f56b3f81661925e6487c2483ca8350c7287c70d1";
- sha256 = "005vxvy87hfmsvg0ksmc035md99b0qykgzlwj4nhcvv1pwpjbazx";
+ rev = "1f6a770a3b2a463cff474df51dc037ae7a6c2920";
+ sha256 = "1p2wwfg4q4apfgfrw475b91d7zim8bkiyx7p6j93adk1zz6dpjbh";
};
meta.homepage = "https://github.com/pwntester/octo.nvim/";
};
@@ -5856,36 +5856,36 @@ final: prev:
onedark-nvim = buildVimPluginFrom2Nix {
pname = "onedark.nvim";
- version = "2022-06-19";
+ version = "2022-06-24";
src = fetchFromGitHub {
owner = "navarasu";
repo = "onedark.nvim";
- rev = "af5595a5bf2358ef8611ab98f5e3c058b321c38f";
- sha256 = "0sd2isramda96kmb7inif3n3dn2p5qrccw0b3apj6pwxf3ridsf5";
+ rev = "4f4bf74bf731cbd779c93a10a6e287ebf16425a2";
+ sha256 = "13bjbalj3wdzywspk60bpb2djyhbl075xwi5f9kagm62fw9c2ji2";
};
meta.homepage = "https://github.com/navarasu/onedark.nvim/";
};
onedark-vim = buildVimPluginFrom2Nix {
pname = "onedark.vim";
- version = "2022-03-24";
+ version = "2022-06-27";
src = fetchFromGitHub {
owner = "joshdick";
repo = "onedark.vim";
- rev = "7db2ed5b825a311d0f6d12694d4738cf60106dc8";
- sha256 = "0jxnymbj83y0wfwv6ixxzlx1zyh9mlv1krq5g9wqhz4w6n9rkmqx";
+ rev = "ff0e0a488ca9d0d146f6e67b6fc3038f760238ea";
+ sha256 = "063390s96464m7nw20sgb3zinwvzawa3ck1ali20gfkywb8qjmll";
};
meta.homepage = "https://github.com/joshdick/onedark.vim/";
};
onedarkpro-nvim = buildVimPluginFrom2Nix {
pname = "onedarkpro.nvim";
- version = "2022-06-15";
+ version = "2022-06-27";
src = fetchFromGitHub {
owner = "olimorris";
repo = "onedarkpro.nvim";
- rev = "5d13f02a8ba579d68be02f877a8c38bac9ff17ed";
- sha256 = "1f9p7crgkq68ql2ri8mjfkp5r6dhq9pmsl3073pg2hzgirb08fgl";
+ rev = "6b66ef86fc473a20d6072fbdb016036c2e3dee37";
+ sha256 = "016fxzl1fig6x041j2alzisy3qzkqls7hxl4770dxv84kl8p8xvp";
};
meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
};
@@ -5928,12 +5928,12 @@ final: prev:
orgmode = buildVimPluginFrom2Nix {
pname = "orgmode";
- version = "2022-06-21";
+ version = "2022-07-01";
src = fetchFromGitHub {
owner = "nvim-orgmode";
repo = "orgmode";
- rev = "d3b95d2036d57f67a0f78ec975c7ef10e9134908";
- sha256 = "0yfdfpqygk77rhbyi28makmghq58rzl5aah8lpqihr604j1l54z5";
+ rev = "72a7a62530e110bd999e9b55d23308d7dbeb39a4";
+ sha256 = "1h2qiga742v6d66181929rw9fdcmp09hmbjfixyhlin6cx6aj2k6";
};
meta.homepage = "https://github.com/nvim-orgmode/orgmode/";
};
@@ -5952,12 +5952,12 @@ final: prev:
packer-nvim = buildVimPluginFrom2Nix {
pname = "packer.nvim";
- version = "2022-06-02";
+ version = "2022-07-01";
src = fetchFromGitHub {
owner = "wbthomason";
repo = "packer.nvim";
- rev = "00ec5adef58c5ff9a07f11f45903b9dbbaa1b422";
- sha256 = "1rgff84r4h5va58652ylspsdv9zhya46fak55spb69m5f9wh2vn5";
+ rev = "d268d2e083ca0abd95a57dfbcc5d5637a615e219";
+ sha256 = "1ay155126vky7ngz77dk04jfpwwacw6m1n8691vhyg6nal8wj1yf";
};
meta.homepage = "https://github.com/wbthomason/packer.nvim/";
};
@@ -6060,12 +6060,12 @@ final: prev:
playground = buildVimPluginFrom2Nix {
pname = "playground";
- version = "2022-05-01";
+ version = "2022-06-22";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "playground";
- rev = "71b00a3c665298e5155ad64a9020135808d4e3e8";
- sha256 = "0cn6q7885ffn0yxv6frjsa8yx6mnil8lmdvml8inj3lvakyprzc8";
+ rev = "ce7e4b757598f1c785ed0fd94fc65959acd7d39c";
+ sha256 = "0r3pjpzwjp1m563n80qp93y7f8gvpqjzlhsrd0hvi67qzm6pj87f";
};
meta.homepage = "https://github.com/nvim-treesitter/playground/";
};
@@ -6121,12 +6121,12 @@ final: prev:
presence-nvim = buildVimPluginFrom2Nix {
pname = "presence.nvim";
- version = "2022-02-09";
+ version = "2022-06-27";
src = fetchFromGitHub {
owner = "andweeb";
repo = "presence.nvim";
- rev = "ebdf23b9b180c7f162e3afb4a250c313ca2b7271";
- sha256 = "0wygl17k2adbsy3pjyyb6amsrx14r11ldbqj21kmkjq289n58f6n";
+ rev = "660bd8815ef8da029fa0058f76ac7fa2ca8f9ec7";
+ sha256 = "1v5vxh6kzvk4649x2mxckwcj1g8cggahxqr51knz0gjq5nz0qsp7";
};
meta.homepage = "https://github.com/andweeb/presence.nvim/";
};
@@ -6350,12 +6350,12 @@ final: prev:
refactoring-nvim = buildVimPluginFrom2Nix {
pname = "refactoring.nvim";
- version = "2022-06-21";
+ version = "2022-06-30";
src = fetchFromGitHub {
owner = "theprimeagen";
repo = "refactoring.nvim";
- rev = "7328413fdafeff52731e5f4961a574ad2fa0837d";
- sha256 = "07jwjcys9h2sjnh7vlf3rjjl254b7qh0axwck66d5hk0i7xviqhm";
+ rev = "50cc6e4e6010ca41aa60519f640a005e7a0f1f2c";
+ sha256 = "0432j6mz7x12hvmn38cdnzg9svij25c6ncxm8hzy882m86fy0bih";
};
meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/";
};
@@ -6711,12 +6711,12 @@ final: prev:
sonokai = buildVimPluginFrom2Nix {
pname = "sonokai";
- version = "2022-06-12";
+ version = "2022-06-29";
src = fetchFromGitHub {
owner = "sainnhe";
repo = "sonokai";
- rev = "e72e59d3e2cad8af17a1e2a0f6772ea56af32e2c";
- sha256 = "0yw98fj4b7vm5p5kvzvpgnmlgc3p54gdh1znlhpz5jkq4r59ggsa";
+ rev = "cbbe66c1cb80c942c35f8da0e28c14eb1ac68bc3";
+ sha256 = "19hbzkxqfvjwqhy9d4yrdwsfz6q93rjh6ym444xk1acs4yavc3my";
};
meta.homepage = "https://github.com/sainnhe/sonokai/";
};
@@ -6735,12 +6735,12 @@ final: prev:
space-vim = buildVimPluginFrom2Nix {
pname = "space-vim";
- version = "2022-06-20";
+ version = "2022-06-23";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "space-vim";
- rev = "b5bd319aa4c7bede97ec1eaf1dffaf7fbc9aa8a8";
- sha256 = "0hbxqs548z9zjjzizcz0g7h894sg4jyw97qwg8fahy0pvi976694";
+ rev = "ae8237c43787d3d018733a06d1c42bbfe1e3aa55";
+ sha256 = "0hk2m12m95p9vkj685bxr34fcqhdy762r8lb3mmxrxh2kr5q9d0n";
};
meta.homepage = "https://github.com/liuchengxu/space-vim/";
};
@@ -6783,12 +6783,12 @@ final: prev:
spellsitter-nvim = buildVimPluginFrom2Nix {
pname = "spellsitter.nvim";
- version = "2022-06-20";
+ version = "2022-07-02";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "spellsitter.nvim";
- rev = "c1b318f8b959e015f5cc7941624d1ca0f84705dd";
- sha256 = "17v7scc6574afmjfhhzawpxhhh31fz118xzbjg1l8qnbdnb159bh";
+ rev = "2e5db5c75a9953579642bb2c7a822a4febc5c688";
+ sha256 = "0hzvn26gasypv0mymdrzy8k6j0zldriznm6yvq1dpj7lchvm3csn";
};
meta.homepage = "https://github.com/lewis6991/spellsitter.nvim/";
};
@@ -6831,12 +6831,12 @@ final: prev:
splitjoin-vim = buildVimPluginFrom2Nix {
pname = "splitjoin.vim";
- version = "2022-05-28";
+ version = "2022-06-30";
src = fetchFromGitHub {
owner = "AndrewRadev";
repo = "splitjoin.vim";
- rev = "4df2b1f4bdaaa3526ff714f5dddb63015a13c511";
- sha256 = "1v8adv0rhzbxhwpdz46w3ichi2g5rr8vrvfnflr8f0fp8jbqnhbj";
+ rev = "5553f71bbac9f87a3a3f78d01de24a615744a4b3";
+ sha256 = "1j3z84n6zjdzdjis54nv8zmh8qxaxazxz43bmzpxjqv7g8jgwqs0";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/";
@@ -6926,6 +6926,18 @@ final: prev:
meta.homepage = "https://github.com/teto/stylish.nvim/";
};
+ substrata-nvim = buildVimPluginFrom2Nix {
+ pname = "substrata.nvim";
+ version = "2022-06-21";
+ src = fetchFromGitHub {
+ owner = "kvrohit";
+ repo = "substrata.nvim";
+ rev = "aea8143ceab98ffcb02934773cc3b4249425f76c";
+ sha256 = "07jjywqmcnll82hnibdrs42i148whn1x6l9dp2wr52kskq1419l2";
+ };
+ meta.homepage = "https://github.com/kvrohit/substrata.nvim/";
+ };
+
suda-vim = buildVimPluginFrom2Nix {
pname = "suda.vim";
version = "2022-02-10";
@@ -7158,12 +7170,12 @@ final: prev:
taskwiki = buildVimPluginFrom2Nix {
pname = "taskwiki";
- version = "2021-10-24";
+ version = "2022-06-28";
src = fetchFromGitHub {
owner = "tools-life";
repo = "taskwiki";
- rev = "925d8ed2f522229d32d4cc39486080c244d20f7a";
- sha256 = "1vifp4j2rkl6568ax3dsx42djl0gvkxaqgxlwzrnlkygmrwv76vn";
+ rev = "22557e7d4281ec915efdc308fc114141f627b1ea";
+ sha256 = "0zssxhfwfpgf60q88gpfyq8w1w549y70hyxqcs9pc8ib0d47m577";
};
meta.homepage = "https://github.com/tools-life/taskwiki/";
};
@@ -7399,12 +7411,12 @@ final: prev:
telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope.nvim";
- version = "2022-06-18";
+ version = "2022-07-01";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
- rev = "d88b44ddf14670cffa9fdb1eaca7a0429a973653";
- sha256 = "11ahi16nd21p9413d3rdw25bgzjkp3k83p6a1jwka3pk15c87nl0";
+ rev = "7df95f9b208ba7228a25e7f75fb4cc02d6604cce";
+ sha256 = "17p91nzrfcmdbniyr99r2k5l8kvamrdsyn0bp4jz1jyrinim4qnn";
};
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
};
@@ -7580,12 +7592,12 @@ final: prev:
toggleterm-nvim = buildVimPluginFrom2Nix {
pname = "toggleterm.nvim";
- version = "2022-06-21";
+ version = "2022-06-29";
src = fetchFromGitHub {
owner = "akinsho";
repo = "toggleterm.nvim";
- rev = "8f2e78d0256eba4896c8514aa150e41e63f7d5b2";
- sha256 = "0mrjha2vadxc8n0q4kqq8x8xf03b2k0yksi68j6r1lbkd1i0rwmx";
+ rev = "04174e19196ecef43dd159b29d4e6ddb07b80909";
+ sha256 = "1vv5hf6ycflf08i8r6flxipmmq991ic3dfx9hc7idx3ivlssj841";
};
meta.homepage = "https://github.com/akinsho/toggleterm.nvim/";
};
@@ -7712,12 +7724,12 @@ final: prev:
undotree = buildVimPluginFrom2Nix {
pname = "undotree";
- version = "2022-02-16";
+ version = "2022-06-27";
src = fetchFromGitHub {
owner = "mbbill";
repo = "undotree";
- rev = "08e259be24d4476c1ee745dc735eefd44f90efdc";
- sha256 = "154k5wrs0lhx8dj2pqkhfgqk11csa1iw1dshn7n07iq0ab2wkimy";
+ rev = "bfc9b060c9e84497b15b4d602095ba008383b664";
+ sha256 = "1w2r73a73zjbgfnkcnq2xlk2k0fw1zdjqrhigs6bp3ni3335dhjq";
};
meta.homepage = "https://github.com/mbbill/undotree/";
};
@@ -7820,12 +7832,12 @@ final: prev:
vifm-vim = buildVimPluginFrom2Nix {
pname = "vifm.vim";
- version = "2022-06-19";
+ version = "2022-06-29";
src = fetchFromGitHub {
owner = "vifm";
repo = "vifm.vim";
- rev = "8f8fd1731c614a76a41fda43b5405b35ffdae3a6";
- sha256 = "1gh5pa754mfnh5nsayq6gf6daz3ysbghd85drj35692x6jz8fpif";
+ rev = "81f077c12ed1edb39f002fbc1d6ce06429fd3279";
+ sha256 = "1hjw57223xyrp1zn1p4shpgaz019pr5gsvzllyg3bh4z8dbib983";
};
meta.homepage = "https://github.com/vifm/vifm.vim/";
};
@@ -8012,12 +8024,12 @@ final: prev:
vim-addon-manager = buildVimPluginFrom2Nix {
pname = "vim-addon-manager";
- version = "2022-01-12";
+ version = "2022-06-29";
src = fetchFromGitHub {
owner = "MarcWeber";
repo = "vim-addon-manager";
- rev = "4da23170ddbba1cac70a1a2678eba26b0e8b65c8";
- sha256 = "1axqblq95d2ry8r35sggr291sr41af0nzm7p7wch2wpqcwz9w0qi";
+ rev = "984320ed46ef6612a1c232bb44f5e51f92d12e7e";
+ sha256 = "1p7ads4rg2rcgh4rf2p5qy7bf5yrnvnx6nri90bfinzfsyddb00l";
};
meta.homepage = "https://github.com/MarcWeber/vim-addon-manager/";
};
@@ -8156,12 +8168,12 @@ final: prev:
vim-airline = buildVimPluginFrom2Nix {
pname = "vim-airline";
- version = "2022-06-08";
+ version = "2022-06-28";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline";
- rev = "97a9aa4bdb24eea5e85ac0015bdd570f42bad6e7";
- sha256 = "1mmvri32fy9yhn3yskqq3dipn1gfzlhnwd9dz4yqqxs57q04pj2y";
+ rev = "91b67e3ca2d7bc66544724f9c702265c564a1f2e";
+ sha256 = "0b007gl1j8k91h3fwxjkviikaijdhfvsq96k8pqvszaqjsszrksj";
};
meta.homepage = "https://github.com/vim-airline/vim-airline/";
};
@@ -8372,11 +8384,11 @@ final: prev:
vim-better-whitespace = buildVimPluginFrom2Nix {
pname = "vim-better-whitespace";
- version = "2021-09-18";
+ version = "2022-06-30";
src = fetchFromGitHub {
owner = "ntpeters";
repo = "vim-better-whitespace";
- rev = "c5afbe91d29c5e3be81d5125ddcdc276fd1f1322";
+ rev = "1b22dc57a2751c7afbc6025a7da39b7c22db635d";
sha256 = "10xzxavz010a8ildkfmikyi0ly6rqi5d6a2ndzr0frd9ingbk79r";
};
meta.homepage = "https://github.com/ntpeters/vim-better-whitespace/";
@@ -8528,12 +8540,12 @@ final: prev:
vim-clap = buildVimPluginFrom2Nix {
pname = "vim-clap";
- version = "2022-06-21";
+ version = "2022-07-01";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
- rev = "48b7b60c6743f4bc82d3edf61978c1c593276cc2";
- sha256 = "02sr55jqly1b8cllhaw124ig9q3p5m3v7s2vprfqrfyy3w681xfm";
+ rev = "81f340af6a7c2456ad7153a7d7700e0e9c93a693";
+ sha256 = "0pwrqyrlfynwi5kamfc8p7ijlrddqkd4agzkpqq9sppph59ckkg5";
};
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
};
@@ -8653,7 +8665,7 @@ final: prev:
owner = "flazz";
repo = "vim-colorschemes";
rev = "fd8f122cef604330c96a6a6e434682dbdfb878c9";
- sha256 = "0kpsf6j20fgblc8vhqn7ymr52v2d1h52vc7rbxmxfwdm80nvv3g5";
+ sha256 = "1cg8q7w0vgl73aw1b9zz0zh5vw5d2pm8pm54fhfzva4azg56f416";
};
meta.homepage = "https://github.com/flazz/vim-colorschemes/";
};
@@ -9020,12 +9032,12 @@ final: prev:
vim-elixir = buildVimPluginFrom2Nix {
pname = "vim-elixir";
- version = "2022-03-29";
+ version = "2022-06-25";
src = fetchFromGitHub {
owner = "elixir-editors";
repo = "vim-elixir";
- rev = "edf880c41ec1768faafc480433ae72ceffaf4362";
- sha256 = "14jgwgwynynlipvmr02i9h4q2mc459fz4jyflcngvpyc9ady9ald";
+ rev = "6dd03f87d825bf0a9f8611eb54076c7952d4f15c";
+ sha256 = "0car62bg681al01bsf7k783m2927shdl5xjl2jlwry54l44b8hry";
};
meta.homepage = "https://github.com/elixir-editors/vim-elixir/";
};
@@ -9056,12 +9068,12 @@ final: prev:
vim-endwise = buildVimPluginFrom2Nix {
pname = "vim-endwise";
- version = "2022-05-15";
+ version = "2022-07-01";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-endwise";
- rev = "4ed852d137853a0c242846fd0a61a241b4c7b467";
- sha256 = "1h7pi8yrm34fxh0l4jli741mn4hg7igc3kv9q11i41ac3izmxi00";
+ rev = "79a3397f7799cb211a7fb803388b96a5f28fd778";
+ sha256 = "1fhs01k6nmnik54inx7jq4yxsfpxiawvw7abwxwwd6fshss57k66";
};
meta.homepage = "https://github.com/tpope/vim-endwise/";
};
@@ -9248,12 +9260,12 @@ final: prev:
vim-flog = buildVimPluginFrom2Nix {
pname = "vim-flog";
- version = "2022-02-28";
+ version = "2022-06-26";
src = fetchFromGitHub {
owner = "rbong";
repo = "vim-flog";
- rev = "47123282f501fc77965e1d3c08357209d991c7f4";
- sha256 = "18fs6pgadffdxl6r03daqnz6v65m7jap3yanx7rzp5g25c0461ps";
+ rev = "fb137707b84a328d3f1b53d22894e3c52f4a6ddb";
+ sha256 = "1n9gzsiccchvs51i1yfn819h4db96wyghnpaddnsvf0fq1as2g3p";
};
meta.homepage = "https://github.com/rbong/vim-flog/";
};
@@ -9308,12 +9320,12 @@ final: prev:
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
- version = "2022-06-19";
+ version = "2022-06-30";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
- rev = "8b39d29d947618913ba1db32de605a6335875b99";
- sha256 = "0zmn09rh17zjq0pkf6nmmpwkchfvj8ycr2559ndjc5vdw8r10x70";
+ rev = "f809dde0e719f89a6fb5cb80f3be65f5cbc1d1fe";
+ sha256 = "0d2ay09pm6vxzfg5a4h503iwm9yfcjn4ia153y3mi0vfr19n5aih";
};
meta.homepage = "https://github.com/tpope/vim-fugitive/";
};
@@ -9332,12 +9344,12 @@ final: prev:
vim-gh-line = buildVimPluginFrom2Nix {
pname = "vim-gh-line";
- version = "2021-11-27";
+ version = "2022-06-30";
src = fetchFromGitHub {
owner = "ruanyl";
repo = "vim-gh-line";
- rev = "d2185b18883b911a21b684d4bb9d26f6a41b62f4";
- sha256 = "0wrgjd7l8cnam7nwqyh0m3np2452b18kz4lvnfv3hlsdsdx9xi17";
+ rev = "622d7812a268b3e869e8f8c7ee5871e7ee98ab43";
+ sha256 = "1bz40bdfhsvh8cdnydf00qixf9yz41c1lzabb4vbrwbb9wizh4zi";
};
meta.homepage = "https://github.com/ruanyl/vim-gh-line/";
};
@@ -10174,12 +10186,12 @@ final: prev:
vim-lsp = buildVimPluginFrom2Nix {
pname = "vim-lsp";
- version = "2022-06-18";
+ version = "2022-07-01";
src = fetchFromGitHub {
owner = "prabirshrestha";
repo = "vim-lsp";
- rev = "74e458bc9c7532ff1959b2443a1d73494e3673b6";
- sha256 = "15m00ihfka0nlvn86q6flmxcwxf64ahykh4g7x9gb030gr6miflp";
+ rev = "68c018eb1a79e0bbeb496f7040f7205b57cf3750";
+ sha256 = "0ykacf1zkiqh66ikfkv9md1qhylyz7n7fb2ql1g2ikc428lh22vc";
};
meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
};
@@ -10234,12 +10246,12 @@ final: prev:
vim-markbar = buildVimPluginFrom2Nix {
pname = "vim-markbar";
- version = "2022-06-06";
+ version = "2022-06-29";
src = fetchFromGitHub {
owner = "Yilin-Yang";
repo = "vim-markbar";
- rev = "7893b2d627dadeaa717758648996ea01e41873eb";
- sha256 = "0b95wc863zyj3mlgdgqvd1q1w2mpp4bvd4rawj665993a2xqkl7x";
+ rev = "4daedbde2fbfbda89aaa16f0dc25b96538389257";
+ sha256 = "0nsb9hciazd029zdgppfilf53r1sffbfmagj5fw4a4w4rbjmav3k";
};
meta.homepage = "https://github.com/Yilin-Yang/vim-markbar/";
};
@@ -10307,12 +10319,12 @@ final: prev:
vim-merginal = buildVimPluginFrom2Nix {
pname = "vim-merginal";
- version = "2022-06-06";
+ version = "2022-06-25";
src = fetchFromGitHub {
owner = "idanarye";
repo = "vim-merginal";
- rev = "d61345a6579a0e141499fc0deb4cdd0620d94344";
- sha256 = "12h15pqv19nxqzy4rflq6lmgnadhrqsyr77ykf0xfc1gzw8431li";
+ rev = "0fab5c23255902f975c52e65fbb6dff9be8ed64d";
+ sha256 = "0ia7nmhipghw4d7azbgsrdmdd8dc36cqdj9grg5g2xlvfmfj15pv";
};
meta.homepage = "https://github.com/idanarye/vim-merginal/";
};
@@ -10355,24 +10367,24 @@ final: prev:
vim-monokai-pro = buildVimPluginFrom2Nix {
pname = "vim-monokai-pro";
- version = "2020-10-02";
+ version = "2022-06-25";
src = fetchFromGitHub {
owner = "phanviet";
repo = "vim-monokai-pro";
- rev = "05e534f9fea9a8e4cbf69a1523c785845deabe4e";
- sha256 = "0hf3iy2ydr6jpraf5zyqg2hl7ma5hn301jyxf6m9ffdsz7722jwm";
+ rev = "6c449e5d4ef6086c519de0544d4aca46c0a9596c";
+ sha256 = "1ri6m1q0rmflzq2l4fnj4wka1vc70algy9whc66qfcj9zqq68z9s";
};
meta.homepage = "https://github.com/phanviet/vim-monokai-pro/";
};
vim-move = buildVimPluginFrom2Nix {
pname = "vim-move";
- version = "2022-06-07";
+ version = "2022-07-01";
src = fetchFromGitHub {
owner = "matze";
repo = "vim-move";
- rev = "31e7230dc7f2485b7315ddea519441f23c78d7d3";
- sha256 = "16h5say2yxc74dbv2x2kzs955w3rkksv3ja2fy7lbcqa05gwbfx5";
+ rev = "a4bbedda7ef516b4a1b74d145cd642297e82e800";
+ sha256 = "11mr7n0mch48mx14h3vq9v45qfwy7fn6kcvcl7p5vmmibmgg2qdp";
};
meta.homepage = "https://github.com/matze/vim-move/";
};
@@ -10559,12 +10571,12 @@ final: prev:
vim-ocaml = buildVimPluginFrom2Nix {
pname = "vim-ocaml";
- version = "2022-02-09";
+ version = "2022-06-24";
src = fetchFromGitHub {
owner = "ocaml";
repo = "vim-ocaml";
- rev = "335ebc6e433afb972aa797be0587895a11dddab5";
- sha256 = "079pfc897zz36mb36as7vq38b9njy42phjvmgarqlyqrwgjc0win";
+ rev = "47fb78a015d3ea185dd26cfc162d81dc564aec76";
+ sha256 = "08ip8g4b6q5ivfgvrgjs4p0f4x6qj1gsyjrr1vshqg3b1z06877z";
};
meta.homepage = "https://github.com/ocaml/vim-ocaml/";
};
@@ -10917,6 +10929,18 @@ final: prev:
meta.homepage = "https://github.com/thinca/vim-prettyprint/";
};
+ vim-printer = buildVimPluginFrom2Nix {
+ pname = "vim-printer";
+ version = "2022-03-01";
+ src = fetchFromGitHub {
+ owner = "meain";
+ repo = "vim-printer";
+ rev = "55ab49179838d86f92fd847504cef3570000b7f3";
+ sha256 = "1h2wh86qph38mgfyahy8ha6zpvn2kvs4h2znipxq9z4ybnwcxmf4";
+ };
+ meta.homepage = "https://github.com/meain/vim-printer/";
+ };
+
vim-prisma = buildVimPluginFrom2Nix {
pname = "vim-prisma";
version = "2020-04-04";
@@ -11135,12 +11159,12 @@ final: prev:
vim-rhubarb = buildVimPluginFrom2Nix {
pname = "vim-rhubarb";
- version = "2022-06-15";
+ version = "2022-06-30";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-rhubarb";
- rev = "f8b70f5ef3b315af1148ef9dcc2a9afb02bc8c79";
- sha256 = "1cgxaaizx9l11s3gs7d1gvlq2c1l42548fmdkqgqnl8z777h065k";
+ rev = "c815057f8e8ace962a1f653b6ab5c35678662a86";
+ sha256 = "1saq33a2k692fljsp3yyxhzg66xamzb4vym7dzih3zbwqx47yymb";
};
meta.homepage = "https://github.com/tpope/vim-rhubarb/";
};
@@ -11171,12 +11195,12 @@ final: prev:
vim-ruby = buildVimPluginFrom2Nix {
pname = "vim-ruby";
- version = "2022-05-15";
+ version = "2022-06-30";
src = fetchFromGitHub {
owner = "vim-ruby";
repo = "vim-ruby";
- rev = "55335f2614f914b117f02995340886f409eddc02";
- sha256 = "1nijpzcahd02q7ykzbyzk1b4w778ivhsal852wpz9d9p1qiq466j";
+ rev = "a99282403445ac1d008b51d6edd820d5dc053ecb";
+ sha256 = "0fapyafzjl00y6xn281m1zjc17hy6hka3ggg29nwkzryvd0hnjxb";
};
meta.homepage = "https://github.com/vim-ruby/vim-ruby/";
};
@@ -11375,12 +11399,12 @@ final: prev:
vim-slime = buildVimPluginFrom2Nix {
pname = "vim-slime";
- version = "2022-06-17";
+ version = "2022-07-01";
src = fetchFromGitHub {
owner = "jpalardy";
repo = "vim-slime";
- rev = "93d202278004fbc8eb3ec9d734916214e6c7f034";
- sha256 = "1nnv2kkq06d72wfsyliqvyrp735j5kg7y9c1r9lypjw2y7548spf";
+ rev = "32f6f838235bad70b646419026796b86ec75cc71";
+ sha256 = "1hjkv5hzpw97raz029w62a64fik0ryr4hyddwir825wn9a614rwv";
};
meta.homepage = "https://github.com/jpalardy/vim-slime/";
};
@@ -11589,6 +11613,18 @@ final: prev:
meta.homepage = "https://github.com/alx741/vim-stylishask/";
};
+ vim-substrata = buildVimPluginFrom2Nix {
+ pname = "vim-substrata";
+ version = "2021-03-23";
+ src = fetchFromGitHub {
+ owner = "arzg";
+ repo = "vim-substrata";
+ rev = "f7b71f31d2ffa91715964b14b41ad4009d4d97f6";
+ sha256 = "1cpmyr63xjx5nm5h619xwryjaljq1kdf3msdrdr082ljci2830z2";
+ };
+ meta.homepage = "https://github.com/arzg/vim-substrata/";
+ };
+
vim-subversive = buildVimPluginFrom2Nix {
pname = "vim-subversive";
version = "2022-01-26";
@@ -11700,12 +11736,12 @@ final: prev:
vim-test = buildVimPluginFrom2Nix {
pname = "vim-test";
- version = "2022-06-08";
+ version = "2022-06-27";
src = fetchFromGitHub {
owner = "vim-test";
repo = "vim-test";
- rev = "ee81a7a50c684298b0eb12bcbdef8cfe3eb1f515";
- sha256 = "06wx8d62zp5x738mhs869gr88cih7cdjcgfx2f2msdbyjqq5zdq3";
+ rev = "dfbf93d71b63699d54accd37f12ba328b8ac311a";
+ sha256 = "1s5m1d37r10l24x5n0dr6pa7hfb5n0s1kw77vfd04k8jf1w2sphb";
};
meta.homepage = "https://github.com/vim-test/vim-test/";
};
@@ -11880,12 +11916,12 @@ final: prev:
vim-tpipeline = buildVimPluginFrom2Nix {
pname = "vim-tpipeline";
- version = "2022-06-19";
+ version = "2022-06-25";
src = fetchFromGitHub {
owner = "vimpostor";
repo = "vim-tpipeline";
- rev = "7945984fd56bd69506c73f68bb300aaceae72e82";
- sha256 = "1w6ifhkjjdfksmywf9r6hnvljbki0vdj440zj3ihbp2jpmhyb09q";
+ rev = "af7fe78523c7c860d00b79383908322fcb5e6133";
+ sha256 = "1wazgrvywmr6hc32l4vbqdd8cjq73fy2pnaiifwcjbpxzxj6qasw";
};
meta.homepage = "https://github.com/vimpostor/vim-tpipeline/";
};
@@ -12084,12 +12120,12 @@ final: prev:
vim-wakatime = buildVimPluginFrom2Nix {
pname = "vim-wakatime";
- version = "2022-05-29";
+ version = "2022-06-27";
src = fetchFromGitHub {
owner = "wakatime";
repo = "vim-wakatime";
- rev = "f86ca61010beac4ba9633dae2be74d1ce57b18fe";
- sha256 = "10kqnb7s5449yxs3lqfwyhkvj8wzbwhhar0ycq70s0d8f7p57kwc";
+ rev = "4692ec3e77ade9e65171182296cca74352a39a12";
+ sha256 = "16av4rd4ga85w3mnb40i762x6kwk9k29pgbpq5qnldyi1pfiph6f";
};
meta.homepage = "https://github.com/wakatime/vim-wakatime/";
};
@@ -12120,12 +12156,12 @@ final: prev:
vim-which-key = buildVimPluginFrom2Nix {
pname = "vim-which-key";
- version = "2022-06-19";
+ version = "2022-06-27";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-which-key";
- rev = "931260e7816ff8eeb26843f859f86dac09912add";
- sha256 = "030ljq24lxqac3hphr5phw06lgcjg7jsrc6yxbgxx2m28v54isi6";
+ rev = "654dfc15cf86946e7e70d12cf095bf55002d93a5";
+ sha256 = "168yxiwhvsbkp8bywxcd9mvhh43hjp3xcpwm3ffny15v13rqadcp";
};
meta.homepage = "https://github.com/liuchengxu/vim-which-key/";
};
@@ -12372,12 +12408,12 @@ final: prev:
vimspector = buildVimPluginFrom2Nix {
pname = "vimspector";
- version = "2022-06-17";
+ version = "2022-06-28";
src = fetchFromGitHub {
owner = "puremourning";
repo = "vimspector";
- rev = "541cedd19bc22b5c00648352f0afe604113db32a";
- sha256 = "1ra6jr5qvgclazaj3332kiwlc5kvpvi2dj9g2vfgd84140036cas";
+ rev = "bdfa7471ec63e49b7712a8f16ee7d1f96f3783d8";
+ sha256 = "0phxs1gkw61g29fcn6ry9v282a6i8dlgkjgnp0nb7r69zrqcigrr";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/puremourning/vimspector/";
@@ -12385,12 +12421,12 @@ final: prev:
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
- version = "2022-06-20";
+ version = "2022-06-28";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
- rev = "fcdf28ae2c7f5e0aabeead8b78bd112141ef26f8";
- sha256 = "0d9g9cdrjhs0zwr3mc8r4dr1sf6jjhx3gywl8vfzk7xbrlyn6vcs";
+ rev = "00cb1b9cd9e94a4a52dfa1fc362dad2e24571fc4";
+ sha256 = "00z4ny304p8yb1xxgpvwh2d4d48hpcr6zl0wwxsmw0njwq3ga49f";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};
@@ -12493,12 +12529,12 @@ final: prev:
wilder-nvim = buildVimPluginFrom2Nix {
pname = "wilder.nvim";
- version = "2022-05-15";
+ version = "2022-06-27";
src = fetchFromGitHub {
owner = "gelguy";
repo = "wilder.nvim";
- rev = "6332b51762faaec0685769111ace06fecf673341";
- sha256 = "0p0ykcavh04rbl2myhlxg6gz1g4icwzb9dgz30557b9xjmvbkm74";
+ rev = "86f5fb0962bc5954babf267ded6b144d992aef85";
+ sha256 = "0cb2hlyrypfp4c0zp3gmbpnpbmv6sbfh1zxjlm61wk58q9g371q0";
};
meta.homepage = "https://github.com/gelguy/wilder.nvim/";
};
@@ -12517,12 +12553,12 @@ final: prev:
winshift-nvim = buildVimPluginFrom2Nix {
pname = "winshift.nvim";
- version = "2022-06-20";
+ version = "2022-06-29";
src = fetchFromGitHub {
owner = "sindrets";
repo = "winshift.nvim";
- rev = "7014fdac39082977f11a9bed4b5486a7c04e4202";
- sha256 = "1q21fh3rzrcl598z406nfr3gnfayy3ry3av9g41z872hx8r49kjf";
+ rev = "9e884748f2857c4ba05e5ee9521dd9a576e22083";
+ sha256 = "19n5zp87qmdyz6rshxfp0j150d4sv76aicz08yv8jzsyjkaqrcxw";
};
meta.homepage = "https://github.com/sindrets/winshift.nvim/";
};
@@ -12601,12 +12637,12 @@ final: prev:
yats-vim = buildVimPluginFrom2Nix {
pname = "yats.vim";
- version = "2022-06-09";
+ version = "2022-06-26";
src = fetchFromGitHub {
owner = "HerringtonDarkholme";
repo = "yats.vim";
- rev = "a5dd9a768b33e843647bddd6e828403cf4ea4476";
- sha256 = "10h8b27z18cblnfbyjig28y0jwn9lf076z1qid4mpl4zklzgphls";
+ rev = "68cd1da2bcea5fb3fbe6b6266958ae7c72e814da";
+ sha256 = "0h4kqfc9mz7wjdqb4ga1400wjj5jfc46f07b80j1npk3bnx8r7cb";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/";
@@ -12650,12 +12686,12 @@ final: prev:
zephyr-nvim = buildVimPluginFrom2Nix {
pname = "zephyr-nvim";
- version = "2022-06-07";
+ version = "2022-06-22";
src = fetchFromGitHub {
owner = "glepnir";
repo = "zephyr-nvim";
- rev = "88a791e125fd7fe6399728329e7c5a52072ad47d";
- sha256 = "0sbnr6i841176mp06dr3dhn44zam0bv3hs70fzcfs5vpji6ddk7s";
+ rev = "1eea36117a8ca4f3250c0223e78a690cdc720f9e";
+ sha256 = "1bizvz1h7dqjplf2fs3w6syn5g3a1n2j84caf6saidr36h6irrns";
};
meta.homepage = "https://github.com/glepnir/zephyr-nvim/";
};
@@ -12686,48 +12722,48 @@ final: prev:
zoxide-vim = buildVimPluginFrom2Nix {
pname = "zoxide.vim";
- version = "2022-05-07";
+ version = "2022-06-29";
src = fetchFromGitHub {
owner = "nanotee";
repo = "zoxide.vim";
- rev = "5062d4c17ff873eeed88cabe317d7ee1a43c5731";
- sha256 = "1chq7fnygvb1wm7v0rg8cf0czn1q1i59kggg0jdvrnwf0f6m7nb4";
+ rev = "7add42b0474b07c206c94d1693997e52d25c5fec";
+ sha256 = "1csr4k4f9nybwa0h6fnd7wgr5cgqzqqqamr0xvrv4z1j4h24i5hr";
};
meta.homepage = "https://github.com/nanotee/zoxide.vim/";
};
catppuccin-nvim = buildVimPluginFrom2Nix {
pname = "catppuccin-nvim";
- version = "2022-06-16";
+ version = "2022-06-24";
src = fetchFromGitHub {
owner = "catppuccin";
repo = "nvim";
- rev = "d46425163dad4cc74910c0c81eeedb00cadf8a61";
- sha256 = "1iqjlvr9d1nlf5bpafd15zz0y9r6vrfgp5mwld7kwv9ipr3gw0sd";
+ rev = "ffd6f3e10445cb2c92401b75d4eccb75faf8b6b1";
+ sha256 = "0970426myaybar4aqf3lz468057q2b88bmr4skmmfy2a2xq3cddc";
};
meta.homepage = "https://github.com/catppuccin/nvim/";
};
catppuccin-vim = buildVimPluginFrom2Nix {
pname = "catppuccin-vim";
- version = "2022-06-20";
+ version = "2022-07-02";
src = fetchFromGitHub {
owner = "catppuccin";
repo = "vim";
- rev = "e2fdf27b0f28f7e285beb377d2fc6936957c2122";
- sha256 = "098blx6c2mzh6ghlvm6cv62bi8cfiys9r867msfw2h7r01gqz2hf";
+ rev = "4f4d11c9c6bd9dec003cad2162ba25fbb20180e4";
+ sha256 = "0f9vf7p22n4sl4qa7km5pg62dcnn30d63ghhbcipm21777xws8a9";
};
meta.homepage = "https://github.com/catppuccin/vim/";
};
chad = buildVimPluginFrom2Nix {
pname = "chad";
- version = "2022-06-21";
+ version = "2022-07-02";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
- rev = "1efa6229ab08d4620a8aa546bfd5103bd98a74e0";
- sha256 = "0mksvj0vswg6wbxfrr9rg6miv0kr700z3q8xcrria43rf06la32l";
+ rev = "26b9deacd2221851dd1868157be226e33b76c7a5";
+ sha256 = "0dp7p0yqfqn25w353xqgrfksl3ssygf38ps8igrhxrsjwqin3ly1";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index a79fb1848a3d..6dbc0a635cbd 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -581,6 +581,7 @@ https://github.com/luukvbaal/stabilize.nvim/,,
https://github.com/eigenfoo/stan-vim/,,
https://github.com/darfink/starsearch.vim/,,
https://github.com/teto/stylish.nvim/,HEAD,
+https://github.com/kvrohit/substrata.nvim/,HEAD,
https://github.com/lambdalisue/suda.vim/,,
https://github.com/ervandew/supertab/,,
https://github.com/ur4ltz/surround.nvim/,,
@@ -916,6 +917,7 @@ https://github.com/jakwings/vim-pony/,,
https://github.com/haya14busa/vim-poweryank/,,
https://github.com/prettier/vim-prettier/,,
https://github.com/thinca/vim-prettyprint/,,
+https://github.com/meain/vim-printer/,HEAD,
https://github.com/pantharshit00/vim-prisma/,,
https://github.com/tpope/vim-projectionist/,,
https://github.com/dhruvasagar/vim-prosession/,,
@@ -973,6 +975,7 @@ https://github.com/dstein64/vim-startuptime/,,
https://github.com/axelf4/vim-strip-trailing-whitespace/,,
https://github.com/nbouscal/vim-stylish-haskell/,,
https://github.com/alx741/vim-stylishask/,,
+https://github.com/arzg/vim-substrata/,HEAD,
https://github.com/svermeulen/vim-subversive/,,
https://github.com/tpope/vim-surround/,,
https://github.com/evanleck/vim-svelte/,,
diff --git a/pkgs/applications/emulators/dolphin-emu/primehack.nix b/pkgs/applications/emulators/dolphin-emu/primehack.nix
index b59001930e61..93ed03097be9 100644
--- a/pkgs/applications/emulators/dolphin-emu/primehack.nix
+++ b/pkgs/applications/emulators/dolphin-emu/primehack.nix
@@ -48,13 +48,13 @@
stdenv.mkDerivation rec {
pname = "dolphin-emu-primehack";
- version = "1.0.6";
+ version = "1.0.6a";
src = fetchFromGitHub {
owner = "shiiion";
repo = "dolphin";
rev = version;
- sha256 = "sha256-ywCh6wiBjXY5baWfu7cBgwc8w8yJaLM3QQ0FATsrweQ=";
+ sha256 = "sha256-gc4+ofoLKR+cvm+SaWEnGaKrSjWMKq7pF6pEIi75Rtk=";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/misc/kiln/default.nix b/pkgs/applications/misc/kiln/default.nix
index 2eb329dd5111..93e65e5fbfe3 100644
--- a/pkgs/applications/misc/kiln/default.nix
+++ b/pkgs/applications/misc/kiln/default.nix
@@ -1,29 +1,28 @@
-{ lib, buildGoModule, fetchFromSourcehut, scdoc }:
+{ lib, buildGoModule, fetchFromSourcehut, scdoc, installShellFiles }:
buildGoModule rec {
pname = "kiln";
- version = "0.3.0";
+ version = "0.3.2";
src = fetchFromSourcehut {
owner = "~adnano";
repo = pname;
rev = version;
- hash = "sha256-owON9ZNi8BufkeARjC6SwxzM81YJYu+bakhH5quzMrA=";
+ hash = "sha256-PI80td/GV92Msdtive+f+H6FWo7wdaPmPCpwrX3iLlo=";
};
- nativeBuildInputs = [ scdoc ];
+ nativeBuildInputs = [ scdoc installShellFiles ];
vendorSha256 = "sha256-C1ueL/zmPzFbpNo5BF56/t74nwCUvb2Vu1exssPqOPE=";
- installPhase = ''
- runHook preInstall
- make PREFIX=$out install
- runHook postInstall
+ postInstall = ''
+ scdoc < docs/kiln.1.scd > docs/kiln.1
+ installManPage docs/kiln.1
'';
meta = with lib; {
description = "A simple static site generator for Gemini";
- homepage = "https://git.sr.ht/~adnano/kiln";
+ homepage = "https://kiln.adnano.co/";
license = licenses.mit;
maintainers = with maintainers; [ sikmir ];
};
diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix
index 9c3313ba5f49..e4e51d78fcab 100644
--- a/pkgs/applications/misc/logseq/default.nix
+++ b/pkgs/applications/misc/logseq/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "logseq";
- version = "0.7.5";
+ version = "0.7.6";
src = fetchurl {
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
- sha256 = "sha256-uMlvpEEzanJ3zTEZKNE2zEfqvGC4IWL97b0AkTfwZeU=";
+ sha256 = "sha256-3YCO0pQT5vUkscQEE4+XrfEkQJro8DpQ5xDLglfqJjI=";
name = "${pname}-${version}.AppImage";
};
diff --git a/pkgs/applications/misc/mako/default.nix b/pkgs/applications/misc/mako/default.nix
index 8f984db7df52..42f3a271b969 100644
--- a/pkgs/applications/misc/mako/default.nix
+++ b/pkgs/applications/misc/mako/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "mako";
- version = "1.6";
+ version = "1.7.1";
src = fetchFromGitHub {
owner = "emersion";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-RcPwZ5NeO9vxwPWfgj5x3wVdCYGKumnYT3ngHEAWfW0=";
+ sha256 = "sha256-/+XYf8FiH4lk7f7/pMt43hm13mRK+UqvaNOpf1TI6m4=";
};
nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-protocols wrapGAppsHook ];
diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 35f0712d9abc..9d29fc6c0bbc 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.61-1";
+ version = "5.3.2679.68-1";
src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
- sha256 = "0cxsdcksv29dxync8rxrn30kr68qzf615085nhkk0ava7jdlvz9g";
+ sha256 = "0dfpxjr1sknkppazmw6dwrczv6gvh14nyc3la3q1y7cdzp95jpx3";
};
unpackPhase = ''
diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
index 26b408ffdecc..e9228493de3e 100644
--- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "chromium-codecs-ffmpeg-extra";
- version = "102.0.5005.49";
+ version = "103.0.5060.53";
src = fetchurl {
- url = "https://launchpadlibrarian.net/601067148/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb";
- sha256 = "sha256-b0oTDOi9VY+8v4JUAGkqdcum4uis08/v+COTx8eHBXg=";
+ url = "https://launchpadlibrarian.net/607589056/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb";
+ sha256 = "sha256-Tsp5Y6sCn+mKrLGZSAWGFoSTHiyfANQ5VA7pesU1HyU=";
};
buildInputs = [ dpkg ];
diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix
index ad51121f1552..420d093755b4 100644
--- a/pkgs/applications/networking/cluster/arkade/default.nix
+++ b/pkgs/applications/networking/cluster/arkade/default.nix
@@ -6,18 +6,18 @@
buildGoModule rec {
pname = "arkade";
- version = "0.8.28";
+ version = "0.8.29";
src = fetchFromGitHub {
owner = "alexellis";
repo = "arkade";
rev = version;
- sha256 = "sha256-Tw/FxrmBpC+FDvfvDT1xQtcQwlxUpQHDMzTs3TrugYg=";
+ sha256 = "sha256-VCscevLGRpBgqxhRNcvIkCdroE0MawG1fROVOLjZLW0=";
};
CGO_ENABLED = 0;
- vendorSha256 = "sha256-E+fjDW7UIAYDiDI8Eb8atAtccEIRcV5hqYdSxRYM9fc=";
+ vendorSha256 = "sha256-CoIlqDMmhZY+B5SEabmnbP2QUu1jkFluCzLp3Y8Z7n0=";
# Exclude pkg/get: tests downloading of binaries which fail when sandbox=true
subPackages = [
diff --git a/pkgs/applications/networking/cluster/cmctl/default.nix b/pkgs/applications/networking/cluster/cmctl/default.nix
index 8a839d065ea2..28a0df2fcd24 100644
--- a/pkgs/applications/networking/cluster/cmctl/default.nix
+++ b/pkgs/applications/networking/cluster/cmctl/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cmctl";
- version = "1.8.1";
+ version = "1.8.2";
src = fetchFromGitHub {
owner = "cert-manager";
repo = "cert-manager";
rev = "v${version}";
- sha256 = "sha256-IR+z3+f9Pa7wQAP4EVya7fb7FnndaUY7F2ckTzpEuCA=";
+ sha256 = "sha256-sfC1acnCrcQ4A1tXXcjh47Af6xeJqjdGXy0gK21ZSFg=";
};
vendorSha256 = "sha256-UYw9WdQ6VwzuuiOsa1yovkLZG7NmLYSW51p8UhmQMeI=";
diff --git a/pkgs/applications/networking/cluster/ocm/default.nix b/pkgs/applications/networking/cluster/ocm/default.nix
index a63979d5a8bd..46fdeef2ac83 100644
--- a/pkgs/applications/networking/cluster/ocm/default.nix
+++ b/pkgs/applications/networking/cluster/ocm/default.nix
@@ -1,21 +1,23 @@
-{ lib, buildGoModule, fetchFromGitHub, stdenv, testers, ocm }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles, stdenv, testers, ocm }:
buildGoModule rec {
pname = "ocm";
- version = "0.1.63";
+ version = "0.1.64";
src = fetchFromGitHub {
owner = "openshift-online";
repo = "ocm-cli";
rev = "v${version}";
- sha256 = "sha256-wBKW2WS1+JmWOFCArmrlVfUTEqFYF7aq1OBrUo7e4ac=";
+ sha256 = "sha256-RMXiEXgf8tAdp2d97kaOzXgFCFVkaMhkJF8AHXIEJm8=";
};
- vendorSha256 = "sha256-LyQ/F+E0y1gQtpGSyPEB2z2ImorA7mjY3QjrRORakIo=";
+ vendorSha256 = "sha256-4m5Ej2Ql9+wGqrzvXQkY8fL2I9tYE6Tm6s9+qcZBHQI=";
# Strip the final binary.
ldflags = [ "-s" "-w" ];
+ nativeBuildInputs = [ installShellFiles ];
+
# Tests expect the binary to be located in the root directory.
preCheck = ''
ln -s $GOPATH/bin/ocm ocm
@@ -24,6 +26,13 @@ buildGoModule rec {
# Tests fail in Darwin sandbox.
doCheck = !stdenv.isDarwin;
+ postInstall = ''
+ installShellCompletion --cmd ocm \
+ --bash <($out/bin/ocm completion bash) \
+ --fish <($out/bin/ocm completion fish) \
+ --zsh <($out/bin/ocm completion zsh)
+ '';
+
passthru.tests.version = testers.testVersion {
package = ocm;
command = "ocm version";
@@ -34,5 +43,6 @@ buildGoModule rec {
license = licenses.asl20;
homepage = "https://github.com/openshift-online/ocm-cli";
maintainers = with maintainers; [ stehessel ];
+ platforms = platforms.all;
};
}
diff --git a/pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh b/pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh
index 389229e04f24..3d1b470edfcd 100644
--- a/pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh
+++ b/pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh
@@ -6,7 +6,7 @@ curl https://raw.githubusercontent.com/dvallin/spacegun/f88cfd1cf653995a301ef4db
curl https://raw.githubusercontent.com/dvallin/spacegun/f88cfd1cf653995a301ef4db4a1e387ef3ca01a1/package-lock.json -o package-lock.json
node2nix \
- --nodejs-12 \
+ --nodejs-16 \
--node-env ../../../../development/node-packages/node-env.nix \
--development \
--input package.json \
diff --git a/pkgs/applications/networking/cluster/spacegun/node-composition.nix b/pkgs/applications/networking/cluster/spacegun/node-composition.nix
index 02fdb925fb1b..0c0b678d98f2 100644
--- a/pkgs/applications/networking/cluster/spacegun/node-composition.nix
+++ b/pkgs/applications/networking/cluster/spacegun/node-composition.nix
@@ -2,7 +2,7 @@
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
let
nodeEnv = import ../../../../development/node-packages/node-env.nix {
diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index aad384f5ba0d..0dc1c9c1e65c 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -60,15 +60,6 @@ let
special-providers =
{
brightbox = automated-providers.brightbox.override { mkProviderGoModule = buildGo118Module; };
- # remove with >= 1.6.0
- # https://github.com/equinix/terraform-provider-equinix/commit/5b4d6415d23dc2ee56988c4b1458fbb51c8cc750
- equinix = automated-providers.equinix.overrideAttrs (a: {
- src = a.src.overrideAttrs (a: {
- postFetch = (a.postFetch or "") + lib.optionalString (!stdenv.isDarwin) ''
- rm $out/cmd/migration-tool/README.md
- '';
- });
- });
# mkisofs needed to create ISOs holding cloud-init data,
# and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630
libvirt = automated-providers.libvirt.overrideAttrs (_: { propagatedBuildInputs = [ cdrtools ]; });
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index a16d739f0e93..e8f337e2184d 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -367,10 +367,10 @@
"owner": "equinix",
"provider-source-address": "registry.terraform.io/equinix/equinix",
"repo": "terraform-provider-equinix",
- "rev": "v1.5.0",
- "sha256": "sha256-+NrEP5x9/ymNb2qSdMyHNu7rjUtYxDT5Nv70vMxfTJw=",
- "vendorSha256": "sha256-5MSZ4Mw6P5cI+COOq5SLTXqaVTr+zOix+w983rgcS+g=",
- "version": "1.5.0"
+ "rev": "v1.6.0",
+ "sha256": "sha256-wvx0dZS38i5B7Jpaaa9iuv93PyzNAaKCxxU8OxklOhE=",
+ "vendorSha256": "sha256-tWMmwCFWwRvsFC/Bu4Eax+uopxN3ijRP9qr35bcg6qQ=",
+ "version": "1.6.0"
},
"exoscale": {
"owner": "exoscale",
@@ -738,10 +738,10 @@
"owner": "equinix",
"provider-source-address": "registry.terraform.io/equinix/metal",
"repo": "terraform-provider-metal",
- "rev": "v3.2.2",
- "sha256": "sha256-sQMvTWGjj4UpmyvH1o+NjBHglKvpXPP7H8vfrNxJaKQ=",
- "vendorSha256": null,
- "version": "3.2.2"
+ "rev": "v3.3.0",
+ "sha256": "sha256-1HTSDVMk2VhoYRLInrBK3bDuYU0SwyhBV1p5A2tlU/I=",
+ "vendorSha256": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI=",
+ "version": "3.3.0"
},
"minio": {
"owner": "aminueza",
diff --git a/pkgs/applications/networking/go-graft/default.nix b/pkgs/applications/networking/go-graft/default.nix
new file mode 100644
index 000000000000..f919ff757fc9
--- /dev/null
+++ b/pkgs/applications/networking/go-graft/default.nix
@@ -0,0 +1,28 @@
+{ lib, fetchFromGitHub, buildGoModule }:
+
+buildGoModule rec {
+ pname = "go-graft";
+ version = "0.2.6";
+
+ src = fetchFromGitHub {
+ owner = "mzz2017";
+ repo = "gg";
+ rev = "v${version}";
+ sha256 = "sha256-nuRkQEqytMPxd2Wh5XeUwk4YzIxnnNEiVTxFY4GlD1E=";
+ };
+
+ CGO_ENABLED = 0;
+
+ ldflags = [ "-X github.com/mzz2017/gg/cmd.Version=${version}" "-s" "-w" "-buildid=" ];
+ vendorSha256 = "sha256-/ckudHo/ttNct+yrQYQEaC6hX+p+Q6M1I/cjJCgjYLk=";
+ subPackages = [ "." ];
+
+ meta = with lib; {
+ description = "A command-line tool for one-click proxy in your research and development without installing v2ray or anything else";
+ homepage = "https://github.com/mzz2017/gg";
+ license = licenses.agpl3Plus;
+ maintainers = with maintainers; [ xyenon ];
+ mainProgram = "gg";
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix
index 97dc48f6e0d0..d1091068c6b4 100644
--- a/pkgs/applications/networking/mullvad-vpn/default.nix
+++ b/pkgs/applications/networking/mullvad-vpn/default.nix
@@ -43,11 +43,11 @@ in
stdenv.mkDerivation rec {
pname = "mullvad-vpn";
- version = "2022.1";
+ version = "2022.2";
src = fetchurl {
url = "https://github.com/mullvad/mullvadvpn-app/releases/download/${version}/MullvadVPN-${version}_amd64.deb";
- sha256 = "0s12y9j75k59kqkcvfflb1v5p3ny7xgc1m5bd635lvql1bv46c3i";
+ sha256 = "sha256-h/c4aPH6E2TzbXGROpLJgF9uHYcjvKiW5upIobpJM9o=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/networking/mullvad/mullvad.nix b/pkgs/applications/networking/mullvad/mullvad.nix
index 801e8602cc95..49f4a44702a8 100644
--- a/pkgs/applications/networking/mullvad/mullvad.nix
+++ b/pkgs/applications/networking/mullvad/mullvad.nix
@@ -13,29 +13,18 @@
, openvpn-mullvad
, shadowsocks-rust
}:
-let
- # result of running address_cache as of 02 Mar 2022
- bootstrap-address-cache = writeText "api-ip-address.txt" ''
- 193.138.218.78:443
- 193.138.218.71:444
- 185.65.134.66:444
- 185.65.135.117:444
- 217.138.254.130:444
- 91.90.44.10:444
- '';
-in
rustPlatform.buildRustPackage rec {
pname = "mullvad";
- version = "2022.1";
+ version = "2022.2";
src = fetchFromGitHub {
owner = "mullvad";
repo = "mullvadvpn-app";
rev = version;
- hash = "sha256-bLwuM3Qy2iStbXIvDEWp31vuiihSQThOej297XKo5Xc=";
+ hash = "sha256-ZtQKzbFrkacrfPIkMz/UOfIwQBXQUoVVlFla//jmMwY=";
};
- cargoHash = "sha256-CBbm8cJHTjyvvzCFQfKmsE5d9N7azEm8nI6KeWLVaa8=";
+ cargoHash = "sha256-J6h3KY1RDCnAc/tQHNGEyOlVQoQNhRqjWbmimPitydQ=";
nativeBuildInputs = [
pkg-config
@@ -59,26 +48,14 @@ rustPlatform.buildRustPackage rec {
postFixup =
# Place all binaries in the 'mullvad-' namespace, even though these
# specific binaries aren't used in the lifetime of the program.
- # `address_cache` is used to generate the `api-ip-address.txt` file, which
- # contains list of Mullvad API servers -- though we provide a "backup" of
- # the output of this command, it could change at any time, so we want
- # users to be able to regenerate the list at any time. (The daemon will
- # refuse to start without this file.)
''
- for bin in address_cache relay_list translations-converter; do
+ for bin in relay_list translations-converter; do
mv "$out/bin/$bin" "$out/bin/mullvad-$bin"
done
'' +
- # Put distributed assets in-place -- specifically, the
- # bootstrap-address-cache is necessary; otherwise, the user will have to run
- # the `address_cache` binary and move the contents into place at
- # `/var/cache/mullvad-vpn/api-ip-address.txt` manually.
- ''
- mkdir -p $out/share/mullvad
- ln -s ${bootstrap-address-cache} $out/share/mullvad/api-ip-address.txt
- '' +
# Files necessary for OpenVPN tunnels to work.
''
+ mkdir -p $out/share/mullvad
cp dist-assets/ca.crt $out/share/mullvad
ln -s ${openvpn-mullvad}/bin/openvpn $out/share/mullvad
ln -s ${shadowsocks-rust}/bin/sslocal $out/share/mullvad
diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix
index 0679cbc9f5f3..6a187a09e063 100644
--- a/pkgs/applications/networking/n8n/node-packages.nix
+++ b/pkgs/applications/networking/n8n/node-packages.nix
@@ -220,6 +220,15 @@ let
sha512 = "FBEPKGnvtQJS8V8Tg1P9obgmVD9AodrIfwtwhBpsjenClhFyugMp3HPJY0tF7rInUB/CivKBCbnQKrUnKxqxzw==";
};
};
+ "@babel/parser-7.18.6" = {
+ name = "_at_babel_slash_parser";
+ packageName = "@babel/parser";
+ version = "7.18.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/parser/-/parser-7.18.6.tgz";
+ sha512 = "uQVSa9jJUe/G/304lXspfWVpKpK4euFLgGiMQFOCpM/bgcAdeoHwi/OQz23O9GK2osz26ZiXRRV9aV+Yl1O8tw==";
+ };
+ };
"@babel/runtime-7.18.6" = {
name = "_at_babel_slash_runtime";
packageName = "@babel/runtime";
@@ -724,13 +733,13 @@ let
sha512 = "/SNsDidUFCvqqcWDwxv2feww/yqhNeTRL5CVoL3jU4Goc4kKEL10T7Eye65ZqPNi4HRx8sAEX59pV1aEH7drNA==";
};
};
- "@types/node-18.0.0" = {
+ "@types/node-18.0.1" = {
name = "_at_types_slash_node";
packageName = "@types/node";
- version = "18.0.0";
+ version = "18.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/node/-/node-18.0.0.tgz";
- sha512 = "cHlGmko4gWLVI27cGJntjs/Sj8th9aYwplmZFwmmgYQQvL5NUsgVJG7OddLvNfLqYS31KFN0s3qlaD9qCaxACA==";
+ url = "https://registry.npmjs.org/@types/node/-/node-18.0.1.tgz";
+ sha512 = "CmR8+Tsy95hhwtZBKJBs0/FFq4XX7sDZHlGGf+0q+BRZfMbOTkzkj0AFAuTyXbObDIoanaBBW0+KEW+m3N16Wg==";
};
};
"@types/node-fetch-2.6.2" = {
@@ -841,6 +850,15 @@ let
sha512 = "QcJ5ZczaXAqbVD3o8mw/mEBhRvO5UAdTtbvgwL/OgoWubvNBh6/MxLBAigtcgIFaq3shon9m3POIxQaLQt4fxQ==";
};
};
+ "@vue/compiler-sfc-2.7.2" = {
+ name = "_at_vue_slash_compiler-sfc";
+ packageName = "@vue/compiler-sfc";
+ version = "2.7.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.2.tgz";
+ sha512 = "khG5m63A4DSeHEOe5yyjHQY2TAE0pUXqKqxgauNUcFaa8M4+J55OWhagy8Bk8O6cO4GhKbQf2NDYzceijmOy8A==";
+ };
+ };
"abbrev-1.1.1" = {
name = "abbrev";
packageName = "abbrev";
@@ -1201,13 +1219,13 @@ let
sha512 = "z4oo33lmnvvNRqfUe3YjDGGpqu/L2+wXBIhMtwq6oqZ+exOUAkQYM6zd2VWKF7AIlajOF8ZZuPFfryTG9iLC/w==";
};
};
- "aws-sdk-2.1164.0" = {
+ "aws-sdk-2.1167.0" = {
name = "aws-sdk";
packageName = "aws-sdk";
- version = "2.1164.0";
+ version = "2.1167.0";
src = fetchurl {
- url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1164.0.tgz";
- sha512 = "q/M9E68WabF22G8d8lFgo3NH+9RooYswSY9VG6zqN16C19RRm2sGThp8Sxtz/WUK98BAsxSnkLW1ksmy3BsP7Q==";
+ url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1167.0.tgz";
+ sha512 = "hUJzAqWVfNYpct1S+GjyPIc2s+GZcAhbWVqIG4qbLYZ3+sBTcjv3lLH5zx7K+qcTGINDU0g4EsMi6hIrAU+blg==";
};
};
"aws-sign2-0.7.0" = {
@@ -1246,13 +1264,13 @@ let
sha512 = "t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==";
};
};
- "axios-retry-3.3.0" = {
+ "axios-retry-3.3.1" = {
name = "axios-retry";
packageName = "axios-retry";
- version = "3.3.0";
+ version = "3.3.1";
src = fetchurl {
- url = "https://registry.npmjs.org/axios-retry/-/axios-retry-3.3.0.tgz";
- sha512 = "lKAk/qIkpYxscEooNPB6Yip3aPNcNJ+cAiU1eiTo9vCh+gYPX482K4lfYubPXwbVvmNM4cakAsfN171nmSHkdg==";
+ url = "https://registry.npmjs.org/axios-retry/-/axios-retry-3.3.1.tgz";
+ sha512 = "RohAUQTDxBSWLFEnoIG/6bvmy8l3TfpkclgStjl5MDCMBDgapAWCmr1r/9harQfWC8bzLC8job6UcL1A1Yc+/Q==";
};
};
"babel-helper-vue-jsx-merge-props-2.0.3" = {
@@ -2299,6 +2317,15 @@ let
sha512 = "FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw==";
};
};
+ "csstype-3.1.0" = {
+ name = "csstype";
+ packageName = "csstype";
+ version = "3.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/csstype/-/csstype-3.1.0.tgz";
+ sha512 = "uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA==";
+ };
+ };
"dashdash-1.14.1" = {
name = "dashdash";
packageName = "dashdash";
@@ -4099,6 +4126,15 @@ let
sha512 = "bF7vcQxbODoGK1imE2P9GS9aw4zD0Sd+Hni68IMZLj7zRnquH7dXUmMw9hDI5S/Jzt7q+IyTXN0rSg2GI0IKhQ==";
};
};
+ "js-md4-0.3.2" = {
+ name = "js-md4";
+ packageName = "js-md4";
+ version = "0.3.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/js-md4/-/js-md4-0.3.2.tgz";
+ sha512 = "/GDnfQYsltsjRswQhN9fhv3EMw2sCpUdrdxyWDOUK7eyD++r3gRhzgiQgc/x4MAv2i1iuQ4lxO5mvqM3vj4bwA==";
+ };
+ };
"js-yaml-3.14.1" = {
name = "js-yaml";
packageName = "js-yaml";
@@ -5053,49 +5089,49 @@ let
sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==";
};
};
- "n8n-core-0.124.0" = {
+ "n8n-core-0.125.0" = {
name = "n8n-core";
packageName = "n8n-core";
- version = "0.124.0";
+ version = "0.125.0";
src = fetchurl {
- url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.124.0.tgz";
- sha512 = "rcOInEZLSxlOuCH2cMuyW+EO1/QUH4pJaDJlCmDUAJ2JdqyXMPVAiYBLX3SPRHy9cvfuE0oV/aSHh9VpiISCHg==";
+ url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.125.0.tgz";
+ sha512 = "xywzkbtSkhxMzCQNZacklxdqAxl6sVgIJLJ8IUuHtfdcS7E6VJNJ5SIT/Ypl+E3UAsfH1kiHHdlkDgLGyB20tA==";
};
};
- "n8n-design-system-0.24.0" = {
+ "n8n-design-system-0.25.0" = {
name = "n8n-design-system";
packageName = "n8n-design-system";
- version = "0.24.0";
+ version = "0.25.0";
src = fetchurl {
- url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.24.0.tgz";
- sha512 = "/JPfW6wDdkrVonApyHOMsdRNDIy3ljQJ1PG7LqGFt7PB1Tgxz8X/y+rClegEm+miQN3i9egN2yq3TChvL/YDmw==";
+ url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.25.0.tgz";
+ sha512 = "vS1dIW6n3/MxrKFJ8EpIt4oMNnvYmoweL2kncDja7CpvOO3Zqsa0ElqUvhbbxypk0DcfSQMonNWfSonGrNIgeg==";
};
};
- "n8n-editor-ui-0.150.0" = {
+ "n8n-editor-ui-0.151.0" = {
name = "n8n-editor-ui";
packageName = "n8n-editor-ui";
- version = "0.150.0";
+ version = "0.151.0";
src = fetchurl {
- url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.150.0.tgz";
- sha512 = "HQ8tblXy9orfCMGcffD12yyHqKfd4kCwZDt7ckXzZpwqq4SUHYT1MQO/O1zXykpdLDY2ZKQ73+YV2kD3tMcLqg==";
+ url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.151.0.tgz";
+ sha512 = "3VbZm2jfOC4BXUDzhdBvtx3L+XPnr2LdLVLQ2yrx6HvDFUpMExuxmoQ3I8/aDTo5asVDEHgi7TKkISqY8LKi8A==";
};
};
- "n8n-nodes-base-0.182.0" = {
+ "n8n-nodes-base-0.183.0" = {
name = "n8n-nodes-base";
packageName = "n8n-nodes-base";
- version = "0.182.0";
+ version = "0.183.0";
src = fetchurl {
- url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.182.0.tgz";
- sha512 = "mC6SeDYmsiKLDSWAL1nDbLCGH+TgZq0HiLYBlTa+ttg/S7Yw1W8VmhFs0ZNVk6VQgACSGSvT9mA5/YTFIPqplA==";
+ url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.183.0.tgz";
+ sha512 = "JH7FodkX+RtvmyqxMyro9hskhLNSigYUOcnX/6568dipH3ZiOgk+GDQD0VApBoOFpV1GHuWF85onkMoEiEJ3HA==";
};
};
- "n8n-workflow-0.106.0" = {
+ "n8n-workflow-0.107.0" = {
name = "n8n-workflow";
packageName = "n8n-workflow";
- version = "0.106.0";
+ version = "0.107.0";
src = fetchurl {
- url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.106.0.tgz";
- sha512 = "vuVKjmK9ycZFYcEAb80JtDGV+/tLG6qVGQHy7qNA+kpVgQBYdsDJCVKEyPw6Bj0zHHW0ggEmL4VmoE35UPeRAw==";
+ url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.107.0.tgz";
+ sha512 = "+SuZ+5aA+sEovnkkobdZNEGFW/0oCTItCpXaL2+umI0TFrqgL8NGGVKwYLIkX6YATa5W3LVgbEszKDECg2sPJA==";
};
};
"named-placeholders-1.1.2" = {
@@ -5269,13 +5305,13 @@ let
sha512 = "KUdDsspqx89sD4UUyUKzdlUOper3hRkDVkrKh/89G+d9WKsU5ox51NWS4tB1XR5dPUdR4SP0E3molyEfOvSa3g==";
};
};
- "nodemailer-6.7.5" = {
+ "nodemailer-6.7.6" = {
name = "nodemailer";
packageName = "nodemailer";
- version = "6.7.5";
+ version = "6.7.6";
src = fetchurl {
- url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.5.tgz";
- sha512 = "6VtMpwhsrixq1HDYSBBHvW0GwiWawE75dS3oal48VqRhUvKJNnKnJo2RI/bCVQubj1vgrgscMNW4DHaD6xtMCg==";
+ url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.6.tgz";
+ sha512 = "/6KF/umU7r7X21Y648/yiRLrgkfz0dmpyuo4BfgYWIpnT/jCbkPTvegMfxCsDAu+O810p2L1BGXieMTPp3nJVA==";
};
};
"nopt-5.0.0" = {
@@ -6187,13 +6223,13 @@ let
sha512 = "b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==";
};
};
- "psl-1.8.0" = {
+ "psl-1.9.0" = {
name = "psl";
packageName = "psl";
- version = "1.8.0";
+ version = "1.9.0";
src = fetchurl {
- url = "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz";
- sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==";
+ url = "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz";
+ sha512 = "E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==";
};
};
"pump-2.0.1" = {
@@ -7393,13 +7429,13 @@ let
sha512 = "+G0LLgjjo9BZX2MfdvPfH+MKLCrxlXSYec5DaPYP1fe6Iyhf0/fSmJ0bFiZ1F8BT6cGXl2LpltQptzjXKWEkKA==";
};
};
- "tedious-14.6.1" = {
+ "tedious-14.7.0" = {
name = "tedious";
packageName = "tedious";
- version = "14.6.1";
+ version = "14.7.0";
src = fetchurl {
- url = "https://registry.npmjs.org/tedious/-/tedious-14.6.1.tgz";
- sha512 = "45Xsvsjm6j41JVXXwKAseAGM/jD6ty8CcSdcxPT4B2dqZ00tIkYsGlI7n8DU8xDoatnvyT4BIYKZZCe3eE16PA==";
+ url = "https://registry.npmjs.org/tedious/-/tedious-14.7.0.tgz";
+ sha512 = "d3qlmZcvZyt7akyPHiOdR+knfzObWZH3mW+gouQTSb7YTSwtpHuYHcvsQabfbY7oOvgbs51xRb7CwOahWK/t9w==";
};
};
"test-console-2.0.0" = {
@@ -7978,13 +8014,13 @@ let
sha512 = "xwTm7NLh/uOjARRBs8/95H0e8fT3Ukw5D/JJWhxMbhKzNh1Nu981jQKvkep9iKYNxzlVrdzD0mlBGkDKZWprlw==";
};
};
- "vue-2.6.14" = {
+ "vue-2.7.2" = {
name = "vue";
packageName = "vue";
- version = "2.6.14";
+ version = "2.7.2";
src = fetchurl {
- url = "https://registry.npmjs.org/vue/-/vue-2.6.14.tgz";
- sha512 = "x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ==";
+ url = "https://registry.npmjs.org/vue/-/vue-2.7.2.tgz";
+ sha512 = "fQPKEfdiUP4bDlrGEjI5MOTkC5s/XIbnfKAx0B3MxJHI4qwh8FPLSo8/9tFkgFiRH3HwvcHjZQ1tCTifOUH0tg==";
};
};
"vue-color-2.8.1" = {
@@ -8086,13 +8122,13 @@ let
sha512 = "NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==";
};
};
- "winston-3.8.0" = {
+ "winston-3.8.1" = {
name = "winston";
packageName = "winston";
- version = "3.8.0";
+ version = "3.8.1";
src = fetchurl {
- url = "https://registry.npmjs.org/winston/-/winston-3.8.0.tgz";
- sha512 = "Iix1w8rIq2kBDkGvclO0db2CVOHYVamCIkVWcUbs567G9i2pdB+gvqLgDgxx4B4HXHYD6U4Zybh6ojepUOqcFQ==";
+ url = "https://registry.npmjs.org/winston/-/winston-3.8.1.tgz";
+ sha512 = "r+6YAiCR4uI3N8eQNOg8k3P3PqwAm20cLKlzVD9E66Ch39+LZC+VH1UKf9JemQj2B3QoUHfKD7Poewn0Pr3Y1w==";
};
};
"winston-transport-4.5.0" = {
@@ -8389,10 +8425,10 @@ in
n8n = nodeEnv.buildNodePackage {
name = "n8n";
packageName = "n8n";
- version = "0.184.0";
+ version = "0.185.0";
src = fetchurl {
- url = "https://registry.npmjs.org/n8n/-/n8n-0.184.0.tgz";
- sha512 = "GBnRD/3/4SHxSm6soWFmcCp4X30HFrzo2uXLgr0qKYbunO7PIJL+hRr7JO4FVP557n5AQhcL9xTzYTNYt8YtHg==";
+ url = "https://registry.npmjs.org/n8n/-/n8n-0.185.0.tgz";
+ sha512 = "S3NBZkON4drha+QMTSmRlFq81F5ENW4Swe6lIsosdTQJziSoHmXb2gKogLYfTYAXSq4BasfVmcgYHDFB/fGQMg==";
};
dependencies = [
sources."@apidevtools/json-schema-ref-parser-8.0.0"
@@ -8492,6 +8528,7 @@ in
sources."tslib-2.4.0"
];
})
+ sources."@babel/parser-7.18.6"
sources."@babel/runtime-7.18.6"
sources."@colors/colors-1.5.0"
(sources."@dabh/diagnostics-2.0.3" // {
@@ -8581,7 +8618,7 @@ in
sources."@types/mime-1.3.2"
sources."@types/minimatch-3.0.5"
sources."@types/multer-1.4.7"
- sources."@types/node-18.0.0"
+ sources."@types/node-18.0.1"
(sources."@types/node-fetch-2.6.2" // {
dependencies = [
sources."form-data-3.0.1"
@@ -8598,6 +8635,7 @@ in
sources."@types/tough-cookie-2.3.8"
sources."@types/tunnel-0.0.3"
sources."@types/yamljs-0.2.31"
+ sources."@vue/compiler-sfc-2.7.2"
sources."abbrev-1.1.1"
sources."accepts-1.3.8"
sources."access-control-1.0.1"
@@ -8649,7 +8687,7 @@ in
];
})
sources."avsc-5.7.4"
- (sources."aws-sdk-2.1164.0" // {
+ (sources."aws-sdk-2.1167.0" // {
dependencies = [
sources."buffer-4.9.2"
sources."events-1.1.1"
@@ -8663,7 +8701,7 @@ in
sources."aws-sign2-0.7.0"
sources."aws4-1.11.0"
sources."axios-0.21.4"
- sources."axios-retry-3.3.0"
+ sources."axios-retry-3.3.1"
sources."babel-helper-vue-jsx-merge-props-2.0.3"
(sources."babel-runtime-6.26.0" // {
dependencies = [
@@ -8838,6 +8876,7 @@ in
sources."css-select-4.3.0"
sources."css-what-6.1.0"
sources."cssfilter-0.0.10"
+ sources."csstype-3.1.0"
sources."dashdash-1.14.1"
sources."debug-4.3.4"
sources."debuglog-1.0.1"
@@ -9075,6 +9114,7 @@ in
sources."jake-10.8.5"
sources."jmespath-0.16.0"
sources."join-component-1.1.0"
+ sources."js-md4-0.3.2"
sources."js-yaml-3.14.1"
sources."jsbi-4.3.0"
sources."jsbn-0.1.1"
@@ -9237,15 +9277,15 @@ in
];
})
sources."mz-2.7.0"
- sources."n8n-core-0.124.0"
- sources."n8n-design-system-0.24.0"
- sources."n8n-editor-ui-0.150.0"
- (sources."n8n-nodes-base-0.182.0" // {
+ sources."n8n-core-0.125.0"
+ sources."n8n-design-system-0.25.0"
+ sources."n8n-editor-ui-0.151.0"
+ (sources."n8n-nodes-base-0.183.0" // {
dependencies = [
sources."iconv-lite-0.6.3"
];
})
- sources."n8n-workflow-0.106.0"
+ sources."n8n-workflow-0.107.0"
(sources."named-placeholders-1.1.2" // {
dependencies = [
sources."lru-cache-4.1.5"
@@ -9277,7 +9317,7 @@ in
sources."node-html-parser-5.3.3"
sources."node-ssh-12.0.4"
sources."nodeify-1.0.1"
- sources."nodemailer-6.7.5"
+ sources."nodemailer-6.7.6"
sources."nopt-5.0.0"
sources."normalize-path-3.0.0"
sources."normalize-wheel-1.0.1"
@@ -9405,7 +9445,7 @@ in
sources."proxy-addr-2.0.7"
sources."proxy-from-env-1.1.0"
sources."pseudomap-1.0.2"
- sources."psl-1.8.0"
+ sources."psl-1.9.0"
sources."pump-3.0.0"
(sources."pumpify-1.5.1" // {
dependencies = [
@@ -9601,7 +9641,7 @@ in
})
sources."tarn-3.0.2"
sources."tdigest-0.1.2"
- (sources."tedious-14.6.1" // {
+ (sources."tedious-14.7.0" // {
dependencies = [
sources."bl-5.0.0"
sources."buffer-6.0.3"
@@ -9707,7 +9747,7 @@ in
];
})
sources."vm2-3.9.9"
- sources."vue-2.6.14"
+ sources."vue-2.7.2"
sources."vue-color-2.8.1"
sources."vue-fragment-1.6.0"
sources."vue-i18n-8.27.2"
@@ -9719,7 +9759,7 @@ in
sources."which-module-2.0.0"
sources."wide-align-1.1.5"
sources."widest-line-3.1.0"
- (sources."winston-3.8.0" // {
+ (sources."winston-3.8.1" // {
dependencies = [
sources."readable-stream-3.6.0"
];
diff --git a/pkgs/applications/office/autokey/default.nix b/pkgs/applications/office/autokey/default.nix
index 4aef68ba0d06..0a00ac1463b5 100644
--- a/pkgs/applications/office/autokey/default.nix
+++ b/pkgs/applications/office/autokey/default.nix
@@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
# Tests appear to be broken with import errors within the project structure
doCheck = false;
- nativeBuildInputs = [ wrapGAppsHook ];
+ nativeBuildInputs = [ wrapGAppsHook gobject-introspection ];
buildInputs = [
gobject-introspection
@@ -38,19 +38,9 @@ python3Packages.buildPythonApplication rec {
pygobject3
];
- dontWrapGapps = true;
-
- pythonPath = with python3Packages; requiredPythonModules [ dbus-python xlib pygobject3 ];
-
postInstall = ''
- rm $out/bin/autokey-qt
- buildPythonPath "$out $pythonPath"
- makeWrapperArgs+=(
- "''${gappsWrapperArgs[@]}"
- # for autokey-shell ModuleNotFoundError: No module named 'autokey'
- --prefix "PYTHONPATH" ":" "$out/lib/${python3Packages.python.libPrefix}/site-packages"
- --prefix "PYTHONPATH" ":" "$program_PYTHONPATH"
- )
+ # remove Qt version which we currently do not support
+ rm $out/bin/autokey-qt $out/share/applications/autokey-qt.desktop
'';
meta = {
diff --git a/pkgs/applications/office/onlyoffice-bin/default.nix b/pkgs/applications/office/onlyoffice-bin/default.nix
index 8e1b7eb79020..7ca12b234271 100644
--- a/pkgs/applications/office/onlyoffice-bin/default.nix
+++ b/pkgs/applications/office/onlyoffice-bin/default.nix
@@ -73,11 +73,11 @@ let
in
stdenv.mkDerivation rec {
pname = "onlyoffice-desktopeditors";
- version = "6.3.1";
+ version = "7.1.0";
minor = null;
src = fetchurl {
url = "https://github.com/ONLYOFFICE/DesktopEditors/releases/download/v${version}/onlyoffice-desktopeditors_amd64.deb";
- sha256 = "sha256-WCjCljA7yB7Zm/I4rDZnfgaUQpDUKwbUvL7hkIG8cVM=";
+ sha256 = "sha256-40IUAmg7PnfYrdTj7TVbfvb9ey0/zzswu+sJllAIktg=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/office/tagainijisho/default.nix b/pkgs/applications/office/tagainijisho/default.nix
index 7869b54a5f04..7211d4f9e562 100644
--- a/pkgs/applications/office/tagainijisho/default.nix
+++ b/pkgs/applications/office/tagainijisho/default.nix
@@ -1,16 +1,19 @@
-{ lib, stdenv, fetchurl, qt4, cmake, sqlite }:
-
-stdenv.mkDerivation rec {
+{ lib, mkDerivation, fetchzip, qtbase, qttools, cmake, sqlite }:
+mkDerivation rec {
pname = "tagainijisho";
- version = "1.0.3";
+ version = "1.2.0";
- src = fetchurl {
+ src = fetchzip {
url = "https://github.com/Gnurou/tagainijisho/releases/download/${version}/tagainijisho-${version}.tar.gz";
- sha256 = "0kmg1940yiqfm4vpifyj680283ids4nsij9s750nrshwxiwwbqvg";
+ hash = "sha256-fLq4Wfpa7Wr62KvHztgLiXE8eopCq+wipgabFm2bq6w=";
};
nativeBuildInputs = [ cmake ];
- buildInputs = [ qt4 sqlite ];
+ buildInputs = [ qtbase qttools sqlite ];
+
+ cmakeFlags = [
+ "-DEMBED_SQLITE=OFF"
+ ];
meta = with lib; {
description = "A free, open-source Japanese dictionary and kanji lookup tool";
diff --git a/pkgs/applications/science/electronics/gtkwave/0001-Fix-detection-of-quartz-in-gdk-3.0-target.patch b/pkgs/applications/science/electronics/gtkwave/0001-Fix-detection-of-quartz-in-gdk-3.0-target.patch
new file mode 100644
index 000000000000..b28e0b8e9720
--- /dev/null
+++ b/pkgs/applications/science/electronics/gtkwave/0001-Fix-detection-of-quartz-in-gdk-3.0-target.patch
@@ -0,0 +1,40 @@
+From 69a6ab80cf0908c2a44430c297932ef3659a1655 Mon Sep 17 00:00:00 2001
+From: Jiajie Chen
+Date: Wed, 22 Jun 2022 16:24:10 +0800
+Subject: [PATCH 1/2] Fix detection of quartz in gdk-3.0 target
+
+The GTK+3 built by Nix targets ``broadway quartz`` instead of only `quartz`,
+thus the target check is wrong. The script is modified to look up `quartz` in a
+loop. The variable name is renamed to `targets` in `gdk-3.0.pc` as well.
+
+---
+ configure | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 628a80f..9cb88d5 100755
+--- a/configure
++++ b/configure
+@@ -7361,7 +7361,10 @@ $as_echo "yes" >&6; }
+ fi
+ GTK_VER=`$PKG_CONFIG gtk+-3.0 --modversion`
+
+- _gdk_tgt=`$PKG_CONFIG --variable=target gdk-3.0`
++ # gdk-3.0 may have multiple targets e.g. "broadway quartz"
++ _gdk_tgts=`$PKG_CONFIG --variable=targets gdk-3.0`
++ for _gdk_tgt in $_gdk_tgts;
++ do
+ if test "x$_gdk_tgt" = xquartz; then
+
+ pkg_failed=no
+@@ -7466,6 +7469,7 @@ fi
+ COCOA_GTK_LDFLAGS="-framework Cocoa -framework ApplicationServices"
+
+ fi
++ done
+
+ if test x$with_gconf = xyes; then
+
+--
+2.36.1
+
diff --git a/pkgs/applications/science/electronics/gtkwave/0002-Check-GDK_WINDOWING_X11-macro-when-using-GtkPlug.patch b/pkgs/applications/science/electronics/gtkwave/0002-Check-GDK_WINDOWING_X11-macro-when-using-GtkPlug.patch
new file mode 100644
index 000000000000..456f5fa278f3
--- /dev/null
+++ b/pkgs/applications/science/electronics/gtkwave/0002-Check-GDK_WINDOWING_X11-macro-when-using-GtkPlug.patch
@@ -0,0 +1,101 @@
+From 6045177a0d4753bb7a6a6ffc3f1a4a3e96129c6d Mon Sep 17 00:00:00 2001
+From: Jiajie Chen
+Date: Wed, 22 Jun 2022 17:03:29 +0800
+Subject: [PATCH 2/2] Check GDK_WINDOWING_X11 macro when using GtkPlug
+
+---
+ src/main.c | 5 +++++
+ src/twinwave.c | 12 ++++++++++--
+ 2 files changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/src/main.c b/src/main.c
+index 81bf505..b89f629 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -2080,10 +2080,15 @@ if(!GLOBALS->socket_xid)
+ #ifdef WAVE_USE_XID
+ else
+ {
++#ifdef GDK_WINDOWING_X11
+ GLOBALS->mainwindow = gtk_plug_new(GLOBALS->socket_xid);
+ gtk_widget_show(GLOBALS->mainwindow);
+
+ g_signal_connect(XXX_GTK_OBJECT(GLOBALS->mainwindow), "destroy", /* formerly was "destroy" */G_CALLBACK(plug_destroy),"Plug destroy");
++#else
++ fprintf(stderr, "GTKWAVE | GtkPlug widget is unavailable\n");
++ exit(1);
++#endif
+ }
+ #endif
+ }
+diff --git a/src/twinwave.c b/src/twinwave.c
+index 590c7f6..d5c60f2 100644
+--- a/src/twinwave.c
++++ b/src/twinwave.c
+@@ -143,15 +143,19 @@ if(GDK_IS_WAYLAND_DISPLAY(gdk_display_get_default()))
+ use_embedded = 0;
+ }
+ #endif
++#if defined(__GTK_SOCKET_H__) && defined(GDK_WINDOWING_X11)
+ {
+ xsocket[0] = gtk_socket_new ();
+ xsocket[1] = gtk_socket_new ();
+ gtk_widget_show (xsocket[0]);
+ gtk_widget_show (xsocket[1]);
+ }
++#endif
+
++#if defined(__GTK_SOCKET_H__) && defined(GDK_WINDOWING_X11)
+ if(!twinwayland)
+ g_signal_connect(XXX_GTK_OBJECT(xsocket[0]), "plug-removed", G_CALLBACK(plug_removed), NULL);
++#endif
+
+ #if GTK_CHECK_VERSION(3,0,0)
+ main_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
+@@ -208,7 +212,7 @@ if(hMapFile != NULL)
+ memset(&pi, 0, sizeof(PROCESS_INFORMATION));
+
+ sprintf(buf, "0+%08X", shmid);
+-#ifdef MINGW_USE_XID
++#if defined(MINGW_USE_XID) && defined(__GTK_SOCKET_H__) && defined(GDK_WINDOWING_X11)
+ sprintf(buf2, "%x", gtk_socket_get_id (GTK_SOCKET(xsocket[0])));
+ #else
+ sprintf(buf2, "%x", 0);
+@@ -279,7 +283,7 @@ if(hMapFile != NULL)
+ memset(&pi, 0, sizeof(PROCESS_INFORMATION));
+
+ sprintf(buf, "1+%08X", shmid);
+-#ifdef MINGW_USE_XID
++#if defined(MINGW_USE_XID) && defined(__GTK_SOCKET_H__) && defined(GDK_WINDOWING_X11)
+ sprintf(buf2, "%x", gtk_socket_get_id (GTK_SOCKET(xsocket[1])));
+ #else
+ sprintf(buf2, "%x", 0);
+@@ -429,10 +433,12 @@ if(shmid >=0)
+ sprintf(buf, "0+%08X", shmid);
+ if(use_embedded)
+ {
++#if defined(__GTK_SOCKET_H__) && defined(GDK_WINDOWING_X11)
+ #ifdef MAC_INTEGRATION
+ sprintf(buf2, "%x", gtk_socket_get_id (GTK_SOCKET(xsocket[0])));
+ #else
+ sprintf(buf2, "%lx", (long)gtk_socket_get_id (GTK_SOCKET(xsocket[0])));
++#endif
+ #endif
+ }
+ else
+@@ -467,10 +473,12 @@ if(shmid >=0)
+ sprintf(buf, "1+%08X", shmid);
+ if(use_embedded)
+ {
++#if defined(__GTK_SOCKET_H__) && defined(GDK_WINDOWING_X11)
+ #ifdef MAC_INTEGRATION
+ sprintf(buf2, "%x", gtk_socket_get_id (GTK_SOCKET(xsocket[1])));
+ #else
+ sprintf(buf2, "%lx", (long)gtk_socket_get_id (GTK_SOCKET(xsocket[1])));
++#endif
+ #endif
+ }
+ else
+--
+2.36.1
+
diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix
index bb6af8a20fd1..10dcb2327c06 100644
--- a/pkgs/applications/science/electronics/gtkwave/default.nix
+++ b/pkgs/applications/science/electronics/gtkwave/default.nix
@@ -3,6 +3,7 @@
, glib
, gperf
, gtk3
+, gtk-mac-integration
, judy
, lib
, pkg-config
@@ -23,7 +24,16 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
- buildInputs = [ bzip2 glib gperf gtk3 judy tcl tk xz ];
+ buildInputs = [ bzip2 glib gperf gtk3 judy tcl tk xz ]
+ ++ lib.optional stdenv.isDarwin gtk-mac-integration;
+
+ # fix compilation under Darwin
+ # remove these patches upon next release
+ # https://github.com/gtkwave/gtkwave/pull/136
+ patches = [
+ ./0001-Fix-detection-of-quartz-in-gdk-3.0-target.patch
+ ./0002-Check-GDK_WINDOWING_X11-macro-when-using-GtkPlug.patch
+ ];
configureFlags = [
"--with-tcl=${tcl}/lib"
@@ -36,7 +46,7 @@ stdenv.mkDerivation rec {
description = "VCD/Waveform viewer for Unix and Win32";
homepage = "http://gtkwave.sourceforge.net";
license = lib.licenses.gpl2Plus;
- maintainers = with lib.maintainers; [ thoughtpolice ];
- platforms = lib.platforms.linux;
+ maintainers = with lib.maintainers; [ thoughtpolice jiegec ];
+ platforms = lib.platforms.linux ++ lib.platforms.darwin;
};
}
diff --git a/pkgs/applications/version-management/cz-cli/node-composition.nix b/pkgs/applications/version-management/cz-cli/node-composition.nix
index 53bdef1f9864..4dfddf3e5bca 100644
--- a/pkgs/applications/version-management/cz-cli/node-composition.nix
+++ b/pkgs/applications/version-management/cz-cli/node-composition.nix
@@ -2,7 +2,7 @@
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
let
nodeEnv = import ./node-env.nix {
diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix
index 932ceba64a9a..1ed773bd65b4 100644
--- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix
@@ -66,7 +66,6 @@ python3Packages.buildPythonApplication rec {
'';
meta = with lib; {
- broken = stdenv.isDarwin;
description = "A patch manager implemented on top of Git";
homepage = "https://stacked-git.github.io/";
license = licenses.gpl2Only;
diff --git a/pkgs/applications/video/adl/default.nix b/pkgs/applications/video/adl/default.nix
new file mode 100644
index 000000000000..621f7246c8ab
--- /dev/null
+++ b/pkgs/applications/video/adl/default.nix
@@ -0,0 +1,43 @@
+{ lib, stdenv, fetchFromGitHub, pkgs, makeWrapper, ... }:
+
+stdenv.mkDerivation rec {
+ pname = "adl";
+ version = "3.0.1";
+
+ src = fetchFromGitHub {
+ owner = "RaitaroH";
+ repo = "adl";
+ rev = "65f68e1dcae4c0caa52668d3a854269e7d226f7c";
+ sha256 = "sha256-huGpDtkWrhZyKDNKXat8T3qtAyMjBaq8HFd1w1ThUVk=";
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ # https://github.com/RaitaroH/adl#requirements
+ buildInputs = with pkgs; [
+ anime-downloader
+ frece
+ fzf
+ mpv
+ perl
+ trackma
+ ueberzug
+ ];
+
+ dontBuild = true;
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp $src/adl $out/bin
+ wrapProgram $out/bin/adl \
+ --prefix PATH : ${lib.makeBinPath buildInputs}
+ '';
+
+ meta = with lib; {
+ homepage = "https://github.com/RaitaroH/adl";
+ description = "popcorn anime-downloader + trackma wrapper";
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ WeebSorceress ];
+ };
+}
diff --git a/pkgs/applications/virtualization/railcar/cargo-lock.patch b/pkgs/applications/virtualization/railcar/cargo-lock.patch
deleted file mode 100644
index bb9d5420f32a..000000000000
--- a/pkgs/applications/virtualization/railcar/cargo-lock.patch
+++ /dev/null
@@ -1,435 +0,0 @@
-From 97e1e2ca82c20317a6de1f345d2fb0adcde0b7fd Mon Sep 17 00:00:00 2001
-From: Katharina Fey
-Date: Mon, 10 Dec 2018 17:42:58 +0100
-Subject: [PATCH] Adding `Cargo.lock` for release `v1.0.4`
-
----
- Cargo.lock | 416 +++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 416 insertions(+)
- create mode 100644 Cargo.lock
-
-diff --git a/Cargo.lock b/Cargo.lock
-new file mode 100644
-index 0000000..bf6aa0e
---- /dev/null
-+++ b/Cargo.lock
-@@ -0,0 +1,416 @@
-+[[package]]
-+name = "ansi_term"
-+version = "0.11.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "atty"
-+version = "0.2.11"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "backtrace"
-+version = "0.3.9"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "backtrace-sys 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rustc-demangle 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "backtrace-sys"
-+version = "0.1.24"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "bitflags"
-+version = "0.7.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "bitflags"
-+version = "1.0.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "caps"
-+version = "0.0.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "custom_derive 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "enum_derive 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "error-chain 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "cc"
-+version = "1.0.25"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "cfg-if"
-+version = "0.1.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "clap"
-+version = "2.32.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "custom_derive"
-+version = "0.1.7"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "dtoa"
-+version = "0.4.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "enum_derive"
-+version = "0.1.7"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "error-chain"
-+version = "0.8.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "error-chain"
-+version = "0.10.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "itoa"
-+version = "0.3.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "lazy_static"
-+version = "0.2.11"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "libc"
-+version = "0.2.45"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "log"
-+version = "0.3.9"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "log"
-+version = "0.4.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "nix"
-+version = "0.8.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "nix"
-+version = "0.12.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "num-traits"
-+version = "0.1.43"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "num-traits"
-+version = "0.2.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "oci"
-+version = "0.1.0"
-+dependencies = [
-+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_derive 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_json 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "prctl"
-+version = "1.0.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "nix 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "quote"
-+version = "0.3.15"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "railcar"
-+version = "1.0.4"
-+dependencies = [
-+ "caps 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "nix 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "oci 0.1.0",
-+ "prctl 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "seccomp-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "redox_syscall"
-+version = "0.1.43"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "redox_termios"
-+version = "0.1.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "redox_syscall 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "rustc-demangle"
-+version = "0.1.9"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "scopeguard"
-+version = "0.3.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "seccomp-sys"
-+version = "0.1.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "serde"
-+version = "0.9.15"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "serde_codegen_internals"
-+version = "0.14.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "serde_derive"
-+version = "0.9.15"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_codegen_internals 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "serde_json"
-+version = "0.9.10"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "strsim"
-+version = "0.7.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "syn"
-+version = "0.11.11"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "synom"
-+version = "0.11.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "termion"
-+version = "1.5.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "redox_syscall 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "textwrap"
-+version = "0.10.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "unicode-width"
-+version = "0.1.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "unicode-xid"
-+version = "0.0.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "vec_map"
-+version = "0.8.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "void"
-+version = "1.0.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "winapi"
-+version = "0.3.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "winapi-i686-pc-windows-gnu"
-+version = "0.4.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "winapi-x86_64-pc-windows-gnu"
-+version = "0.4.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[metadata]
-+"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
-+"checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652"
-+"checksum backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "89a47830402e9981c5c41223151efcced65a0510c13097c769cede7efb34782a"
-+"checksum backtrace-sys 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)" = "c66d56ac8dabd07f6aacdaf633f4b8262f5b3601a810a0dcddffd5c22c69daa0"
-+"checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d"
-+"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
-+"checksum caps 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2c238ba41e8d1d354c8576228110585046ae379efd7af972932993d5c1d41c7d"
-+"checksum cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "f159dfd43363c4d08055a07703eb7a3406b0dac4d0584d96965a3262db3c9d16"
-+"checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4"
-+"checksum clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e"
-+"checksum custom_derive 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "ef8ae57c4978a2acd8b869ce6b9ca1dfe817bff704c220209fdef2c0b75a01b9"
-+"checksum dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6d301140eb411af13d3115f9a562c85cc6b541ade9dfa314132244aaee7489dd"
-+"checksum enum_derive 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "406ac2a8c9eedf8af9ee1489bee9e50029278a6456c740f7454cf8a158abc816"
-+"checksum error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d9435d864e017c3c6afeac1654189b06cdb491cf2ff73dbf0d73b0f292f42ff8"
-+"checksum error-chain 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6930e04918388a9a2e41d518c25cf679ccafe26733fb4127dbf21993f2575d46"
-+"checksum itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8324a32baf01e2ae060e9de58ed0bc2320c9a2833491ee36cd3b4c414de4db8c"
-+"checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
-+"checksum libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)" = "2d2857ec59fadc0773853c664d2d18e7198e83883e7060b63c924cb077bd5c74"
-+"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
-+"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
-+"checksum nix 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "921f61dc817b379d0834e45d5ec45beaacfae97082090a49c2cf30dcbc30206f"
-+"checksum nix 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "47e49f6982987135c5e9620ab317623e723bd06738fd85377e8d55f57c8b6487"
-+"checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
-+"checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1"
-+"checksum prctl 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "059a34f111a9dee2ce1ac2826a68b24601c4298cfeb1a587c3cb493d5ab46f52"
-+"checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
-+"checksum redox_syscall 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "679da7508e9a6390aeaf7fbd02a800fdc64b73fe2204dd2c8ae66d22d9d5ad5d"
-+"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
-+"checksum rustc-demangle 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "bcfe5b13211b4d78e5c2cadfebd7769197d95c639c35a50057eb4c05de811395"
-+"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
-+"checksum seccomp-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0d4082b110d25cf281ddbf78dc56e1a65c929fd72ac6c2deb1a4c20a23999dfa"
-+"checksum serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af"
-+"checksum serde_codegen_internals 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bc888bd283bd2420b16ad0d860e35ad8acb21941180a83a189bb2046f9d00400"
-+"checksum serde_derive 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "978fd866f4d4872084a81ccc35e275158351d3b9fe620074e7d7504b816b74ba"
-+"checksum serde_json 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ad8bcf487be7d2e15d3d543f04312de991d631cfe1b43ea0ade69e6a8a5b16a1"
-+"checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550"
-+"checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"
-+"checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6"
-+"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"
-+"checksum textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "307686869c93e71f94da64286f9a9524c0f308a9e1c87a583de8e9c9039ad3f6"
-+"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526"
-+"checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
-+"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
-+"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
-+"checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0"
-+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
---
-2.17.2
-
diff --git a/pkgs/applications/virtualization/railcar/default.nix b/pkgs/applications/virtualization/railcar/default.nix
deleted file mode 100644
index 3c7dc0a7d24e..000000000000
--- a/pkgs/applications/virtualization/railcar/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ lib, fetchFromGitHub, rustPlatform, libseccomp }:
-
-rustPlatform.buildRustPackage rec {
- pname = "railcar";
- version = "1.0.4";
-
- src = fetchFromGitHub {
- owner = "oracle";
- repo = "railcar";
- rev = "v${version}";
- sha256 = "09zn160qxd7760ii6rs5nhr00qmaz49x1plclscznxh9hinyjyh9";
- };
-
- # Submitted upstream https://github.com/oracle/railcar/pull/44
- cargoPatches = [ ./cargo-lock.patch ];
- cargoSha256 = "1zsch6gpbw96j5wa68ksbk4x6nbsl7dbvdhdprljpcyrwwkhz47x";
-
- buildInputs = [ libseccomp ];
-
- meta = with lib; {
- description = "Rust implementation of the Open Containers Initiative oci-runtime";
- homepage = "https://github.com/oracle/railcar";
- license = with licenses; [ asl20 /* or */ upl ];
- maintainers = [ maintainers.spacekookie ];
- };
-}
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 75e0d52d921b..39008df74f17 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -332,7 +332,7 @@ rec {
, # JSON containing configuration and metadata for this layer.
baseJson
, # Files to add to the layer.
- contents ? null
+ copyToRoot ? null
, # When copying the contents into the image, preserve symlinks to
# directories (see `rsync -K`). Otherwise, transform those symlinks
# into directories.
@@ -344,7 +344,8 @@ rec {
}:
runCommand "docker-layer-${name}"
{
- inherit baseJson contents extraCommands;
+ inherit baseJson extraCommands;
+ contents = copyToRoot;
nativeBuildInputs = [ jshon rsync tarsum ];
}
''
@@ -390,7 +391,8 @@ rec {
, # Script to run as root. Bash.
runAsRoot
, # Files to add to the layer. If null, an empty layer will be created.
- contents ? null
+ # To add packages to /bin, use `buildEnv` or similar.
+ copyToRoot ? null
, # When copying the contents into the image, preserve symlinks to
# directories (see `rsync -K`). Otherwise, transform those symlinks
# into directories.
@@ -418,9 +420,9 @@ rec {
inherit fromImage fromImageName fromImageTag diskSize;
- preMount = lib.optionalString (contents != null && contents != [ ]) ''
+ preMount = lib.optionalString (copyToRoot != null && copyToRoot != [ ]) ''
echo "Adding contents..."
- for item in ${escapeShellArgs (map (c: "${c}") (toList contents))}; do
+ for item in ${escapeShellArgs (map (c: "${c}") (toList copyToRoot))}; do
echo "Adding $item..."
rsync -a${if keepContentsDirlinks then "K" else "k"} --chown=0:0 $item/ layer/
done
@@ -500,7 +502,7 @@ rec {
, # Tag of the parent image; will be read from the image otherwise.
fromImageTag ? null
, # Files to put on the image (a nix store path or list of paths).
- contents ? null
+ copyToRoot ? null
, # When copying the contents into the image, preserve symlinks to
# directories (see `rsync -K`). Otherwise, transform those symlinks
# into directories.
@@ -517,10 +519,20 @@ rec {
diskSize ? 1024
, # Time of creation of the image.
created ? "1970-01-01T00:00:01Z"
+ , # Deprecated.
+ contents ? null
,
}:
let
+ checked =
+ lib.warnIf (contents != null)
+ "in docker image ${name}: The contents parameter is deprecated. Change to copyToRoot if the contents are designed to be copied to the root filesystem, such as when you use `buildEnv` or similar between contents and your packages. Use copyToRoot = buildEnv { ... }; or similar if you intend to add packages to /bin."
+ lib.throwIf (contents != null && copyToRoot != null) "in docker image ${name}: You can not specify both contents and copyToRoot."
+ ;
+
+ rootContents = if copyToRoot == null then contents else copyToRoot;
+
baseName = baseNameOf name;
# Create a JSON blob of the configuration. Set the date to unix zero.
@@ -545,13 +557,15 @@ rec {
mkPureLayer
{
name = baseName;
- inherit baseJson contents keepContentsDirlinks extraCommands uid gid;
+ inherit baseJson keepContentsDirlinks extraCommands uid gid;
+ copyToRoot = rootContents;
} else
mkRootLayer {
name = baseName;
inherit baseJson fromImage fromImageName fromImageTag
- contents keepContentsDirlinks runAsRoot diskSize
+ keepContentsDirlinks runAsRoot diskSize
extraCommands;
+ copyToRoot = rootContents;
};
result = runCommand "docker-image-${baseName}.tar.gz"
{
@@ -715,7 +729,7 @@ rec {
'';
in
- result;
+ checked result;
# Merge the tarballs of images built with buildImage into a single
# tarball that contains all images. Running `docker load` on the resulting
@@ -776,12 +790,14 @@ rec {
# contents. The main purpose is to be able to use nix commands in
# the container.
# Be careful since this doesn't work well with multilayer.
- buildImageWithNixDb = args@{ contents ? null, extraCommands ? "", ... }: (
+ # TODO: add the dependencies of the config json.
+ buildImageWithNixDb = args@{ copyToRoot ? contents, contents ? null, extraCommands ? "", ... }: (
buildImage (args // {
- extraCommands = (mkDbExtraCommand contents) + extraCommands;
+ extraCommands = (mkDbExtraCommand copyToRoot) + extraCommands;
})
);
+ # TODO: add the dependencies of the config json.
buildLayeredImageWithNixDb = args@{ contents ? null, extraCommands ? "", ... }: (
buildLayeredImage (args // {
extraCommands = (mkDbExtraCommand contents) + extraCommands;
diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix
index f0535f59dfcc..f92a55c2e4f7 100644
--- a/pkgs/build-support/docker/examples.nix
+++ b/pkgs/build-support/docker/examples.nix
@@ -24,7 +24,11 @@ rec {
bash = buildImage {
name = "bash";
tag = "latest";
- contents = pkgs.bashInteractive;
+ copyToRoot = pkgs.buildEnv {
+ name = "image-root";
+ paths = [ pkgs.bashInteractive ];
+ pathsToLink = [ "/bin" ];
+ };
};
# 2. service example, layered on another image
@@ -36,7 +40,12 @@ rec {
fromImage = bash;
# fromImage = debian;
- contents = pkgs.redis;
+ copyToRoot = pkgs.buildEnv {
+ name = "image-root";
+ paths = [ pkgs.redis ];
+ pathsToLink = [ "/bin" ];
+ };
+
runAsRoot = ''
mkdir -p /data
'';
@@ -118,13 +127,17 @@ rec {
# 5. example of multiple contents, emacs and vi happily coexisting
editors = buildImage {
name = "editors";
- contents = [
- pkgs.coreutils
- pkgs.bash
- pkgs.emacs
- pkgs.vim
- pkgs.nano
- ];
+ copyToRoot = pkgs.buildEnv {
+ name = "image-root";
+ pathsToLink = [ "/bin" ];
+ paths = [
+ pkgs.coreutils
+ pkgs.bash
+ pkgs.emacs
+ pkgs.vim
+ pkgs.nano
+ ];
+ };
};
# 6. nix example to play with the container nix store
@@ -132,13 +145,17 @@ rec {
nix = buildImageWithNixDb {
name = "nix";
tag = "latest";
- contents = [
- # nix-store uses cat program to display results as specified by
- # the image env variable NIX_PAGER.
- pkgs.coreutils
- pkgs.nix
- pkgs.bash
- ];
+ copyToRoot = pkgs.buildEnv {
+ name = "image-root";
+ pathsToLink = [ "/bin" ];
+ paths = [
+ # nix-store uses cat program to display results as specified by
+ # the image env variable NIX_PAGER.
+ pkgs.coreutils
+ pkgs.nix
+ pkgs.bash
+ ];
+ };
config = {
Env = [
"NIX_PAGER=cat"
@@ -155,7 +172,11 @@ rec {
name = "onTopOfPulledImage";
tag = "latest";
fromImage = nixFromDockerHub;
- contents = [ pkgs.hello ];
+ copyToRoot = pkgs.buildEnv {
+ name = "image-root";
+ pathsToLink = [ "/bin" ];
+ paths = [ pkgs.hello ];
+ };
};
# 8. regression test for erroneous use of eval and string expansion.
@@ -163,7 +184,11 @@ rec {
runAsRootExtraCommands = pkgs.dockerTools.buildImage {
name = "runAsRootExtraCommands";
tag = "latest";
- contents = [ pkgs.coreutils ];
+ copyToRoot = pkgs.buildEnv {
+ name = "image-root";
+ pathsToLink = [ "/bin" ];
+ paths = [ pkgs.coreutils ];
+ };
# The parens here are to create problematic bash to embed and eval. In case
# this is *embedded* into the script (with nix expansion) the initial quotes
# will close the string and the following parens are unexpected
@@ -176,7 +201,11 @@ rec {
unstableDate = pkgs.dockerTools.buildImage {
name = "unstable-date";
tag = "latest";
- contents = [ pkgs.coreutils ];
+ copyToRoot = pkgs.buildEnv {
+ name = "image-root";
+ pathsToLink = [ "/bin" ];
+ paths = [ pkgs.coreutils ];
+ };
created = "now";
};
@@ -265,7 +294,11 @@ rec {
name = "l3";
fromImage = l2;
tag = "latest";
- contents = [ pkgs.coreutils ];
+ copyToRoot = pkgs.buildEnv {
+ name = "image-root";
+ pathsToLink = [ "/bin" ];
+ paths = [ pkgs.coreutils ];
+ };
extraCommands = ''
mkdir -p tmp
echo layer3 > tmp/layer3
@@ -290,7 +323,11 @@ rec {
name = "child";
fromImage = environmentVariablesParent;
tag = "latest";
- contents = [ pkgs.coreutils ];
+ copyToRoot = pkgs.buildEnv {
+ name = "image-root";
+ pathsToLink = [ "/bin" ];
+ paths = [ pkgs.coreutils ];
+ };
config = {
Env = [
"FROM_CHILD=true"
@@ -424,7 +461,11 @@ rec {
name = "layers-unpack-order-${layerName}";
tag = "latest";
fromImage = parent;
- contents = [ pkgs.coreutils ];
+ copyToRoot = pkgs.buildEnv {
+ name = "image-root";
+ pathsToLink = [ "/bin" ];
+ paths = [ pkgs.coreutils ];
+ };
runAsRoot = ''
#!${pkgs.runtimeShell}
echo -n "${layerName}" >> /layer-order
@@ -441,7 +482,8 @@ rec {
# buildImage without explicit tag
bashNoTag = pkgs.dockerTools.buildImage {
name = "bash-no-tag";
- contents = pkgs.bashInteractive;
+ # Not recommended. Use `buildEnv` between copy and packages to avoid file duplication.
+ copyToRoot = pkgs.bashInteractive;
};
# buildLayeredImage without explicit tag
@@ -501,7 +543,11 @@ rec {
in crossPkgs.dockerTools.buildImage {
name = "hello-cross";
tag = "latest";
- contents = crossPkgs.hello;
+ copyToRoot = pkgs.buildEnv {
+ name = "image-root";
+ pathsToLink = [ "/bin" ];
+ paths = [ crossPkgs.hello ];
+ };
};
# layered image where a store path is itself a symlink
@@ -643,7 +689,8 @@ rec {
build-image-with-path = buildImage {
name = "build-image-with-path";
tag = "latest";
- contents = [ pkgs.bashInteractive ./test-dummy ];
+ # Not recommended. Use `buildEnv` between copy and packages to avoid file duplication.
+ copyToRoot = [ pkgs.bashInteractive ./test-dummy ];
};
layered-image-with-path = pkgs.dockerTools.streamLayeredImage {
diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
index f43206db5f37..d2c519614b36 100644
--- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
+++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "elementary-xfce-icon-theme";
- version = "0.16";
+ version = "0.17";
src = fetchFromGitHub {
owner = "shimmerproject";
repo = "elementary-xfce";
rev = "v${version}";
- sha256 = "sha256-p6HQhYf+rw3obrc6e5lYqC02i4dK+5eXGwnTJj0+D+k=";
+ sha256 = "sha256-9WdVUCwHFX6wlu3++QqzV0RgTDYDnUYqK7yUl83liko=";
};
nativeBuildInputs = [
diff --git a/pkgs/data/icons/luna-icons/default.nix b/pkgs/data/icons/luna-icons/default.nix
index 380e2a5d2a4c..7efc6059bb87 100644
--- a/pkgs/data/icons/luna-icons/default.nix
+++ b/pkgs/data/icons/luna-icons/default.nix
@@ -10,13 +10,13 @@
stdenvNoCC.mkDerivation rec {
pname = "luna-icons";
- version = "2.0";
+ version = "2.1";
src = fetchFromGitHub {
owner = "darkomarko42";
repo = pname;
rev = version;
- sha256 = "sha256-aNN7ZoD4hZTw39Rwef4HRHzNzCM6O8Ev+37jZOfzN7s=";
+ sha256 = "sha256-zxaay4hwKgb9WWhPNG/s9JekltAvRNYmObeoTJi6Po0=";
};
nativeBuildInputs = [
diff --git a/pkgs/data/icons/zafiro-icons/default.nix b/pkgs/data/icons/zafiro-icons/default.nix
index af6586b5c519..d7315e1005cc 100644
--- a/pkgs/data/icons/zafiro-icons/default.nix
+++ b/pkgs/data/icons/zafiro-icons/default.nix
@@ -1,18 +1,19 @@
-{ lib, stdenvNoCC, fetchFromGitHub, gtk3, breeze-icons, gnome-icon-theme, numix-icon-theme, numix-icon-theme-circle, hicolor-icon-theme }:
+{ lib, stdenvNoCC, fetchFromGitHub, gtk3, breeze-icons, gnome-icon-theme, numix-icon-theme, numix-icon-theme-circle, hicolor-icon-theme, jdupes }:
stdenvNoCC.mkDerivation rec {
pname = "zafiro-icons";
- version = "1.1";
+ version = "1.2";
src = fetchFromGitHub {
owner = "zayronxio";
repo = pname;
rev = version;
- sha256 = "05h8qm9izjbp8pnl9jpbw3y9sddhp0zmg94fm1k4d4hhdqnakqhv";
+ sha256 = "sha256-Awc5Sw4X25pXEd4Ob0u6A6Uu0e8FYfwp0fEl90vrsUE=";
};
nativeBuildInputs = [
gtk3
+ jdupes
];
propagatedBuildInputs = [
@@ -26,10 +27,23 @@ stdenvNoCC.mkDerivation rec {
dontDropIconThemeCache = true;
+ dontPatchELF = true;
+ dontRewriteSymlinks = true;
+
installPhase = ''
+ runHook preInstall
+
+ # remove copy file, as it is there clearly by mistake
+ rm "apps/scalable/android-sdk (copia 1).svg"
+
mkdir -p $out/share/icons/Zafiro-icons
cp -a * $out/share/icons/Zafiro-icons
- gtk-update-icon-cache "$out"/share/icons/Zafiro-icons
+
+ gtk-update-icon-cache $out/share/icons/Zafiro-icons
+
+ jdupes --link-soft --recurse $out/share
+
+ runHook postInstall
'';
meta = with lib; {
diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix
index 4af6f3b4db40..bde4188154f7 100644
--- a/pkgs/data/misc/osinfo-db/default.nix
+++ b/pkgs/data/misc/osinfo-db/default.nix
@@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "osinfo-db";
- version = "20220214";
+ version = "20220516";
src = fetchurl {
url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
- sha256 = "sha256-E+bJAOuCAPFmD4oe13Xs7NWgH9skv7bu4c5l3XvP06k=";
+ sha256 = "sha256-1g9p2K/J3MU9dqL7aNVMJtH9w6giuVwYAd5Yw8Zs2m0=";
};
nativeBuildInputs = [
diff --git a/pkgs/data/misc/papirus-folders/default.nix b/pkgs/data/misc/papirus-folders/default.nix
new file mode 100644
index 000000000000..ce55a28aca15
--- /dev/null
+++ b/pkgs/data/misc/papirus-folders/default.nix
@@ -0,0 +1,27 @@
+{ lib, stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ pname = "papirus-folders";
+ version = "1.12.0";
+
+ src = fetchFromGitHub {
+ owner = "PapirusDevelopmentTeam";
+ repo = "papirus-folders";
+ rev = "v${version}";
+ sha256 = "sha256-ZZMEZCWO+qW76eqa+TgxWGVz69VkSCPcttLoCrH7ppY=";
+ };
+
+ makeFlags = [ "PREFIX=${placeholder "out"}" ];
+
+ meta = with lib; {
+ description = "A tool to change papirus icon theme color";
+ longDescription = ''
+ papirus-folders is a bash script that allows changing the color of
+ folders in Papirus icon theme and its forks (which based on version 20171007 and newer).
+ '';
+ homepage = "https://github.com/PapirusDevelopmentTeam/papirus-folders";
+ license = licenses.mit;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.aacebedo ];
+ };
+}
diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix
index ce9861f1762e..098182664658 100644
--- a/pkgs/desktops/mate/caja/default.nix
+++ b/pkgs/desktops/mate/caja/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "caja";
- version = "1.26.0";
+ version = "1.26.1";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1m0ai2r8b2mvlr8bqj9n6vg1pwzlwa46fqpq206wgyx5sgxac052";
+ sha256 = "MP1ubwCjggD24uiYrX+nl4drsGDx0DQd0vc5MnnhTAc=";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
index f58b02da6fb9..2b8bcdd6ef1f 100644
--- a/pkgs/desktops/plasma-5/fetch.sh
+++ b/pkgs/desktops/plasma-5/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/plasma/5.25.1/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.25.2/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
index 73298c78399e..b2c8f4090938 100644
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@@ -4,427 +4,427 @@
{
bluedevil = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/bluedevil-5.25.1.tar.xz";
- sha256 = "1fdbxz2lk43svp6f0srjhpfhipfimf0nqjnvv62bqzpasv74p13g";
- name = "bluedevil-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/bluedevil-5.25.2.tar.xz";
+ sha256 = "0sx8qbmig787jmfixmv6ajawv6j846gcbj67szkfw4r4yqpsagr1";
+ name = "bluedevil-5.25.2.tar.xz";
};
};
breeze = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/breeze-5.25.1.tar.xz";
- sha256 = "13qwxvbdmf3qx7nfarr33q22rn43xsby7l8bjjfn6862l7pqhash";
- name = "breeze-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/breeze-5.25.2.tar.xz";
+ sha256 = "198vzmhljbwrzn48x7g8caj2qwj3q82n6xlj50lpvxcmc0cv740w";
+ name = "breeze-5.25.2.tar.xz";
};
};
breeze-grub = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/breeze-grub-5.25.1.tar.xz";
- sha256 = "11ic3cjfvgs2jkwbkzr2xd568ym7x2l99w488qhdhw9fzkk56rrh";
- name = "breeze-grub-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/breeze-grub-5.25.2.tar.xz";
+ sha256 = "1fnqfmjzlhw1lizax0225qypdm7k4zpxc90s57f2n2173qgi3qfc";
+ name = "breeze-grub-5.25.2.tar.xz";
};
};
breeze-gtk = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/breeze-gtk-5.25.1.tar.xz";
- sha256 = "0lzh7lrqiw537phfkz6bvqfbyqc4h4rb5bkxcb4s1ryynamy36yh";
- name = "breeze-gtk-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/breeze-gtk-5.25.2.tar.xz";
+ sha256 = "0vzl0nf39ky3f4jdsmm7hz9kj6yacjjx5mawgzv417zaa6khg8id";
+ name = "breeze-gtk-5.25.2.tar.xz";
};
};
breeze-plymouth = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/breeze-plymouth-5.25.1.tar.xz";
- sha256 = "0xprjl0bszs2dmn27pvklwxx5qbcsdmrr256jlvljvq5hs5vd9ly";
- name = "breeze-plymouth-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/breeze-plymouth-5.25.2.tar.xz";
+ sha256 = "026np3kkh6sd0rji7bl2x84za0bpgsljl2dmb3lhwydn93vpv9n1";
+ name = "breeze-plymouth-5.25.2.tar.xz";
};
};
discover = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/discover-5.25.1.tar.xz";
- sha256 = "1cpmi4qfxlprvj5qamjkxj4lq8038fv1fyldsfhnyi9s4zw6ww9s";
- name = "discover-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/discover-5.25.2.tar.xz";
+ sha256 = "1cgalkajbpnpn6vzr84sqkvfdvsanx5l9pxhdkrd94s27gbr9l8c";
+ name = "discover-5.25.2.tar.xz";
};
};
drkonqi = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/drkonqi-5.25.1.tar.xz";
- sha256 = "147azxas0idb0ymcwg15davb5p84czysmsfxmcbrcqlxjkby3dy0";
- name = "drkonqi-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/drkonqi-5.25.2.tar.xz";
+ sha256 = "1a9y88vkq6qiaiabwy1a13cycj4n79ikn4zdk10zrkgqlnvbyq3y";
+ name = "drkonqi-5.25.2.tar.xz";
};
};
kactivitymanagerd = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/kactivitymanagerd-5.25.1.tar.xz";
- sha256 = "1jjby09p8hak52syjzaf4wz9hyjz8rylz4jzranrkk3n85znqwk0";
- name = "kactivitymanagerd-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/kactivitymanagerd-5.25.2.tar.xz";
+ sha256 = "06arr36kapjq0gbvk7wnwdgzn8bj64h2cpcrhvzjwmgh4azsz2ww";
+ name = "kactivitymanagerd-5.25.2.tar.xz";
};
};
kde-cli-tools = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/kde-cli-tools-5.25.1.tar.xz";
- sha256 = "03v7ws48ywjkaqj87zcw7d0dfi36abpz9bnv9s9qp2y4mnk9x198";
- name = "kde-cli-tools-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/kde-cli-tools-5.25.2.tar.xz";
+ sha256 = "1s6v8xnx1d51lax02fkrx191jxiw6mbsixiw4hvh91viwdckmwr3";
+ name = "kde-cli-tools-5.25.2.tar.xz";
};
};
kde-gtk-config = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/kde-gtk-config-5.25.1.tar.xz";
- sha256 = "17sqznjz5sn3xih6l83sx62p0s2sk3p1svqg297x3jq67a9299yj";
- name = "kde-gtk-config-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/kde-gtk-config-5.25.2.tar.xz";
+ sha256 = "1v5j2jy90mi309v43fgn3fadk0gapzvn48zizns6avc9v6h9kgvq";
+ name = "kde-gtk-config-5.25.2.tar.xz";
};
};
kdecoration = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/kdecoration-5.25.1.tar.xz";
- sha256 = "15gik2c0370f2rmd7jv3pbxbsjng25g6cwzamq3xaa3gqh6l2b33";
- name = "kdecoration-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/kdecoration-5.25.2.tar.xz";
+ sha256 = "1ynghykyv0h4g3micdc3qf8xxy3vxrdd01gy31jskisksgjkyvw7";
+ name = "kdecoration-5.25.2.tar.xz";
};
};
kdeplasma-addons = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/kdeplasma-addons-5.25.1.tar.xz";
- sha256 = "14p69kpyaszir8y4zxnyhxmall291rwcy770w4d0mlc04difki8d";
- name = "kdeplasma-addons-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/kdeplasma-addons-5.25.2.tar.xz";
+ sha256 = "04n00s6z2cvwax1i8vs1f3by72qzpicsyw3c366kxnaiz3lklqzk";
+ name = "kdeplasma-addons-5.25.2.tar.xz";
};
};
kgamma5 = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/kgamma5-5.25.1.tar.xz";
- sha256 = "1pc8abx3j91iqb93rsc13bq8sr610zxa91dhy8hr301fmvv9dbg2";
- name = "kgamma5-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/kgamma5-5.25.2.tar.xz";
+ sha256 = "0z784j2lyrwl0rlxivgcb91rcpziqnvvfhxzdjk8mkc7j9cxznkx";
+ name = "kgamma5-5.25.2.tar.xz";
};
};
khotkeys = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/khotkeys-5.25.1.tar.xz";
- sha256 = "14i9bdqjf5myacybsplsais70x3rnjnfj9807xxgwnqy5dqbz8hg";
- name = "khotkeys-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/khotkeys-5.25.2.tar.xz";
+ sha256 = "1yr0zydpsl26gmn4n72lql9n4fxrfbzi405srd2694yaxl5xyzl1";
+ name = "khotkeys-5.25.2.tar.xz";
};
};
kinfocenter = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/kinfocenter-5.25.1.tar.xz";
- sha256 = "0pyirq0zz8y1pvznw5idjsxwslp0bchfjp72l855z5bwfwh7dmfq";
- name = "kinfocenter-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/kinfocenter-5.25.2.tar.xz";
+ sha256 = "004sgb89h0024bliha0bzfzx82d0qi62zicnq68jqngbj5hkmaqm";
+ name = "kinfocenter-5.25.2.tar.xz";
};
};
kmenuedit = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/kmenuedit-5.25.1.tar.xz";
- sha256 = "0v7k9dcawylgdbjklmjn4mv10z6cm6hhp3za9ni88wlgb2vh9mmk";
- name = "kmenuedit-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/kmenuedit-5.25.2.tar.xz";
+ sha256 = "0d9ldili1zjv4ri1b779zl0kyfxl818n3r7j8cqd3jyfrmh45jgi";
+ name = "kmenuedit-5.25.2.tar.xz";
};
};
kscreen = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/kscreen-5.25.1.tar.xz";
- sha256 = "1dflaaba001wk5r9n523b1mxib7pd0x5b6dnhis62zn9v5apqhaa";
- name = "kscreen-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/kscreen-5.25.2.tar.xz";
+ sha256 = "0llassqfn24vkc88pagd0haqdlblg5ha09rw5q4cc6irvqwrvaxa";
+ name = "kscreen-5.25.2.tar.xz";
};
};
kscreenlocker = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/kscreenlocker-5.25.1.tar.xz";
- sha256 = "1bhl8a1jhzr2iycq6fzkj1sb4bybyqlnxs8rnfw0s4mmcs17lmm7";
- name = "kscreenlocker-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/kscreenlocker-5.25.2.tar.xz";
+ sha256 = "15zkmxwcv9cdaczxvjpipngv77dqhn0s26678831axfjzh7v89iy";
+ name = "kscreenlocker-5.25.2.tar.xz";
};
};
ksshaskpass = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/ksshaskpass-5.25.1.tar.xz";
- sha256 = "1mxmjiprcckqn4sgqyj9nk32prvgymscmpv0kfkcsg60phqyz91m";
- name = "ksshaskpass-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/ksshaskpass-5.25.2.tar.xz";
+ sha256 = "1zwhrzclbg3mxdwif13f9avv01kykwi8b3j9qk4ycfrwdvwidnd6";
+ name = "ksshaskpass-5.25.2.tar.xz";
};
};
ksystemstats = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/ksystemstats-5.25.1.tar.xz";
- sha256 = "0cp6hsy24g2yhijiyavx5av5djdrypvwrcpzswp8mr86p6b1ii8n";
- name = "ksystemstats-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/ksystemstats-5.25.2.tar.xz";
+ sha256 = "1i6sg5j97w4nl508yl80v2rnr9zmb5f6ymvjvvkfbigp62yz8gcf";
+ name = "ksystemstats-5.25.2.tar.xz";
};
};
kwallet-pam = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/kwallet-pam-5.25.1.tar.xz";
- sha256 = "1n9bnlsm4l051hp73hsp9wa14q77pplr855w3j620qz0az2zxwwx";
- name = "kwallet-pam-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/kwallet-pam-5.25.2.tar.xz";
+ sha256 = "0pffi0jkfib01aqqif5401avkljxsi468wg5nva1fg3h8w9i7xqd";
+ name = "kwallet-pam-5.25.2.tar.xz";
};
};
kwayland-integration = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/kwayland-integration-5.25.1.tar.xz";
- sha256 = "1r80rj7f8xskiwp7lfzxp92q39gm2y6xy3ip4hv0sgjr2014fb21";
- name = "kwayland-integration-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/kwayland-integration-5.25.2.tar.xz";
+ sha256 = "1praxpzsbwb7b1p6rsnrmv9wdn5p0j28vch6ydj2qc25f8h7nvfj";
+ name = "kwayland-integration-5.25.2.tar.xz";
};
};
kwin = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/kwin-5.25.1.tar.xz";
- sha256 = "1srwdx1pw8kjcdmj531f43789fqsa0wj1kkhp0g42wbwj0y9af8x";
- name = "kwin-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/kwin-5.25.2.tar.xz";
+ sha256 = "1mskwppqv3ismlg4r8fmlrya455mds8ng36lma4acj13vsh1wx2l";
+ name = "kwin-5.25.2.tar.xz";
};
};
kwrited = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/kwrited-5.25.1.tar.xz";
- sha256 = "0gpql9kzwvv0n2ccq6jwwf9agd1abxc8q45plj48sv09b31bxvhz";
- name = "kwrited-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/kwrited-5.25.2.tar.xz";
+ sha256 = "02c24ywwrzyz5k54ywh32lx2yrjd0xydn1f20h9h6cx16fmlwdq3";
+ name = "kwrited-5.25.2.tar.xz";
};
};
layer-shell-qt = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/layer-shell-qt-5.25.1.tar.xz";
- sha256 = "0lh1dy1z08k6c40xdxcbmpdzzm18dq98gb14q6b6snh1jcrvg95c";
- name = "layer-shell-qt-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/layer-shell-qt-5.25.2.tar.xz";
+ sha256 = "14xk9hjxm267dfb8dxgwdjmws95nqc9ygr51mdzsyxqwis9v1i4m";
+ name = "layer-shell-qt-5.25.2.tar.xz";
};
};
libkscreen = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/libkscreen-5.25.1.tar.xz";
- sha256 = "1zbdbacmbnczskk8cpr99ph9cn28izvr25x5v5l455dk077qf25g";
- name = "libkscreen-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/libkscreen-5.25.2.tar.xz";
+ sha256 = "0jy2p87jj39c75jmj95jqpilphwhzqf7m1qljhbrjgr2w1adnz9p";
+ name = "libkscreen-5.25.2.tar.xz";
};
};
libksysguard = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/libksysguard-5.25.1.tar.xz";
- sha256 = "1xn454ch9ggx67c69hjvhhykprrdys38ych1ap8l3b1j2731vyn6";
- name = "libksysguard-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/libksysguard-5.25.2.tar.xz";
+ sha256 = "020wxlkj03sj0d81r1f8axw4i78gg45cm3zf6ikhyvka9hbh5xcy";
+ name = "libksysguard-5.25.2.tar.xz";
};
};
milou = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/milou-5.25.1.tar.xz";
- sha256 = "0al6d26b96j3kx37p34gmqamc1pz7l3shyqf7dxf7j71hh0mrk09";
- name = "milou-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/milou-5.25.2.tar.xz";
+ sha256 = "15gf3mgbx8z4cahw6w978r5inpn9rfhzj7x5sfhi6w631nasd1yl";
+ name = "milou-5.25.2.tar.xz";
};
};
oxygen = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/oxygen-5.25.1.tar.xz";
- sha256 = "1ax0vw7mzlln09aajis5vc78snbi3508lg6qbx6vw9m59lpq140v";
- name = "oxygen-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/oxygen-5.25.2.tar.xz";
+ sha256 = "0d7705s5lp4lac7rn7q7sy2l0n5519zqfpx6746434z505zc1krc";
+ name = "oxygen-5.25.2.tar.xz";
};
};
oxygen-sounds = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/oxygen-sounds-5.25.1.tar.xz";
- sha256 = "14z23yzqcvwjyy0qbm20xgijrndiw8pk1xf4wdbslny454k0l1q7";
- name = "oxygen-sounds-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/oxygen-sounds-5.25.2.tar.xz";
+ sha256 = "13hhvfndz57gsdb70jnb12vcich4bfrm0rvb12zaza5j1qk939k7";
+ name = "oxygen-sounds-5.25.2.tar.xz";
};
};
plasma-browser-integration = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/plasma-browser-integration-5.25.1.tar.xz";
- sha256 = "140j74dbsx0jicz1407h4n1hqsnnvh3mk07w4y7slvf3392fqp6i";
- name = "plasma-browser-integration-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/plasma-browser-integration-5.25.2.tar.xz";
+ sha256 = "0fyqd160c0ap3z8k2p16x4k8hvbdmnfp2hbx0p93d3acpi9vpqa3";
+ name = "plasma-browser-integration-5.25.2.tar.xz";
};
};
plasma-desktop = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/plasma-desktop-5.25.1.tar.xz";
- sha256 = "1j1d0j4sdnyfcpv9z4ch6z5z0d7ylkbqcwkhwx0qqs7if8p6f355";
- name = "plasma-desktop-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/plasma-desktop-5.25.2.tar.xz";
+ sha256 = "09pnxh29xzag90sxdcjw8jafwrlpm8d4bl0xws74df94kqkcira1";
+ name = "plasma-desktop-5.25.2.tar.xz";
};
};
plasma-disks = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/plasma-disks-5.25.1.tar.xz";
- sha256 = "1ji4gkm36zk4ybdnqzynni0q66nniryfa4p60wqmqr7x97h4376s";
- name = "plasma-disks-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/plasma-disks-5.25.2.tar.xz";
+ sha256 = "1fvka372hjqb2m6m5479g9w9z96hygiaqm2jzh9f5qn6aj4baq84";
+ name = "plasma-disks-5.25.2.tar.xz";
};
};
plasma-firewall = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/plasma-firewall-5.25.1.tar.xz";
- sha256 = "0vip17v0860grmqh9sv7vjisnxgpxqs5hw8yw0fdign0dp3yjn33";
- name = "plasma-firewall-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/plasma-firewall-5.25.2.tar.xz";
+ sha256 = "0gciy4nl7dcghgwcy7kx3zbsgvygs90wfrzr1nkk2vgphgvr4c6c";
+ name = "plasma-firewall-5.25.2.tar.xz";
};
};
plasma-integration = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/plasma-integration-5.25.1.tar.xz";
- sha256 = "09xpbjp5k28bjvs8nszkzk9mw72zv0v171y495ffn8af6yq35cgj";
- name = "plasma-integration-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/plasma-integration-5.25.2.tar.xz";
+ sha256 = "1mvzxasr3m2jf7kvx5df0ijilbs7nvw3kxpsa543c2bmp6ib9zla";
+ name = "plasma-integration-5.25.2.tar.xz";
};
};
plasma-mobile = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/plasma-mobile-5.25.1.tar.xz";
- sha256 = "04dg6xyzj9zg9g80f6l1chg8f9pj0wz4c8szj3mx1cs98lp3bvcy";
- name = "plasma-mobile-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/plasma-mobile-5.25.2.tar.xz";
+ sha256 = "0jgrw9wp0l289sygpr0mg7zcjg97bdgl039vdabf4ixd721swmz8";
+ name = "plasma-mobile-5.25.2.tar.xz";
};
};
plasma-nano = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/plasma-nano-5.25.1.tar.xz";
- sha256 = "0acdz8qqkk4rwsfglk06am8s89zyz0jafhqq574bw83znq13xhfy";
- name = "plasma-nano-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/plasma-nano-5.25.2.tar.xz";
+ sha256 = "1byhcnbjy691jkmhd7pch0rxhi6bbrzhzx47c97mqgxid5a8j0bk";
+ name = "plasma-nano-5.25.2.tar.xz";
};
};
plasma-nm = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/plasma-nm-5.25.1.tar.xz";
- sha256 = "011i4d612ljvy2b9vv4lqr2ad5yq0qv18nqqjdy3wmj7w1nm4ww9";
- name = "plasma-nm-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/plasma-nm-5.25.2.tar.xz";
+ sha256 = "1hwxsprrwxap5q707jv9w8i7l3rql33dwh66fwqrjjm5v3ncac48";
+ name = "plasma-nm-5.25.2.tar.xz";
};
};
plasma-pa = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/plasma-pa-5.25.1.tar.xz";
- sha256 = "1nrsw3f2dj1sd3ibyym7142shwxnsi72j4nkhx02206fcjm5p9d1";
- name = "plasma-pa-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/plasma-pa-5.25.2.tar.xz";
+ sha256 = "1k925flcmgi78rln7nb0vh43gdf1001wk68n3zdx6wmhscpbjwwd";
+ name = "plasma-pa-5.25.2.tar.xz";
};
};
plasma-sdk = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/plasma-sdk-5.25.1.tar.xz";
- sha256 = "1cy9c4h6yxqjnylnpy2ai7vsx3c1b9p6ga3771jdb1zgqw55lgg7";
- name = "plasma-sdk-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/plasma-sdk-5.25.2.tar.xz";
+ sha256 = "15iaw4lggsmd4hhgdkwcp4q3j1y9rxjngc5gxh7ah28ijmq6fnr1";
+ name = "plasma-sdk-5.25.2.tar.xz";
};
};
plasma-systemmonitor = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/plasma-systemmonitor-5.25.1.tar.xz";
- sha256 = "1l6m5jnqk56r20mv24s567qj4fbv6ixnzsw75pssngn5zmccm6xy";
- name = "plasma-systemmonitor-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/plasma-systemmonitor-5.25.2.tar.xz";
+ sha256 = "02jw59b7190wqkhyz4w8zcdydxpp9kq1dxd9x51wy0wpcp6igina";
+ name = "plasma-systemmonitor-5.25.2.tar.xz";
};
};
plasma-tests = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/plasma-tests-5.25.1.tar.xz";
- sha256 = "1vdvyirk53xv77mdj9kd3n8sk9rfgrz7c31h93bs1hybpbkqbc4g";
- name = "plasma-tests-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/plasma-tests-5.25.2.tar.xz";
+ sha256 = "0zq4w8js35b9p0gih7x92iscmm2snwgm7bclrh29gvxyfsjir8wa";
+ name = "plasma-tests-5.25.2.tar.xz";
};
};
plasma-thunderbolt = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/plasma-thunderbolt-5.25.1.tar.xz";
- sha256 = "19wjs5sapq4v4wwmhd4fk1pdc4zkn0p0w91vc29mzw7vy51id5w0";
- name = "plasma-thunderbolt-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/plasma-thunderbolt-5.25.2.tar.xz";
+ sha256 = "1mjh14yfap7jr181xvkar9hgmqzvghb4rs2d45b1ddwz3n340ak6";
+ name = "plasma-thunderbolt-5.25.2.tar.xz";
};
};
plasma-vault = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/plasma-vault-5.25.1.tar.xz";
- sha256 = "15pad4p9lf6z4nkm0zk82k1zn0x724l68hajvwrhw4qjrr8p2p68";
- name = "plasma-vault-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/plasma-vault-5.25.2.tar.xz";
+ sha256 = "12z4kcrsp5jy16x4kssc9l7d2acbkg30jyg6f77jqh1ra671y1a5";
+ name = "plasma-vault-5.25.2.tar.xz";
};
};
plasma-workspace = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/plasma-workspace-5.25.1.tar.xz";
- sha256 = "1pin9x3sz0x39af0cvfna518sx383sr2564f85c7znvyw4qdys0k";
- name = "plasma-workspace-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/plasma-workspace-5.25.2.tar.xz";
+ sha256 = "16chbhmby9ixyh46xqsa0nd6yhpf3xlk2sv43g34my1hkhp63r6w";
+ name = "plasma-workspace-5.25.2.tar.xz";
};
};
plasma-workspace-wallpapers = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/plasma-workspace-wallpapers-5.25.1.tar.xz";
- sha256 = "0cpqgp45rbsaynasf1k974fvwwrfv93r68hn6bvka99nh6j4vpki";
- name = "plasma-workspace-wallpapers-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/plasma-workspace-wallpapers-5.25.2.tar.xz";
+ sha256 = "12r2zfz63xgfv0sxv1px7hbwan9pv3ik5h7lkfhcjbi9bhav2pyr";
+ name = "plasma-workspace-wallpapers-5.25.2.tar.xz";
};
};
plymouth-kcm = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/plymouth-kcm-5.25.1.tar.xz";
- sha256 = "08sf692fsdffaj91kgw3mg4bgxyy080kx992zb6drnkjmxq6pi93";
- name = "plymouth-kcm-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/plymouth-kcm-5.25.2.tar.xz";
+ sha256 = "04wfd5a63zbnvsngxpj0jvvhjhcchk2nd0ln8i2zdhhr0xlsbiw1";
+ name = "plymouth-kcm-5.25.2.tar.xz";
};
};
polkit-kde-agent = {
- version = "1-5.25.1";
+ version = "1-5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/polkit-kde-agent-1-5.25.1.tar.xz";
- sha256 = "0aawaq09l1ifn7wd9ggj50vv19vj30w8bmfdzwjhj9zgym2s8dc4";
- name = "polkit-kde-agent-1-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/polkit-kde-agent-1-5.25.2.tar.xz";
+ sha256 = "1hcyw7qzryvqlszqv7lmhmhz7fbjd4961xq7hh18glm53rrz3z31";
+ name = "polkit-kde-agent-1-5.25.2.tar.xz";
};
};
powerdevil = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/powerdevil-5.25.1.tar.xz";
- sha256 = "0m57mp577liv3cmd4afm834mif688akdir9i89xjmvwdg8cws7n4";
- name = "powerdevil-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/powerdevil-5.25.2.tar.xz";
+ sha256 = "1ahq10mrnryq87ihj5b6a1ifjnyam7sxcgbr3avc2jpb4q8njmb6";
+ name = "powerdevil-5.25.2.tar.xz";
};
};
qqc2-breeze-style = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/qqc2-breeze-style-5.25.1.tar.xz";
- sha256 = "00ij7ci9xh125g9n8f1qmlpjjy93hydqi3gf29bfz4vh2lnvfd4l";
- name = "qqc2-breeze-style-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/qqc2-breeze-style-5.25.2.tar.xz";
+ sha256 = "1l8133qlqhdq8y42yiy0njgfv9lzxlc6fdicfmr21bfvj3aj20mk";
+ name = "qqc2-breeze-style-5.25.2.tar.xz";
};
};
sddm-kcm = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/sddm-kcm-5.25.1.tar.xz";
- sha256 = "1m371dqj72f3lxyn8bjz0bgxycrz5ik1byzqqhrjkfy3an68vs36";
- name = "sddm-kcm-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/sddm-kcm-5.25.2.tar.xz";
+ sha256 = "0idr9ckrbyh66m0lbza66z2v24pfzwx04np84242p79kyqgjlljf";
+ name = "sddm-kcm-5.25.2.tar.xz";
};
};
systemsettings = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/systemsettings-5.25.1.tar.xz";
- sha256 = "1kichbhmsnr3kmlzic4dp3ajbkwrn8q9idjwwffnr48rz1pnb3j3";
- name = "systemsettings-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/systemsettings-5.25.2.tar.xz";
+ sha256 = "1bz00nnrmpm2kjcapzaxkhx0j4a2vn0nhshgch65h7f3kjp4z0nm";
+ name = "systemsettings-5.25.2.tar.xz";
};
};
xdg-desktop-portal-kde = {
- version = "5.25.1";
+ version = "5.25.2";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.25.1/xdg-desktop-portal-kde-5.25.1.tar.xz";
- sha256 = "15b9wradlqlcipn9q09czc698xsb4q7j6pwgnv8fbaq5na6xgh0s";
- name = "xdg-desktop-portal-kde-5.25.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.25.2/xdg-desktop-portal-kde-5.25.2.tar.xz";
+ sha256 = "1sjm15z83s6vna78ffn390sdr4pnyw5yl8lq0jz79mkxyz2w4y2h";
+ name = "xdg-desktop-portal-kde-5.25.2.tar.xz";
};
};
}
diff --git a/pkgs/development/compilers/elm/packages/node-composition.nix b/pkgs/development/compilers/elm/packages/node-composition.nix
index 8fd8c0ffcce3..bbb39db07b71 100644
--- a/pkgs/development/compilers/elm/packages/node-composition.nix
+++ b/pkgs/development/compilers/elm/packages/node-composition.nix
@@ -2,7 +2,7 @@
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
let
nodeEnv = import ../../../node-packages/node-env.nix {
diff --git a/pkgs/development/compilers/sbcl/2.2.6.nix b/pkgs/development/compilers/sbcl/2.2.6.nix
new file mode 100644
index 000000000000..6fb24da6abe5
--- /dev/null
+++ b/pkgs/development/compilers/sbcl/2.2.6.nix
@@ -0,0 +1,4 @@
+import ./common.nix {
+ version = "2.2.6";
+ sha256 = "sha256-PiMEjI+oJvuRMiC+sqw2l9vFwM3y6J/tjbOe0XEjBKA=";
+}
diff --git a/pkgs/development/compilers/sbcl/common.nix b/pkgs/development/compilers/sbcl/common.nix
index 7b28425af771..3a774754a6cd 100644
--- a/pkgs/development/compilers/sbcl/common.nix
+++ b/pkgs/development/compilers/sbcl/common.nix
@@ -1,6 +1,6 @@
{ version, sha256 }:
-{ lib, stdenv, fetchurl, fetchpatch, writeText, sbclBootstrap
+{ lib, stdenv, fetchurl, fetchpatch, writeText, sbclBootstrap, zstd
, sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit"
, threadSupport ? (stdenv.hostPlatform.isx86 || "aarch64-linux" == stdenv.hostPlatform.system || "aarch64-darwin" == stdenv.hostPlatform.system)
, linkableRuntime ? stdenv.hostPlatform.isx86
@@ -9,6 +9,7 @@
# Note that the created binaries still need `patchelf --set-interpreter ...`
# to get rid of ${glibc} dependency.
, purgeNixReferences ? false
+, coreCompression ? lib.versionAtLeast version "2.2.6"
, texinfo
}:
@@ -21,7 +22,8 @@ stdenv.mkDerivation rec {
inherit sha256;
};
- buildInputs = [texinfo];
+ nativeBuildInputs = [ texinfo ];
+ buildInputs = lib.optionals coreCompression [ zstd ];
patches = lib.optional
(lib.versionAtLeast version "2.1.2" && lib.versionOlder version "2.1.8")
@@ -38,6 +40,14 @@ stdenv.mkDerivation rec {
url = "https://bugs.launchpad.net/sbcl/+bug/1980570/+attachment/5600916/+files/0001-src-runtime-fix-fno-common-build-on-darwin.patch";
sha256 = "0avpwgjdaxxdpq8pfvv9darfn4ql5dgqq7zaf3nmxnvhh86ngzij";
})
+ ] ++ lib.optionals (version == "2.2.6") [
+ # Take contrib blocklist into account for doc generation. This fixes sbcl
+ # build on aarch64, because the docs Makefile tries to require sb-simd,
+ # which is blocked in that platform.
+ (fetchpatch {
+ url = "https://github.com/sbcl/sbcl/commit/f88989694200a5192fb68047d43d0500b2165f7b.patch";
+ sha256 = "sha256-MXEsK46RARPmB2WBPcrmZk6ArliU8DgHw73x9+/QAmk=";
+ })
];
postPatch = ''
@@ -85,6 +95,7 @@ stdenv.mkDerivation rec {
enableFeatures = with lib;
optional threadSupport "sb-thread" ++
optional linkableRuntime "sb-linkable-runtime" ++
+ optional coreCompression "sb-core-compression" ++
optional stdenv.isAarch32 "arm";
disableFeatures = with lib;
diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix
index 54bd91db3ae8..cafa505da621 100644
--- a/pkgs/development/libraries/amdvlk/default.nix
+++ b/pkgs/development/libraries/amdvlk/default.nix
@@ -22,13 +22,13 @@ let
in stdenv.mkDerivation rec {
pname = "amdvlk";
- version = "2022.Q2.3";
+ version = "2022.Q2.2";
src = fetchRepoProject {
name = "${pname}-src";
manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
rev = "refs/tags/v-${version}";
- sha256 = "Yd2juNdSP8TdSX9j/iXsC2xrIRzDEuXJbms91AqwjEc=";
+ sha256 = "4LV6g2snT1usY+Ic9Hb/IwXAJQ97I9DigZCah6mwewA=";
};
buildInputs = [
diff --git a/pkgs/development/libraries/aml/default.nix b/pkgs/development/libraries/aml/default.nix
index ef3ba58e7e25..392dae609c0b 100644
--- a/pkgs/development/libraries/aml/default.nix
+++ b/pkgs/development/libraries/aml/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "aml";
- version = "0.2.1";
+ version = "0.2.2";
src = fetchFromGitHub {
owner = "any1";
repo = pname;
rev = "v${version}";
- sha256 = "1m911n3rd41ch4yk3k9k1lz29xp3h54k6jx122abq5kmngy9znqw";
+ sha256 = "sha256-WhhjK9uzKyvnzpGtAWXXo0upfZTPINHVk0qmzNXwobE=";
};
nativeBuildInputs = [ meson pkg-config ninja ];
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 1e6d9260b579..079caf85da9e 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -47,6 +47,9 @@ stdenv.mkDerivation rec {
./python-310-detection-without-distutils.patch
# Find correct version string for Python >= 3.10, https://dev.gnupg.org/D546
./python-find-version-string-above-310.patch
+ # Fix a test after disallowing compressed signatures in gpg (PR #180336)
+ ./test_t-verify_double-plaintext.patch
+
# Disable python tests on Darwin as they use gpg (see configureFlags below)
] ++ lib.optional stdenv.isDarwin ./disable-python-tests.patch
# Fix _AC_UNDECLARED_WARNING for autoconf>=2.70
diff --git a/pkgs/development/libraries/gpgme/test_t-verify_double-plaintext.patch b/pkgs/development/libraries/gpgme/test_t-verify_double-plaintext.patch
new file mode 100644
index 000000000000..566e057f7bee
--- /dev/null
+++ b/pkgs/development/libraries/gpgme/test_t-verify_double-plaintext.patch
@@ -0,0 +1,11 @@
+--- a/tests/gpg/t-verify.c
++++ b/tests/gpg/t-verify.c
+@@ -304,7 +304,7 @@
+ err = gpgme_data_new (&text);
+ fail_if_err (err);
+ err = gpgme_op_verify (ctx, sig, NULL, text);
+- if (gpgme_err_code (err) != GPG_ERR_BAD_DATA)
++ if (gpgme_err_code (err) == GPG_ERR_NO_ERROR)
+ {
+ fprintf (stderr, "%s:%i: Double plaintext message not detected\n",
+ PGM, __LINE__);
diff --git a/pkgs/development/libraries/libschrift/default.nix b/pkgs/development/libraries/libschrift/default.nix
index d8093a58deec..443550e8a0a1 100644
--- a/pkgs/development/libraries/libschrift/default.nix
+++ b/pkgs/development/libraries/libschrift/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libschrift";
- version = "0.10.1";
+ version = "0.10.2";
src = fetchFromGitHub {
owner = "tomolt";
repo = pname;
rev = "v" + version;
- sha256 = "0fvji0z6z2al68p07w58l4hc29ds68v71h7z84vxiqhxnsgc0hlv";
+ sha256 = "01hgvkcb46kr9jzc4ah0js0jy9kr0ll18j2k0c5zil55l3a9rqw1";
};
postPatch = ''
diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix
index 82f5614458f0..0b8d8d8e5817 100644
--- a/pkgs/development/libraries/libwebsockets/default.nix
+++ b/pkgs/development/libraries/libwebsockets/default.nix
@@ -5,73 +5,54 @@
, openssl
, zlib
, libuv
-, fetchpatch
-# External poll is required for e.g. mosquitto, but discouraged by the maintainer.
+ # External poll is required for e.g. mosquitto, but discouraged by the maintainer.
, withExternalPoll ? false
}:
-let
- generic = { version, sha256, patches ? [] }: stdenv.mkDerivation rec {
- pname = "libwebsockets";
- inherit version;
+stdenv.mkDerivation rec {
+ pname = "libwebsockets";
+ version = "4.3.2";
- src = fetchFromGitHub {
- owner = "warmcat";
- repo = "libwebsockets";
- rev = "v${version}";
- inherit sha256;
- };
-
- inherit patches;
-
- buildInputs = [ openssl zlib libuv ];
-
- nativeBuildInputs = [ cmake ];
-
- cmakeFlags = [
- "-DLWS_WITH_PLUGINS=ON"
- "-DLWS_WITH_IPV6=ON"
- "-DLWS_WITH_SOCKS5=ON"
- "-DDISABLE_WERROR=ON"
- # Required since v4.2.0
- "-DLWS_BUILD_HASH=no_hash"
- ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DLWS_WITHOUT_TESTAPPS=ON"
- ++ lib.optional withExternalPoll "-DLWS_WITH_EXTERNAL_POLL=ON";
-
- postInstall = ''
- rm -r ${placeholder "out"}/share/libwebsockets-test-server
- '';
-
- # $out/share/libwebsockets-test-server/plugins/libprotocol_*.so refers to crtbeginS.o
- disallowedReferences = [ stdenv.cc.cc ];
-
- meta = with lib; {
- description = "Light, portable C library for websockets";
- longDescription = ''
- Libwebsockets is a lightweight pure C library built to
- use minimal CPU and memory resources, and provide fast
- throughput in both directions.
- '';
- homepage = "https://libwebsockets.org/";
- # Relicensed from LGPLv2.1+ to MIT with 4.0. Licensing situation
- # is tricky, see https://github.com/warmcat/libwebsockets/blob/main/LICENSE
- license = with licenses; [ mit publicDomain bsd3 asl20 ];
- maintainers = with maintainers; [ mindavi ];
- platforms = platforms.all;
- };
+ src = fetchFromGitHub {
+ owner = "warmcat";
+ repo = "libwebsockets";
+ rev = "v${version}";
+ hash = "sha256-why8LAcc4XN0JdTJ1JoNWijKENL5mOHBsi9K4wpYr2c=";
};
-in {
- libwebsockets_4_3 = generic {
- version = "4.3.1";
- sha256 = "sha256-lB3JHh058cQc5rycLnHk3JAOgtku0nRCixN5U6lPKq8=";
- patches = [
- # fixes the propagated cmake files, fixing the build of ttyd
- # see also https://github.com/tsl0922/ttyd/issues/918
- (fetchpatch {
- url = "https://github.com/warmcat/libwebsockets/commit/99a8b9c4422bed45c8b7412a1e121056f2a6132a.patch";
- hash = "sha256-zHBo2ZEayvibM+jzeVaZqySxghaOLUglpSFwuGhl6HM=";
- })
- ];
+ buildInputs = [ openssl zlib libuv ];
+
+ nativeBuildInputs = [ cmake ];
+
+ cmakeFlags = [
+ "-DLWS_WITH_PLUGINS=ON"
+ "-DLWS_WITH_IPV6=ON"
+ "-DLWS_WITH_SOCKS5=ON"
+ "-DDISABLE_WERROR=ON"
+ "-DLWS_BUILD_HASH=no_hash"
+ ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DLWS_WITHOUT_TESTAPPS=ON"
+ ++ lib.optional withExternalPoll "-DLWS_WITH_EXTERNAL_POLL=ON";
+
+ postInstall = ''
+ rm -r ${placeholder "out"}/share/libwebsockets-test-server
+ '';
+
+ # $out/share/libwebsockets-test-server/plugins/libprotocol_*.so refers to crtbeginS.o
+ disallowedReferences = [ stdenv.cc.cc ];
+
+ meta = with lib; {
+ description = "Light, portable C library for websockets";
+ longDescription = ''
+ Libwebsockets is a lightweight pure C library built to
+ use minimal CPU and memory resources, and provide fast
+ throughput in both directions.
+ '';
+ homepage = "https://libwebsockets.org/";
+ # Relicensed from LGPLv2.1+ to MIT with 4.0. Licensing situation
+ # is tricky, see https://github.com/warmcat/libwebsockets/blob/main/LICENSE
+ license = with licenses; [ mit publicDomain bsd3 asl20 ];
+ maintainers = with maintainers; [ mindavi ];
+ platforms = platforms.all;
};
}
+
diff --git a/pkgs/development/libraries/physics/geant4/datasets.nix b/pkgs/development/libraries/physics/geant4/datasets.nix
index 18809654c467..b1df2875fab7 100644
--- a/pkgs/development/libraries/physics/geant4/datasets.nix
+++ b/pkgs/development/libraries/physics/geant4/datasets.nix
@@ -1,10 +1,10 @@
-{ lib, stdenv, fetchurl, geant_version }:
+{ lib, stdenv, fetchurl, geant4 }:
let
mkDataset = { pname, version, sha256, envvar }:
stdenv.mkDerivation {
inherit pname version;
- inherit geant_version;
+ geant_version = geant4.version;
src = fetchurl {
url = "https://cern.ch/geant4-data/datasets/${pname}.${version}.tar.gz";
@@ -15,7 +15,7 @@ let
dontBuild = true;
dontConfigure = true;
- datadir = "${placeholder "out"}/share/Geant4-${geant_version}/data/${pname}${version}";
+ datadir = "${placeholder "out"}/share/Geant4-${geant4.version}/data/${pname}${version}";
installPhase = ''
mkdir -p $datadir
mv ./* $datadir
diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix
index 5fb220580655..3a23d25d8751 100644
--- a/pkgs/development/libraries/physics/geant4/default.nix
+++ b/pkgs/development/libraries/physics/geant4/default.nix
@@ -1,8 +1,7 @@
{ enableMultiThreading ? true
-, enableG3toG4 ? false
, enableInventor ? false
-, enableGDML ? false
-, enableQT ? false
+, enableQT ? false # deprecated name
+, enableQt ? enableQT
, enableXM ? false
, enableOpenGLX11 ? true
, enablePython ? false
@@ -11,15 +10,12 @@
# Standard build environment with cmake.
, lib, stdenv, fetchurl, fetchpatch, cmake
-# Optional system packages, otherwise internal GEANT4 packages are used.
, clhep ? null # not packaged currently
, expat
+, xercesc
, zlib
-# For enableGDML.
-, xercesc
-
-# For enableQT.
+# For enableQt.
, qtbase
, wrapQtAppsHook
@@ -31,7 +27,7 @@
, soxt
, libXpm
-# For enableQT, enableXM, enableOpenGLX11, enableRaytracerX11.
+# For enableQt, enableXM, enableOpenGLX11, enableRaytracerX11.
, libGLU, libGL
, xlibsWrapper
, libXmu
@@ -48,6 +44,8 @@ let
boost_python = boost.override { enablePython = true; python = python3; };
in
+lib.warnIf (enableQT != false) "geant4: enableQT is deprecated, please use enableQt"
+
stdenv.mkDerivation rec {
version = "11.0.0";
pname = "geant4";
@@ -59,17 +57,17 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DGEANT4_INSTALL_DATA=OFF"
- "-DGEANT4_USE_GDML=${if enableGDML then "ON" else "OFF"}"
- "-DGEANT4_USE_G3TOG4=${if enableG3toG4 then "ON" else "OFF"}"
- "-DGEANT4_USE_QT=${if enableQT then "ON" else "OFF"}"
+ "-DGEANT4_USE_GDML=ON"
+ "-DGEANT4_USE_G3TOG4=ON"
+ "-DGEANT4_USE_QT=${if enableQt then "ON" else "OFF"}"
"-DGEANT4_USE_XM=${if enableXM then "ON" else "OFF"}"
"-DGEANT4_USE_OPENGL_X11=${if enableOpenGLX11 then "ON" else "OFF"}"
"-DGEANT4_USE_INVENTOR=${if enableInventor then "ON" else "OFF"}"
"-DGEANT4_USE_PYTHON=${if enablePython then "ON" else "OFF"}"
"-DGEANT4_USE_RAYTRACER_X11=${if enableRaytracerX11 then "ON" else "OFF"}"
"-DGEANT4_USE_SYSTEM_CLHEP=${if clhep != null then "ON" else "OFF"}"
- "-DGEANT4_USE_SYSTEM_EXPAT=${if expat != null then "ON" else "OFF"}"
- "-DGEANT4_USE_SYSTEM_ZLIB=${if zlib != null then "ON" else "OFF"}"
+ "-DGEANT4_USE_SYSTEM_EXPAT=ON"
+ "-DGEANT4_USE_SYSTEM_ZLIB=ON"
"-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}"
] ++ lib.optionals stdenv.isDarwin [
"-DXQuartzGL_INCLUDE_DIR=${libGL.dev}/include"
@@ -83,37 +81,36 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
- ] ++ lib.optionals enableQT [
- wrapQtAppsHook
];
- dontWrapQtApps = !enableQT;
+ propagatedNativeBuildInputs = lib.optionals enableQt [
+ wrapQtAppsHook
+ ];
+ dontWrapQtApps = true; # no binaries
buildInputs = [ libGLU xlibsWrapper libXmu ]
++ lib.optionals enableInventor [ libXpm coin3d soxt motif ]
++ lib.optionals enablePython [ boost_python python3 ];
- propagatedBuildInputs = [ clhep expat zlib libGL ]
- ++ lib.optionals enableGDML [ xercesc ]
+ propagatedBuildInputs = [ clhep expat xercesc zlib libGL ]
++ lib.optionals enableXM [ motif ]
- ++ lib.optionals enableQT [ qtbase ];
+ ++ lib.optionals enableQt [ qtbase ];
postFixup = ''
# Don't try to export invalid environment variables.
sed -i 's/export G4\([A-Z]*\)DATA/#export G4\1DATA/' "$out"/bin/geant4.sh
- '' + lib.optionalString enableQT ''
+ '' + lib.optionalString enableQt ''
wrapQtAppsHook
'';
setupHook = ./geant4-hook.sh;
passthru = {
- data = import ./datasets.nix {
- inherit lib stdenv fetchurl;
- geant_version = version;
- };
+ data = callPackage ./datasets.nix {};
tests = callPackage ./tests.nix {};
+
+ inherit enableQt;
};
# Set the myriad of envars required by Geant4 if we use a nix-shell.
diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index 3e2146899913..4ffbf24ad25e 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -67,7 +67,7 @@
stdenv.mkDerivation rec {
pname = "webkitgtk";
- version = "2.36.3";
+ version = "2.36.4";
outputs = [ "out" "dev" ];
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
- sha256 = "sha256-cy/PjE7GRLjtKLRuu9fB66udngr+qb315dEnhq/EeNE=";
+ sha256 = "sha256-tr6+H4WkedlowZ5EpHBGIu+M72FjatGyQGt30Wri4qg=";
};
patches = lib.optionals stdenv.isLinux [
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 54068fa5c2c6..0be9b1a27f42 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -203,6 +203,7 @@
, "livedown"
, "lodash"
, "lua-fmt"
+, "lv_font_conv"
, "madoko"
, "manta"
, "markdownlint-cli"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 974499eb783f..28c3b3911862 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -2695,13 +2695,13 @@ let
sha512 = "iw78lmxm49q2LhHTQCSu9zs85E8Sm6ui82OvxajU9rdhckFzZoj/KCQi9P0gFuL+w3WmQObHqdH2/sxK4oi2wA==";
};
};
- "@cspell/dict-companies-2.0.5" = {
+ "@cspell/dict-companies-2.0.6" = {
name = "_at_cspell_slash_dict-companies";
packageName = "@cspell/dict-companies";
- version = "2.0.5";
+ version = "2.0.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@cspell/dict-companies/-/dict-companies-2.0.5.tgz";
- sha512 = "H8+LU+gDUeJ8RcV1kMSIiHa5PE/8tYyA2tg/s6ssHtsgsJ206I+cRFV8yAlu0mUUCXD617+KKXmclZ0eZ7ku4w==";
+ url = "https://registry.npmjs.org/@cspell/dict-companies/-/dict-companies-2.0.6.tgz";
+ sha512 = "S1U+ZqvwDwiMYEFPKNxRmH0z7YlmOj93xadga4U0LMa3S4ORSf192uMB0w0AFBwXUPnXHM5uqIGP0LTt0b4Ygg==";
};
};
"@cspell/dict-cpp-3.1.0" = {
@@ -2812,13 +2812,13 @@ let
sha512 = "do7/Iwxjx+FHybe6UTocsWNRF1ar4cwhQoV2K2YzYTm73CoU5LMEwi2LY0Mwp/mn90TKbpPPQGCJ0sRpvaZ4AA==";
};
};
- "@cspell/dict-fonts-2.0.0" = {
+ "@cspell/dict-fonts-2.0.1" = {
name = "_at_cspell_slash_dict-fonts";
packageName = "@cspell/dict-fonts";
- version = "2.0.0";
+ version = "2.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@cspell/dict-fonts/-/dict-fonts-2.0.0.tgz";
- sha512 = "AgkTalphfDPtKFPYmEExDcj8rRCh86xlOSXco8tehOEkYVYbksOk9XH0YVH34RFpy93YBd2nnVGLgyGVwagcPw==";
+ url = "https://registry.npmjs.org/@cspell/dict-fonts/-/dict-fonts-2.0.1.tgz";
+ sha512 = "UX9evXp7IPZ55G1NxVLADoRgGa+6MPSFx4zWveT6vHIVI9k50yZZY2QkIgQIOEPgk8RNrNe1Tf6HLfndgFL2kQ==";
};
};
"@cspell/dict-fullstack-2.0.6" = {
@@ -3748,13 +3748,13 @@ let
sha512 = "ax8izl48JJuymEuvJzvNH22GHmpPEWLP+h4doyFZ/9IhR9AEycNc2rGBthZ5FiuktnFgusNag1AHr/WCj5pttw==";
};
};
- "@fluentui/react-8.76.1" = {
+ "@fluentui/react-8.77.0" = {
name = "_at_fluentui_slash_react";
packageName = "@fluentui/react";
- version = "8.76.1";
+ version = "8.77.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@fluentui/react/-/react-8.76.1.tgz";
- sha512 = "oMekX87wpjBv2AD9oz1XUbdM9vFOM4zePe6OtgVh3MdCDsQ7DZ9Un/nhd50GOq7nf/XBKR6U0fhxI9WoyvnV5w==";
+ url = "https://registry.npmjs.org/@fluentui/react/-/react-8.77.0.tgz";
+ sha512 = "0Eu6eIOSS9Bpq2yySYZIJUNQWJefOKGOajupKSaKn2Qa0XNReW9HEyn6B0v80tVgPCg6wzqfr1CAPnszoLAHxA==";
};
};
"@fluentui/react-focus-8.7.0" = {
@@ -3856,49 +3856,49 @@ let
sha512 = "+GFtFqBhFzwKaKmeEfw1jWQgZJNX4q11CCx1fSPFJB49Fdjb7k3lx74jAyzHlX0UWnm6DMK+/cYT7j5t6G9LfA==";
};
};
- "@forge/bundler-3.0.7" = {
+ "@forge/bundler-3.0.8" = {
name = "_at_forge_slash_bundler";
packageName = "@forge/bundler";
- version = "3.0.7";
+ version = "3.0.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@forge/bundler/-/bundler-3.0.7.tgz";
- sha512 = "fYnZF6W61pG4ij54ylXw3YhHGME3v2uRyi/5/Ocso4M5F/kAYfmTu/DaaWpz489jJ4pxNbVsgJSlUSqVyQtHbw==";
+ url = "https://registry.npmjs.org/@forge/bundler/-/bundler-3.0.8.tgz";
+ sha512 = "s9BKPoEcWBubf4XIueCHBansfL8mRB1FsdJA+BcFnDF0OrTUyFnzx1IelSEDT3XTWbrAkwNDMJS0Ng+EF5semQ==";
};
};
- "@forge/cli-shared-2.5.0" = {
+ "@forge/cli-shared-2.5.1" = {
name = "_at_forge_slash_cli-shared";
packageName = "@forge/cli-shared";
- version = "2.5.0";
+ version = "2.5.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-2.5.0.tgz";
- sha512 = "oBEsmRAo7+9nUR2SOpxLS6qE7a9qKb3EeM3J8aKVnms3GduwQOvRODqmRPeL99juOFk9ztUH5iWxeRPwbS1bAg==";
+ url = "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-2.5.1.tgz";
+ sha512 = "sUS6WO61TK1a5Y5/NlB47fOEXjkYvDASJbsYIq85PY7RzTrbrf9XozeOui8nhBuJaEy3/KOJTG7sSZ9RexKPmA==";
};
};
- "@forge/csp-1.10.0" = {
+ "@forge/csp-1.11.0" = {
name = "_at_forge_slash_csp";
packageName = "@forge/csp";
- version = "1.10.0";
+ version = "1.11.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@forge/csp/-/csp-1.10.0.tgz";
- sha512 = "uVpxfrfuUP+VUBomdfgi2wIjY9XgQOBn98VLn7hfuvGtZVyN0Ehoc2Dj5F+x1vgu52vudoJecziQwK6h4K0Q1w==";
+ url = "https://registry.npmjs.org/@forge/csp/-/csp-1.11.0.tgz";
+ sha512 = "VJsDidMQ0W6vCbVuNgvI6yyGQvwhwjT8w8MhcaaFWXvHbQG+ARGZf73ZK4CJM2XB/MjXfHElvTukgbh7mXqJeA==";
};
};
- "@forge/lint-3.1.1" = {
+ "@forge/lint-3.1.2" = {
name = "_at_forge_slash_lint";
packageName = "@forge/lint";
- version = "3.1.1";
+ version = "3.1.2";
src = fetchurl {
- url = "https://registry.npmjs.org/@forge/lint/-/lint-3.1.1.tgz";
- sha512 = "ndrpnPdhCw41i0sU8Rf7r3/ZJxluKUoAwEM4u0y9YcbW1WpE3A7KtlfsiqNPPN7QtHVm8kgtDfoQt+r9f5XFfA==";
+ url = "https://registry.npmjs.org/@forge/lint/-/lint-3.1.2.tgz";
+ sha512 = "fYj+U0ZRvy8liRkybk5pR3pUopRs3khvU9vmpvguwfo9KzxiNOxL2M1DfuDQmHjAeSjjqmfspMJDsdoq8Q4ynw==";
};
};
- "@forge/manifest-3.8.0" = {
+ "@forge/manifest-3.8.1" = {
name = "_at_forge_slash_manifest";
packageName = "@forge/manifest";
- version = "3.8.0";
+ version = "3.8.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@forge/manifest/-/manifest-3.8.0.tgz";
- sha512 = "fCE/igDKD1OkCjetT0g4V0kOMq8u2BafKW0+2vtz/F/Y6vtnsR9OZssnQN546EvgwHq/o0/A0CM+GkjGnB+DSg==";
+ url = "https://registry.npmjs.org/@forge/manifest/-/manifest-3.8.1.tgz";
+ sha512 = "kXqooktuU5tmIyQJ42XoQs74CnSrOdN2IYRbOpnHY+iMwPBjmXbpz7VCFc2VWApbaCDM1K+gch4qHaLPPvGuDw==";
};
};
"@forge/storage-1.3.0" = {
@@ -4000,13 +4000,13 @@ let
sha512 = "dznNbRd/Y8J0C0xvdvCPi3B1msK/dj/Nya+NQZ2doUOLT6eoa261tBwk9umOQs5L5GKcdlqQKbBjrNjDYVbzQA==";
};
};
- "@grammyjs/types-2.7.2" = {
+ "@grammyjs/types-2.8.0" = {
name = "_at_grammyjs_slash_types";
packageName = "@grammyjs/types";
- version = "2.7.2";
+ version = "2.8.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@grammyjs/types/-/types-2.7.2.tgz";
- sha512 = "zaZH34j/tXhz9fmCv+7dUkvHgp4q/uIuQ2SEWn7hJ7TEuUUa764bNguVHillqTwTgOL1XkbaTSMczbbCnjeB4Q==";
+ url = "https://registry.npmjs.org/@grammyjs/types/-/types-2.8.0.tgz";
+ sha512 = "su7pK6oP5co+fqopY79zV2KIlWUN6baT/RW1kGLUfMB0b8pdkeKbGtAjxZ/ccxfXVPsqIn+53ERARLT65g+6xw==";
};
};
"@graphql-cli/common-4.1.0" = {
@@ -5791,13 +5791,13 @@ let
sha512 = "ES5rj6J39FUkHe/b3C9SJs8bqIungYhuU7rBINTBaHOv/Ce4RCb3Gw08CZVl32W33UEkgRkzyWaIedV4at+QHg==";
};
};
- "@mdn/browser-compat-data-5.0.1" = {
+ "@mdn/browser-compat-data-5.1.1" = {
name = "_at_mdn_slash_browser-compat-data";
packageName = "@mdn/browser-compat-data";
- version = "5.0.1";
+ version = "5.1.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-5.0.1.tgz";
- sha512 = "c+RIBgZSqSWgxZdNWLaaCAfBon2YM4pz0QD+VoT32rIOGChJl3l99E7B/xSWvVlSSiE7jQkEuJx3hbKoUdAi3w==";
+ url = "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-5.1.1.tgz";
+ sha512 = "odIvtuAoXePQL4UcPrhy3MSXMvz2vefTe5uQQoLzKHQ6+f6vAhVlZEbs92d6cz8oSjylF+KL3Z/G2eLCMFl7qw==";
};
};
"@medable/mdctl-api-1.0.66" = {
@@ -6718,13 +6718,13 @@ let
sha512 = "0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg==";
};
};
- "@octokit/openapi-types-12.1.0" = {
+ "@octokit/openapi-types-12.4.0" = {
name = "_at_octokit_slash_openapi-types";
packageName = "@octokit/openapi-types";
- version = "12.1.0";
+ version = "12.4.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-12.1.0.tgz";
- sha512 = "kQzJh3ZUv3lDpi6M+uekMRHULvf9DlWoI1XgKN6nPeGDzkSgtkhVq1MMz3bFKQ6H6GbdC3ZqG/a6VzKhIx0VeA==";
+ url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-12.4.0.tgz";
+ sha512 = "Npcb7Pv30b33U04jvcD7l75yLU0mxhuX2Xqrn51YyZ5WTkF04bpbxLaZ6GcaTqu03WZQHoO/Gbfp95NGRueDUA==";
};
};
"@octokit/plugin-enterprise-rest-6.0.1" = {
@@ -6736,13 +6736,13 @@ let
sha512 = "93uGjlhUD+iNg1iWhUENAtJata6w5nE+V4urXOAlIXdco6xNZtUSfYY8dzp3Udy74aqO/B5UZL80x/YMa5PKRw==";
};
};
- "@octokit/plugin-paginate-rest-2.18.0" = {
+ "@octokit/plugin-paginate-rest-2.19.0" = {
name = "_at_octokit_slash_plugin-paginate-rest";
packageName = "@octokit/plugin-paginate-rest";
- version = "2.18.0";
+ version = "2.19.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.18.0.tgz";
- sha512 = "n5/AzIoy5Wzp85gqzSbR+dWQDHlyHZrGijnDfLh452547Ynu0hCvszH7EfRE0eqM5ZjfkplO0k+q+P8AAIIJEA==";
+ url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.19.0.tgz";
+ sha512 = "hQ4Qysg2hNmEMuZeJkvyzM4eSZiTifOKqYAMsW8FnxFKowhuwWICSgBQ9Gn9GpUmgKB7qaf1hFvMjYaTAg5jQA==";
};
};
"@octokit/plugin-request-log-1.0.4" = {
@@ -6754,13 +6754,13 @@ let
sha512 = "mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==";
};
};
- "@octokit/plugin-rest-endpoint-methods-5.14.0" = {
+ "@octokit/plugin-rest-endpoint-methods-5.15.0" = {
name = "_at_octokit_slash_plugin-rest-endpoint-methods";
packageName = "@octokit/plugin-rest-endpoint-methods";
- version = "5.14.0";
+ version = "5.15.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.14.0.tgz";
- sha512 = "MRnMs4Dcm1OSaz/g/RLr4YY9otgysS7vN5SUkHGd7t+R8323cHsHFoEWHYPSmgUC0BieHRhvnCRWb4i3Pl+Lgg==";
+ url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.15.0.tgz";
+ sha512 = "Gsw9+Xm56jVhfbJoy4pt6eOOyf8/3K6CAnx1Sl7U2GhZWcg8MR6YgXWnpfdF69S2ViMXLA7nfvTDAsZpFlkLRw==";
};
};
"@octokit/plugin-retry-3.0.9" = {
@@ -6772,13 +6772,13 @@ let
sha512 = "r+fArdP5+TG6l1Rv/C9hVoty6tldw6cE2pRHNGmFPdyfrc696R6JjrQ3d7HdVqGwuzfyrcaLAKD7K8TX8aehUQ==";
};
};
- "@octokit/plugin-throttling-3.6.2" = {
+ "@octokit/plugin-throttling-3.7.0" = {
name = "_at_octokit_slash_plugin-throttling";
packageName = "@octokit/plugin-throttling";
- version = "3.6.2";
+ version = "3.7.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@octokit/plugin-throttling/-/plugin-throttling-3.6.2.tgz";
- sha512 = "0az5fxgVlhFfFtiKLKVXTpmCG2tK3BG0fYI8SO4pmGlN1kyJktJVQA+6KKaFxtxMIWsuHmSEAkR6zSgtk86g2A==";
+ url = "https://registry.npmjs.org/@octokit/plugin-throttling/-/plugin-throttling-3.7.0.tgz";
+ sha512 = "qrKT1Yl/KuwGSC6/oHpLBot3ooC9rq0/ryDYBCpkRtoj+R8T47xTMDT6Tk2CxWopFota/8Pi/2SqArqwC0JPow==";
};
};
"@octokit/request-5.6.3" = {
@@ -6808,13 +6808,13 @@ let
sha512 = "gDPiOHlyGavxr72y0guQEhLsemgVjwRePayJ+FcKc2SJqKUbxbkvf5kAZEWA/MKvsfYlQAMVzNJE3ezQcxMJ2Q==";
};
};
- "@octokit/types-6.35.0" = {
+ "@octokit/types-6.37.0" = {
name = "_at_octokit_slash_types";
packageName = "@octokit/types";
- version = "6.35.0";
+ version = "6.37.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@octokit/types/-/types-6.35.0.tgz";
- sha512 = "DhLfdUuv3H37u6jBDfkwamypx3HflHg29b26nbA6iVFYkAlZ5cMEtu/9pQoihGnQE5M7jJFnNo25Rr1UwQNF8Q==";
+ url = "https://registry.npmjs.org/@octokit/types/-/types-6.37.0.tgz";
+ sha512 = "BXWQhFKRkjX4dVW5L2oYa0hzWOAqsEsujXsQLSdepPoDZfYdubrD1KDGpyNldGXtR8QM/WezDcxcIN1UKJMGPA==";
};
};
"@opencensus/core-0.0.8" = {
@@ -10480,13 +10480,13 @@ let
sha512 = "aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg==";
};
};
- "@typescript-eslint/eslint-plugin-5.28.0" = {
+ "@typescript-eslint/eslint-plugin-5.29.0" = {
name = "_at_typescript-eslint_slash_eslint-plugin";
packageName = "@typescript-eslint/eslint-plugin";
- version = "5.28.0";
+ version = "5.29.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.28.0.tgz";
- sha512 = "DXVU6Cg29H2M6EybqSg2A+x8DgO9TCUBRp4QEXQHJceLS7ogVDP0g3Lkg/SZCqcvkAP/RruuQqK0gdlkgmhSUA==";
+ url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.29.0.tgz";
+ sha512 = "kgTsISt9pM53yRFQmLZ4npj99yGl3x3Pl7z4eA66OuTzAGC4bQB5H5fuLwPnqTKU3yyrrg4MIhjF17UYnL4c0w==";
};
};
"@typescript-eslint/experimental-utils-4.33.0" = {
@@ -10507,13 +10507,13 @@ let
sha512 = "ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==";
};
};
- "@typescript-eslint/parser-5.28.0" = {
+ "@typescript-eslint/parser-5.29.0" = {
name = "_at_typescript-eslint_slash_parser";
packageName = "@typescript-eslint/parser";
- version = "5.28.0";
+ version = "5.29.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.28.0.tgz";
- sha512 = "ekqoNRNK1lAcKhZESN/PdpVsWbP9jtiNqzFWkp/yAUdZvJalw2heCYuqRmM5eUJSIYEkgq5sGOjq+ZqsLMjtRA==";
+ url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.29.0.tgz";
+ sha512 = "ruKWTv+x0OOxbzIw9nW5oWlUopvP/IQDjB5ZqmTglLIoDTctLlAJpAQFpNPJP/ZI7hTT9sARBosEfaKbcFuECw==";
};
};
"@typescript-eslint/scope-manager-4.33.0" = {
@@ -10525,22 +10525,22 @@ let
sha512 = "5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ==";
};
};
- "@typescript-eslint/scope-manager-5.28.0" = {
+ "@typescript-eslint/scope-manager-5.29.0" = {
name = "_at_typescript-eslint_slash_scope-manager";
packageName = "@typescript-eslint/scope-manager";
- version = "5.28.0";
+ version = "5.29.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.28.0.tgz";
- sha512 = "LeBLTqF/he1Z+boRhSqnso6YrzcKMTQ8bO/YKEe+6+O/JGof9M0g3IJlIsqfrK/6K03MlFIlycbf1uQR1IjE+w==";
+ url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.29.0.tgz";
+ sha512 = "etbXUT0FygFi2ihcxDZjz21LtC+Eps9V2xVx09zFoN44RRHPrkMflidGMI+2dUs821zR1tDS6Oc9IXxIjOUZwA==";
};
};
- "@typescript-eslint/type-utils-5.28.0" = {
+ "@typescript-eslint/type-utils-5.29.0" = {
name = "_at_typescript-eslint_slash_type-utils";
packageName = "@typescript-eslint/type-utils";
- version = "5.28.0";
+ version = "5.29.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.28.0.tgz";
- sha512 = "SyKjKh4CXPglueyC6ceAFytjYWMoPHMswPQae236zqe1YbhvCVQyIawesYywGiu98L9DwrxsBN69vGIVxJ4mQQ==";
+ url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.29.0.tgz";
+ sha512 = "JK6bAaaiJozbox3K220VRfCzLa9n0ib/J+FHIwnaV3Enw/TO267qe0pM1b1QrrEuy6xun374XEAsRlA86JJnyg==";
};
};
"@typescript-eslint/types-3.10.1" = {
@@ -10561,13 +10561,13 @@ let
sha512 = "zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ==";
};
};
- "@typescript-eslint/types-5.28.0" = {
+ "@typescript-eslint/types-5.29.0" = {
name = "_at_typescript-eslint_slash_types";
packageName = "@typescript-eslint/types";
- version = "5.28.0";
+ version = "5.29.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.28.0.tgz";
- sha512 = "2OOm8ZTOQxqkPbf+DAo8oc16sDlVR5owgJfKheBkxBKg1vAfw2JsSofH9+16VPlN9PWtv8Wzhklkqw3k/zCVxA==";
+ url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.29.0.tgz";
+ sha512 = "X99VbqvAXOMdVyfFmksMy3u8p8yoRGITgU1joBJPzeYa0rhdf5ok9S56/itRoUSh99fiDoMtarSIJXo7H/SnOg==";
};
};
"@typescript-eslint/typescript-estree-3.10.1" = {
@@ -10588,22 +10588,22 @@ let
sha512 = "rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA==";
};
};
- "@typescript-eslint/typescript-estree-5.28.0" = {
+ "@typescript-eslint/typescript-estree-5.29.0" = {
name = "_at_typescript-eslint_slash_typescript-estree";
packageName = "@typescript-eslint/typescript-estree";
- version = "5.28.0";
+ version = "5.29.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.28.0.tgz";
- sha512 = "9GX+GfpV+F4hdTtYc6OV9ZkyYilGXPmQpm6AThInpBmKJEyRSIjORJd1G9+bknb7OTFYL+Vd4FBJAO6T78OVqA==";
+ url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.29.0.tgz";
+ sha512 = "mQvSUJ/JjGBdvo+1LwC+GY2XmSYjK1nAaVw2emp/E61wEVYEyibRHCqm1I1vEKbXCpUKuW4G7u9ZCaZhJbLoNQ==";
};
};
- "@typescript-eslint/utils-5.28.0" = {
+ "@typescript-eslint/utils-5.29.0" = {
name = "_at_typescript-eslint_slash_utils";
packageName = "@typescript-eslint/utils";
- version = "5.28.0";
+ version = "5.29.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.28.0.tgz";
- sha512 = "E60N5L0fjv7iPJV3UGc4EC+A3Lcj4jle9zzR0gW7vXhflO7/J29kwiTGITA2RlrmPokKiZbBy2DgaclCaEUs6g==";
+ url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.29.0.tgz";
+ sha512 = "3Eos6uP1nyLOBayc/VUdKZikV90HahXE5Dx9L5YlSd/7ylQPXhLk1BYb29SDgnBnTp+jmSZUU0QxUiyHgW4p7A==";
};
};
"@typescript-eslint/visitor-keys-3.10.1" = {
@@ -10624,13 +10624,13 @@ let
sha512 = "uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg==";
};
};
- "@typescript-eslint/visitor-keys-5.28.0" = {
+ "@typescript-eslint/visitor-keys-5.29.0" = {
name = "_at_typescript-eslint_slash_visitor-keys";
packageName = "@typescript-eslint/visitor-keys";
- version = "5.28.0";
+ version = "5.29.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.28.0.tgz";
- sha512 = "BtfP1vCor8cWacovzzPFOoeW4kBQxzmhxGoOpt0v1SFvG+nJ0cWaVdJk7cky1ArTcFHHKNIxyo2LLr3oNkSuXA==";
+ url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.29.0.tgz";
+ sha512 = "Hpb/mCWsjILvikMQoZIE3voc9wtQcS0A9FUw3h8bhr9UxBdtI/tw1ZDZUOXHXLOVMedKCH5NxyzATwnU78bWCQ==";
};
};
"@ungap/promise-all-settled-1.1.2" = {
@@ -12298,13 +12298,13 @@ let
sha512 = "qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ==";
};
};
- "addons-linter-5.7.0" = {
+ "addons-linter-5.9.0" = {
name = "addons-linter";
packageName = "addons-linter";
- version = "5.7.0";
+ version = "5.9.0";
src = fetchurl {
- url = "https://registry.npmjs.org/addons-linter/-/addons-linter-5.7.0.tgz";
- sha512 = "w2QPCPfRbxTUDVuhtfMwOp1J+xIjUXCQMcGjg9t3Hu+vx8h9NZEGiBwYPYyoR5OD6yow52GvZncUMeO8+hIp+Q==";
+ url = "https://registry.npmjs.org/addons-linter/-/addons-linter-5.9.0.tgz";
+ sha512 = "ACvBvkO8WtupOT42S3ln801/Ek7X1Yss59aYlI5JPc+dEBfEyEtkUa23UEQmALqdDEoHk0i+3NkKHdiXbhqp/g==";
};
};
"addons-moz-compare-1.2.0" = {
@@ -14773,13 +14773,13 @@ let
sha512 = "545VawhsCQ7yEx9jZKV0hTTW3FS/waycISWMvnNwqRfpU9o4FQ4DSu3je7ekn5yFKM+91dxJC+IfJgtIV8WaUw==";
};
};
- "aws-sdk-2.1157.0" = {
+ "aws-sdk-2.1158.0" = {
name = "aws-sdk";
packageName = "aws-sdk";
- version = "2.1157.0";
+ version = "2.1158.0";
src = fetchurl {
- url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1157.0.tgz";
- sha512 = "30t+zhCECib8uaggd0Du8ifab4vtJjgVvNKxHWTpiLa3deTnM+0K7x3pwM99zxw0gLDxAUet/oURaoPJHwk/5Q==";
+ url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1158.0.tgz";
+ sha512 = "uHYzZMGE+b50sWXaLhga4aD1SpB3+DEZclAkg9aYz2pDZlSDTOMh3uJ/ufsMBs7VcDKGS7mQRibCmCbwRGTIlg==";
};
};
"aws-sign2-0.6.0" = {
@@ -18140,13 +18140,13 @@ let
sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==";
};
};
- "caniuse-lite-1.0.30001356" = {
+ "caniuse-lite-1.0.30001358" = {
name = "caniuse-lite";
packageName = "caniuse-lite";
- version = "1.0.30001356";
+ version = "1.0.30001358";
src = fetchurl {
- url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001356.tgz";
- sha512 = "/30854bktMLhxtjieIxsrJBfs2gTM1pel6MXKF3K+RdIVJZcsn2A2QdhsuR4/p9+R204fZw0zCBBhktX8xWuyQ==";
+ url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001358.tgz";
+ sha512 = "hvp8PSRymk85R20bsDra7ZTCpSVGN/PAz9pSAjPSjKC+rNmnUk5vCRgJwiTT/O4feQ/yu/drvZYpKxxhbFuChw==";
};
};
"canvas-2.9.1" = {
@@ -18302,22 +18302,22 @@ let
sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==";
};
};
- "cdk8s-2.3.31" = {
+ "cdk8s-2.3.32" = {
name = "cdk8s";
packageName = "cdk8s";
- version = "2.3.31";
+ version = "2.3.32";
src = fetchurl {
- url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.3.31.tgz";
- sha512 = "l0d5vDsnRhVxBn+w30B9erVijHX5/zYutshMoa7Gz2wfCAfy/ms3Y4RT9VSgZGYmbVlNxXYbgWwZn4ZSrpJ8VA==";
+ url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.3.32.tgz";
+ sha512 = "tFBIna07+zHTkMIGchDGA0jlo7PQllhETM3fmAf7iXK5d2jWOjX8UFMPxBWNJh3anxtvxnAR0Oa6o/J3kP3XQw==";
};
};
- "cdk8s-plus-22-2.0.0-rc.23" = {
+ "cdk8s-plus-22-2.0.0-rc.25" = {
name = "cdk8s-plus-22";
packageName = "cdk8s-plus-22";
- version = "2.0.0-rc.23";
+ version = "2.0.0-rc.25";
src = fetchurl {
- url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-2.0.0-rc.23.tgz";
- sha512 = "EZm8HnPOJLk+wJFHLEPtJVt0J0MeZAb7jGH0aVen+yYTQufdUaSLyljweWqqHLwWQRHxhhMv1bPIlWOKha51og==";
+ url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-2.0.0-rc.25.tgz";
+ sha512 = "s+Fv9wBp0ABVh51vbXokJs4ATB6I4vaoLbSEGreZwNFjJPrK59ZRbUlxjJHkDovk8v4ij+EcaQJ6eMj/T+7EhA==";
};
};
"cdktf-0.11.2" = {
@@ -21615,31 +21615,31 @@ let
sha512 = "UoGQ/cfzGYIuiq6Z7vWL1HfkE9U9IZ4Ub+0XSiJTCzvbZzgPA69oDF2f+lgJ6dFFLEdjW5O6svvoKzXX23xFkA==";
};
};
- "core-js-3.23.1" = {
+ "core-js-3.23.2" = {
name = "core-js";
packageName = "core-js";
- version = "3.23.1";
+ version = "3.23.2";
src = fetchurl {
- url = "https://registry.npmjs.org/core-js/-/core-js-3.23.1.tgz";
- sha512 = "wfMYHWi1WQjpgZNC9kAlN4ut04TM9fUTdi7CqIoTVM7yaiOUQTklOzfb+oWH3r9edQcT3F887swuVmxrV+CC8w==";
+ url = "https://registry.npmjs.org/core-js/-/core-js-3.23.2.tgz";
+ sha512 = "ELJOWxNrJfOH/WK4VJ3Qd+fOqZuOuDNDJz0xG6Bt4mGg2eO/UT9CljCrbqDGovjLKUrGajEEBcoTOc0w+yBYeQ==";
};
};
- "core-js-compat-3.23.1" = {
+ "core-js-compat-3.23.2" = {
name = "core-js-compat";
packageName = "core-js-compat";
- version = "3.23.1";
+ version = "3.23.2";
src = fetchurl {
- url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.23.1.tgz";
- sha512 = "KeYrEc8t6FJsKYB2qnDwRHWaC0cJNaqlHfCpMe5q3j/W1nje3moib/txNklddLPCtGb+etcBIyJ8zuMa/LN5/A==";
+ url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.23.2.tgz";
+ sha512 = "lrgZvxFwbQp9v7E8mX0rJ+JX7Bvh4eGULZXA1IAyjlsnWvCdw6TF8Tg6xtaSUSJMrSrMaLdpmk+V54LM1dvfOA==";
};
};
- "core-js-pure-3.23.1" = {
+ "core-js-pure-3.23.2" = {
name = "core-js-pure";
packageName = "core-js-pure";
- version = "3.23.1";
+ version = "3.23.2";
src = fetchurl {
- url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.23.1.tgz";
- sha512 = "3qNgf6TqI3U1uhuSYRzJZGfFd4T+YlbyVPl+jgRiKjdZopvG4keZQwWZDAWpu1UH9nCgTpUzIV3GFawC7cJsqg==";
+ url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.23.2.tgz";
+ sha512 = "t6u7H4Ff/yZNk+zqTr74UjCcZ3k8ApBryeLLV4rYQd9aF3gqmjjGjjR44ENfeBMH8VVvSynIjAJ0mUuFhzQtrA==";
};
};
"core-util-is-1.0.2" = {
@@ -21885,13 +21885,13 @@ let
sha512 = "gYTKKexFO3kh200H1Nit76sRwRtOY32vQd3jpAQKpLtZqyNsSQNfI4N7o3eP2wUjV35pTWKRYqFUDBvUha/Pkw==";
};
};
- "create-gatsby-2.16.0" = {
+ "create-gatsby-2.17.0" = {
name = "create-gatsby";
packageName = "create-gatsby";
- version = "2.16.0";
+ version = "2.17.0";
src = fetchurl {
- url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-2.16.0.tgz";
- sha512 = "X/4fu+C8qBtfI9JTnnhI+zBFwe2V7uC27XEnA/9GbCp507xuiqkO6MuUJGDxdhe0cDBub+KD+3TLQ94XaXiJpg==";
+ url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-2.17.0.tgz";
+ sha512 = "RrMAHZL7J5Ew/laz83g+UNQ2RnXszGuub3sG7DQkG0tK5mS9TqTW+FIYyzHCLhdJkr81qC/HRDFsJv0fuYISwg==";
};
};
"create-graphback-1.0.1" = {
@@ -26304,13 +26304,13 @@ let
sha512 = "WvaW1EgRinDQ61khHFZfx30rkPQG5ItaOT0wrI7iJv9A3SbghriQGfZQfHZs25fWLBe6/vkv05LOqg6aDw6Wzw==";
};
};
- "electron-to-chromium-1.4.161" = {
+ "electron-to-chromium-1.4.164" = {
name = "electron-to-chromium";
packageName = "electron-to-chromium";
- version = "1.4.161";
+ version = "1.4.164";
src = fetchurl {
- url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.161.tgz";
- sha512 = "sTjBRhqh6wFodzZtc5Iu8/R95OkwaPNn7tj/TaDU5nu/5EFiQDtADGAXdR4tJcTEHlYfJpHqigzJqHvPgehP8A==";
+ url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.164.tgz";
+ sha512 = "K7iy5y6XyP9Pzh3uaDti0KC4JUNT6T1tLG5RTOmesqq2YgAJpYYYJ32m+anvZYjCV35llPTEh87kvEV/uSsiyQ==";
};
};
"electrum-client-git+https://github.com/janoside/electrum-client" = {
@@ -27395,15 +27395,6 @@ let
sha512 = "VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==";
};
};
- "eslint-8.17.0" = {
- name = "eslint";
- packageName = "eslint";
- version = "8.17.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/eslint/-/eslint-8.17.0.tgz";
- sha512 = "gq0m0BTJfci60Fz4nczYxNAlED+sMcihltndR8t9t1evnU/azx53x3t2UHXC/uRjcbvRw/XctpaNygSTcQD+Iw==";
- };
- };
"eslint-8.18.0" = {
name = "eslint";
packageName = "eslint";
@@ -29114,13 +29105,13 @@ let
sha512 = "W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==";
};
};
- "fast-text-encoding-1.0.3" = {
+ "fast-text-encoding-1.0.4" = {
name = "fast-text-encoding";
packageName = "fast-text-encoding";
- version = "1.0.3";
+ version = "1.0.4";
src = fetchurl {
- url = "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.3.tgz";
- sha512 = "dtm4QZH9nZtcDt8qJiOH9fcQd1NAgi+K1O2DbE6GG1PPCK/BWfOH3idCTRQ4ImXRUOyopDEgDEnVEE7Y/2Wrig==";
+ url = "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.4.tgz";
+ sha512 = "x6lDDm/tBAzX9kmsPcZsNbvDs3Zey3+scsxaZElS8xWLgUMAg/oFLeewfUz0mu1CblHhhsu15jGkraldkFh8KQ==";
};
};
"fast-url-parser-1.1.3" = {
@@ -30122,13 +30113,13 @@ let
sha512 = "d+9na7t9FyH8gBJoNDSi28mE4NgQVGGvxQ4aHtFRetjyh5SXjuus+V5EZaxFmFdXVemSOrx0lsgEl/ZMjnOWJA==";
};
};
- "flow-parser-0.180.0" = {
+ "flow-parser-0.180.1" = {
name = "flow-parser";
packageName = "flow-parser";
- version = "0.180.0";
+ version = "0.180.1";
src = fetchurl {
- url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.180.0.tgz";
- sha512 = "kkzsuGAhckWgn/G+JfCyEa6BYslGrjlH4CJL0LZhdn9of9ukvi7SzVQSFsrEhuhh/zQUghfUEoaeZy1wjQXpUg==";
+ url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.180.1.tgz";
+ sha512 = "+zhnnWjpNomIrI/FL8inDMOQP3hniNxZlROBlaerzM+PqszgqaC2724kvU8ThkNWDMmgC5N8M1HemMPc3h4IBA==";
};
};
"fluent-ffmpeg-2.1.2" = {
@@ -31148,22 +31139,22 @@ let
sha512 = "w4n9cPWyP7aHxKxYHFQMegj7WIAsL/YX/C4Bs5Rr8s1H9M1rNtRWRsw+ovYMkXDQ5S4ZbYHsHAPmevPjPgw44w==";
};
};
- "gatsby-core-utils-3.16.0" = {
+ "gatsby-core-utils-3.17.0" = {
name = "gatsby-core-utils";
packageName = "gatsby-core-utils";
- version = "3.16.0";
+ version = "3.17.0";
src = fetchurl {
- url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-3.16.0.tgz";
- sha512 = "cr3aIlzfzQkXSKng0dfAkg+v+Q0WOFJ1CCpM6HFvMykYtw5vSdaLxs6gwNmtPowG1wmCHkQ+pcyqppP+IdmVsg==";
+ url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-3.17.0.tgz";
+ sha512 = "1e0YaqTAEpSSBkpWkY703lu+Bl76ASXUvUcpnNO3CavCYZsRQxAXtMXIKIEvhm1z6zWJmY9HILo6/DjP+PHeyw==";
};
};
- "gatsby-telemetry-3.16.0" = {
+ "gatsby-telemetry-3.17.0" = {
name = "gatsby-telemetry";
packageName = "gatsby-telemetry";
- version = "3.16.0";
+ version = "3.17.0";
src = fetchurl {
- url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-3.16.0.tgz";
- sha512 = "u7s3/VoWwYO7gyqiEn7J1YiNxsdn26WSFL9egFM5jH1IMnj86fiFM4EnDfcaZ5MSTEA1dFqBa6hidwhrpv2rhw==";
+ url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-3.17.0.tgz";
+ sha512 = "1N4uKj2Yj7AykLmwjsdOmNirf3UmP8CBXjj/LmWf5cLDVbdPqkirAlyD6uTeEliG5UFHPTlBsRi26v558mFYJQ==";
};
};
"gauge-1.2.7" = {
@@ -32346,13 +32337,13 @@ let
sha512 = "xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==";
};
};
- "globule-1.3.3" = {
+ "globule-1.3.4" = {
name = "globule";
packageName = "globule";
- version = "1.3.3";
+ version = "1.3.4";
src = fetchurl {
- url = "https://registry.npmjs.org/globule/-/globule-1.3.3.tgz";
- sha512 = "mb1aYtDbIjTu4ShMB85m3UzjX9BVKe9WCzsnfMSZk+K5GpIbBOexgg4PPCt5eHDEG5/ZQAUX2Kct02zfiPLsKg==";
+ url = "https://registry.npmjs.org/globule/-/globule-1.3.4.tgz";
+ sha512 = "OPTIfhMBh7JbBYDpa5b+Q5ptmMWKwcNcFSR/0c6t8V4f3ZAVBEsKNY37QdVqmLRYSMhOUGYrY0QhSoEpzGr/Eg==";
};
};
"glogg-1.0.2" = {
@@ -38503,13 +38494,13 @@ let
sha512 = "NnRs6dsyqUXejqk/yv2aiXlAvOs56sLkX6nUdeaNezI5LFFLlsZjOThmwnrcwh5ZZRwZlCMnVAY3CvhIhoVEKQ==";
};
};
- "js-beautify-1.14.3" = {
+ "js-beautify-1.14.4" = {
name = "js-beautify";
packageName = "js-beautify";
- version = "1.14.3";
+ version = "1.14.4";
src = fetchurl {
- url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.3.tgz";
- sha512 = "f1ra8PHtOEu/70EBnmiUlV8nJePS58y9qKjl4JHfYWlFH6bo7ogZBz//FAZp7jDuXtYnGYKymZPlrg2I/9Zo4g==";
+ url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.4.tgz";
+ sha512 = "+b4A9c3glceZEmxyIbxDOYB0ZJdReLvyU1077RqKsO4dZx9FUHjTOJn8VHwpg33QoucIykOiYbh7MfqBOghnrA==";
};
};
"js-git-0.7.8" = {
@@ -38836,13 +38827,13 @@ let
sha512 = "n8y3er0nOchLo17Wh0/yVmCDGNuwlhccp/Liwvl0ewf0hYMC5vICjWTIdCetsRoQQIOuc4pOmMNomldTTlPUUw==";
};
};
- "jsii-srcmak-0.1.594" = {
+ "jsii-srcmak-0.1.595" = {
name = "jsii-srcmak";
packageName = "jsii-srcmak";
- version = "0.1.594";
+ version = "0.1.595";
src = fetchurl {
- url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.594.tgz";
- sha512 = "futPwZ5HCDisZo2+Ke42jD+B3UZmLWnRNYdBdtUZWWV6LNZBRVfT2F866r5TjmBxlwmYOqQSfbArGAbxYdVK6Q==";
+ url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.595.tgz";
+ sha512 = "iGxXjTZtW1GzSwG3VjEqa0upXloywbdIPPoUuIQSvFa+U3AWedCX1wkhHovAQ6ETRkS7dGJQ7t0l3eRc2Tm+xg==";
};
};
"json-bigint-1.0.0" = {
@@ -39151,13 +39142,13 @@ let
sha512 = "YRZbUnyaJZLZUJSRi2G/MqahCyRv9n/ds+4oIetjDF3jWQA7AG7iSeKTiZiCNqtMZM7HDyt0e/W6lEnoGEmMGA==";
};
};
- "json2jsii-0.3.44" = {
+ "json2jsii-0.3.45" = {
name = "json2jsii";
packageName = "json2jsii";
- version = "0.3.44";
+ version = "0.3.45";
src = fetchurl {
- url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.3.44.tgz";
- sha512 = "u8accT4U0SYI1rAjDJNlmnvM73EH7kqI+jprMk6L5212y0zQUzeqdgmKfbqv19d+H3A3PE+wLhk2tT1lVfvvCg==";
+ url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.3.45.tgz";
+ sha512 = "bpxMmmikd3LzjZ0NG2kv0ie6q+gn5B6NpGYJNMgy3g+ny4p3d8YgYeav5oSdSsZd3dOk1qIPmpjI04/9Dx+neQ==";
};
};
"json3-3.2.6" = {
@@ -39808,13 +39799,13 @@ let
sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==";
};
};
- "keyv-4.3.0" = {
+ "keyv-4.3.1" = {
name = "keyv";
packageName = "keyv";
- version = "4.3.0";
+ version = "4.3.1";
src = fetchurl {
- url = "https://registry.npmjs.org/keyv/-/keyv-4.3.0.tgz";
- sha512 = "C30Un9+63J0CsR7Wka5quXKqYZsT6dcRQ2aOwGcSc3RiQ4HGWpTAHlCA+puNfw2jA/s11EsxA1nCXgZRuRKMQQ==";
+ url = "https://registry.npmjs.org/keyv/-/keyv-4.3.1.tgz";
+ sha512 = "nwP7AQOxFzELXsNq3zCx/oh81zu4DHWwCE6W9RaeHb7OHO0JpmKS8n801ovVQC7PTsZDWtPA5j1QY+/WWtARYg==";
};
};
"khroma-1.4.1" = {
@@ -40906,15 +40897,6 @@ let
sha512 = "F/pz9ZZP+R+arY94cECTZco7PXgBXyL+KVWUPZq8AQE9TOu14GV6fYeKOviv02JCvFa4Oi3Rs1hYEpfeajc+ow==";
};
};
- "lmdb-2.3.10" = {
- name = "lmdb";
- packageName = "lmdb";
- version = "2.3.10";
- src = fetchurl {
- url = "https://registry.npmjs.org/lmdb/-/lmdb-2.3.10.tgz";
- sha512 = "GtH+nStn9V59CfYeQ5ddx6YTfuFCmu86UJojIjJAweG+/Fm0PDknuk3ovgYDtY/foMeMdZa8/P7oSljW/d5UPw==";
- };
- };
"lmdb-2.5.2" = {
name = "lmdb";
packageName = "lmdb";
@@ -40924,60 +40906,6 @@ let
sha512 = "V5V5Xa2Hp9i2XsbDALkBTeHXnBXh/lEmk9p22zdr7jtuOIY9TGhjK6vAvTpOOx9IKU4hJkRWZxn/HsvR1ELLtA==";
};
};
- "lmdb-darwin-arm64-2.3.10" = {
- name = "lmdb-darwin-arm64";
- packageName = "lmdb-darwin-arm64";
- version = "2.3.10";
- src = fetchurl {
- url = "https://registry.npmjs.org/lmdb-darwin-arm64/-/lmdb-darwin-arm64-2.3.10.tgz";
- sha512 = "LVXbH2MYu7/ZuQ8+P9rv+SwNyBKltxo7vHAGJS94HWyfwnCbKEYER9PImBvNBwzvgtaYk6x0RMX3oor6e6KdDQ==";
- };
- };
- "lmdb-darwin-x64-2.3.10" = {
- name = "lmdb-darwin-x64";
- packageName = "lmdb-darwin-x64";
- version = "2.3.10";
- src = fetchurl {
- url = "https://registry.npmjs.org/lmdb-darwin-x64/-/lmdb-darwin-x64-2.3.10.tgz";
- sha512 = "gAc/1b/FZOb9yVOT+o0huA+hdW82oxLo5r22dFTLoRUFG1JMzxdTjmnW6ONVOHdqC9a5bt3vBCEY3jmXNqV26A==";
- };
- };
- "lmdb-linux-arm-2.3.10" = {
- name = "lmdb-linux-arm";
- packageName = "lmdb-linux-arm";
- version = "2.3.10";
- src = fetchurl {
- url = "https://registry.npmjs.org/lmdb-linux-arm/-/lmdb-linux-arm-2.3.10.tgz";
- sha512 = "Rb8+4JjsThuEcJ7GLLwFkCFnoiwv/3hAAbELWITz70buQFF+dCZvCWWgEgmDTxwn5r+wIkdUjmFv4dqqiKQFmQ==";
- };
- };
- "lmdb-linux-arm64-2.3.10" = {
- name = "lmdb-linux-arm64";
- packageName = "lmdb-linux-arm64";
- version = "2.3.10";
- src = fetchurl {
- url = "https://registry.npmjs.org/lmdb-linux-arm64/-/lmdb-linux-arm64-2.3.10.tgz";
- sha512 = "Ihr8mdICTK3jA4GXHxrXGK2oekn0mY6zuDSXQDNtyRSH19j3D2Y04A7SEI9S0EP/t5sjKSudYgZbiHDxRCsI5A==";
- };
- };
- "lmdb-linux-x64-2.3.10" = {
- name = "lmdb-linux-x64";
- packageName = "lmdb-linux-x64";
- version = "2.3.10";
- src = fetchurl {
- url = "https://registry.npmjs.org/lmdb-linux-x64/-/lmdb-linux-x64-2.3.10.tgz";
- sha512 = "E3l3pDiCA9uvnLf+t3qkmBGRO01dp1EHD0x0g0iRnfpAhV7wYbayJGfG93BUt22Tj3fnq4HDo4dQ6ZWaDI1nuw==";
- };
- };
- "lmdb-win32-x64-2.3.10" = {
- name = "lmdb-win32-x64";
- packageName = "lmdb-win32-x64";
- version = "2.3.10";
- src = fetchurl {
- url = "https://registry.npmjs.org/lmdb-win32-x64/-/lmdb-win32-x64-2.3.10.tgz";
- sha512 = "gspWk34tDANhjn+brdqZstJMptGiwj4qFNVg0Zey9ds+BUlif+Lgf5szrfOVzZ8gVRkk1Lgbz7i78+V7YK7SCA==";
- };
- };
"ln-accounting-5.0.7" = {
name = "ln-accounting";
packageName = "ln-accounting";
@@ -42634,6 +42562,15 @@ let
sha512 = "CPSJw4ftjf517EhXZGGvTHHkYobo7ZCc0kvwUoOYcjfR2UVrI66RHj8MCrfAdEitdmFqbu2BYdYs8FHHZSb6iw==";
};
};
+ "logform-2.4.1" = {
+ name = "logform";
+ packageName = "logform";
+ version = "2.4.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/logform/-/logform-2.4.1.tgz";
+ sha512 = "7XB/tqc3VRbri9pRjU6E97mQ8vC27ivJ3lct4jhyT+n0JNDd4YKldFl0D75NqDp46hk8RC7Ma1Vjv/UPf67S+A==";
+ };
+ };
"logidrom-0.3.1" = {
name = "logidrom";
packageName = "logidrom";
@@ -43265,13 +43202,13 @@ let
sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==";
};
};
- "make-fetch-happen-10.1.7" = {
+ "make-fetch-happen-10.1.8" = {
name = "make-fetch-happen";
packageName = "make-fetch-happen";
- version = "10.1.7";
+ version = "10.1.8";
src = fetchurl {
- url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.1.7.tgz";
- sha512 = "J/2xa2+7zlIUKqfyXDCXFpH3ypxO4k3rgkZHPSZkyUYcBT/hM80M3oyKLM/9dVriZFiGeGGS2Ei+0v2zfhqj3Q==";
+ url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.1.8.tgz";
+ sha512 = "0ASJbG12Au6+N5I84W+8FhGS6iM8MyzvZady+zaQAu+6IOaESFzCLLD0AR1sAFF3Jufi8bxm586ABN6hWd3k7g==";
};
};
"make-fetch-happen-8.0.14" = {
@@ -45632,13 +45569,13 @@ let
sha512 = "rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==";
};
};
- "minipass-3.2.1" = {
+ "minipass-3.3.3" = {
name = "minipass";
packageName = "minipass";
- version = "3.2.1";
+ version = "3.3.3";
src = fetchurl {
- url = "https://registry.npmjs.org/minipass/-/minipass-3.2.1.tgz";
- sha512 = "v5cqJP4WxUVXYXhOOdPiOZEDoF7omSpLivw2GMCL1v/j+xh886bPXKh6SzyA6sa45e4NRQ46IRBEkAazvb6I6A==";
+ url = "https://registry.npmjs.org/minipass/-/minipass-3.3.3.tgz";
+ sha512 = "N0BOsdFAlNRfmwMhjAsLVWOk7Ljmeb39iqFlsV1At+jqRhSUP9yeof8FyJu4imaJiSUp8vQebWD/guZwGQC8iA==";
};
};
"minipass-collect-1.0.2" = {
@@ -47793,15 +47730,6 @@ let
sha512 = "amJnQCcgtRVw9SvoebO3BKGESClrfXGCUTX9hSn1OuGQTQBOZmVd0Z0OlecpuRksKvbsUqALE8jls/ErClAPuQ==";
};
};
- "node-gyp-build-optional-packages-4.3.5" = {
- name = "node-gyp-build-optional-packages";
- packageName = "node-gyp-build-optional-packages";
- version = "4.3.5";
- src = fetchurl {
- url = "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-4.3.5.tgz";
- sha512 = "5ke7D8SiQsTQL7CkHpfR1tLwfqtKc0KYEmlnkwd40jHCASskZeS98qoZ1qDUns2aUQWikcjidRUs6PM/3iyN/w==";
- };
- };
"node-gyp-build-optional-packages-5.0.2" = {
name = "node-gyp-build-optional-packages";
packageName = "node-gyp-build-optional-packages";
@@ -49378,6 +49306,15 @@ let
sha512 = "dqaz3u44QbRXQooZLTUKU41ZrzYrcvLISVgbrzbyCMxpmSLJvZ3ZamIJIZ29P6OhZIkNIQKosdeM6t1LYbA9hg==";
};
};
+ "on-exit-leak-free-1.0.0" = {
+ name = "on-exit-leak-free";
+ packageName = "on-exit-leak-free";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/on-exit-leak-free/-/on-exit-leak-free-1.0.0.tgz";
+ sha512 = "Ve8ubhrXRdnuCJ5bQSQpP3uaV43K1PMcOfSRC1pqHgRZommXCgsXwh08jVC5NpjwScE23BPDwDvVg4cov3mwjw==";
+ };
+ };
"on-finished-2.2.1" = {
name = "on-finished";
packageName = "on-finished";
@@ -52222,15 +52159,6 @@ let
sha512 = "0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==";
};
};
- "pino-7.11.0" = {
- name = "pino";
- packageName = "pino";
- version = "7.11.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/pino/-/pino-7.11.0.tgz";
- sha512 = "dMACeu63HtRLmCG8VKdy4cShCPKaYDR4youZqoSWLxl5Gu99HUw8bw75thbPv9Nip+H+QYX8o3ZJbTdVZZ2TVg==";
- };
- };
"pino-7.6.5" = {
name = "pino";
packageName = "pino";
@@ -52240,6 +52168,15 @@ let
sha512 = "38tAwlJ7HevMENHD5FZE+yxSlAH5Wg3FoOjbB3MX2j3/kgpOEkmDHhTVKkecR57qxD5doHo2yi9nac94gqqbiQ==";
};
};
+ "pino-8.0.0" = {
+ name = "pino";
+ packageName = "pino";
+ version = "8.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pino/-/pino-8.0.0.tgz";
+ sha512 = "EvZh9ZUoLGkrhqhoF9UBxw2/ZiAhXHUKlGrI4WUT/wLu0sfu8Wr3NJaZ6lxcy/S51W0PMSon5KE7ujPAhc/G6g==";
+ };
+ };
"pino-abstract-transport-0.5.0" = {
name = "pino-abstract-transport";
packageName = "pino-abstract-transport";
@@ -52267,6 +52204,15 @@ let
sha512 = "cK0pekc1Kjy5w9V2/n+8MkZwusa6EyyxfeQCB799CQRhRt/CqYKiWs5adeu8Shve2ZNffvfC/7J64A2PJo1W/Q==";
};
};
+ "pino-std-serializers-5.6.0" = {
+ name = "pino-std-serializers";
+ packageName = "pino-std-serializers";
+ version = "5.6.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-5.6.0.tgz";
+ sha512 = "VdUXCw8gO+xhir7sFuoYSjTnzB+TMDGxhAC/ph3YS3sdHnXNdsK0wMtADNUltfeGkn2KDxEM21fnjF3RwXyC8A==";
+ };
+ };
"pipe-functions-1.3.0" = {
name = "pipe-functions";
packageName = "pipe-functions";
@@ -54067,6 +54013,15 @@ let
sha512 = "du4wfLyj4yCZq1VupnVSZmRsPJsNuxoDQFdCFHLaYiEbFBD7QE0a+I4D7hOxrVnh78QE/YipFAj9lXHiXocV+Q==";
};
};
+ "process-warning-2.0.0" = {
+ name = "process-warning";
+ packageName = "process-warning";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/process-warning/-/process-warning-2.0.0.tgz";
+ sha512 = "+MmoAXoUX+VTHAlwns0h+kFUWFs/3FZy+ZuchkgjyOu3oioLAo2LB5aCfKPh2+P9O18i3m43tUEv3YqttSy0Ww==";
+ };
+ };
"progbar-1.2.1" = {
name = "progbar";
packageName = "progbar";
@@ -55615,13 +55570,13 @@ let
sha512 = "pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ==";
};
};
- "pyright-1.1.254" = {
+ "pyright-1.1.255" = {
name = "pyright";
packageName = "pyright";
- version = "1.1.254";
+ version = "1.1.255";
src = fetchurl {
- url = "https://registry.npmjs.org/pyright/-/pyright-1.1.254.tgz";
- sha512 = "YDbIqr55EkwRCFSVjWxj8KOwBTMVK1U3HLLdqp+W3n+88S31YbRERrCni9izmtt5i4wnuhf7oRI/9K8KwLxmgQ==";
+ url = "https://registry.npmjs.org/pyright/-/pyright-1.1.255.tgz";
+ sha512 = "pAec1Mqyq0l0+C6JH7o7Va0oWyZVACEFgP2cWD9DU/C1epoqZAt/PCRbae/7fFfn7ZGew5tiTMdtO/2RZO/cRg==";
};
};
"q-0.9.7" = {
@@ -62032,13 +61987,13 @@ let
sha512 = "zlOmAKFLJzTI+MbvmkWhnOOJ++NYo0Iy7F93ARNPmvZvpWG2l8Ff3uwM3CkpHqRw8v3pcRROScM5E+vbeTeOKw==";
};
};
- "sonic-boom-2.8.0" = {
+ "sonic-boom-3.0.0" = {
name = "sonic-boom";
packageName = "sonic-boom";
- version = "2.8.0";
+ version = "3.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-2.8.0.tgz";
- sha512 = "kuonw1YOYYNOve5iHdSahXPOK49GqwA+LZhI6Wz/l0rP57iKyXXIHaRagOBHAPmGwJC6od2Z9zgvZ5loSgMlVg==";
+ url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-3.0.0.tgz";
+ sha512 = "p5DiZOZHbJ2ZO5MADczp5qrfOd3W5Vr2vHxfCpe7G4AzPwVOweIjbfgku8wSQUuk+Y5Yuo8W7JqRe6XKmKistg==";
};
};
"sorcery-0.10.0" = {
@@ -66075,13 +66030,13 @@ let
sha512 = "woZFt0cLFkPdhsa+IGpRo1jiSouaHxMIljzTgt30CMjBWoUYbbcHqnunW5Yv+BXko9H05MVIcxMipI3Jblallw==";
};
};
- "thread-stream-0.15.2" = {
+ "thread-stream-1.0.0" = {
name = "thread-stream";
packageName = "thread-stream";
- version = "0.15.2";
+ version = "1.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/thread-stream/-/thread-stream-0.15.2.tgz";
- sha512 = "UkEhKIg2pD+fjkHQKyJO3yoIvAP3N6RlNFt2dUhcS1FGvCD1cQa1M/PGknCLFIyZdtJOWQjejp7bdNqmN7zwdA==";
+ url = "https://registry.npmjs.org/thread-stream/-/thread-stream-1.0.0.tgz";
+ sha512 = "2Sw29jWubQWOcVa7MhLHJ51wjksUD/GHN4Fy3hP9w9DYTujifoZGSKBl54CMLRXWoD5h2pD707kY3fAdzhcwAg==";
};
};
"thriftrw-3.12.0" = {
@@ -67947,13 +67902,13 @@ let
sha512 = "7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g==";
};
};
- "typegram-3.9.2" = {
+ "typegram-3.10.0" = {
name = "typegram";
packageName = "typegram";
- version = "3.9.2";
+ version = "3.10.0";
src = fetchurl {
- url = "https://registry.npmjs.org/typegram/-/typegram-3.9.2.tgz";
- sha512 = "lbMhaP0jHsEbz8EJf2s4/hkKLtt2/9THTNatXa2mJCKHZBeJzGO1jrwueQBnXsSgA5pPHLwcPslTnsKXGo/GIQ==";
+ url = "https://registry.npmjs.org/typegram/-/typegram-3.10.0.tgz";
+ sha512 = "kma7ZF7SFRqcUCgo5sHg1MbPwc9/KYjVkbvrqIZK7oXfPdLBGz1s7wF9d7o4yjHp+AOGke8cyYGhI/+4xYYC4Q==";
};
};
"typeorm-0.2.38" = {
@@ -71061,13 +71016,13 @@ let
sha512 = "FS5ou3G+WRnPPr/tWVs8b/jVzeDacgZHy/y7/QQW7maSPFEAmRt2bFGUJtJVEUDLBqtDm/3VGMJ7D31cF2U1tw==";
};
};
- "vsce-2.9.1" = {
+ "vsce-2.9.2" = {
name = "vsce";
packageName = "vsce";
- version = "2.9.1";
+ version = "2.9.2";
src = fetchurl {
- url = "https://registry.npmjs.org/vsce/-/vsce-2.9.1.tgz";
- sha512 = "l/X4hkoYgOoZhRYQpJXqexBJU2z4mzNywx+artzWnOV3v45YMM6IoDDtIcB9SWluobem476KmMPLkCdAdnvoOg==";
+ url = "https://registry.npmjs.org/vsce/-/vsce-2.9.2.tgz";
+ sha512 = "xyLqL4U82BilUX1t6Ym2opQEa2tLGWYjbgB7+ETeNVXlIJz5sWBJjQJSYJVFOKJSpiOtQclolu88cj7oY6vvPQ==";
};
};
"vscode-css-languageservice-3.0.13" = {
@@ -74853,7 +74808,7 @@ in
})
sources."mimic-fn-2.1.0"
sources."minimatch-3.1.2"
- sources."minipass-3.2.1"
+ sources."minipass-3.3.3"
sources."minipass-collect-1.0.2"
sources."minipass-fetch-1.4.1"
sources."minipass-flush-1.0.5"
@@ -74884,7 +74839,7 @@ in
dependencies = [
sources."@tootallnate/once-2.0.0"
sources."http-proxy-agent-5.0.0"
- sources."make-fetch-happen-10.1.7"
+ sources."make-fetch-happen-10.1.8"
sources."minipass-fetch-2.1.0"
sources."socks-proxy-agent-7.0.0"
];
@@ -75330,10 +75285,10 @@ in
"@astrojs/language-server" = nodeEnv.buildNodePackage {
name = "_at_astrojs_slash_language-server";
packageName = "@astrojs/language-server";
- version = "0.19.2";
+ version = "0.19.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-0.19.2.tgz";
- sha512 = "O40YPSMrWaOiXQTxqXXk5c5cSh8HFqMYjiUqWjsKmogEVBBpcUTg/6ABJ1D4dfrPxdf+ipmAXOXTTotQHzYHRQ==";
+ url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-0.19.3.tgz";
+ sha512 = "oaGiJadSxzbnl60jA5OssenbTvefd1pc2Cx4eT0FbVI1XkjNM6KURLJilg0lzN12kQFphkg9TkSS6KzR4YnbGQ==";
};
dependencies = [
sources."@astrojs/svelte-language-integration-0.1.6"
@@ -75925,10 +75880,10 @@ in
"@forge/cli" = nodeEnv.buildNodePackage {
name = "_at_forge_slash_cli";
packageName = "@forge/cli";
- version = "4.4.0";
+ version = "4.4.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@forge/cli/-/cli-4.4.0.tgz";
- sha512 = "ZwE1yXvTcjuGGnfvY7eCCJ59xnloSONrlyHk901DDgEOR0xUWQgsu/1kA65piaG79i+RKEC9FmGiS00AgOj8GA==";
+ url = "https://registry.npmjs.org/@forge/cli/-/cli-4.4.1.tgz";
+ sha512 = "AIlSXdRYv4TkAuQSABUQnTpUqWJ4OvHO0xI9+HMjMzrEWTDka8JjN2kr+qlxXqdthC222V38jxsJ0ejLvJraQg==";
};
dependencies = [
sources."@ampproject/remapping-2.2.0"
@@ -75983,11 +75938,11 @@ in
sources."@forge/api-2.7.0"
sources."@forge/auth-0.0.1"
sources."@forge/babel-plugin-transform-ui-1.1.0"
- sources."@forge/bundler-3.0.7"
- sources."@forge/cli-shared-2.5.0"
- sources."@forge/csp-1.10.0"
- sources."@forge/lint-3.1.1"
- sources."@forge/manifest-3.8.0"
+ sources."@forge/bundler-3.0.8"
+ sources."@forge/cli-shared-2.5.1"
+ sources."@forge/csp-1.11.0"
+ sources."@forge/lint-3.1.2"
+ sources."@forge/manifest-3.8.1"
sources."@forge/storage-1.3.0"
sources."@forge/util-1.2.0"
sources."@jridgewell/gen-mapping-0.1.1"
@@ -76115,7 +76070,7 @@ in
})
sources."call-bind-1.0.2"
sources."call-me-maybe-1.0.1"
- sources."caniuse-lite-1.0.30001356"
+ sources."caniuse-lite-1.0.30001358"
sources."case-1.6.3"
sources."chainsaw-0.1.0"
sources."chalk-2.4.2"
@@ -76199,7 +76154,7 @@ in
];
})
sources."duplexer3-0.1.4"
- sources."electron-to-chromium-1.4.161"
+ sources."electron-to-chromium-1.4.164"
(sources."elliptic-6.5.4" // {
dependencies = [
sources."bn.js-4.12.0"
@@ -76817,7 +76772,7 @@ in
sources."event-target-shim-5.0.1"
sources."extend-3.0.2"
sources."external-editor-3.1.0"
- sources."fast-text-encoding-1.0.3"
+ sources."fast-text-encoding-1.0.4"
sources."figures-3.2.0"
sources."fill-range-7.0.1"
sources."find-up-5.0.0"
@@ -76882,7 +76837,7 @@ in
sources."jsonfile-6.1.0"
sources."jwa-2.0.0"
sources."jws-4.0.0"
- sources."keyv-4.3.0"
+ sources."keyv-4.3.1"
sources."lines-and-columns-1.2.4"
sources."locate-path-6.0.0"
sources."lodash-4.17.21"
@@ -78333,16 +78288,16 @@ in
sources."@octokit/core-3.6.0"
sources."@octokit/endpoint-6.0.12"
sources."@octokit/graphql-4.8.0"
- sources."@octokit/openapi-types-12.1.0"
- sources."@octokit/plugin-paginate-rest-2.18.0"
+ sources."@octokit/openapi-types-12.4.0"
+ sources."@octokit/plugin-paginate-rest-2.19.0"
sources."@octokit/plugin-request-log-1.0.4"
- sources."@octokit/plugin-rest-endpoint-methods-5.14.0"
+ sources."@octokit/plugin-rest-endpoint-methods-5.15.0"
sources."@octokit/plugin-retry-3.0.9"
- sources."@octokit/plugin-throttling-3.6.2"
+ sources."@octokit/plugin-throttling-3.7.0"
sources."@octokit/request-5.6.3"
sources."@octokit/request-error-2.1.0"
sources."@octokit/rest-18.12.0"
- sources."@octokit/types-6.35.0"
+ sources."@octokit/types-6.37.0"
sources."@sideway/address-4.1.4"
sources."@sideway/formula-3.0.0"
sources."@sideway/pinpoint-2.0.0"
@@ -78508,7 +78463,7 @@ in
sources."buffer-5.7.1"
sources."buffer-from-1.1.2"
sources."callsites-3.1.0"
- sources."caniuse-lite-1.0.30001356"
+ sources."caniuse-lite-1.0.30001358"
sources."chalk-3.0.0"
sources."chardet-0.7.0"
sources."chokidar-3.5.3"
@@ -78526,7 +78481,7 @@ in
sources."cross-spawn-7.0.3"
sources."deepmerge-4.2.2"
sources."defaults-1.0.3"
- sources."electron-to-chromium-1.4.161"
+ sources."electron-to-chromium-1.4.164"
sources."emoji-regex-8.0.0"
sources."end-of-stream-1.4.4"
sources."enhanced-resolve-5.9.3"
@@ -78906,7 +78861,7 @@ in
sources."async-limiter-1.0.1"
sources."asynckit-0.4.0"
sources."atob-2.1.2"
- (sources."aws-sdk-2.1157.0" // {
+ (sources."aws-sdk-2.1158.0" // {
dependencies = [
sources."uuid-8.0.0"
];
@@ -79514,7 +79469,7 @@ in
})
sources."call-bind-1.0.2"
sources."camelcase-6.3.0"
- sources."caniuse-lite-1.0.30001356"
+ sources."caniuse-lite-1.0.30001358"
sources."caw-2.0.1"
sources."chalk-4.1.2"
sources."chardet-0.7.0"
@@ -79567,12 +79522,12 @@ in
sources."cookie-0.5.0"
sources."cookie-signature-1.0.6"
sources."copy-descriptor-0.1.1"
- (sources."core-js-compat-3.23.1" // {
+ (sources."core-js-compat-3.23.2" // {
dependencies = [
sources."semver-7.0.0"
];
})
- sources."core-js-pure-3.23.1"
+ sources."core-js-pure-3.23.2"
sources."core-util-is-1.0.3"
sources."cors-2.8.5"
(sources."cross-spawn-6.0.5" // {
@@ -79635,7 +79590,7 @@ in
sources."easy-stack-1.0.1"
sources."ee-first-1.1.1"
sources."ejs-3.1.8"
- sources."electron-to-chromium-1.4.161"
+ sources."electron-to-chromium-1.4.164"
sources."emoji-regex-8.0.0"
sources."encodeurl-1.0.2"
sources."end-of-stream-1.4.4"
@@ -79745,7 +79700,7 @@ in
sources."which-2.0.2"
];
})
- sources."flow-parser-0.180.0"
+ sources."flow-parser-0.180.1"
sources."for-each-0.3.3"
sources."for-in-1.0.2"
sources."forwarded-0.2.0"
@@ -81085,7 +81040,7 @@ in
sources."balanced-match-1.0.2"
sources."brace-expansion-2.0.1"
sources."browserslist-4.20.4"
- sources."caniuse-lite-1.0.30001356"
+ sources."caniuse-lite-1.0.30001358"
sources."chalk-2.4.2"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
@@ -81095,7 +81050,7 @@ in
sources."convert-source-map-1.8.0"
sources."debug-4.3.4"
sources."ejs-3.1.6"
- sources."electron-to-chromium-1.4.161"
+ sources."electron-to-chromium-1.4.164"
sources."ensure-posix-path-1.1.1"
sources."escalade-3.1.1"
sources."escape-string-regexp-1.0.5"
@@ -81481,8 +81436,8 @@ in
};
dependencies = [
sources."browserslist-4.20.4"
- sources."caniuse-lite-1.0.30001356"
- sources."electron-to-chromium-1.4.161"
+ sources."caniuse-lite-1.0.30001358"
+ sources."electron-to-chromium-1.4.164"
sources."escalade-3.1.1"
sources."fraction.js-4.2.0"
sources."node-releases-2.0.5"
@@ -81517,7 +81472,7 @@ in
sources."ansi-regex-5.0.1"
sources."ansi-styles-4.3.0"
sources."ast-types-0.13.4"
- (sources."aws-sdk-2.1157.0" // {
+ (sources."aws-sdk-2.1158.0" // {
dependencies = [
sources."uuid-8.0.0"
];
@@ -82187,7 +82142,7 @@ in
})
sources."@colors/colors-1.5.0"
sources."@dabh/diagnostics-2.0.3"
- sources."@grammyjs/types-2.7.2"
+ sources."@grammyjs/types-2.8.0"
sources."@grpc/grpc-js-1.6.7"
sources."@grpc/proto-loader-0.6.13"
sources."@handsontable/formulajs-2.0.2"
@@ -85103,10 +85058,10 @@ in
cdk8s-cli = nodeEnv.buildNodePackage {
name = "cdk8s-cli";
packageName = "cdk8s-cli";
- version = "2.0.25";
+ version = "2.0.27";
src = fetchurl {
- url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.0.25.tgz";
- sha512 = "olYwi6GtseJ0t8DqW/qF6uRgkz5yuop6Y4TEC0hipFQ/y44LSq+AOoGLekf6FQ4iEhDroFCacg9m3RZ3IzJLjg==";
+ url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.0.27.tgz";
+ sha512 = "yHbf+UtmKrMBS8WoXvZ1uXXha+PV3tsahqTRNyf6rqnBy2pQQl2KZyPv9l7m71ukUG5KH2OhdJ7Kg1BJa0JixQ==";
};
dependencies = [
sources."@jsii/check-node-1.61.0"
@@ -85123,8 +85078,8 @@ in
sources."braces-3.0.2"
sources."camelcase-6.3.0"
sources."case-1.6.3"
- sources."cdk8s-2.3.31"
- sources."cdk8s-plus-22-2.0.0-rc.23"
+ sources."cdk8s-2.3.32"
+ sources."cdk8s-plus-22-2.0.0-rc.25"
sources."chalk-4.1.2"
sources."cliui-7.0.4"
sources."clone-2.1.2"
@@ -85193,14 +85148,14 @@ in
sources."yargs-16.2.0"
];
})
- (sources."jsii-srcmak-0.1.594" // {
+ (sources."jsii-srcmak-0.1.595" // {
dependencies = [
sources."fs-extra-9.1.0"
];
})
sources."json-schema-0.4.0"
sources."json-schema-traverse-1.0.0"
- sources."json2jsii-0.3.44"
+ sources."json2jsii-0.3.45"
sources."jsonfile-6.1.0"
sources."locate-path-5.0.0"
sources."log4js-6.5.2"
@@ -85478,7 +85433,7 @@ in
sources."yargs-parser-20.2.9"
];
})
- (sources."jsii-srcmak-0.1.594" // {
+ (sources."jsii-srcmak-0.1.595" // {
dependencies = [
sources."fs-extra-9.1.0"
sources."jsonfile-6.1.0"
@@ -86385,7 +86340,7 @@ in
sources."metals-languageclient-0.4.2"
sources."minimatch-3.1.2"
sources."minimist-1.2.6"
- sources."minipass-3.2.1"
+ sources."minipass-3.3.3"
sources."minizlib-2.1.2"
sources."mkdirp-1.0.4"
sources."ms-2.1.2"
@@ -86517,13 +86472,13 @@ in
coc-pyright = nodeEnv.buildNodePackage {
name = "coc-pyright";
packageName = "coc-pyright";
- version = "1.1.253";
+ version = "1.1.255";
src = fetchurl {
- url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.253.tgz";
- sha512 = "cQ8JXEofYh5jHv/1KuMOzLtA4By5IHfKSv6Nh7SfZ771tfAFSiEevqONhcjeqQSPVTzwL5v/u57qWN45/tpEeg==";
+ url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.255.tgz";
+ sha512 = "EY0CD9B+niaca81hxiGG/Kvt3Z5zIB1Xs6QyUrbxpOmSDSk9F0HAzypgaK+B4NRLlxS0UtDwVZziCnK4ma1riw==";
};
dependencies = [
- sources."pyright-1.1.254"
+ sources."pyright-1.1.255"
];
buildInputs = globalBuildInputs;
meta = {
@@ -86831,7 +86786,7 @@ in
sources."callsites-3.1.0"
sources."camelcase-5.3.1"
sources."camelcase-keys-6.2.2"
- sources."caniuse-lite-1.0.30001356"
+ sources."caniuse-lite-1.0.30001358"
(sources."chalk-4.1.2" // {
dependencies = [
sources."ansi-styles-4.3.0"
@@ -86868,7 +86823,7 @@ in
sources."domelementtype-1.3.1"
sources."domhandler-2.4.2"
sources."domutils-1.7.0"
- sources."electron-to-chromium-1.4.161"
+ sources."electron-to-chromium-1.4.164"
sources."emoji-regex-8.0.0"
sources."entities-1.1.2"
sources."error-ex-1.3.2"
@@ -87946,7 +87901,7 @@ in
sources."is-arrayish-0.3.2"
sources."is-stream-2.0.1"
sources."kuler-2.0.0"
- sources."logform-2.4.0"
+ sources."logform-2.4.1"
sources."ms-2.1.3"
sources."one-time-1.0.0"
sources."prom-client-14.0.1"
@@ -88574,7 +88529,7 @@ in
sources."mimic-response-1.0.1"
sources."minimatch-3.1.2"
sources."minimist-1.2.6"
- sources."minipass-3.2.1"
+ sources."minipass-3.3.3"
sources."minipass-collect-1.0.2"
sources."minipass-fetch-1.4.1"
sources."minipass-flush-1.0.5"
@@ -89252,7 +89207,7 @@ in
sources."@cspell/dict-ada-2.0.0"
sources."@cspell/dict-aws-2.0.0"
sources."@cspell/dict-bash-2.0.3"
- sources."@cspell/dict-companies-2.0.5"
+ sources."@cspell/dict-companies-2.0.6"
sources."@cspell/dict-cpp-3.1.0"
sources."@cspell/dict-cryptocurrencies-2.0.0"
sources."@cspell/dict-csharp-3.0.1"
@@ -89265,7 +89220,7 @@ in
sources."@cspell/dict-en-gb-1.1.33"
sources."@cspell/dict-en_us-2.2.6"
sources."@cspell/dict-filetypes-2.0.2"
- sources."@cspell/dict-fonts-2.0.0"
+ sources."@cspell/dict-fonts-2.0.1"
sources."@cspell/dict-fullstack-2.0.6"
sources."@cspell/dict-git-1.0.1"
sources."@cspell/dict-golang-3.0.1"
@@ -90279,7 +90234,7 @@ in
})
sources."call-bind-1.0.2"
sources."camel-case-4.1.2"
- sources."caniuse-lite-1.0.30001356"
+ sources."caniuse-lite-1.0.30001358"
sources."capital-case-1.0.4"
sources."chalk-2.4.2"
sources."change-case-4.1.2"
@@ -90312,7 +90267,7 @@ in
sources."constant-case-3.0.4"
sources."convert-source-map-1.8.0"
sources."copy-descriptor-0.1.1"
- (sources."core-js-compat-3.23.1" // {
+ (sources."core-js-compat-3.23.2" // {
dependencies = [
sources."semver-7.0.0"
];
@@ -90341,7 +90296,7 @@ in
sources."@types/node-16.11.41"
];
})
- sources."electron-to-chromium-1.4.161"
+ sources."electron-to-chromium-1.4.164"
sources."emoji-js-clean-4.0.0"
sources."emoji-mart-3.0.1"
sources."emoji-regex-9.2.2"
@@ -91394,7 +91349,7 @@ in
sources."jsonfile-6.1.0"
sources."jsprim-1.4.2"
sources."junk-3.1.0"
- sources."keyv-4.3.0"
+ sources."keyv-4.3.1"
sources."load-json-file-2.0.0"
sources."locate-path-2.0.0"
sources."lodash-4.17.21"
@@ -91419,7 +91374,7 @@ in
sources."mimic-response-1.0.1"
sources."minimatch-3.1.2"
sources."minimist-1.2.6"
- sources."minipass-3.2.1"
+ sources."minipass-3.3.3"
sources."minipass-collect-1.0.2"
sources."minipass-fetch-1.4.1"
sources."minipass-flush-1.0.5"
@@ -91748,7 +91703,7 @@ in
sources."callsites-3.1.0"
sources."camelcase-5.3.1"
sources."camelcase-keys-6.2.2"
- sources."caniuse-lite-1.0.30001356"
+ sources."caniuse-lite-1.0.30001358"
sources."chalk-2.4.2"
sources."ci-info-2.0.0"
sources."cli-boxes-2.2.1"
@@ -91777,7 +91732,7 @@ in
];
})
sources."dot-prop-5.3.0"
- sources."electron-to-chromium-1.4.161"
+ sources."electron-to-chromium-1.4.164"
sources."emoji-regex-8.0.0"
sources."emojilib-2.4.0"
sources."end-of-stream-1.4.4"
@@ -92046,7 +92001,7 @@ in
sources."@fluentui/foundation-legacy-8.2.8"
sources."@fluentui/keyboard-key-0.4.1"
sources."@fluentui/merge-styles-8.5.2"
- sources."@fluentui/react-8.76.1"
+ sources."@fluentui/react-8.77.0"
sources."@fluentui/react-focus-8.7.0"
sources."@fluentui/react-hooks-8.6.0"
sources."@fluentui/react-portal-compat-context-9.0.0-rc.2"
@@ -93990,7 +93945,7 @@ in
sources."camel-case-3.0.0"
sources."camelcase-5.3.1"
sources."caniuse-api-3.0.0"
- sources."caniuse-lite-1.0.30001356"
+ sources."caniuse-lite-1.0.30001358"
sources."case-sensitive-paths-webpack-plugin-2.4.0"
sources."caseless-0.12.0"
sources."chalk-2.4.2"
@@ -94231,7 +94186,7 @@ in
sources."ecc-jsbn-0.1.2"
sources."ee-first-1.1.1"
sources."ejs-2.7.4"
- sources."electron-to-chromium-1.4.161"
+ sources."electron-to-chromium-1.4.164"
(sources."elliptic-6.5.4" // {
dependencies = [
sources."bn.js-4.12.0"
@@ -94715,7 +94670,7 @@ in
sources."minimalistic-crypto-utils-1.0.1"
sources."minimatch-3.1.2"
sources."minimist-1.2.6"
- sources."minipass-3.2.1"
+ sources."minipass-3.3.3"
sources."mississippi-3.0.0"
(sources."mixin-deep-1.3.2" // {
dependencies = [
@@ -96150,7 +96105,7 @@ in
})
sources."camelcase-6.3.0"
sources."caniuse-api-3.0.0"
- sources."caniuse-lite-1.0.30001356"
+ sources."caniuse-lite-1.0.30001358"
(sources."chalk-4.1.2" // {
dependencies = [
sources."ansi-styles-4.3.0"
@@ -96402,7 +96357,7 @@ in
sources."duplexer3-0.1.4"
sources."duplexify-3.7.1"
sources."ee-first-1.1.1"
- sources."electron-to-chromium-1.4.161"
+ sources."electron-to-chromium-1.4.164"
(sources."elliptic-6.5.4" // {
dependencies = [
sources."bn.js-4.12.0"
@@ -96804,7 +96759,7 @@ in
sources."json5-1.0.1"
sources."jsonfile-6.1.0"
sources."keychain-1.3.0"
- sources."keyv-4.3.0"
+ sources."keyv-4.3.1"
sources."killable-1.0.1"
sources."kind-of-6.0.3"
sources."kleur-3.0.3"
@@ -97941,7 +97896,7 @@ in
sources."callsites-3.1.0"
sources."camelcase-5.3.1"
sources."camelcase-keys-6.2.2"
- sources."caniuse-lite-1.0.30001356"
+ sources."caniuse-lite-1.0.30001358"
sources."chalk-2.4.2"
sources."chownr-1.1.4"
sources."ci-info-2.0.0"
@@ -97966,7 +97921,7 @@ in
})
sources."delay-5.0.0"
sources."devtools-protocol-0.0.981744"
- sources."electron-to-chromium-1.4.161"
+ sources."electron-to-chromium-1.4.164"
sources."emoji-regex-8.0.0"
sources."end-of-stream-1.4.4"
sources."error-ex-1.3.2"
@@ -98861,7 +98816,7 @@ in
sources."fast-deep-equal-3.1.3"
sources."fast-json-stable-stringify-2.1.0"
sources."fast-levenshtein-2.0.6"
- sources."fast-text-encoding-1.0.3"
+ sources."fast-text-encoding-1.0.4"
(sources."fast-url-parser-1.1.3" // {
dependencies = [
sources."punycode-1.4.1"
@@ -99059,7 +99014,7 @@ in
sources."lodash.snakecase-4.1.1"
sources."lodash.union-4.6.0"
sources."log-symbols-4.1.0"
- sources."logform-2.4.0"
+ sources."logform-2.4.1"
sources."long-4.0.0"
sources."lowercase-keys-1.0.1"
sources."lru-cache-6.0.0"
@@ -99069,7 +99024,7 @@ in
sources."semver-6.3.0"
];
})
- (sources."make-fetch-happen-10.1.7" // {
+ (sources."make-fetch-happen-10.1.8" // {
dependencies = [
sources."@tootallnate/once-2.0.0"
sources."http-proxy-agent-5.0.0"
@@ -99096,7 +99051,7 @@ in
sources."mimic-response-1.0.1"
sources."minimatch-3.1.2"
sources."minimist-1.2.6"
- sources."minipass-3.2.1"
+ sources."minipass-3.3.3"
sources."minipass-collect-1.0.2"
sources."minipass-fetch-2.1.0"
sources."minipass-flush-1.0.5"
@@ -100138,7 +100093,7 @@ in
sources."kind-of-6.0.3"
sources."kuler-2.0.0"
sources."lazy-1.0.11"
- (sources."logform-2.4.0" // {
+ (sources."logform-2.4.1" // {
dependencies = [
sources."ms-2.1.3"
];
@@ -100428,10 +100383,10 @@ in
gatsby-cli = nodeEnv.buildNodePackage {
name = "gatsby-cli";
packageName = "gatsby-cli";
- version = "4.16.0";
+ version = "4.17.0";
src = fetchurl {
- url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-4.16.0.tgz";
- sha512 = "VBQK46y5ZFKNQT4rCH134Du//y2hrxf7NXPB4WN+WzzplwtSo6wmU7cG1rPZWVNDCwZcJ1fpJCVIgKA62zAivw==";
+ url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-4.17.0.tgz";
+ sha512 = "x1oxUVSWYEDxYl8sNTDTakMnCYKIbjwIAfGBhp1v3wK8WvqKz2+ICho6vvd2rXSkGGbwAg/gJ5g4/p78WOdRLw==";
};
dependencies = [
sources."@ampproject/remapping-2.2.0"
@@ -100488,6 +100443,12 @@ in
sources."@jridgewell/set-array-1.1.1"
sources."@jridgewell/sourcemap-codec-1.4.13"
sources."@jridgewell/trace-mapping-0.3.13"
+ sources."@lmdb/lmdb-darwin-arm64-2.5.2"
+ sources."@lmdb/lmdb-darwin-x64-2.5.2"
+ sources."@lmdb/lmdb-linux-arm-2.5.2"
+ sources."@lmdb/lmdb-linux-arm64-2.5.2"
+ sources."@lmdb/lmdb-linux-x64-2.5.2"
+ sources."@lmdb/lmdb-win32-x64-2.5.2"
sources."@msgpackr-extract/msgpackr-extract-darwin-arm64-2.0.2"
sources."@msgpackr-extract/msgpackr-extract-darwin-x64-2.0.2"
sources."@msgpackr-extract/msgpackr-extract-linux-arm-2.0.2"
@@ -100536,7 +100497,7 @@ in
})
sources."call-bind-1.0.2"
sources."camelcase-6.3.0"
- sources."caniuse-lite-1.0.30001356"
+ sources."caniuse-lite-1.0.30001358"
(sources."chalk-4.1.2" // {
dependencies = [
sources."ansi-styles-4.3.0"
@@ -100574,7 +100535,7 @@ in
sources."configstore-5.0.1"
sources."convert-hrtime-3.0.0"
sources."convert-source-map-1.8.0"
- sources."create-gatsby-2.16.0"
+ sources."create-gatsby-2.17.0"
(sources."cross-spawn-6.0.5" // {
dependencies = [
sources."semver-5.7.1"
@@ -100601,7 +100562,7 @@ in
sources."domutils-2.8.0"
sources."dot-prop-5.3.0"
sources."duplexer3-0.1.4"
- sources."electron-to-chromium-1.4.161"
+ sources."electron-to-chromium-1.4.164"
sources."emoji-regex-8.0.0"
sources."end-of-stream-1.4.4"
sources."entities-2.2.0"
@@ -100636,8 +100597,8 @@ in
sources."fs-extra-10.1.0"
sources."fs.realpath-1.0.0"
sources."function-bind-1.1.1"
- sources."gatsby-core-utils-3.16.0"
- (sources."gatsby-telemetry-3.16.0" // {
+ sources."gatsby-core-utils-3.17.0"
+ (sources."gatsby-telemetry-3.17.0" // {
dependencies = [
sources."ansi-styles-4.3.0"
sources."boxen-4.2.0"
@@ -100701,16 +100662,10 @@ in
sources."json-buffer-3.0.1"
sources."json5-2.2.1"
sources."jsonfile-6.1.0"
- sources."keyv-4.3.0"
+ sources."keyv-4.3.1"
sources."kleur-3.0.3"
sources."latest-version-5.1.0"
- sources."lmdb-2.3.10"
- sources."lmdb-darwin-arm64-2.3.10"
- sources."lmdb-darwin-x64-2.3.10"
- sources."lmdb-linux-arm-2.3.10"
- sources."lmdb-linux-arm64-2.3.10"
- sources."lmdb-linux-x64-2.3.10"
- sources."lmdb-win32-x64-2.3.10"
+ sources."lmdb-2.5.2"
sources."locate-path-5.0.0"
sources."lock-1.1.0"
sources."lodash-4.17.21"
@@ -100737,11 +100692,10 @@ in
];
})
sources."mute-stream-0.0.8"
- sources."nan-2.16.0"
sources."nice-try-1.0.5"
sources."node-addon-api-4.3.0"
sources."node-fetch-2.6.7"
- sources."node-gyp-build-optional-packages-4.3.5"
+ sources."node-gyp-build-optional-packages-5.0.3"
sources."node-object-hash-2.3.10"
sources."node-releases-2.0.5"
sources."normalize-url-6.1.0"
@@ -100945,14 +100899,14 @@ in
sources."@octokit/core-3.6.0"
sources."@octokit/endpoint-6.0.12"
sources."@octokit/graphql-4.8.0"
- sources."@octokit/openapi-types-12.1.0"
- sources."@octokit/plugin-paginate-rest-2.18.0"
+ sources."@octokit/openapi-types-12.4.0"
+ sources."@octokit/plugin-paginate-rest-2.19.0"
sources."@octokit/plugin-request-log-1.0.4"
- sources."@octokit/plugin-rest-endpoint-methods-5.14.0"
+ sources."@octokit/plugin-rest-endpoint-methods-5.15.0"
sources."@octokit/request-5.6.3"
sources."@octokit/request-error-2.1.0"
sources."@octokit/rest-18.12.0"
- sources."@octokit/types-6.35.0"
+ sources."@octokit/types-6.37.0"
sources."@types/normalize-package-data-2.4.1"
sources."ansi-regex-2.1.1"
sources."ansi-styles-4.3.0"
@@ -101439,7 +101393,7 @@ in
sources."is-interactive-2.0.0"
sources."is-unicode-supported-1.2.0"
sources."json-buffer-3.0.1"
- sources."keyv-4.3.0"
+ sources."keyv-4.3.1"
sources."li-1.3.0"
(sources."log-symbols-5.1.0" // {
dependencies = [
@@ -102446,7 +102400,7 @@ in
sources."mimic-response-1.0.1"
sources."minimatch-3.1.2"
sources."minimist-1.2.6"
- sources."minipass-3.2.1"
+ sources."minipass-3.3.3"
sources."minizlib-2.1.2"
sources."mkdirp-1.0.4"
sources."ms-2.1.2"
@@ -104700,7 +104654,7 @@ in
sources."assert-plus-1.0.0"
sources."async-2.6.4"
sources."asynckit-0.4.0"
- sources."aws-sdk-2.1157.0"
+ sources."aws-sdk-2.1158.0"
sources."aws-sign2-0.7.0"
sources."aws4-1.11.0"
sources."base64-js-1.5.1"
@@ -106308,7 +106262,7 @@ in
sources."fs-minipass-2.1.0"
sources."gauge-3.0.2"
sources."is-fullwidth-code-point-3.0.0"
- sources."minipass-3.2.1"
+ sources."minipass-3.3.3"
sources."minizlib-2.1.2"
sources."mkdirp-1.0.4"
sources."node-fetch-2.6.7"
@@ -106378,7 +106332,7 @@ in
sources."async-mutex-0.1.4"
sources."asynckit-0.4.0"
sources."atob-2.1.2"
- (sources."aws-sdk-2.1157.0" // {
+ (sources."aws-sdk-2.1158.0" // {
dependencies = [
sources."sax-1.2.1"
sources."uuid-8.0.0"
@@ -106410,7 +106364,7 @@ in
dependencies = [
sources."chownr-2.0.0"
sources."fs-minipass-2.1.0"
- sources."minipass-3.2.1"
+ sources."minipass-3.3.3"
sources."minizlib-2.1.2"
sources."mkdirp-1.0.4"
sources."rimraf-3.0.2"
@@ -106768,7 +106722,7 @@ in
})
(sources."make-fetch-happen-9.1.0" // {
dependencies = [
- sources."minipass-3.2.1"
+ sources."minipass-3.3.3"
];
})
(sources."markdown-it-10.0.0" // {
@@ -106807,28 +106761,28 @@ in
})
(sources."minipass-collect-1.0.2" // {
dependencies = [
- sources."minipass-3.2.1"
+ sources."minipass-3.3.3"
];
})
(sources."minipass-fetch-1.4.1" // {
dependencies = [
- sources."minipass-3.2.1"
+ sources."minipass-3.3.3"
sources."minizlib-2.1.2"
];
})
(sources."minipass-flush-1.0.5" // {
dependencies = [
- sources."minipass-3.2.1"
+ sources."minipass-3.3.3"
];
})
(sources."minipass-pipeline-1.2.4" // {
dependencies = [
- sources."minipass-3.2.1"
+ sources."minipass-3.3.3"
];
})
(sources."minipass-sized-1.0.3" // {
dependencies = [
- sources."minipass-3.2.1"
+ sources."minipass-3.3.3"
];
})
sources."minizlib-1.3.3"
@@ -106859,7 +106813,7 @@ in
sources."fs-minipass-2.1.0"
sources."gauge-4.0.4"
sources."is-fullwidth-code-point-3.0.0"
- sources."minipass-3.2.1"
+ sources."minipass-3.3.3"
sources."minizlib-2.1.2"
sources."mkdirp-1.0.4"
sources."npmlog-6.0.2"
@@ -107016,7 +106970,7 @@ in
dependencies = [
sources."chownr-2.0.0"
sources."fs-minipass-2.1.0"
- sources."minipass-3.2.1"
+ sources."minipass-3.3.3"
sources."minizlib-2.1.2"
sources."mkdirp-1.0.4"
sources."tar-6.1.11"
@@ -107025,7 +106979,7 @@ in
sources."sshpk-1.17.0"
(sources."ssri-8.0.1" // {
dependencies = [
- sources."minipass-3.2.1"
+ sources."minipass-3.3.3"
];
})
sources."statuses-1.5.0"
@@ -107166,10 +107120,10 @@ in
js-beautify = nodeEnv.buildNodePackage {
name = "js-beautify";
packageName = "js-beautify";
- version = "1.14.3";
+ version = "1.14.4";
src = fetchurl {
- url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.3.tgz";
- sha512 = "f1ra8PHtOEu/70EBnmiUlV8nJePS58y9qKjl4JHfYWlFH6bo7ogZBz//FAZp7jDuXtYnGYKymZPlrg2I/9Zo4g==";
+ url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.4.tgz";
+ sha512 = "+b4A9c3glceZEmxyIbxDOYB0ZJdReLvyU1077RqKsO4dZx9FUHjTOJn8VHwpg33QoucIykOiYbh7MfqBOghnrA==";
};
dependencies = [
sources."abbrev-1.1.1"
@@ -108869,7 +108823,7 @@ in
sources."buffer-from-1.1.2"
sources."bytes-3.1.2"
sources."call-bind-1.0.2"
- sources."caniuse-lite-1.0.30001356"
+ sources."caniuse-lite-1.0.30001358"
sources."chalk-2.4.2"
sources."chardet-1.4.0"
sources."chownr-1.1.4"
@@ -108898,7 +108852,7 @@ in
sources."convert-source-map-1.8.0"
sources."cookie-0.5.0"
sources."cookie-signature-1.0.6"
- sources."core-js-3.23.1"
+ sources."core-js-3.23.2"
sources."core-util-is-1.0.3"
sources."cors-2.8.5"
sources."create-hash-1.2.0"
@@ -108937,7 +108891,7 @@ in
})
sources."dotenv-8.6.0"
sources."ee-first-1.1.1"
- sources."electron-to-chromium-1.4.161"
+ sources."electron-to-chromium-1.4.164"
sources."emoji-regex-8.0.0"
sources."encodeurl-1.0.2"
sources."end-of-stream-1.4.4"
@@ -109319,10 +109273,10 @@ in
lcov-result-merger = nodeEnv.buildNodePackage {
name = "lcov-result-merger";
packageName = "lcov-result-merger";
- version = "3.2.0";
+ version = "3.3.0";
src = fetchurl {
- url = "https://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-3.2.0.tgz";
- sha512 = "gE4b+2bIFoAfxkLi6OVCyawN+zJtzBCZV36rVKdHYl1ithsYxRvCjksOcF+nHHNz998dFHPDqjnht7dXRBRBzQ==";
+ url = "https://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-3.3.0.tgz";
+ sha512 = "Krg9p24jGaIT93RBMA8b5qLHDEiAXTavaTiEdMAZaJS93PsBKIcg/89cw/8rgeSfRuQX+I9x7h73SHFjCZ6cHg==";
};
dependencies = [
sources."ansi-regex-5.0.1"
@@ -110106,11 +110060,11 @@ in
];
})
sources."@octokit/graphql-4.8.0"
- sources."@octokit/openapi-types-12.1.0"
+ sources."@octokit/openapi-types-12.4.0"
sources."@octokit/plugin-enterprise-rest-6.0.1"
- sources."@octokit/plugin-paginate-rest-2.18.0"
+ sources."@octokit/plugin-paginate-rest-2.19.0"
sources."@octokit/plugin-request-log-1.0.4"
- sources."@octokit/plugin-rest-endpoint-methods-5.14.0"
+ sources."@octokit/plugin-rest-endpoint-methods-5.15.0"
(sources."@octokit/request-5.6.3" // {
dependencies = [
sources."is-plain-object-5.0.0"
@@ -110118,7 +110072,7 @@ in
})
sources."@octokit/request-error-2.1.0"
sources."@octokit/rest-18.12.0"
- sources."@octokit/types-6.35.0"
+ sources."@octokit/types-6.37.0"
sources."@tootallnate/once-1.1.2"
sources."@types/minimatch-3.0.5"
sources."@types/minimist-1.2.2"
@@ -110426,7 +110380,7 @@ in
sources."arrify-1.0.1"
];
})
- sources."minipass-3.2.1"
+ sources."minipass-3.3.3"
sources."minipass-collect-1.0.2"
sources."minipass-fetch-1.4.1"
sources."minipass-flush-1.0.5"
@@ -110485,7 +110439,7 @@ in
sources."hosted-git-info-5.0.0"
sources."http-proxy-agent-5.0.0"
sources."lru-cache-7.10.1"
- sources."make-fetch-happen-10.1.7"
+ sources."make-fetch-happen-10.1.8"
sources."minipass-fetch-2.1.0"
sources."npm-package-arg-9.0.2"
sources."socks-proxy-agent-7.0.0"
@@ -111647,6 +111601,24 @@ in
bypassCache = true;
reconstructLock = true;
};
+ lv_font_conv = nodeEnv.buildNodePackage {
+ name = "lv_font_conv";
+ packageName = "lv_font_conv";
+ version = "1.5.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/lv_font_conv/-/lv_font_conv-1.5.2.tgz";
+ sha512 = "0UapRSTkVP/pnB8Z4r2HDHx5p2dJx/xUG1+14u/WXo59mwuC7BahR+Bnx/66jKoDrG1wFQwn9ZzoyMxRHOD9bg==";
+ };
+ buildInputs = globalBuildInputs;
+ meta = {
+ description = "Rasterize vector fonts for embedded use. Supports subsettings & merge.";
+ homepage = "https://github.com/lvgl/lv_font_conv#readme";
+ license = "MIT";
+ };
+ production = true;
+ bypassCache = true;
+ reconstructLock = true;
+ };
madoko = nodeEnv.buildNodePackage {
name = "madoko";
packageName = "madoko";
@@ -113342,7 +113314,7 @@ in
sources."is-arrayish-0.3.2"
sources."is-stream-2.0.1"
sources."kuler-2.0.0"
- sources."logform-2.4.0"
+ sources."logform-2.4.1"
sources."lru-cache-6.0.0"
sources."ms-2.1.3"
sources."one-time-1.0.0"
@@ -113454,9 +113426,9 @@ in
sources."is-lambda-1.0.1"
sources."isexe-2.0.0"
sources."lru-cache-7.10.1"
- sources."make-fetch-happen-10.1.7"
+ sources."make-fetch-happen-10.1.8"
sources."minimatch-3.1.2"
- sources."minipass-3.2.1"
+ sources."minipass-3.3.3"
sources."minipass-collect-1.0.2"
sources."minipass-fetch-2.1.0"
sources."minipass-flush-1.0.5"
@@ -114147,7 +114119,7 @@ in
sources."universalify-2.0.0"
];
})
- sources."keyv-4.3.0"
+ sources."keyv-4.3.1"
sources."leven-2.1.0"
sources."lodash.clonedeep-4.5.0"
sources."lowercase-keys-2.0.0"
@@ -114172,7 +114144,7 @@ in
sources."mimic-response-1.0.1"
sources."minimatch-3.1.2"
sources."minimist-1.2.6"
- (sources."minipass-3.2.1" // {
+ (sources."minipass-3.3.3" // {
dependencies = [
sources."yallist-4.0.0"
];
@@ -114411,7 +114383,7 @@ in
sources."mime-types-2.1.35"
sources."minimatch-3.1.2"
sources."minimist-1.2.6"
- sources."minipass-3.2.1"
+ sources."minipass-3.3.3"
sources."minizlib-2.1.2"
sources."mkdirp-0.3.5"
sources."ncp-0.4.2"
@@ -114925,7 +114897,7 @@ in
sources."js-tokens-4.0.0"
sources."json-buffer-3.0.1"
sources."json-parse-even-better-errors-2.3.1"
- sources."keyv-4.3.0"
+ sources."keyv-4.3.1"
sources."kind-of-6.0.3"
sources."latest-version-5.1.0"
sources."lines-and-columns-1.2.4"
@@ -115406,7 +115378,7 @@ in
sources."mimic-response-1.0.1"
sources."minimatch-5.1.0"
sources."minimist-1.2.6"
- sources."minipass-3.2.1"
+ sources."minipass-3.3.3"
sources."minipass-collect-1.0.2"
sources."minipass-fetch-1.4.1"
sources."minipass-flush-1.0.5"
@@ -115435,7 +115407,7 @@ in
dependencies = [
sources."@tootallnate/once-2.0.0"
sources."http-proxy-agent-5.0.0"
- sources."make-fetch-happen-10.1.7"
+ sources."make-fetch-happen-10.1.8"
sources."minipass-fetch-2.1.0"
sources."socks-proxy-agent-7.0.0"
];
@@ -115959,7 +115931,7 @@ in
sources."caller-path-2.0.0"
sources."callsites-2.0.0"
sources."caniuse-api-3.0.0"
- sources."caniuse-lite-1.0.30001356"
+ sources."caniuse-lite-1.0.30001358"
sources."caseless-0.12.0"
sources."chalk-2.4.2"
sources."chokidar-2.1.8"
@@ -115985,7 +115957,7 @@ in
sources."convert-source-map-1.8.0"
sources."copy-descriptor-0.1.1"
sources."core-js-2.6.12"
- (sources."core-js-compat-3.23.1" // {
+ (sources."core-js-compat-3.23.2" // {
dependencies = [
sources."semver-7.0.0"
];
@@ -116096,7 +116068,7 @@ in
sources."duplexer2-0.1.4"
sources."ecc-jsbn-0.1.2"
sources."ee-first-1.1.1"
- sources."electron-to-chromium-1.4.161"
+ sources."electron-to-chromium-1.4.164"
(sources."elliptic-6.5.4" // {
dependencies = [
sources."bn.js-4.12.0"
@@ -116861,7 +116833,7 @@ in
sources."browserslist-4.20.4"
sources."buffer-from-1.1.2"
sources."callsites-3.1.0"
- sources."caniuse-lite-1.0.30001356"
+ sources."caniuse-lite-1.0.30001358"
(sources."chalk-4.1.2" // {
dependencies = [
sources."ansi-styles-4.3.0"
@@ -116892,7 +116864,7 @@ in
sources."domutils-2.8.0"
sources."dotenv-7.0.0"
sources."dotenv-expand-5.1.0"
- sources."electron-to-chromium-1.4.161"
+ sources."electron-to-chromium-1.4.164"
sources."entities-3.0.1"
sources."error-ex-1.3.2"
sources."escalade-3.1.1"
@@ -118811,7 +118783,7 @@ in
sources."minimatch-3.1.2"
];
})
- (sources."globule-1.3.3" // {
+ (sources."globule-1.3.4" // {
dependencies = [
sources."glob-7.1.7"
];
@@ -118948,7 +118920,7 @@ in
sources."minimatch-3.1.2"
];
})
- (sources."globule-1.3.3" // {
+ (sources."globule-1.3.4" // {
dependencies = [
sources."glob-7.1.7"
];
@@ -119303,10 +119275,10 @@ in
pyright = nodeEnv.buildNodePackage {
name = "pyright";
packageName = "pyright";
- version = "1.1.254";
+ version = "1.1.255";
src = fetchurl {
- url = "https://registry.npmjs.org/pyright/-/pyright-1.1.254.tgz";
- sha512 = "YDbIqr55EkwRCFSVjWxj8KOwBTMVK1U3HLLdqp+W3n+88S31YbRERrCni9izmtt5i4wnuhf7oRI/9K8KwLxmgQ==";
+ url = "https://registry.npmjs.org/pyright/-/pyright-1.1.255.tgz";
+ sha512 = "pAec1Mqyq0l0+C6JH7o7Va0oWyZVACEFgP2cWD9DU/C1epoqZAt/PCRbae/7fFfn7ZGew5tiTMdtO/2RZO/cRg==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -120004,7 +119976,7 @@ in
sources."camel-case-3.0.0"
sources."camelcase-5.3.1"
sources."caniuse-api-3.0.0"
- sources."caniuse-lite-1.0.30001356"
+ sources."caniuse-lite-1.0.30001358"
sources."case-sensitive-paths-webpack-plugin-2.4.0"
sources."caw-2.0.1"
sources."chalk-2.4.2"
@@ -120084,7 +120056,7 @@ in
sources."copy-concurrently-1.0.5"
sources."copy-descriptor-0.1.1"
sources."core-js-2.6.12"
- (sources."core-js-compat-3.23.1" // {
+ (sources."core-js-compat-3.23.2" // {
dependencies = [
sources."semver-7.0.0"
];
@@ -120225,7 +120197,7 @@ in
sources."duplexify-3.7.1"
sources."ee-first-1.1.1"
sources."ejs-2.7.4"
- sources."electron-to-chromium-1.4.161"
+ sources."electron-to-chromium-1.4.164"
(sources."elliptic-6.5.4" // {
dependencies = [
sources."bn.js-4.12.0"
@@ -122413,10 +122385,10 @@ in
rollup = nodeEnv.buildNodePackage {
name = "rollup";
packageName = "rollup";
- version = "2.75.6";
+ version = "2.75.7";
src = fetchurl {
- url = "https://registry.npmjs.org/rollup/-/rollup-2.75.6.tgz";
- sha512 = "OEf0TgpC9vU6WGROJIk1JA3LR5vk/yvqlzxqdrE2CzzXnqKXNzbAwlWUXis8RS3ZPe7LAq+YUxsRa0l3r27MLA==";
+ url = "https://registry.npmjs.org/rollup/-/rollup-2.75.7.tgz";
+ sha512 = "VSE1iy0eaAYNCxEXaleThdFXqZJ42qDBatAwrfnPlENEZ8erQ+0LYX4JXOLPceWfZpV1VtZwZ3dFCuOZiSyFtQ==";
};
dependencies = [
sources."fsevents-2.3.2"
@@ -122448,14 +122420,14 @@ in
sources."@types/json-schema-7.0.11"
sources."@types/node-14.17.34"
sources."@types/vscode-1.66.0"
- sources."@typescript-eslint/eslint-plugin-5.28.0"
- sources."@typescript-eslint/parser-5.28.0"
- sources."@typescript-eslint/scope-manager-5.28.0"
- sources."@typescript-eslint/type-utils-5.28.0"
- sources."@typescript-eslint/types-5.28.0"
- sources."@typescript-eslint/typescript-estree-5.28.0"
- sources."@typescript-eslint/utils-5.28.0"
- sources."@typescript-eslint/visitor-keys-5.28.0"
+ sources."@typescript-eslint/eslint-plugin-5.29.0"
+ sources."@typescript-eslint/parser-5.29.0"
+ sources."@typescript-eslint/scope-manager-5.29.0"
+ sources."@typescript-eslint/type-utils-5.29.0"
+ sources."@typescript-eslint/types-5.29.0"
+ sources."@typescript-eslint/typescript-estree-5.29.0"
+ sources."@typescript-eslint/utils-5.29.0"
+ sources."@typescript-eslint/visitor-keys-5.29.0"
sources."@vscode/test-electron-2.1.4"
sources."acorn-8.7.1"
sources."acorn-jsx-5.3.2"
@@ -122767,7 +122739,7 @@ in
sources."url-join-4.0.1"
sources."util-deprecate-1.0.2"
sources."v8-compile-cache-2.3.0"
- (sources."vsce-2.9.1" // {
+ (sources."vsce-2.9.2" // {
dependencies = [
sources."ansi-styles-3.2.1"
sources."chalk-2.4.2"
@@ -123173,7 +123145,7 @@ in
sources."async-3.2.4"
sources."asynckit-0.4.0"
sources."at-least-node-1.0.0"
- (sources."aws-sdk-2.1157.0" // {
+ (sources."aws-sdk-2.1158.0" // {
dependencies = [
sources."buffer-4.9.2"
sources."ieee754-1.1.13"
@@ -123421,7 +123393,7 @@ in
sources."jsonfile-6.1.0"
sources."jszip-3.10.0"
sources."jwt-decode-2.2.0"
- sources."keyv-4.3.0"
+ sources."keyv-4.3.1"
sources."lazystream-1.0.1"
sources."lie-3.3.0"
sources."lodash-4.17.21"
@@ -123451,7 +123423,7 @@ in
sources."mimic-fn-2.1.0"
sources."mimic-response-1.0.1"
sources."minimatch-3.1.2"
- sources."minipass-3.2.1"
+ sources."minipass-3.3.3"
sources."minizlib-2.1.2"
sources."mkdirp-1.0.4"
sources."ms-2.1.2"
@@ -124252,10 +124224,10 @@ in
snyk = nodeEnv.buildNodePackage {
name = "snyk";
packageName = "snyk";
- version = "1.953.0";
+ version = "1.954.0";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk/-/snyk-1.953.0.tgz";
- sha512 = "H0nx9cdFPY16CvCrbBTtSq9Za0Hyw5+w3pYlV2MR61FlgcO8izvD4p8mzYZdqyxGTZKiLUR3pOKpYk3ewohMBQ==";
+ url = "https://registry.npmjs.org/snyk/-/snyk-1.954.0.tgz";
+ sha512 = "QkuoCjvLCIyf1PfAyzlL8rMo99mZ5Hq6I0afGAixICg3FM0phdnlZ7t/F4NtU5iZgMPKkutWbc2oK69lAyA6eA==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -124472,10 +124444,10 @@ in
sql-formatter = nodeEnv.buildNodePackage {
name = "sql-formatter";
packageName = "sql-formatter";
- version = "7.0.1";
+ version = "7.0.2";
src = fetchurl {
- url = "https://registry.npmjs.org/sql-formatter/-/sql-formatter-7.0.1.tgz";
- sha512 = "8YsnJowfW01iClXzpyBSbUbGO9qU6uGbt1alRtj0EaigZ+temgdMCteui9ciCs7qOzbRYiVwpw6Gd5Ld3ap+Hw==";
+ url = "https://registry.npmjs.org/sql-formatter/-/sql-formatter-7.0.2.tgz";
+ sha512 = "l6JVgMKT3Nzq7Jtpf43QhL26QEM5ICDMN2ARnZz5Z2l1d6e2mT/nRWAZun9kSSkrHrOAsBn20vknWFWuOlz3ww==";
};
dependencies = [
sources."argparse-2.0.1"
@@ -125517,7 +125489,7 @@ in
sources."async-1.5.2"
sources."async-limiter-1.0.1"
sources."asynckit-0.4.0"
- (sources."aws-sdk-2.1157.0" // {
+ (sources."aws-sdk-2.1158.0" // {
dependencies = [
sources."uuid-8.0.0"
];
@@ -127746,7 +127718,7 @@ in
sources."tr46-0.0.3"
sources."tunnel-agent-0.6.0"
sources."tweetnacl-1.0.3"
- sources."typegram-3.9.2"
+ sources."typegram-3.10.0"
sources."uri-js-4.4.1"
sources."uuid-3.4.0"
sources."verror-1.10.0"
@@ -129006,7 +128978,7 @@ in
sources."content-type-1.0.4"
sources."cookie-0.4.2"
sources."cookie-signature-1.0.6"
- sources."core-js-3.23.1"
+ sources."core-js-3.23.2"
sources."core-util-is-1.0.2"
sources."cors-2.8.5"
sources."css-select-4.3.0"
@@ -129049,7 +129021,7 @@ in
sources."eventemitter3-4.0.7"
sources."express-4.17.3"
sources."extsprintf-1.4.1"
- sources."fast-text-encoding-1.0.3"
+ sources."fast-text-encoding-1.0.4"
sources."file-type-16.5.3"
sources."filename-reserved-regex-2.0.0"
sources."filenamify-4.3.0"
@@ -129120,7 +129092,7 @@ in
sources."json-buffer-3.0.1"
sources."jwa-2.0.0"
sources."jws-4.0.0"
- sources."keyv-4.3.0"
+ sources."keyv-4.3.1"
sources."ldap-filter-0.3.3"
sources."ldapjs-2.3.1"
sources."linkify-it-3.0.3"
@@ -129143,7 +129115,7 @@ in
sources."minimalistic-assert-1.0.1"
sources."minimatch-3.1.2"
sources."minimist-1.2.6"
- sources."minipass-3.2.1"
+ sources."minipass-3.3.3"
sources."minizlib-2.1.2"
sources."mkdirp-1.0.4"
sources."ms-2.0.0"
@@ -129352,7 +129324,7 @@ in
sources."content-type-1.0.4"
sources."cookie-0.4.2"
sources."cookie-signature-1.0.6"
- sources."core-js-3.23.1"
+ sources."core-js-3.23.2"
sources."core-util-is-1.0.2"
sources."cors-2.8.5"
sources."css-select-4.3.0"
@@ -129395,7 +129367,7 @@ in
sources."eventemitter3-4.0.7"
sources."express-4.17.3"
sources."extsprintf-1.4.1"
- sources."fast-text-encoding-1.0.3"
+ sources."fast-text-encoding-1.0.4"
sources."file-type-16.5.3"
sources."filename-reserved-regex-2.0.0"
sources."filenamify-4.3.0"
@@ -129466,7 +129438,7 @@ in
sources."json-buffer-3.0.1"
sources."jwa-2.0.0"
sources."jws-4.0.0"
- sources."keyv-4.3.0"
+ sources."keyv-4.3.1"
sources."ldap-filter-0.3.3"
sources."ldapjs-2.3.1"
sources."linkify-it-3.0.3"
@@ -129489,7 +129461,7 @@ in
sources."minimalistic-assert-1.0.1"
sources."minimatch-3.1.2"
sources."minimist-1.2.6"
- sources."minipass-3.2.1"
+ sources."minipass-3.3.3"
sources."minizlib-2.1.2"
sources."mkdirp-1.0.4"
sources."ms-2.0.0"
@@ -129720,7 +129692,7 @@ in
sources."content-type-1.0.4"
sources."cookie-0.4.0"
sources."cookie-signature-1.0.6"
- sources."core-js-3.23.1"
+ sources."core-js-3.23.2"
sources."core-util-is-1.0.2"
sources."css-select-1.2.0"
sources."css-what-2.1.3"
@@ -129779,7 +129751,7 @@ in
sources."extsprintf-1.4.1"
sources."fast-deep-equal-3.1.3"
sources."fast-json-stable-stringify-2.1.0"
- sources."fast-text-encoding-1.0.3"
+ sources."fast-text-encoding-1.0.4"
sources."file-type-12.3.1"
sources."filename-reserved-regex-2.0.0"
sources."filenamify-4.1.0"
@@ -130394,7 +130366,7 @@ in
sources."content-type-1.0.4"
sources."cookie-0.4.0"
sources."cookie-signature-1.0.6"
- sources."core-js-3.23.1"
+ sources."core-js-3.23.2"
sources."core-util-is-1.0.2"
sources."css-select-1.2.0"
sources."css-what-2.1.3"
@@ -130454,7 +130426,7 @@ in
sources."extsprintf-1.4.1"
sources."fast-deep-equal-3.1.3"
sources."fast-json-stable-stringify-2.1.0"
- sources."fast-text-encoding-1.0.3"
+ sources."fast-text-encoding-1.0.4"
sources."file-type-14.7.1"
sources."filename-reserved-regex-2.0.0"
sources."filenamify-4.1.0"
@@ -130528,7 +130500,7 @@ in
})
sources."jwa-2.0.0"
sources."jws-4.0.0"
- sources."keyv-4.3.0"
+ sources."keyv-4.3.1"
sources."ldap-filter-0.3.3"
sources."ldapjs-2.1.1"
sources."linkify-it-3.0.2"
@@ -130861,7 +130833,7 @@ in
sources."content-type-1.0.4"
sources."cookie-0.4.0"
sources."cookie-signature-1.0.6"
- sources."core-js-3.23.1"
+ sources."core-js-3.23.2"
sources."core-util-is-1.0.2"
sources."css-select-1.2.0"
sources."css-what-2.1.3"
@@ -130921,7 +130893,7 @@ in
sources."extsprintf-1.4.1"
sources."fast-deep-equal-3.1.3"
sources."fast-json-stable-stringify-2.1.0"
- sources."fast-text-encoding-1.0.3"
+ sources."fast-text-encoding-1.0.4"
sources."file-type-14.7.1"
sources."filename-reserved-regex-2.0.0"
sources."filenamify-4.1.0"
@@ -130995,7 +130967,7 @@ in
})
sources."jwa-2.0.0"
sources."jws-4.0.0"
- sources."keyv-4.3.0"
+ sources."keyv-4.3.1"
sources."ldap-filter-0.3.3"
sources."ldapjs-2.1.1"
sources."linkify-it-3.0.2"
@@ -131676,14 +131648,14 @@ in
sources."@octokit/core-3.6.0"
sources."@octokit/endpoint-6.0.12"
sources."@octokit/graphql-4.8.0"
- sources."@octokit/openapi-types-12.1.0"
- sources."@octokit/plugin-paginate-rest-2.18.0"
+ sources."@octokit/openapi-types-12.4.0"
+ sources."@octokit/plugin-paginate-rest-2.19.0"
sources."@octokit/plugin-request-log-1.0.4"
- sources."@octokit/plugin-rest-endpoint-methods-5.14.0"
+ sources."@octokit/plugin-rest-endpoint-methods-5.15.0"
sources."@octokit/request-5.6.3"
sources."@octokit/request-error-2.1.0"
sources."@octokit/rest-18.12.0"
- sources."@octokit/types-6.35.0"
+ sources."@octokit/types-6.37.0"
sources."@xmldom/xmldom-0.8.2"
sources."ajv-6.12.6"
sources."asn1-0.2.6"
@@ -132403,12 +132375,12 @@ in
sources."jquery-ui-1.13.1"
sources."json-buffer-3.0.1"
sources."just-detect-adblock-1.1.0"
- sources."keyv-4.3.0"
+ sources."keyv-4.3.1"
sources."knockout-3.5.1"
sources."kuler-2.0.0"
sources."latest-version-6.0.0"
sources."lodash-4.17.21"
- (sources."logform-2.4.0" // {
+ (sources."logform-2.4.1" // {
dependencies = [
sources."ms-2.1.3"
];
@@ -132769,7 +132741,7 @@ in
})
sources."mimic-response-2.1.0"
sources."minimatch-3.1.2"
- sources."minipass-3.2.1"
+ sources."minipass-3.3.3"
sources."minizlib-2.1.2"
sources."mkdirp-1.0.4"
sources."ms-2.1.2"
@@ -133099,7 +133071,7 @@ in
sources."mimic-response-1.0.1"
sources."minimatch-3.1.2"
sources."minimist-1.2.6"
- sources."minipass-3.2.1"
+ sources."minipass-3.3.3"
sources."minizlib-2.1.2"
sources."mkdirp-1.0.4"
sources."ms-2.1.2"
@@ -133646,7 +133618,7 @@ in
sha512 = "Un7gzQgvACjGtsT0Yll5QqHgL65a4mTK5ChgMnO4dgTZ3tuwJCaP84oztBqvuFZzN9QxA3C07J4QEQvf1xjcgQ==";
};
dependencies = [
- sources."core-js-3.23.1"
+ sources."core-js-3.23.2"
sources."jsonc-parser-3.0.0"
sources."regenerator-runtime-0.13.9"
sources."request-light-0.5.8"
@@ -133736,7 +133708,7 @@ in
sources."buffer-from-1.1.2"
sources."call-bind-1.0.2"
sources."camelcase-6.3.0"
- sources."caniuse-lite-1.0.30001356"
+ sources."caniuse-lite-1.0.30001358"
(sources."chalk-4.1.2" // {
dependencies = [
sources."supports-color-7.2.0"
@@ -133776,7 +133748,7 @@ in
sources."domelementtype-2.3.0"
sources."domhandler-5.0.3"
sources."domutils-3.0.1"
- sources."electron-to-chromium-1.4.161"
+ sources."electron-to-chromium-1.4.164"
sources."emoji-regex-8.0.0"
sources."emojis-list-3.0.0"
sources."enhanced-resolve-5.9.3"
@@ -134715,7 +134687,7 @@ in
sources."isarray-1.0.0"
sources."isexe-2.0.0"
sources."isobject-3.0.1"
- sources."js-beautify-1.14.3"
+ sources."js-beautify-1.14.4"
sources."js-tokens-4.0.0"
sources."js-yaml-3.14.1"
sources."json-buffer-3.0.0"
@@ -135287,7 +135259,7 @@ in
sources."combined-stream-1.0.8"
sources."concat-map-0.0.1"
sources."console-control-strings-1.1.0"
- sources."core-js-pure-3.23.1"
+ sources."core-js-pure-3.23.2"
sources."cssom-0.4.4"
(sources."cssstyle-2.3.0" // {
dependencies = [
@@ -135359,7 +135331,7 @@ in
sources."mime-types-2.1.35"
sources."mimic-response-2.1.0"
sources."minimatch-3.1.2"
- sources."minipass-3.2.1"
+ sources."minipass-3.3.3"
sources."minizlib-2.1.2"
sources."mkdirp-1.0.4"
sources."ms-2.1.2"
@@ -135444,10 +135416,10 @@ in
web-ext = nodeEnv.buildNodePackage {
name = "web-ext";
packageName = "web-ext";
- version = "7.0.0";
+ version = "7.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/web-ext/-/web-ext-7.0.0.tgz";
- sha512 = "+i2lfRWm4Br/zIkY1sbpQHkTb7fzDFS5rkAobNGWqhaYpFWdD7ZUaNkH0Y682Ut5rEiRX9IWKI+9hkQIchtIWw==";
+ url = "https://registry.npmjs.org/web-ext/-/web-ext-7.1.0.tgz";
+ sha512 = "wrEU9uIieKwkqQaa2NESuaypIvtJWEvMzPh3LSfI3C6R7DMMTmtxHchVLJnupeWjQ1FJzc3TszfcVRIwXk8DfQ==";
};
dependencies = [
sources."@babel/code-frame-7.16.7"
@@ -135476,7 +135448,7 @@ in
})
sources."@humanwhocodes/config-array-0.9.5"
sources."@humanwhocodes/object-schema-1.2.1"
- sources."@mdn/browser-compat-data-5.0.1"
+ sources."@mdn/browser-compat-data-5.1.1"
sources."@sindresorhus/is-0.14.0"
sources."@szmarczak/http-timer-1.1.2"
sources."@types/minimatch-3.0.5"
@@ -135484,7 +135456,7 @@ in
sources."@types/yauzl-2.9.2"
sources."acorn-8.7.1"
sources."acorn-jsx-5.3.2"
- sources."addons-linter-5.7.0"
+ sources."addons-linter-5.9.0"
sources."addons-moz-compare-1.2.0"
sources."addons-scanner-utils-7.0.0"
sources."adm-zip-0.5.9"
@@ -135590,7 +135562,7 @@ in
sources."escalade-3.1.1"
sources."escape-goat-2.1.1"
sources."escape-string-regexp-4.0.0"
- (sources."eslint-8.17.0" // {
+ (sources."eslint-8.18.0" // {
dependencies = [
sources."ajv-6.12.6"
sources."json-schema-traverse-0.4.1"
@@ -135807,7 +135779,7 @@ in
sources."nth-check-2.1.1"
sources."oauth-sign-0.9.0"
sources."object-assign-4.1.1"
- sources."on-exit-leak-free-0.2.0"
+ sources."on-exit-leak-free-1.0.0"
sources."once-1.4.0"
sources."onetime-5.1.2"
sources."open-8.4.0"
@@ -135832,14 +135804,14 @@ in
sources."pend-1.2.0"
sources."performance-now-2.1.0"
sources."picocolors-1.0.0"
- sources."pino-7.11.0"
+ sources."pino-8.0.0"
sources."pino-abstract-transport-0.5.0"
- sources."pino-std-serializers-4.0.0"
+ sources."pino-std-serializers-5.6.0"
sources."postcss-8.4.14"
sources."prelude-ls-1.2.1"
sources."prepend-http-2.0.0"
sources."process-nextick-args-2.0.1"
- sources."process-warning-1.0.0"
+ sources."process-warning-2.0.0"
sources."promise-toolbox-0.21.0"
sources."psl-1.8.0"
sources."pump-3.0.0"
@@ -135905,7 +135877,7 @@ in
sources."shellwords-0.1.1"
sources."sign-addon-5.0.0"
sources."signal-exit-3.0.7"
- sources."sonic-boom-2.8.0"
+ sources."sonic-boom-3.0.0"
sources."source-map-0.6.1"
sources."source-map-js-1.0.2"
sources."source-map-support-0.5.21"
@@ -135928,7 +135900,7 @@ in
sources."text-table-0.2.0"
sources."thenify-3.3.1"
sources."thenify-all-1.6.0"
- sources."thread-stream-0.15.2"
+ sources."thread-stream-1.0.0"
sources."through-2.3.8"
sources."tmp-0.2.1"
sources."to-readable-stream-1.0.0"
@@ -135966,7 +135938,7 @@ in
sources."wrap-ansi-7.0.0"
sources."wrappy-1.0.2"
sources."write-file-atomic-3.0.3"
- sources."ws-8.7.0"
+ sources."ws-8.8.0"
sources."xdg-basedir-4.0.0"
sources."xml2js-0.4.23"
sources."xmlbuilder-11.0.1"
@@ -136030,10 +136002,10 @@ in
sources."ajv-keywords-3.5.2"
sources."browserslist-4.20.4"
sources."buffer-from-1.1.2"
- sources."caniuse-lite-1.0.30001356"
+ sources."caniuse-lite-1.0.30001358"
sources."chrome-trace-event-1.0.3"
sources."commander-2.20.3"
- sources."electron-to-chromium-1.4.161"
+ sources."electron-to-chromium-1.4.164"
sources."enhanced-resolve-5.9.3"
sources."es-module-lexer-0.9.3"
sources."escalade-3.1.1"
@@ -137188,7 +137160,7 @@ in
sources."config-chain-1.1.13"
sources."configstore-3.1.5"
sources."console-control-strings-1.1.0"
- sources."core-js-3.23.1"
+ sources."core-js-3.23.2"
sources."core-util-is-1.0.3"
sources."create-error-class-3.0.2"
sources."cross-spawn-6.0.5"
@@ -137469,7 +137441,7 @@ in
];
})
sources."minimist-1.2.6"
- sources."minipass-3.2.1"
+ sources."minipass-3.3.3"
sources."minipass-collect-1.0.2"
sources."minipass-fetch-1.4.1"
sources."minipass-flush-1.0.5"
@@ -137552,7 +137524,7 @@ in
sources."http-cache-semantics-4.1.0"
sources."http-proxy-agent-5.0.0"
sources."lru-cache-7.10.1"
- (sources."make-fetch-happen-10.1.7" // {
+ (sources."make-fetch-happen-10.1.8" // {
dependencies = [
sources."minipass-fetch-2.1.0"
];
@@ -138026,10 +137998,10 @@ in
zx = nodeEnv.buildNodePackage {
name = "zx";
packageName = "zx";
- version = "7.0.0";
+ version = "7.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/zx/-/zx-7.0.0.tgz";
- sha512 = "QPUkzM2o/yfr8CnJgR3Uzi4ESW3IhM4iOIrDx2wJ0vZAU4Gz0Bd/wvOWdqAheJgUTc1ecTkOMpdBKCSBvVDnTg==";
+ url = "https://registry.npmjs.org/zx/-/zx-7.0.1.tgz";
+ sha512 = "5jCux4+8EL7blqjQZDCV9KiV+TEY9Vn9dkddOYEqdrE79X0jsVDRMt0u2O6UsBkC8Da8flcr6Vx9EmcVX4S5vg==";
};
dependencies = [
sources."@nodelib/fs.scandir-2.1.5"
diff --git a/pkgs/development/ocaml-modules/chacha/default.nix b/pkgs/development/ocaml-modules/chacha/default.nix
index 21bae79ab5f8..ebd73b519f95 100644
--- a/pkgs/development/ocaml-modules/chacha/default.nix
+++ b/pkgs/development/ocaml-modules/chacha/default.nix
@@ -1,6 +1,7 @@
{ lib
, buildDunePackage
-, fetchurl
+, fetchFromGitHub
+, fetchpatch
, ocaml
, alcotest
@@ -10,16 +11,22 @@
buildDunePackage rec {
pname = "chacha";
- version = "1.0.0";
+ version = "1.1.0";
- src = fetchurl {
- url = "https://github.com/abeaumont/ocaml-chacha/releases/download/${version}/${pname}-${version}.tbz";
- sha256 = "sha256-t8dOMQQDpje0QbuOhjSIa3xnXuXcxMVTLENa/rwdgA4=";
+ src = fetchFromGitHub {
+ owner = "abeaumont";
+ repo = "ocaml-chacha";
+ rev = version;
+ sha256 = "sha256-PmeiFloU0k3SqOK1VjaliiCEzDzrzyMSasgnO5fJS1k=";
};
- useDune2 = true;
+ # Ensure compatibility with cstruct ≥ 6.1.0
+ patches = [ (fetchpatch {
+ url = "https://github.com/abeaumont/ocaml-chacha/commit/fbe4a0a808226229728a68f278adf370251196fd.patch";
+ sha256 = "sha256-y7X9toFDrgdv3qmFmUs7K7QS+Gy45rRLulKy48m7uqc=";
+ })];
- minimumOCamlVersion = "4.02";
+ minimalOCamlVersion = "4.02";
propagatedBuildInputs = [ cstruct mirage-crypto ];
diff --git a/pkgs/development/ocaml-modules/hxd/default.nix b/pkgs/development/ocaml-modules/hxd/default.nix
index 7840bb4ff19a..54ce87de99ee 100644
--- a/pkgs/development/ocaml-modules/hxd/default.nix
+++ b/pkgs/development/ocaml-modules/hxd/default.nix
@@ -1,26 +1,19 @@
{ lib, buildDunePackage, fetchurl
-, ocaml, dune-configurator, cmdliner
-, lwt, withLwt ? lib.versionAtLeast ocaml.version "4.07"
+, dune-configurator, cmdliner
+, lwt, withLwt ? true
}:
buildDunePackage rec {
pname = "hxd";
- version = "0.3.1";
+ version = "0.3.2";
- useDune2 = true;
-
- minimumOCamlVersion = "4.06";
+ minimalOCamlVersion = "4.08";
src = fetchurl {
- url = "https://github.com/dinosaure/hxd/releases/download/v${version}/hxd-v${version}.tbz";
- sha256 = "1c226c91e17cd329dec0c287bfd20f36302aa533069ff9c6ced32721f96b29bc";
+ url = "https://github.com/dinosaure/hxd/releases/download/v${version}/hxd-${version}.tbz";
+ sha256 = "a00290abb8538e79b32ddc22ed9b301b9806bc4c03eb1e5105b14af47dabec9f";
};
- # ignore yes stderr output due to trapped SIGPIPE
- postPatch = ''
- sed -i 's|yes ".\+"|& 2> /dev/null|' test/*.t
- '';
-
propagatedBuildInputs = lib.optional withLwt lwt;
buildInputs = [
diff --git a/pkgs/development/ocaml-modules/mirage-net-xen/default.nix b/pkgs/development/ocaml-modules/mirage-net-xen/default.nix
index 0d7a7e53fb1a..49a00747cfa6 100644
--- a/pkgs/development/ocaml-modules/mirage-net-xen/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-net-xen/default.nix
@@ -17,8 +17,6 @@ buildDunePackage {
inherit (netchannel)
src
version
- useDune2
- minimumOCamlVersion
meta
;
diff --git a/pkgs/development/ocaml-modules/mirage-xen/default.nix b/pkgs/development/ocaml-modules/mirage-xen/default.nix
index 0d53d0f9c3b7..a2b84e8fb5e4 100644
--- a/pkgs/development/ocaml-modules/mirage-xen/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-xen/default.nix
@@ -1,7 +1,6 @@
{ lib
, buildDunePackage
, fetchurl
-, pkg-config
, cstruct
, lwt
, shared-memory-ring-lwt
@@ -11,7 +10,6 @@
, mirage-runtime
, logs
, fmt
-, ocaml-freestanding
, bheap
, duration
, io-page
@@ -19,32 +17,14 @@
buildDunePackage rec {
pname = "mirage-xen";
- version = "6.0.0";
-
- useDune2 = true;
+ version = "7.2.0";
src = fetchurl {
- url = "https://github.com/mirage/mirage-xen/releases/download/v${version}/mirage-xen-v${version}.tbz";
- sha256 = "f991e972059b27993c287ad010d9281fee061efaa1dd475d0955179f93710fbd";
+ url = "https://github.com/mirage/mirage-xen/releases/download/v${version}/mirage-xen-${version}.tbz";
+ sha256 = "sha256-5ZdzourQshHGtYPPdJtJLpH8P6ZLNbjQWy7TDxcY3OA=";
};
- patches = [
- ./makefile-no-opam.patch
- ./pkg-config.patch
- ];
-
- # can't handle OCAMLFIND_DESTDIR with substituteAll
- postPatch = ''
- substituteInPlace lib/bindings/mirage-xen.pc \
- --replace "@out@" "$out" \
- --replace "@OCAMLFIND_DESTDIR@" "$OCAMLFIND_DESTDIR"
- '';
-
- minimumOCamlVersion = "4.08";
-
- nativeBuildInputs = [
- pkg-config
- ];
+ minimalOCamlVersion = "4.08";
propagatedBuildInputs = [
cstruct
@@ -59,16 +39,8 @@ buildDunePackage rec {
fmt
bheap
duration
- (ocaml-freestanding.override { target = "xen"; })
];
- # Move pkg-config files into their well-known location.
- # This saves us an extra setup hook and causes no issues
- # since we patch all relative paths out of the .pc file.
- postInstall = ''
- mv $OCAMLFIND_DESTDIR/pkgconfig $out/lib/pkgconfig
- '';
-
meta = with lib; {
description = "Xen core platform libraries for MirageOS";
license = licenses.isc;
diff --git a/pkgs/development/ocaml-modules/mirage-xen/makefile-no-opam.patch b/pkgs/development/ocaml-modules/mirage-xen/makefile-no-opam.patch
deleted file mode 100644
index 905e6efc3f4a..000000000000
--- a/pkgs/development/ocaml-modules/mirage-xen/makefile-no-opam.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/lib/bindings/Makefile b/lib/bindings/Makefile
-index 4e413c0..67c7bdc 100644
---- a/lib/bindings/Makefile
-+++ b/lib/bindings/Makefile
-@@ -1,4 +1,6 @@
--PKG_CONFIG_PATH := $(shell opam config var prefix)/lib/pkgconfig
-+ifneq (, $(shell command -v opam))
-+ PKG_CONFIG_PATH ?= $(shell opam config var prefix)/lib/pkgconfig
-+endif
-
- CC ?= cc
- FREESTANDING_CFLAGS := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --cflags ocaml-freestanding)
diff --git a/pkgs/development/ocaml-modules/mirage-xen/pkg-config.patch b/pkgs/development/ocaml-modules/mirage-xen/pkg-config.patch
deleted file mode 100644
index 19205cf7ee4d..000000000000
--- a/pkgs/development/ocaml-modules/mirage-xen/pkg-config.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/lib/bindings/mirage-xen.pc b/lib/bindings/mirage-xen.pc
-index a03a217..8499aa4 100644
---- a/lib/bindings/mirage-xen.pc
-+++ b/lib/bindings/mirage-xen.pc
-@@ -1,6 +1,6 @@
--prefix=${pcfiledir}/../..
-+prefix=@out@
- exec_prefix=${prefix}
--libdir=${exec_prefix}/lib
-+libdir=@OCAMLFIND_DESTDIR@
-
- Name: mirage-xen
- Version: 6.0.0
diff --git a/pkgs/development/ocaml-modules/netchannel/default.nix b/pkgs/development/ocaml-modules/netchannel/default.nix
index e7b021d6fbe9..61e5c70edd44 100644
--- a/pkgs/development/ocaml-modules/netchannel/default.nix
+++ b/pkgs/development/ocaml-modules/netchannel/default.nix
@@ -12,20 +12,20 @@
, shared-memory-ring
, sexplib
, logs
-, rresult
+, macaddr
+, lwt-dllist
+, result
}:
buildDunePackage rec {
pname = "netchannel";
- version = "2.0.0";
+ version = "2.1.1";
- useDune2 = true;
-
- minimumOCamlVersion = "4.08";
+ minimalOCamlVersion = "4.08";
src = fetchurl {
- url = "https://github.com/mirage/mirage-net-xen/releases/download/v${version}/mirage-net-xen-v${version}.tbz";
- sha256 = "ec3906ef1804ef6a9e36b91f4ae73ce4849e9e0d1d36a80fe66b5f905fab93ad";
+ url = "https://github.com/mirage/mirage-net-xen/releases/download/v${version}/mirage-net-xen-${version}.tbz";
+ sha256 = "sha256-kYsAf6ntwWKUp26dMcp5BScdUOaGpM46050jVZe6gfs=";
};
nativeBuildInputs = [
@@ -43,7 +43,9 @@ buildDunePackage rec {
shared-memory-ring
sexplib
logs
- rresult
+ macaddr
+ lwt-dllist
+ result
];
meta = with lib; {
diff --git a/pkgs/development/ocaml-modules/xmlm/default.nix b/pkgs/development/ocaml-modules/xmlm/default.nix
index 9396dd7b9144..82d64566b9a6 100644
--- a/pkgs/development/ocaml-modules/xmlm/default.nix
+++ b/pkgs/development/ocaml-modules/xmlm/default.nix
@@ -4,17 +4,17 @@ let
webpage = "https://erratique.ch/software/${pname}";
in
-if lib.versionOlder ocaml.version "4.02"
+if lib.versionOlder ocaml.version "4.05"
then throw "xmlm is not available for OCaml ${ocaml.version}"
else
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-${pname}-${version}";
- version = "1.3.0";
+ version = "1.4.0";
src = fetchurl {
url = "${webpage}/releases/${pname}-${version}.tbz";
- sha256 = "1rrdxg5kh9zaqmgapy9bhdqyxbbvxxib3bdfg1vhw4rrkp1z0x8n";
+ sha256 = "sha256-CRJSJY490WMgw85N2yG81X79nIwuv7eZ7mpUPtSS2fo=";
};
nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "An OCaml streaming codec to decode and encode the XML data format";
homepage = webpage;
- license = licenses.bsd3;
+ license = licenses.isc;
maintainers = [ maintainers.vbgl ];
mainProgram = "xmltrip";
inherit (ocaml.meta) platforms;
diff --git a/pkgs/development/python-modules/aesara/default.nix b/pkgs/development/python-modules/aesara/default.nix
index 814de3554f61..91ad5de78b5c 100644
--- a/pkgs/development/python-modules/aesara/default.nix
+++ b/pkgs/development/python-modules/aesara/default.nix
@@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "aesara";
- version = "2.7.4";
+ version = "2.7.5";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "aesara-devs";
repo = "aesara";
rev = "refs/tags/rel-${version}";
- hash = "sha256-gLIBO1AzU8OTCPcZQN1A7vGi3L9fqzCXQsPek/+dsQc=";
+ hash = "sha256-wx0F7GHfIS2OTnOIlhQAsUAZHm9PncoIG+bn3dsIWrU=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix
index 922d856010d1..6b165bbaa570 100644
--- a/pkgs/development/python-modules/ailment/default.nix
+++ b/pkgs/development/python-modules/ailment/default.nix
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "ailment";
- version = "9.2.8";
+ version = "9.2.9";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
- hash = "sha256-eZNIRUbwJf58DUm/D4Gtkl++z42wjY3m/4K05s2+Z9E=";
+ hash = "sha256-NvSbv/lMWEWZDHqo/peND8YsaZBKMm2SandDozyDoNs=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix
index b178913c0f59..4156d799ad74 100644
--- a/pkgs/development/python-modules/aioconsole/default.nix
+++ b/pkgs/development/python-modules/aioconsole/default.nix
@@ -16,7 +16,7 @@
# wrapped to be able to find aioconsole and any other packages.
buildPythonPackage rec {
pname = "aioconsole";
- version = "0.4.1";
+ version = "0.5.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -24,8 +24,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "vxgmichel";
repo = pname;
- rev = "v${version}";
- sha256 = "sha256-OCsao4oerHGpzsoqPP3EXJVs6NZeLNsoaC83k7oX688=";
+ rev = "refs/tags/v${version}";
+ sha256 = "sha256-/20FR7yc2aMA9cL3l7XAL/kak3cBBTniAICLC/TOI+U=";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/aioslimproto/default.nix b/pkgs/development/python-modules/aioslimproto/default.nix
index 2990659556cb..7d5dfa0ba519 100644
--- a/pkgs/development/python-modules/aioslimproto/default.nix
+++ b/pkgs/development/python-modules/aioslimproto/default.nix
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "aioslimproto";
- version = "2.0.1";
+ version = "2.1.1";
format = "setuptools";
disabled = pythonOlder "3.9";
@@ -15,8 +15,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "home-assistant-libs";
repo = pname;
- rev = version;
- hash = "sha256-xa0LZGq0di4lnJGVMbb1Un0Ebd4vXRlbkxbatJ9GwB0=";
+ rev = "refs/tags/${version}";
+ hash = "sha256-Er7UsJDBDXD8CQSkUIOeO78HQaCsrRycU18LOjBpv/w=";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix
index 335708fb8472..1774e0e60f0a 100644
--- a/pkgs/development/python-modules/angr/default.nix
+++ b/pkgs/development/python-modules/angr/default.nix
@@ -46,7 +46,7 @@ in
buildPythonPackage rec {
pname = "angr";
- version = "9.2.8";
+ version = "9.2.9";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -55,7 +55,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "v${version}";
- hash = "sha256-H2+2OS06oeW14Zzd7Twi13XVNaE6O0TJqTnZxxCNW+U=";
+ hash = "sha256-8tIqAs3TPoc4G6h91Y7tQVy4KowmyJA5HwFbFwQTgjc=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix
index 1fb25447f445..64aebd5b3993 100644
--- a/pkgs/development/python-modules/archinfo/default.nix
+++ b/pkgs/development/python-modules/archinfo/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "archinfo";
- version = "9.2.8";
+ version = "9.2.9";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
- hash = "sha256-glfvSaXlT+PuF8ztA5A6+HG9FQ6CsrOn8ZAir8+db7c=";
+ hash = "sha256-TEW5aoBMBZCoW4nMFOVkg3xlHIM8TsKhdmijCoIOFoM=";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/aresponses/default.nix b/pkgs/development/python-modules/aresponses/default.nix
index 697b8ebbf080..7bb54f33d513 100644
--- a/pkgs/development/python-modules/aresponses/default.nix
+++ b/pkgs/development/python-modules/aresponses/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "aresponses";
- version = "2.1.5";
+ version = "2.1.6";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "CircleUp";
repo = pname;
rev = version;
- sha256 = "sha256-9ZzIrj87TwxQi0YMlTHFPAp0V1oxfuL0+RMGXxUxFoE=";
+ sha256 = "sha256-Ui9ZpWaVBfCbDlZH3EgHX32FIZtyTHnc/UXqtoEyFcw=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/azure-eventgrid/default.nix b/pkgs/development/python-modules/azure-eventgrid/default.nix
index 861f9ccd0f9b..99e9198c4fea 100644
--- a/pkgs/development/python-modules/azure-eventgrid/default.nix
+++ b/pkgs/development/python-modules/azure-eventgrid/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "azure-eventgrid";
- version = "4.8.0";
+ version = "4.9.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
extension = "zip";
- hash = "sha256-8jEtTQTUJLSa2iuA/Sgirgcm8kbwWOT11O1n46CLouw=";
+ hash = "sha256-ueuOxhNATK6o/Vue+x5vtP0ac3CQellkuyQmSrq7tqQ=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/browser-cookie3/default.nix b/pkgs/development/python-modules/browser-cookie3/default.nix
index 07874e808d48..50310cff8ef5 100644
--- a/pkgs/development/python-modules/browser-cookie3/default.nix
+++ b/pkgs/development/python-modules/browser-cookie3/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "browser-cookie3";
- version = "0.15.0";
+ version = "0.16.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-AfRL2u1wMXXCCfKyrD0F96hXap88TQx7D1fjFWGKDy4=";
+ hash = "sha256-2JXs7KGS6XyhRwsoWlt+4gL40t1JNWbRO8n84zX5Cf4=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix
index 494e23f09f34..2b411204cf0c 100644
--- a/pkgs/development/python-modules/claripy/default.nix
+++ b/pkgs/development/python-modules/claripy/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "claripy";
- version = "9.2.8";
+ version = "9.2.9";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
- hash = "sha256-ScJoe0YFM5mipVt+7/hy7BI1qytrpO+qcYjY8roBMfc=";
+ hash = "sha256-8uavNI/Zhvt7jf8+bOvnExp7Jx/By+rgIc5MbNtrSdY=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix
index 51166bfac0d7..7f3f7f1fcb29 100644
--- a/pkgs/development/python-modules/cle/default.nix
+++ b/pkgs/development/python-modules/cle/default.nix
@@ -15,7 +15,7 @@
let
# The binaries are following the argr projects release cycle
- version = "9.2.8";
+ version = "9.2.9";
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub {
@@ -37,7 +37,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
- hash = "sha256-VwZSGWJ3XT34kkpXOiUfObGRK28nb54XZ4iskg7xetk=";
+ hash = "sha256-TnDJFBCejMyV6UdgvuywxXeE/OKe4XCE1+lIGl6YEjc=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/cron-descriptor/default.nix b/pkgs/development/python-modules/cron-descriptor/default.nix
index ecabfc44b015..5c2b0e8ba880 100644
--- a/pkgs/development/python-modules/cron-descriptor/default.nix
+++ b/pkgs/development/python-modules/cron-descriptor/default.nix
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "cron_descriptor";
- version = "1.2.27";
+ version = "1.2.30";
src = fetchFromGitHub {
owner = "Salamek";
repo = "cron-descriptor";
rev = "refs/tags/${version}";
- sha256 = "sha256-ycpBbXVUl7mIPx6p4DoVq51T86Im9bkF6LQFSYUL4uk=";
+ sha256 = "sha256-Qei9f0HlIu5sautMEASvxdUqZyXKvHDWJgd3oST1gJo=";
};
# remove tests_require, as we don't do linting anyways
diff --git a/pkgs/development/python-modules/dvc-objects/default.nix b/pkgs/development/python-modules/dvc-objects/default.nix
index 8674bc87648e..ec487e0bbae7 100644
--- a/pkgs/development/python-modules/dvc-objects/default.nix
+++ b/pkgs/development/python-modules/dvc-objects/default.nix
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "dvc-objects";
- version = "0.0.18";
+ version = "0.0.19";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -24,8 +24,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "iterative";
repo = pname;
- rev = version;
- hash = "sha256-mkL+E+PQqm+L7ejccJ0FFpXmIsi26KzfBnzlSuaC3ds=";
+ rev = "refs/tags/${version}";
+ hash = "sha256-nuGsFNWJBsdL0QdnhYYz6rR6a9aNxCFnun7Xb2eZO3U=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
diff --git a/pkgs/development/python-modules/goodwe/default.nix b/pkgs/development/python-modules/goodwe/default.nix
index b750164ccf7a..6dc6f07e4ae0 100644
--- a/pkgs/development/python-modules/goodwe/default.nix
+++ b/pkgs/development/python-modules/goodwe/default.nix
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "goodwe";
- version = "0.2.17";
+ version = "0.2.18";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -15,8 +15,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "marcelblijleven";
repo = pname;
- rev = "v${version}";
- sha256 = "sha256-Lx7jvL7Fyq8fqJQq8ZgEG/V20+tHxw3yl3s7scAwwjA=";
+ rev = "refs/tags/v${version}";
+ sha256 = "sha256-2AbEX/dYwcMIlp27umBcSGgPboGu5y0mmndefXCjkJg=";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix
index 3882f3571e4d..d228e40e1a00 100644
--- a/pkgs/development/python-modules/google-auth/default.nix
+++ b/pkgs/development/python-modules/google-auth/default.nix
@@ -4,6 +4,7 @@
, fetchPypi
, pytestCheckHook
, cachetools
+, cryptography
, flask
, freezegun
, mock
@@ -32,6 +33,7 @@ buildPythonPackage rec {
];
checkInputs = [
+ cryptography
flask
freezegun
mock
@@ -46,21 +48,11 @@ buildPythonPackage rec {
"google.oauth2"
];
- disabledTests = lib.optionals stdenv.isDarwin [
- "test_request_with_timeout_success"
- "test_request_with_timeout_failure"
- "test_request_headers"
- "test_request_error"
- "test_request_basic"
- ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
- # E MemoryError: Cannot allocate write+execute memory for ffi.callback().
- # You might be running on a system that prevents this.
- # For more information, see https://cffi.readthedocs.io/en/latest/using.html#callbacks
- "test_configure_mtls_channel_with_callback"
- "test_configure_mtls_channel_with_metadata"
- "TestDecryptPrivateKey"
- "TestMakeMutualTlsHttp"
- "TestMutualTlsAdapter"
+ disabledTestPaths = [
+ # Disable tests related to pyopenssl
+ "tests/transport/test__mtls_helper.py"
+ "tests/transport/test_requests.py"
+ "tests/transport/test_urllib3.py"
];
meta = with lib; {
diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
index b1d7c8d5da19..4cdc289741bd 100644
--- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
+++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
@@ -5,22 +5,36 @@
, google-api-core
, libcst
, mock
+, protobuf
, proto-plus
, pytest-asyncio
+, pythonOlder
}:
buildPythonPackage rec {
pname = "google-cloud-websecurityscanner";
- version = "1.7.2";
+ version = "1.8.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-JDuMhyk1018pMYNOhRVmP7XyF2wsK5temDTP5033Dxk=";
+ hash = "sha256-rp/clC5lN3+fc3bz3Qb+oqHyVMS+jLX9gxxB0zOCxfM=";
};
- propagatedBuildInputs = [ google-api-core libcst proto-plus ];
+ propagatedBuildInputs = [
+ google-api-core
+ libcst
+ protobuf
+ proto-plus
+ ];
- checkInputs = [ mock pytest-asyncio pytestCheckHook ];
+ checkInputs = [
+ mock
+ pytest-asyncio
+ pytestCheckHook
+ ];
pythonImportsCheck = [
"google.cloud.websecurityscanner_v1alpha"
diff --git a/pkgs/development/python-modules/gradient/default.nix b/pkgs/development/python-modules/gradient/default.nix
index 7cdaaa007af7..b78373294326 100644
--- a/pkgs/development/python-modules/gradient/default.nix
+++ b/pkgs/development/python-modules/gradient/default.nix
@@ -23,12 +23,12 @@
buildPythonPackage rec {
pname = "gradient";
- version = "2.0.4";
+ version = "2.0.5";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- hash = "sha256-s80e15u2j7t/FVKcaKGTloN3dwfJuF7XgqIj4XpKHYU=";
+ hash = "sha256-D0JX6tk6SY5seH9m21hwMZ2TnaAG6OrHo+ucJEredd0=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix
index 6017c7b83aee..ebbca4763a88 100644
--- a/pkgs/development/python-modules/jc/default.nix
+++ b/pkgs/development/python-modules/jc/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "jc";
- version = "1.20.1";
+ version = "1.20.2";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "kellyjonbrazil";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-xsPz7v5+rIO88F1Y/inBSUwVnI7uKZrV2nzVvJ9L02A=";
+ sha256 = "sha256-ZhDk6JxgRASSezRkQ5KnRHKhQBykeZUpGCLW5zzLBSM=";
};
propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ];
diff --git a/pkgs/development/python-modules/ldap/0001-Check-whether-libldap-is-threadsafe-on-startup.patch b/pkgs/development/python-modules/ldap/0001-Check-whether-libldap-is-threadsafe-on-startup.patch
deleted file mode 100644
index f2b7812cf70f..000000000000
--- a/pkgs/development/python-modules/ldap/0001-Check-whether-libldap-is-threadsafe-on-startup.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 3593e2c299c0ac0402f23d44cdbe8e6ff3687b68 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ond=C5=99ej=20Kuzn=C3=ADk?=
-Date: Thu, 27 Jan 2022 10:35:56 +0000
-Subject: [PATCH] Check whether libldap is threadsafe on startup.
-
-Closes #432
----
- Lib/ldap/constants.py | 2 --
- Modules/constants.c | 10 ++++++++++
- setup.cfg | 6 ++++--
- setup.py | 1 -
- 4 files changed, 14 insertions(+), 5 deletions(-)
-
-diff --git a/Lib/ldap/constants.py b/Lib/ldap/constants.py
-index 1c1d76a..f76609b 100644
---- a/Lib/ldap/constants.py
-+++ b/Lib/ldap/constants.py
-@@ -341,9 +341,7 @@ CONSTANTS = (
- # XXX - these should be errors
- Int('URL_ERR_BADSCOPE'),
- Int('URL_ERR_MEM'),
-- # Int('LIBLDAP_R'),
-
-- Feature('LIBLDAP_R', 'HAVE_LIBLDAP_R'),
- Feature('SASL_AVAIL', 'HAVE_SASL'),
- Feature('TLS_AVAIL', 'HAVE_TLS'),
- Feature('INIT_FD_AVAIL', 'HAVE_LDAP_INIT_FD'),
-diff --git a/Modules/constants.c b/Modules/constants.c
-index 07d6065..8d6f63b 100644
---- a/Modules/constants.c
-+++ b/Modules/constants.c
-@@ -197,6 +197,8 @@ int
- LDAPinit_constants(PyObject *m)
- {
- PyObject *exc, *nobj;
-+ struct ldap_apifeature_info info = { 1, "X_OPENLDAP_THREAD_SAFE", 0 };
-+ int thread_safe = 0;
-
- /* simple constants */
-
-@@ -221,6 +223,14 @@ LDAPinit_constants(PyObject *m)
- return -1;
- Py_INCREF(LDAPexception_class);
-
-+#ifdef LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE
-+ if (ldap_get_option(NULL, LDAP_OPT_API_FEATURE_INFO, &info) == LDAP_SUCCESS) {
-+ thread_safe = (info.ldapaif_version == 1);
-+ }
-+#endif
-+ if (PyModule_AddIntConstant(m, "LIBLDAP_R", thread_safe) != 0)
-+ return -1;
-+
- /* Generated constants -- see Lib/ldap/constants.py */
-
- #define add_err(n) do { \
-diff --git a/setup.cfg b/setup.cfg
-index 2e372ba..a75f186 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -5,7 +5,9 @@ license_file = LICENCE
- defines = HAVE_SASL HAVE_TLS HAVE_LIBLDAP_R
- extra_compile_args =
- extra_objects =
--libs = ldap_r lber
-+# Uncomment this if your libldap is not thread-safe and you need libldap_r
-+# instead
-+#libs = ldap_r lber
-
- [install]
- compile = 1
-@@ -13,7 +15,7 @@ optimize = 1
-
- [bdist_rpm]
- provides = python-ldap
--requires = python libldap-2_4
-+requires = python libldap-2
- vendor = python-ldap project
- packager = python-ldap team
- distribution_name = openSUSE 11.x
-diff --git a/setup.py b/setup.py
-index 119b571..b193957 100644
---- a/setup.py
-+++ b/setup.py
-@@ -132,7 +132,6 @@ setup(
- extra_objects = LDAP_CLASS.extra_objects,
- runtime_library_dirs = (not sys.platform.startswith("win"))*LDAP_CLASS.library_dirs,
- define_macros = LDAP_CLASS.defines + \
-- ('ldap_r' in LDAP_CLASS.libs or 'oldap_r' in LDAP_CLASS.libs)*[('HAVE_LIBLDAP_R',None)] + \
- ('sasl' in LDAP_CLASS.libs or 'sasl2' in LDAP_CLASS.libs or 'libsasl' in LDAP_CLASS.libs)*[('HAVE_SASL',None)] + \
- ('ssl' in LDAP_CLASS.libs and 'crypto' in LDAP_CLASS.libs)*[('HAVE_TLS',None)] + \
- [
---
-2.36.0
-
diff --git a/pkgs/development/python-modules/ldap/default.nix b/pkgs/development/python-modules/ldap/default.nix
index b58f6bafed5d..ceaf4f6bf83a 100644
--- a/pkgs/development/python-modules/ldap/default.nix
+++ b/pkgs/development/python-modules/ldap/default.nix
@@ -5,17 +5,13 @@
buildPythonPackage rec {
pname = "python-ldap";
- version = "3.4.0";
+ version = "3.4.2";
src = fetchPypi {
inherit pname version;
- sha256 = "60464c8fc25e71e0fd40449a24eae482dcd0fb7fcf823e7de627a6525b3e0d12";
+ sha256 = "sha256-sWRwoJg6rwmgD/uPQLaaJEbz0L5jmiKSVrzjgfyyaPc=";
};
- patches = [
- ./0001-Check-whether-libldap-is-threadsafe-on-startup.patch
- ];
-
propagatedBuildInputs = [ pyasn1 pyasn1-modules ];
checkInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/lsassy/default.nix b/pkgs/development/python-modules/lsassy/default.nix
index e19edfd67eaa..f1a62b8856d3 100644
--- a/pkgs/development/python-modules/lsassy/default.nix
+++ b/pkgs/development/python-modules/lsassy/default.nix
@@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "lsassy";
- version = "3.1.2";
+ version = "3.1.3";
src = fetchFromGitHub {
owner = "Hackndo";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-FnqWDPcWgRQpX1k/Sf2NQKpuu6srh6xWdNKtHzXZTtk=";
+ sha256 = "sha256-h99wqgRNy2GkiertDddFJQN4hv2R26bo72zNwLPR3mk=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix
index 554df0878595..815ec9d77c87 100644
--- a/pkgs/development/python-modules/nomadnet/default.nix
+++ b/pkgs/development/python-modules/nomadnet/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "nomadnet";
- version = "0.1.9";
+ version = "0.2.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "markqvist";
repo = "NomadNet";
rev = version;
- hash = "sha256-GZsARzqnLyZZU900ONv1/sejsEGMTFNIhOS+SESFBqg=";
+ hash = "sha256-1Ur8iLzOIc1l5bFo8LDY2awHYJ97V9ih4aep6/wt4ns=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix
index 37078a6347d1..8ebfd659b408 100644
--- a/pkgs/development/python-modules/plugwise/default.nix
+++ b/pkgs/development/python-modules/plugwise/default.nix
@@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "plugwise";
- version = "0.20.0";
+ version = "0.20.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = pname;
repo = "python-plugwise";
rev = "refs/tags/v${version}";
- sha256 = "sha256-2ESoMJtoh0f7E427q7IFZZJW2ZcwgnjFDasKbHyF844=";
+ sha256 = "sha256-Sk7L0JPwn7IXVl5GeERxrG/vrHXeNwUjW1mgm4g40Ng=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix
index 19f2a352d1ed..3d27d552caef 100644
--- a/pkgs/development/python-modules/pontos/default.nix
+++ b/pkgs/development/python-modules/pontos/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "pontos";
- version = "22.5.0";
+ version = "22.7.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "greenbone";
repo = pname;
rev = "v${version}";
- hash = "sha256-WTIuK5kPPqft4u44dN5NDJJKxIPrZGCJjZ5pR6HgOxw=";
+ hash = "sha256-QkDHVIAVdd3OcKeh4G5ucO7UROYOOGYjgc+/00DgXFc=";
};
nativeBuildInputs = [
@@ -54,6 +54,9 @@ buildPythonPackage rec {
# CLI test fails
"test_missing_cmd"
"test_update_file_changed"
+ # Network access
+ "test_fail_sign_on_upload_fail"
+ "test_successfully_sign"
];
pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix
index 41d033dcd2be..f104c9b0cc8f 100644
--- a/pkgs/development/python-modules/pyvex/default.nix
+++ b/pkgs/development/python-modules/pyvex/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "pyvex";
- version = "9.2.8";
+ version = "9.2.9";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- hash = "sha256-GHVY+V18OwlNI1aQAQCLmeh5Z9fbT5cm+bh9KAY/gkE=";
+ hash = "sha256-QlgfiKQv1kMgGhtasOvuRFrciyFH7rsehbhOUxXSABk=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix
index 8c41b908c721..aff2aca70915 100644
--- a/pkgs/development/python-modules/sagemaker/default.nix
+++ b/pkgs/development/python-modules/sagemaker/default.nix
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "sagemaker";
- version = "2.97.0";
+ version = "2.98.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-iHh6WOefWmoLDzZYk1p2TtR0CAudP+paQOOj3RVFlRE=";
+ hash = "sha256-mNCThiZvmKvbYQEMOPkr3MHOI/oFMGCLpWw5zJz16dQ=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/types-urllib3/default.nix b/pkgs/development/python-modules/types-urllib3/default.nix
index 063f3666c705..296cffecba84 100644
--- a/pkgs/development/python-modules/types-urllib3/default.nix
+++ b/pkgs/development/python-modules/types-urllib3/default.nix
@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-urllib3";
- version = "1.26.15";
+ version = "1.26.16";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- hash = "sha256-yJKDVB75LjRLf1n4Pqm1opWxY2bO7j8l7PxVk8efeU4=";
+ hash = "sha256-i7ODLGhMMMvtQLluKLwEcDvssrl9gqxlukuWh4NFOw4=";
};
# Module doesn't have tests
diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index 1f07c8ff030f..4291fdfd86da 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, makeWrapper, jre }:
stdenv.mkDerivation rec {
- version = "10.3";
+ version = "10.3.1";
pname = "checkstyle";
src = fetchurl {
url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
- sha256 = "sha256-3n5gXGHznrLGL9hudk1nZs1GJ5V2qzqVPCtn1fqujB0=";
+ sha256 = "sha256-mHBCZtBvi2DxzzWckvncCXgRCZirzx1OTtx7m6kRNvc=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix
index 288549313d20..d99c8e8e120d 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.26.0";
+ version = "1.26.2";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
- hash = "sha256-IYrLf2StBzIIl6xhN0gbgKGeopetuAko+kXjvlXAsBg=";
+ hash = "sha256-ogUFAKik8Ksf+3CncfL086GPiY+x3Kx7/4bCYQjGTXg=";
};
ldflags = [
@@ -22,7 +22,7 @@ buildGoModule rec {
# "-extldflags '-fno-PIC -static'"
];
- vendorSha256 = "sha256-AayEYoybJGWdRES73wlf7pLpMukBbuxtaOU/RT9ObkI=";
+ vendorSha256 = "sha256-uuQZIrAuF+E0Sd+PSjZszQU1pqVDdBUtEsk9w7dzTAE=";
subPackages = [
"cmd/tfsec"
diff --git a/pkgs/development/tools/async-profiler/0001-Fix-darwin-build.patch b/pkgs/development/tools/async-profiler/0001-Fix-darwin-build.patch
deleted file mode 100644
index bfb636bf562a..000000000000
--- a/pkgs/development/tools/async-profiler/0001-Fix-darwin-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From e54c17899118ea940c36bc17a48d8ff759243f16 Mon Sep 17 00:00:00 2001
-From: Uri Baghin
-Date: Sat, 8 May 2021 09:49:18 +1000
-Subject: [PATCH] Fix darwin build.
-
----
- src/itimer.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/itimer.cpp b/src/itimer.cpp
-index 08c46d1..52628ef 100644
---- a/src/itimer.cpp
-+++ b/src/itimer.cpp
-@@ -52,8 +52,8 @@ Error ITimer::start(Arguments& args) {
-
- OS::installSignalHandler(SIGPROF, signalHandler);
-
-- long sec = _interval / 1000000000;
-- long usec = (_interval % 1000000000) / 1000;
-+ time_t sec = _interval / 1000000000;
-+ suseconds_t usec = (_interval % 1000000000) / 1000;
- struct itimerval tv = {{sec, usec}, {sec, usec}};
-
- if (setitimer(ITIMER_PROF, &tv, NULL) != 0) {
---
-2.31.1
-
diff --git a/pkgs/development/tools/async-profiler/default.nix b/pkgs/development/tools/async-profiler/default.nix
index 8db41ce8bd73..f2671bdf6157 100644
--- a/pkgs/development/tools/async-profiler/default.nix
+++ b/pkgs/development/tools/async-profiler/default.nix
@@ -1,17 +1,19 @@
-{ lib, stdenv, fetchFromGitHub, jdk8 }:
+{ lib, stdenv, fetchFromGitHub, jdk, makeWrapper }:
stdenv.mkDerivation rec {
pname = "async-profiler";
- version = "2.0";
+ version = "2.8.1";
src = fetchFromGitHub {
owner = "jvm-profiling-tools";
repo = "async-profiler";
rev = "v${version}";
- sha256 = "sha256-vSBueRNraMgLcaprPsBUriX3WZ7N0UrllnSVLL2F738=";
+ sha256 = "sha256-TbsLYPAaL2nzzRxvCD+7oaIf0s9X2s6BHIT/KD6CN74=";
};
- buildInputs = [ jdk8 ];
+ nativeBuildInputs = [ makeWrapper ];
+
+ buildInputs = [ jdk ];
installPhase = ''
runHook preInstall
@@ -22,17 +24,14 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
- patches = [
- # https://github.com/jvm-profiling-tools/async-profiler/pull/428
- ./0001-Fix-darwin-build.patch
- ];
-
fixupPhase = ''
substituteInPlace $out/bin/async-profiler \
--replace 'JATTACH=$SCRIPT_DIR/build/jattach' \
'JATTACH=${placeholder "out"}/bin/jattach' \
--replace 'PROFILER=$SCRIPT_DIR/build/libasyncProfiler.so' \
'PROFILER=${placeholder "out"}/lib/libasyncProfiler.so'
+
+ wrapProgram $out/bin/async-profiler --prefix PATH : ${lib.makeBinPath [ jdk ]}
'';
meta = with lib; {
diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix
index 1a7060a2f042..ef7ab4cb1cc2 100644
--- a/pkgs/development/tools/build-managers/bloop/default.nix
+++ b/pkgs/development/tools/build-managers/bloop/default.nix
@@ -10,7 +10,7 @@
stdenv.mkDerivation rec {
pname = "bloop";
- version = "1.5.0";
+ version = "1.5.2";
platform =
if stdenv.isLinux && stdenv.isx86_64 then "x86_64-pc-linux"
@@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
bloop-binary = fetchurl rec {
url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}";
sha256 =
- if stdenv.isLinux && stdenv.isx86_64 then "sha256-jif9z05W17vjFgb146qWC3o44HmbnX05gWPlbXttYsE="
- else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-YOnXgKXsGrTu9P4I0NZW6ollZVQUXnbW8WtZTJmy+w0="
+ if stdenv.isLinux && stdenv.isx86_64 then "0dizvvkr5dw5xb3ggil2c5xi2vfcqyb46kfxnq8whbrq8pis70pi"
+ else if stdenv.isDarwin && stdenv.isx86_64 then "1a3a90ggyhfjq58wiqlxhz4djjp5crxvl822f8gzm3pjara5xpbc"
else throw "unsupported platform";
};
diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix
index 87cd47aee38a..09ec296bed6c 100644
--- a/pkgs/development/tools/buildah/default.nix
+++ b/pkgs/development/tools/buildah/default.nix
@@ -14,13 +14,13 @@
buildGoModule rec {
pname = "buildah";
- version = "1.26.1";
+ version = "1.26.2";
src = fetchFromGitHub {
owner = "containers";
repo = "buildah";
rev = "v${version}";
- sha256 = "sha256-RlDvTabpW2DQHJe4wFYBBuNrkfKTYbyudoX26MyvGBQ=";
+ sha256 = "sha256-FQ0fYiQBz+Ba8Xe8PWIYpIKyWOYa+NlTNJqzBC64O6M=";
};
outputs = [ "out" "man" ];
diff --git a/pkgs/development/tools/butane/default.nix b/pkgs/development/tools/butane/default.nix
index 4570faa96f26..d79a141acf8d 100644
--- a/pkgs/development/tools/butane/default.nix
+++ b/pkgs/development/tools/butane/default.nix
@@ -4,13 +4,13 @@ with lib;
buildGoModule rec {
pname = "butane";
- version = "0.14.0";
+ version = "0.15.0";
src = fetchFromGitHub {
owner = "coreos";
repo = "butane";
rev = "v${version}";
- sha256 = "sha256-rS1/LQ5R3WY9ot1pgtN+6t/ZChr9SxPzrsNio7WWNqQ=";
+ sha256 = "sha256-Aa3IBLBJwSDaQ+BJakxBZB27yx0gelDoujWLaAaQ9VI=";
};
vendorSha256 = null;
diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix
index 0aebf2363f53..15a358b4e627 100644
--- a/pkgs/development/tools/conftest/default.nix
+++ b/pkgs/development/tools/conftest/default.nix
@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "conftest";
- version = "0.32.1";
+ version = "0.33.0";
src = fetchFromGitHub {
owner = "open-policy-agent";
repo = "conftest";
rev = "v${version}";
- sha256 = "sha256-lmz5ALGvTwPiz0PaGYlL3UTd6tYgO5rpUHXFoLKgS7E=";
+ sha256 = "sha256-0MS2Ra+3RhBLE3qWfoMihc1PvyK4wzsoeFIKPucjlJQ=";
};
- vendorSha256 = "sha256-Y0S759iPSU7kboa9GxC56QR3caOG9gEmEG44B1Lp3w4=";
+ vendorSha256 = "sha256-oYAU2YuIAxwy/uOkOEgCKazSJlttKdHV+KUYV0WXOn8=";
ldflags = [
"-s"
@@ -21,7 +21,7 @@ buildGoModule rec {
nativeBuildInputs = [ installShellFiles ];
preCheck = ''
- export HOME="$TMPDIR"
+ export HOME="$(mktemp -d)"
'';
postInstall = ''
@@ -33,7 +33,7 @@ buildGoModule rec {
doInstallCheck = true;
installCheckPhase = ''
- export HOME="$TMPDIR"
+ export HOME="$(mktemp -d)"
$out/bin/conftest --version | grep ${version} > /dev/null
'';
diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix
index 5b33c02809eb..1687fb7c52fc 100644
--- a/pkgs/development/tools/continuous-integration/github-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix
@@ -19,10 +19,6 @@
, zlib
, writeShellApplication
, nuget-to-nix
-# Keeping this option until upstream removes support for EoL Node.js 12 entirely
-# Also refer to: https://github.com/actions/runner/pull/1716
-, withNode12 ? false
-, nodejs-12_x
}:
let
nugetSource = linkFarmFromDrvs "nuget-packages" (
@@ -192,9 +188,6 @@ stdenv.mkDerivation rec {
++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [
# "JavaScript Actions in Alpine containers are only supported on x64 Linux runners. Detected Linux Arm64"
"GitHub.Runner.Common.Tests.Worker.StepHostL0.DetermineNodeRuntimeVersionInAlpineContainerAsync"
- ]
- ++ lib.optionals (!withNode12) [
- "GitHub.Runner.Common.Tests.ProcessExtensionL0.SuccessReadProcessEnv"
];
checkInputs = [ git ];
@@ -202,7 +195,6 @@ stdenv.mkDerivation rec {
runHook preCheck
mkdir -p _layout/externals
- ${lib.optionalString withNode12 "ln -s ${nodejs-12_x} _layout/externals/node12"}
ln -s ${nodejs-16_x} _layout/externals/node16
printf 'Disabled tests:\n%s\n' '${lib.concatMapStringsSep "\n" (x: " - ${x}") disabledTests}'
@@ -251,7 +243,6 @@ stdenv.mkDerivation rec {
# externals/node{12,16}. As opposed to the official releases, we don't
# link the Alpine Node flavors.
mkdir -p $out/externals
- ${lib.optionalString withNode12 "ln -s ${nodejs-12_x} $out/externals/node12"}
ln -s ${nodejs-16_x} $out/externals/node16
# Install Nodejs scripts called from workflows
diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix
index e51cbe6d1da8..f3a1b95bbbb6 100644
--- a/pkgs/development/tools/database/sqlfluff/default.nix
+++ b/pkgs/development/tools/database/sqlfluff/default.nix
@@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "sqlfluff";
- version = "1.0.0";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
- hash = "sha256-qJVzeorNojWzJ6TRTFQNNOXLWbHLMTteJaDWUcrz0j0=";
+ hash = "sha256-6nVNUVvTKwVAQ55y8IunJyEKHN1/pf1BxM3tBqvNFIc=";
};
propagatedBuildInputs = with python3.pkgs; [
diff --git a/pkgs/development/tools/goda/default.nix b/pkgs/development/tools/goda/default.nix
new file mode 100644
index 000000000000..43f78aa70693
--- /dev/null
+++ b/pkgs/development/tools/goda/default.nix
@@ -0,0 +1,27 @@
+{ lib, nix-update-script, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "goda";
+ version = "0.5.1";
+
+ src = fetchFromGitHub {
+ owner = "loov";
+ repo = "goda";
+ rev = "v${version}";
+ sha256 = "sha256-tXXUDeqGjv6T2eI/VJ+kwPKJLT7D1nO9BaKN5FHS34I=";
+ };
+
+ vendorSha256 = "sha256-OyQEw6mRrRneo3T8wns0doU4lxJYEoilTd30xctLBJ4=";
+
+ passthru.updateScript = nix-update-script {
+ attrPath = pname;
+ };
+
+ meta = with lib; {
+ homepage = "https://github.com/loov/goda";
+ description = "Go Dependency Analysis toolkit";
+ maintainers = with maintainers; [ michaeladler ];
+ license = licenses.mit;
+ mainProgram = "goda";
+ };
+}
diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix
index e311a4b8107c..1b6489a74c82 100644
--- a/pkgs/development/tools/hcloud/default.nix
+++ b/pkgs/development/tools/hcloud/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "hcloud";
- version = "1.29.5";
+ version = "1.30.0";
src = fetchFromGitHub {
owner = "hetznercloud";
repo = "cli";
rev = "v${version}";
- sha256 = "sha256-a+AXWr/60VFdNk+UkDYRXo5ib8LvaCVpjNi1GFrRVho=";
+ sha256 = "sha256-mbMrXPQg5yUhmfJ3ztrXD/NKmwJKkZFFPu+utrsaPEc=";
};
- vendorSha256 = "sha256-iJnjmfP9BcT+OXotbS2+OSWGxQaMXwdlR1WTi04FesM=";
+ vendorSha256 = "sha256-++uvg/vXRX2lPU4CmqAcLWbsWBXZHXaXO4qXEaq90T4";
ldflags = [
"-s" "-w"
@@ -21,7 +21,7 @@ buildGoModule rec {
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
- for shell in bash zsh; do
+ for shell in bash fish zsh; do
$out/bin/hcloud completion $shell > hcloud.$shell
installShellCompletion hcloud.$shell
done
diff --git a/pkgs/development/tools/jsonnet-language-server/default.nix b/pkgs/development/tools/jsonnet-language-server/default.nix
new file mode 100644
index 000000000000..1bd82f850199
--- /dev/null
+++ b/pkgs/development/tools/jsonnet-language-server/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "jsonnet-language-server";
+ version = "0.7.2";
+
+ src = fetchFromGitHub {
+ owner = "grafana";
+ repo = "jsonnet-language-server";
+ rev = "v${version}";
+ sha256 = "sha256-hI8eGfHC7la52nImg6BaBxdl9oD/J9q3F3+xbsHrn30=";
+ };
+
+ vendorSha256 = "sha256-UEQogVVlTVnSRSHH2koyYaR9l50Rn3075opieK5Fu7I=";
+
+ ldflags = [
+ "-s -w -X 'main.version=${version}'"
+ ];
+
+ meta = with lib; {
+ homepage = "https://github.com/grafana/jsonnet-language-server";
+ description = "Language Server Protocol server for Jsonnet";
+ license = licenses.agpl3Only;
+ maintainers = with maintainers; [ hardselius ];
+ };
+}
diff --git a/pkgs/development/tools/kube-linter/default.nix b/pkgs/development/tools/kube-linter/default.nix
index ab6d3759feeb..7c16988a6b2a 100644
--- a/pkgs/development/tools/kube-linter/default.nix
+++ b/pkgs/development/tools/kube-linter/default.nix
@@ -1,22 +1,31 @@
-{ lib, buildGoModule, fetchFromGitHub, testers, kube-linter }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, kube-linter }:
buildGoModule rec {
pname = "kube-linter";
- version = "0.3.0";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "stackrox";
repo = pname;
rev = version;
- sha256 = "ZqnD9zsh+r1RL34o1nAkvO1saKe721ZJ2+DgBjmsH58=";
+ sha256 = "XAsPbl9fqYk2nhDxRg5wyPwciwSpfigoBZ4hzdWAVgw=";
};
- vendorSha256 = "sha256-tm1+2jsktNrw8S7peJz7w8k3+JwAYUgKfKWuQ8zIfvk=";
+ vendorSha256 = "sha256-0bjAIHSjw0kHrh9CzJHv1UAaBJDn6381055eOHufvCw=";
ldflags = [
"-s" "-w" "-X golang.stackrox.io/kube-linter/internal/version.version=${version}"
];
+ nativeBuildInputs = [ installShellFiles ];
+
+ postInstall = ''
+ installShellCompletion --cmd kube-linter \
+ --bash <($out/bin/kube-linter completion bash) \
+ --fish <($out/bin/kube-linter completion fish) \
+ --zsh <($out/bin/kube-linter completion zsh)
+ '';
+
passthru.tests.version = testers.testVersion {
package = kube-linter;
command = "kube-linter version";
@@ -27,5 +36,6 @@ buildGoModule rec {
homepage = "https://kubelinter.io";
license = licenses.asl20;
maintainers = with maintainers; [ mtesseract stehessel ];
+ platforms = platforms.all;
};
}
diff --git a/pkgs/development/tools/stylua/default.nix b/pkgs/development/tools/stylua/default.nix
index 60fd43d09cd3..3bba34c531ec 100644
--- a/pkgs/development/tools/stylua/default.nix
+++ b/pkgs/development/tools/stylua/default.nix
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "stylua";
- version = "0.13.1";
+ version = "0.14.0";
src = fetchFromGitHub {
owner = "johnnymorganz";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-0Pl8SogCSZcboLHVAI45JqCLojAqIWBFuoZAK4gTzrs=";
+ sha256 = "sha256-G7fCLkvpO5GHqWCfy2m3GxSgDSHCcYOaXyPDtdmdSY0=";
};
- cargoSha256 = "sha256-VFgA5kOwUJG0GgKU4AUYCB/psAPM2GdTz5oRFgkrNi8=";
+ cargoSha256 = "sha256-MqRoGuRMEgOYvL2VI324EXZjrPVCbCE/c7aVEXr0xmw=";
buildFeatures = lib.optional lua52Support "lua52"
++ lib.optional luauSupport "luau";
diff --git a/pkgs/development/web/cypress/cypress-example-kitchensink/cypress-example-kitchensink.nix b/pkgs/development/web/cypress/cypress-example-kitchensink/cypress-example-kitchensink.nix
index 653dbe4a257a..af8e91649090 100644
--- a/pkgs/development/web/cypress/cypress-example-kitchensink/cypress-example-kitchensink.nix
+++ b/pkgs/development/web/cypress/cypress-example-kitchensink/cypress-example-kitchensink.nix
@@ -2,7 +2,7 @@
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
let
nodeEnv = import ./node-env.nix {
diff --git a/pkgs/development/web/cypress/cypress-example-kitchensink/default.nix b/pkgs/development/web/cypress/cypress-example-kitchensink/default.nix
index 86fec8950002..a98493ab20e1 100644
--- a/pkgs/development/web/cypress/cypress-example-kitchensink/default.nix
+++ b/pkgs/development/web/cypress/cypress-example-kitchensink/default.nix
@@ -1,6 +1,6 @@
{ callPackage
, cypress
-, nodejs-12_x
+, nodejs-14_x
, # FIXME: duplicated from ./regen-nix. node2nix should expose this
nodePackages
, xorg
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
passthru.fc = fontConfigEtc;
nativeBuildInputs = [
cypress
- nodejs-12_x
+ nodejs-14_x
xorg.xorgserver
nodePackages.jsonplaceholder
];
diff --git a/pkgs/development/web/cypress/cypress-example-kitchensink/regen-nix b/pkgs/development/web/cypress/cypress-example-kitchensink/regen-nix
index 86061211d7b3..ba35dafe5269 100755
--- a/pkgs/development/web/cypress/cypress-example-kitchensink/regen-nix
+++ b/pkgs/development/web/cypress/cypress-example-kitchensink/regen-nix
@@ -3,7 +3,7 @@
#!nix-shell -i bash
node2nix \
- --nodejs-12 \
+ --nodejs-16 \
--input $src/package.json \
--lock $src/package-lock.json \
--composition cypress-example-kitchensink.nix \
diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix
index 6601820b219e..97d47c922311 100644
--- a/pkgs/development/web/cypress/default.nix
+++ b/pkgs/development/web/cypress/default.nix
@@ -16,11 +16,11 @@
stdenv.mkDerivation rec {
pname = "cypress";
- version = "10.0.3";
+ version = "10.2.0";
src = fetchzip {
url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
- sha256 = "0lz9rf58dzn18yxs337sw3fia0xif039dmlmslxhlhn48g9yj67z";
+ sha256 = "y34EnCoAmV9ib72LpT7D0eUxP1h80h+rKqvrn9TfsQg=";
};
# don't remove runtime deps
diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix
index 2ad6305f808a..6875082864cd 100644
--- a/pkgs/development/web/deno/default.nix
+++ b/pkgs/development/web/deno/default.nix
@@ -16,15 +16,15 @@
rustPlatform.buildRustPackage rec {
pname = "deno";
- version = "1.23.2";
+ version = "1.23.3";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-rygBiDIZ8W51GIu36+g6zFOnIvmGe+HLGZg7x/pRFJ0=";
+ sha256 = "sha256-kxQZDuqVddooYeelW3gJBbU7N/PnARj/IG7eBVJoAJ8=";
};
- cargoSha256 = "sha256-q7yZZXws58QuEfC0J+fZo8QyYUWx6sOKfphmIurxVkU=";
+ cargoSha256 = "sha256-bQZpE3kBqN5+lPdHWiiUQsWQwuMkvnfHLy3S1HnS4lk=";
postPatch = ''
# upstream uses lld on aarch64-darwin for faster builds
diff --git a/pkgs/development/web/newman/node-composition.nix b/pkgs/development/web/newman/node-composition.nix
index 64326c6b2160..f929727d59d6 100644
--- a/pkgs/development/web/newman/node-composition.nix
+++ b/pkgs/development/web/newman/node-composition.nix
@@ -2,7 +2,7 @@
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
let
nodeEnv = import ./node-env.nix {
diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix
deleted file mode 100644
index ea7c211163e2..000000000000
--- a/pkgs/development/web/nodejs/v12.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ callPackage, icu68, python2, lib, stdenv, enableNpm ? true }:
-
-let
- buildNodejs = callPackage ./nodejs.nix {
- icu = icu68;
- python = python2;
- };
-in
- buildNodejs {
- inherit enableNpm;
- version = "12.22.12";
- sha256 = "1whl0zi6fs9ay33bhcn2kh9xynran05iipahg1zzr6sv97wbfhmw";
- patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
- }
diff --git a/pkgs/games/cdogs-sdl/default.nix b/pkgs/games/cdogs-sdl/default.nix
index 474fd735f73d..3a7f4ff63eba 100644
--- a/pkgs/games/cdogs-sdl/default.nix
+++ b/pkgs/games/cdogs-sdl/default.nix
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "cdogs";
- version = "0.13.0";
+ version = "1.3.1";
src = fetchFromGitHub {
repo = "cdogs-sdl";
owner = "cxong";
rev = version;
- sha256 = "sha256-7wNiDA/gOpqzSFWw8Bn6suC/f5RXdDTxPV49nCvOxas=";
+ sha256 = "sha256-fKqipk1kiPC6HrkNzxHK2aYe5WDZ3hEbPCwsqK5uQ2s=";
};
postPatch = ''
diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix
index a79f0cd77426..46f71c856221 100644
--- a/pkgs/games/ddnet/default.nix
+++ b/pkgs/games/ddnet/default.nix
@@ -26,13 +26,13 @@
stdenv.mkDerivation rec {
pname = "ddnet";
- version = "16.1";
+ version = "16.2";
src = fetchFromGitHub {
owner = "ddnet";
repo = pname;
rev = version;
- sha256 = "sha256-9qKGaISEHtfKLmTGWLgOz4vfq7BqvDr17AdjCqPDu+Q=";
+ sha256 = "sha256-VQISfScZ11DYiZhQVc8EvXYEAN2/580peP34bBTuXPo=";
};
nativeBuildInputs = [ cmake ninja pkg-config ];
diff --git a/pkgs/games/rare/default.nix b/pkgs/games/rare/default.nix
index 93a6296f6759..d23645242fdf 100644
--- a/pkgs/games/rare/default.nix
+++ b/pkgs/games/rare/default.nix
@@ -1,23 +1,23 @@
-{ lib, fetchPypi, buildPythonApplication, makeDesktopItem, copyDesktopItems, qt5
-, pillow, psutil, pypresence, pyqt5, python, qtawesome, requests }:
+{ lib, fetchFromGitHub, buildPythonApplication, qt5
+, psutil, pypresence, pyqt5, python, qtawesome, requests }:
buildPythonApplication rec {
pname = "rare";
version = "1.8.9";
- src = fetchPypi {
- inherit version;
- pname = "Rare";
- sha256 = "sha256-UEvGwWjr4FCsvyFz6Db3VnhVS6MS3FYzYSucumzOoEA=";
+ src = fetchFromGitHub {
+ owner = "Dummerle";
+ repo = "Rare";
+ rev = version;
+ sha256 = "sha256-2l8Id+bA5Ugb8+3ioiZ78dUtDusU8cvZEAMhmYBcJFc=";
+ fetchSubmodules = true;
};
nativeBuildInputs = [
- copyDesktopItems
qt5.wrapQtAppsHook
];
propagatedBuildInputs = [
- pillow
psutil
pypresence
pyqt5
@@ -25,17 +25,6 @@ buildPythonApplication rec {
requests
];
- desktopItems = [
- (makeDesktopItem {
- name = pname;
- exec = "rare";
- icon = "Rare";
- comment = meta.description;
- desktopName = "Rare";
- genericName = "Rare (Epic Games Launcher Open Source Alternative)";
- })
- ];
-
dontWrapQtApps = true;
preBuild = ''
@@ -44,7 +33,8 @@ buildPythonApplication rec {
'';
postInstall = ''
- install -Dm644 $out/${python.sitePackages}/rare/resources/images/Rare.png -t $out/share/pixmaps/
+ install -Dm644 misc/rare.desktop -t $out/share/applications/
+ install -Dm644 $out/${python.sitePackages}/rare/resources/images/Rare.png $out/share/pixmaps/rare.png
'';
preFixup = ''
diff --git a/pkgs/misc/base16-builder/generate.sh b/pkgs/misc/base16-builder/generate.sh
index 1d06b6230dbb..fb13a70bc679 100755
--- a/pkgs/misc/base16-builder/generate.sh
+++ b/pkgs/misc/base16-builder/generate.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env nix-shell
#! nix-shell -i bash -p nodePackages.node2nix
-exec node2nix --nodejs-12 \
+exec node2nix --nodejs-16 \
--input node-packages.json \
--output node-packages-generated.nix \
--supplement-input supplement.json \
diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix
index 006429c9ed44..dacf1581ada0 100644
--- a/pkgs/misc/base16-builder/node-packages.nix
+++ b/pkgs/misc/base16-builder/node-packages.nix
@@ -2,7 +2,7 @@
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
let
globalBuildInputs = pkgs.lib.attrValues (import ./supplement.nix {
diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix
index 834844f96741..81d858d41b4c 100644
--- a/pkgs/servers/mail/dovecot/default.nix
+++ b/pkgs/servers/mail/dovecot/default.nix
@@ -2,6 +2,7 @@
, bzip2, zlib, lz4, inotify-tools, pam, libcap, coreutils
, clucene_core_2, icu, openldap, libsodium, libstemmer, cyrus_sasl
, nixosTests
+, fetchpatch
# Auth modules
, withMySQL ? false, libmysqlclient
, withPgSQL ? false, postgresql
@@ -57,6 +58,11 @@ stdenv.mkDerivation rec {
# so we can symlink plugins from several packages there.
# The symlinking needs to be done in NixOS.
./2.3.x-module_dir.patch
+ # fix CVE-2022-30550
+ (fetchpatch {
+ url = "https://github.com/dovecot/core/compare/7bad6a24%5E..a1022072.patch";
+ hash = "sha256-aSyRcQreyA9j8QwkODHqPpRuS3vzouVatEWCqhh+r+8=";
+ })
];
configureFlags = [
diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh b/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh
index 1fceed1c72c1..06245937bcb2 100755
--- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh
+++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh
@@ -6,7 +6,7 @@ curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.11.0
curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.11.0/package-lock.json -o package-lock.json
node2nix \
- --nodejs-12 \
+ --nodejs-16 \
--node-env ../../../development/node-packages/node-env.nix \
--development \
--input package.json \
diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix
index 9f0040e2f446..f9a1999f36d7 100644
--- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix
+++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix
@@ -2,7 +2,7 @@
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
let
nodeEnv = import ../../../development/node-packages/node-env.nix {
diff --git a/pkgs/servers/misc/virtiofsd/default.nix b/pkgs/servers/misc/virtiofsd/default.nix
index 0c60281b0d76..68f60792c21d 100644
--- a/pkgs/servers/misc/virtiofsd/default.nix
+++ b/pkgs/servers/misc/virtiofsd/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "virtiofsd";
- version = "1.2.0";
+ version = "1.3.0";
src = fetchFromGitLab {
owner = "virtio-fs";
repo = "virtiofsd";
rev = "v${version}";
- sha256 = "161z88nx2x2j4q8fbxryv7v63f9aw7wpvl6vg6x4xzllnrw6p607";
+ sha256 = "sha256-pLlO9M2r80/t7gGpIk+b1pEuSK2g8HxamaaotOmJxXo=";
};
- cargoSha256 = "0ma3kaaa4bl11015gxijwzyxhixz947k8byaypmmw0dj9m1vhv77";
+ cargoSha256 = "sha256-03LnZdtbejkrjnuwCDaeAPVJrLY+4fmt7YOJpBemaVc=";
LIBCAPNG_LIB_PATH = "${lib.getLib libcap_ng}/lib";
LIBCAPNG_LINK_TYPE =
diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix
index 87e36134acbb..078bd329a3c9 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@@ -12,16 +12,16 @@
# server, and the FHS userenv and corresponding NixOS module should
# automatically pick up the changes.
stdenv.mkDerivation rec {
- version = "1.27.1.5916-6b0e31a64";
+ version = "1.27.2.5929-a806c5905";
pname = "plexmediaserver";
# Fetch the source
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
- sha256 = "0cyx83a64vdq68qknsscdnawx9lcyr5siiwys2gc9gnxm6sv8x82";
+ sha256 = "0xm8bjmmybmyv1nbip8n23pd61lnvr41rsxa12cb9j6bg4nbka3x";
} else fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
- sha256 = "0v5gkk0izqkma9m4gvqyx94mij4jvv8vdv6897r7v8xqg9wji24l";
+ sha256 = "15wjy59ga5y93y09l5mbi20rqw63v61xv7x831iinhp96v5ixq00";
};
outputs = [ "out" "basedb" ];
diff --git a/pkgs/servers/psitransfer/node-composition.nix b/pkgs/servers/psitransfer/node-composition.nix
index 749d685105d5..1de33eb05b83 100644
--- a/pkgs/servers/psitransfer/node-composition.nix
+++ b/pkgs/servers/psitransfer/node-composition.nix
@@ -2,7 +2,7 @@
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
let
nodeEnv = import ../../development/node-packages/node-env.nix {
diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix
index dd2fc355dc6a..5678502454ab 100644
--- a/pkgs/servers/tailscale/default.nix
+++ b/pkgs/servers/tailscale/default.nix
@@ -1,16 +1,16 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute2, procps }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute2, procps, shadow, getent }:
buildGoModule rec {
pname = "tailscale";
- version = "1.26.1";
+ version = "1.26.2";
src = fetchFromGitHub {
owner = "tailscale";
repo = "tailscale";
rev = "v${version}";
- sha256 = "sha256-3WBvJI9uyzreUbk8ROYxXQgvttZ95OEepdzA4ZhdaJ0=";
+ sha256 = "sha256:0axcqkqrj4l8c63fd316hp0wlndrbry9x3wml7ssah491f4f3g9w";
};
- vendorSha256 = "sha256-NHmMkYfGgAEFjvFvKaPoaAuzeDbTJAw+85fZcxVA2jY=";
+ vendorSha256 = "sha256:0b04ihp5ds8vcqv78kjdz5ffn91yid0pn0aq54jawdd4cfb6bmji";
nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ];
@@ -23,7 +23,7 @@ buildGoModule rec {
doCheck = false;
postInstall = lib.optionalString stdenv.isLinux ''
- wrapProgram $out/bin/tailscaled --prefix PATH : ${lib.makeBinPath [ iproute2 iptables ]}
+ wrapProgram $out/bin/tailscaled --prefix PATH : ${lib.makeBinPath [ iproute2 iptables getent shadow ]}
wrapProgram $out/bin/tailscale --suffix PATH : ${lib.makeBinPath [ procps ]}
sed -i -e "s#/usr/sbin#$out/bin#" -e "/^EnvironmentFile/d" ./cmd/tailscaled/tailscaled.service
diff --git a/pkgs/servers/web-apps/cryptpad/bower-packages.nix b/pkgs/servers/web-apps/cryptpad/bower-packages.nix
deleted file mode 100644
index c10623f3b00b..000000000000
--- a/pkgs/servers/web-apps/cryptpad/bower-packages.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-# Generated by bower2nix v3.2.0 (https://github.com/rvl/bower2nix)
-{ fetchbower, buildEnv }:
-buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
- (fetchbower "jquery" "2.2.4" "2.2.4" "0kaln93pzjlr4vqf2zvsm9dwgjkrii9xlsqg48hc1vs16cl109rn")
- (fetchbower "tweetnacl" "0.12.2" "0.12.2" "1lfzbfrdaly3zyzbcp1p53yhxlrx56k8x04q924kg7l52gblm65g")
- (fetchbower "components-font-awesome" "4.7.0" "^4.6.3" "1w27im6ayjrbgjqa0i49ml5d3wy4ld40h9b29hz9myv77bpx4lg1")
- (fetchbower "ckeditor" "4.14.0" "4.14.0" "0lw9q0k8c0jlxvf35vrccab9c3c8rgpc6x66czj9si8yy2lyliyp")
- (fetchbower "codemirror" "5.63.3" "^5.19.0" "09di53sfsgpd328fvz1qjlmybk5mmnb2p9r38xw329bi9b21rq0r")
- (fetchbower "requirejs" "2.3.5" "2.3.5" "05lyvgz914h2w08r24rk0vkk3yxmqrvlg7j3i5av9ffkg9lpzsli")
- (fetchbower "marked" "1.1.0" "1.1.0" "1sdgqw9iki9c1pfm4c5h6c956mchbip2jywjrcmrlb75k53flsjz")
- (fetchbower "rangy" "rangy-release#1.3.0" "rangy-release#~1.3.0" "13x3wci003p8jyv2ncir0k23bxckx99b3555r0zvgmlwycg7w0zv")
- (fetchbower "json.sortify" "2.1.0" "~2.1.0" "1rz9xz0gnm4ak31n10vhslqsw8fw493gjylwj8xsy3bxqq1ygpnh")
- (fetchbower "secure-fabric.js" "secure-v1.7.9" "secure-v1.7.9" "1l56mk7hbnsm9cdg5zdcmg95p7a9w96dq0bbl8fp11vs0awjil7a")
- (fetchbower "hyperjson" "1.4.0" "~1.4.0" "1n68ls3x4lyhg1yy8i4q3xkgh5xqpyakf45sny4x91mkr68x4bd9")
- (fetchbower "chainpad-crypto" "0.2.6" "^0.2.0" "0h6ibv6gcym7mm080swdw4l6l159xjmxgqnahyxw3aydha5cj1z0")
- (fetchbower "chainpad-listmap" "1.0.0" "^1.0.0" "0qzqblw67y1p69xc9n734srfhjviwwb2jbqxgxs0rf4vdyspwvcb")
- (fetchbower "chainpad" "5.2.4" "^5.2.0" "1f4nap0r8w50qpmjdfhhjhpz5xcl0n4zaxxnav1qaxi5j6dyg8h6")
- (fetchbower "file-saver" "1.3.1" "1.3.1" "065nzkvdiicxnw06z1sjz1sbp9nyis8z839hv6ng1fk25dc5kvkg")
- (fetchbower "alertifyjs" "1.0.11" "1.0.11" "0v7323bzq90k35shm3h6azj4wd9la3kbi1va1pw4qyvndkwma69l")
- (fetchbower "scrypt-async" "1.2.0" "1.2.0" "0d076ax708p9b8hcmk4f82j925nlnm0hmp0ni45ql37g7iirfpyv")
- (fetchbower "require-css" "0.1.10" "0.1.10" "106gz9i76v71q9zx2pnqkkj342m630lvssnw54023a0ljc0gqcwq")
- (fetchbower "bootstrap" "4.6.0" "^v4.0.0" "1pp2n88pkms25p7mbna7vxxl5mkpdn8nvnfzwcwpp6b0871njmr6")
- (fetchbower "diff-dom" "2.1.1" "2.1.1" "0nrn6xqlhp0p5ixjxdk8qg3939crkggh1l8swd20d7bsz186l5f1")
- (fetchbower "nthen" "0.1.7" "0.1.7" "03yap5ildigaw4rwxmxs37pcwhq415iham8w39zd56ka98gpfxa5")
- (fetchbower "open-sans-fontface" "1.4.2" "^1.4.2" "0ksav1fcq640fmdz49ra4prwsrrfj35y2p4shx1jh1j7zxd044nf")
- (fetchbower "bootstrap-tokenfield" "0.12.1" "0.12.1" "1dh791s6ih8bf9ihck9n39h68c273jb3lg4mqk94bvqraz45fvwx")
- (fetchbower "localforage" "1.10.0" "^1.5.2" "019rh006v2w5x63mgk78qhw59kf8czbkwdvfngmac8fs6gz88lc8")
- (fetchbower "html2canvas" "0.4.1" "^0.4.1" "0yg7y90nav068q0i5afc2c221zkddpf28hi0hwc46cawx4180c69")
- (fetchbower "croppie" "2.6.5" "^2.5.0" "1j1v5620zi13ad42r358i4ay891abwn6nz357484kgq2bgjj6ccx")
- (fetchbower "sortablejs" "1.14.0" "^1.6.0" "104d688lrbwxi3hnfr4q169850ffyfv1s8qnycqxhx0zfh3887m0")
- (fetchbower "saferphore" "0.0.1" "^0.0.1" "1wfr9wpbm3lswmvy2p0247ydb108h4qh5s286py89k871qh6jwdi")
- (fetchbower "jszip" "Stuk/jszip#3.7.1" "Stuk/jszip#^3.1.5" "0lzq1zd2glvfh3wwj73c9sffas56ql5472yj1cwq3g7iva5iliwq")
- (fetchbower "requirejs-plugins" "1.0.3" "^1.0.3" "00s3sdz1ykygx5shldwhhhybwgw7c99vkqd94i5i5x0gl97ifxf5")
- (fetchbower "dragula.js" "3.7.2" "3.7.2" "0dbkmrl8bcxiplprmmp9fj96ri5nahb2ql8cc7zwawncv0drvlh0")
- (fetchbower "MathJax" "3.0.5" "3.0.5" "087a9av15qj43m8pr3b9g59ncmydhmg40m6dfzsac62ykianh2a0")
- (fetchbower "chainpad-netflux" "1.0.0" "^1.0.0" "08rpc73x1vyvd6zkb7w0m1smzjhq3b7cwb30nlmg93x873zjlsl6")
- (fetchbower "netflux-websocket" "1.0.0" "^1.0.0" "10hgc5ra3ll7qc2r8aal6p03gx6dgz06l2b54lh995pvf901wzi6")
-]; }
diff --git a/pkgs/servers/web-apps/cryptpad/default.nix b/pkgs/servers/web-apps/cryptpad/default.nix
deleted file mode 100644
index 4e8daf38453c..000000000000
--- a/pkgs/servers/web-apps/cryptpad/default.nix
+++ /dev/null
@@ -1,90 +0,0 @@
-{ stdenv
-, pkgs
-, lib
-, buildBowerComponents
-, fetchbower
-, fetchurl
-, nodejs
-}:
-
-let
- nodePackages = import ./node-packages.nix {
- inherit pkgs nodejs;
- inherit (stdenv.hostPlatform) system;
- };
-
- bowerPackages = (buildBowerComponents {
- name = "${cryptpad.name}-bower-packages";
- generated = ./bower-packages.nix;
- src = cryptpad.src;
- }).overrideAttrs (old: {
- bowerPackages = old.bowerPackages.override (old_: {
- # add missing dependencies:
- # Those dependencies are EOL and they are not installed by buildBowerComponents,
- # but they are required, otherwise the resolver crashes.
- # * add the second jquery ~2.1.0 entry
- # * add the second bootstrap ~3.1.1 entry
- paths = old_.paths ++ [
- (fetchbower "jquery" "2.1.0" "~2.1.0" "02kwvz93vzpv10qnp7s0dz3al0jh77awwrizb6wadsvgifxssnlr")
- (fetchbower "bootstrap" "3.1.1" "~3.1.1" "06bhjwa8p7mzbpr3jkgydd804z1nwrkdql66h7jkfml99psv9811")
- ];
- });
- });
-
- # find an element in an attribute set
- findValue = pred: default: set:
- let
- list =
- lib.concatMap
- (name:
- let v = set.${name}; in
- if pred name v then [ v ] else [ ]
- )
- (lib.attrNames set)
- ;
- in
- if list == [ ] then default
- else lib.head list
- ;
-
- # The cryptpad package attribute key changes for each release. Get it out
- # programatically instead.
- cryptpad = findValue
- (k: v: v.packageName == "cryptpad")
- (throw "cryptpad not found")
- nodePackages
- ;
-
- combined = cryptpad.override {
- postInstall = ''
- out_cryptpad=$out/lib/node_modules/cryptpad
-
- substituteInPlace $out_cryptpad/lib/workers/index.js --replace "lib/workers/db-worker" "$out_cryptpad/lib/workers/db-worker"
-
- # add the bower components
- ln -sv \
- ${bowerPackages}/bower_components \
- $out_cryptpad/www/bower_components
-
- # add executable
- mkdir $out/bin
- cat < $out/bin/cryptpad
- #!${stdenv.shell}
- exec ${nodejs}/bin/node $out_cryptpad/server.js
- EOF
- chmod +x $out/bin/cryptpad
- '';
-
- meta = {
- longDescription = ''
- CryptPad is a collaboration suite that is end-to-end-encrypted and open-source.
- It is built to enable collaboration, synchronizing changes to documents in real time.
- Because all data is encrypted, the service and its administrators have no way of seeing the content being edited and stored.
- '';
- maintainers = with lib.maintainers; [ davhau ];
- mainProgram = "cryptpad";
- };
-
- };
-in
-combined
diff --git a/pkgs/servers/web-apps/cryptpad/generate.sh b/pkgs/servers/web-apps/cryptpad/generate.sh
deleted file mode 100755
index da2253889f88..000000000000
--- a/pkgs/servers/web-apps/cryptpad/generate.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env nix-shell
-#! nix-shell -i bash -I nixpkgs=../../../.. -p nodePackages.node2nix nix
-
-# This script is meant to be run in the current directory
-
-cryptpadSrc=$(nix eval '(import ../../../.. {}).cryptpad.src' --raw)
-echo "cryptpad src: $cryptpadSrc"
-
-nix-shell -I nixpkgs=../../../.. -p '(nodePackages.override { nodejs = nodejs-12_x; }).bower2nix' --run "bower2nix $cryptpadSrc/bower.json bower-packages.nix"
-
-
-set -euo pipefail
-
-node2nix --nodejs-12 \
- --input node-packages.json \
- --output node-packages-generated.nix \
- --composition node-packages.nix \
- --node-env ../../../development/node-packages/node-env.nix
diff --git a/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix b/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix
deleted file mode 100644
index 7321022c7ebf..000000000000
--- a/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix
+++ /dev/null
@@ -1,754 +0,0 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
-
-{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
-
-let
- sources = {
- "@mcrowe/minibloom-0.2.0" = {
- name = "_at_mcrowe_slash_minibloom";
- packageName = "@mcrowe/minibloom";
- version = "0.2.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/@mcrowe/minibloom/-/minibloom-0.2.0.tgz";
- sha1 = "1bed96aec18388198da37443899b2c3ff5948053";
- };
- };
- "accepts-1.3.7" = {
- name = "accepts";
- packageName = "accepts";
- version = "1.3.7";
- src = fetchurl {
- url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz";
- sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==";
- };
- };
- "array-flatten-1.1.1" = {
- name = "array-flatten";
- packageName = "array-flatten";
- version = "1.1.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz";
- sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2";
- };
- };
- "async-limiter-1.0.1" = {
- name = "async-limiter";
- packageName = "async-limiter";
- version = "1.0.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz";
- sha512 = "csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==";
- };
- };
- "body-parser-1.18.3" = {
- name = "body-parser";
- packageName = "body-parser";
- version = "1.18.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz";
- sha1 = "5b292198ffdd553b3a0f20ded0592b956955c8b4";
- };
- };
- "bytes-3.0.0" = {
- name = "bytes";
- packageName = "bytes";
- version = "3.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz";
- sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048";
- };
- };
- "chainpad-crypto-0.2.6" = {
- name = "chainpad-crypto";
- packageName = "chainpad-crypto";
- version = "0.2.6";
- src = fetchurl {
- url = "https://registry.npmjs.org/chainpad-crypto/-/chainpad-crypto-0.2.6.tgz";
- sha512 = "yk7bBj22rs9PaX6LiqQxiw+Vj/afBStsNP1xP/B4Uh9a8iyJ7JrSZJ2Hj3d6fyqxJlBrMAX82Aj5PCZb5dzzHw==";
- };
- };
- "chainpad-server-5.1.0" = {
- name = "chainpad-server";
- packageName = "chainpad-server";
- version = "5.1.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/chainpad-server/-/chainpad-server-5.1.0.tgz";
- sha512 = "BdjgOOLTXXo1EjQ7lURDe7oqsqfQISNvwhILfp3K3diY2K1hxpPLbjYzOSgxNOTADeOAff0xnInR5eUCESVWaQ==";
- };
- };
- "content-disposition-0.5.2" = {
- name = "content-disposition";
- packageName = "content-disposition";
- version = "0.5.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz";
- sha1 = "0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4";
- };
- };
- "content-type-1.0.4" = {
- name = "content-type";
- packageName = "content-type";
- version = "1.0.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz";
- sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==";
- };
- };
- "cookie-0.3.1" = {
- name = "cookie";
- packageName = "cookie";
- version = "0.3.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz";
- sha1 = "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb";
- };
- };
- "cookie-signature-1.0.6" = {
- name = "cookie-signature";
- packageName = "cookie-signature";
- version = "1.0.6";
- src = fetchurl {
- url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz";
- sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c";
- };
- };
- "debug-2.6.9" = {
- name = "debug";
- packageName = "debug";
- version = "2.6.9";
- src = fetchurl {
- url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz";
- sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==";
- };
- };
- "depd-1.1.2" = {
- name = "depd";
- packageName = "depd";
- version = "1.1.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz";
- sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9";
- };
- };
- "destroy-1.0.4" = {
- name = "destroy";
- packageName = "destroy";
- version = "1.0.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz";
- sha1 = "978857442c44749e4206613e37946205826abd80";
- };
- };
- "ee-first-1.1.1" = {
- name = "ee-first";
- packageName = "ee-first";
- version = "1.1.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz";
- sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d";
- };
- };
- "encodeurl-1.0.2" = {
- name = "encodeurl";
- packageName = "encodeurl";
- version = "1.0.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz";
- sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59";
- };
- };
- "escape-html-1.0.3" = {
- name = "escape-html";
- packageName = "escape-html";
- version = "1.0.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz";
- sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988";
- };
- };
- "etag-1.8.1" = {
- name = "etag";
- packageName = "etag";
- version = "1.8.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz";
- sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887";
- };
- };
- "express-4.16.4" = {
- name = "express";
- packageName = "express";
- version = "4.16.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/express/-/express-4.16.4.tgz";
- sha512 = "j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==";
- };
- };
- "finalhandler-1.1.1" = {
- name = "finalhandler";
- packageName = "finalhandler";
- version = "1.1.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz";
- sha512 = "Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==";
- };
- };
- "forwarded-0.2.0" = {
- name = "forwarded";
- packageName = "forwarded";
- version = "0.2.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz";
- sha512 = "buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==";
- };
- };
- "fresh-0.5.2" = {
- name = "fresh";
- packageName = "fresh";
- version = "0.5.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz";
- sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7";
- };
- };
- "fs-extra-7.0.1" = {
- name = "fs-extra";
- packageName = "fs-extra";
- version = "7.0.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz";
- sha512 = "YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==";
- };
- };
- "gar-1.0.4" = {
- name = "gar";
- packageName = "gar";
- version = "1.0.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/gar/-/gar-1.0.4.tgz";
- sha512 = "w4n9cPWyP7aHxKxYHFQMegj7WIAsL/YX/C4Bs5Rr8s1H9M1rNtRWRsw+ovYMkXDQ5S4ZbYHsHAPmevPjPgw44w==";
- };
- };
- "get-folder-size-2.0.1" = {
- name = "get-folder-size";
- packageName = "get-folder-size";
- version = "2.0.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/get-folder-size/-/get-folder-size-2.0.1.tgz";
- sha512 = "+CEb+GDCM7tkOS2wdMKTn9vU7DgnKUTuDlehkNJKNSovdCOVxs14OfKCk4cvSaR3za4gj+OBdl9opPN9xrJ0zA==";
- };
- };
- "graceful-fs-4.2.8" = {
- name = "graceful-fs";
- packageName = "graceful-fs";
- version = "4.2.8";
- src = fetchurl {
- url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz";
- sha512 = "qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==";
- };
- };
- "http-errors-1.6.3" = {
- name = "http-errors";
- packageName = "http-errors";
- version = "1.6.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz";
- sha1 = "8b55680bb4be283a0b5bf4ea2e38580be1d9320d";
- };
- };
- "iconv-lite-0.4.23" = {
- name = "iconv-lite";
- packageName = "iconv-lite";
- version = "0.4.23";
- src = fetchurl {
- url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz";
- sha512 = "neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==";
- };
- };
- "inherits-2.0.3" = {
- name = "inherits";
- packageName = "inherits";
- version = "2.0.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
- sha1 = "633c2c83e3da42a502f52466022480f4208261de";
- };
- };
- "ipaddr.js-1.9.1" = {
- name = "ipaddr.js";
- packageName = "ipaddr.js";
- version = "1.9.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz";
- sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==";
- };
- };
- "jsonfile-4.0.0" = {
- name = "jsonfile";
- packageName = "jsonfile";
- version = "4.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz";
- sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb";
- };
- };
- "lex-1.7.9" = {
- name = "lex";
- packageName = "lex";
- version = "1.7.9";
- src = fetchurl {
- url = "https://registry.npmjs.org/lex/-/lex-1.7.9.tgz";
- sha1 = "5d5636ccef574348362938b79a47f0eed8ed0d43";
- };
- };
- "looper-3.0.0" = {
- name = "looper";
- packageName = "looper";
- version = "3.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/looper/-/looper-3.0.0.tgz";
- sha1 = "2efa54c3b1cbaba9b94aee2e5914b0be57fbb749";
- };
- };
- "media-typer-0.3.0" = {
- name = "media-typer";
- packageName = "media-typer";
- version = "0.3.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz";
- sha1 = "8710d7af0aa626f8fffa1ce00168545263255748";
- };
- };
- "merge-descriptors-1.0.1" = {
- name = "merge-descriptors";
- packageName = "merge-descriptors";
- version = "1.0.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz";
- sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61";
- };
- };
- "methods-1.1.2" = {
- name = "methods";
- packageName = "methods";
- version = "1.1.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz";
- sha1 = "5529a4d67654134edcc5266656835b0f851afcee";
- };
- };
- "mime-1.4.1" = {
- name = "mime";
- packageName = "mime";
- version = "1.4.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz";
- sha512 = "KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==";
- };
- };
- "mime-db-1.50.0" = {
- name = "mime-db";
- packageName = "mime-db";
- version = "1.50.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/mime-db/-/mime-db-1.50.0.tgz";
- sha512 = "9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A==";
- };
- };
- "mime-types-2.1.33" = {
- name = "mime-types";
- packageName = "mime-types";
- version = "2.1.33";
- src = fetchurl {
- url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.33.tgz";
- sha512 = "plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g==";
- };
- };
- "ms-2.0.0" = {
- name = "ms";
- packageName = "ms";
- version = "2.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz";
- sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8";
- };
- };
- "negotiator-0.6.2" = {
- name = "negotiator";
- packageName = "negotiator";
- version = "0.6.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz";
- sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==";
- };
- };
- "netflux-websocket-0.1.21" = {
- name = "netflux-websocket";
- packageName = "netflux-websocket";
- version = "0.1.21";
- src = fetchurl {
- url = "https://registry.npmjs.org/netflux-websocket/-/netflux-websocket-0.1.21.tgz";
- sha512 = "Zjl5lefg8urC0a0T7YCPGiUgRsISZBsTZl1STylmQz8Bq4ohcZ8cP3r6VoCpeVcvJ1Y/e3ZCXPxndWlNP9Jfug==";
- };
- };
- "nthen-0.1.8" = {
- name = "nthen";
- packageName = "nthen";
- version = "0.1.8";
- src = fetchurl {
- url = "https://registry.npmjs.org/nthen/-/nthen-0.1.8.tgz";
- sha512 = "Oh2CwIbhj+wUT94lQV7LKmmgw3UYAGGd8oLIqp6btQN3Bz3PuWp4BuvtUo35H3rqDknjPfKx5P6mt7v+aJNjcw==";
- };
- };
- "on-finished-2.3.0" = {
- name = "on-finished";
- packageName = "on-finished";
- version = "2.3.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz";
- sha1 = "20f1336481b083cd75337992a16971aa2d906947";
- };
- };
- "parseurl-1.3.3" = {
- name = "parseurl";
- packageName = "parseurl";
- version = "1.3.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz";
- sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==";
- };
- };
- "path-to-regexp-0.1.7" = {
- name = "path-to-regexp";
- packageName = "path-to-regexp";
- version = "0.1.7";
- src = fetchurl {
- url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz";
- sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c";
- };
- };
- "proxy-addr-2.0.7" = {
- name = "proxy-addr";
- packageName = "proxy-addr";
- version = "2.0.7";
- src = fetchurl {
- url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz";
- sha512 = "llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==";
- };
- };
- "pull-stream-3.6.14" = {
- name = "pull-stream";
- packageName = "pull-stream";
- version = "3.6.14";
- src = fetchurl {
- url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.14.tgz";
- sha512 = "KIqdvpqHHaTUA2mCYcLG1ibEbu/LCKoJZsBWyv9lSYtPkJPBq8m3Hxa103xHi6D2thj5YXa0TqK3L3GUkwgnew==";
- };
- };
- "qs-6.5.2" = {
- name = "qs";
- packageName = "qs";
- version = "6.5.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz";
- sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==";
- };
- };
- "range-parser-1.2.1" = {
- name = "range-parser";
- packageName = "range-parser";
- version = "1.2.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz";
- sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==";
- };
- };
- "raw-body-2.3.3" = {
- name = "raw-body";
- packageName = "raw-body";
- version = "2.3.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz";
- sha512 = "9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==";
- };
- };
- "safe-buffer-5.1.2" = {
- name = "safe-buffer";
- packageName = "safe-buffer";
- version = "5.1.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz";
- sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
- };
- };
- "safer-buffer-2.1.2" = {
- name = "safer-buffer";
- packageName = "safer-buffer";
- version = "2.1.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz";
- sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
- };
- };
- "saferphore-0.0.1" = {
- name = "saferphore";
- packageName = "saferphore";
- version = "0.0.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/saferphore/-/saferphore-0.0.1.tgz";
- sha1 = "cc962eda4e2b2452e6437fd32dcfb6f69ef2ea63";
- };
- };
- "send-0.16.2" = {
- name = "send";
- packageName = "send";
- version = "0.16.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/send/-/send-0.16.2.tgz";
- sha512 = "E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==";
- };
- };
- "serve-static-1.13.2" = {
- name = "serve-static";
- packageName = "serve-static";
- version = "1.13.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz";
- sha512 = "p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==";
- };
- };
- "setprototypeof-1.1.0" = {
- name = "setprototypeof";
- packageName = "setprototypeof";
- version = "1.1.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz";
- sha512 = "BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==";
- };
- };
- "sortify-1.0.4" = {
- name = "sortify";
- packageName = "sortify";
- version = "1.0.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/sortify/-/sortify-1.0.4.tgz";
- sha1 = "f0178687c83231be8a34fc0ec5462ea957b60284";
- };
- };
- "statuses-1.4.0" = {
- name = "statuses";
- packageName = "statuses";
- version = "1.4.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz";
- sha512 = "zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==";
- };
- };
- "stream-to-pull-stream-1.7.3" = {
- name = "stream-to-pull-stream";
- packageName = "stream-to-pull-stream";
- version = "1.7.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/stream-to-pull-stream/-/stream-to-pull-stream-1.7.3.tgz";
- sha512 = "6sNyqJpr5dIOQdgNy/xcDWwDuzAsAwVzhzrWlAPAQ7Lkjx/rv0wgvxEyKwTq6FmNd5rjTrELt/CLmaSw7crMGg==";
- };
- };
- "tiny-each-async-2.0.3" = {
- name = "tiny-each-async";
- packageName = "tiny-each-async";
- version = "2.0.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/tiny-each-async/-/tiny-each-async-2.0.3.tgz";
- sha1 = "8ebbbfd6d6295f1370003fbb37162afe5a0a51d1";
- };
- };
- "tweetnacl-0.12.2" = {
- name = "tweetnacl";
- packageName = "tweetnacl";
- version = "0.12.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.12.2.tgz";
- sha1 = "bd59f890507856fb0a1136acc3a8b44547e29ddb";
- };
- };
- "tweetnacl-git+https://github.com/dchest/tweetnacl-js.git#v0.12.2" = {
- name = "tweetnacl";
- packageName = "tweetnacl";
- version = "0.12.2";
- src = fetchgit {
- url = "https://github.com/dchest/tweetnacl-js.git";
- rev = "8a21381d696acdc4e99c9f706f1ad23285795f79";
- sha256 = "10f27b673944107995b3f6dcd65caecd705acdae9c37b7e79b810a8a72a40a31";
- };
- };
- "type-is-1.6.18" = {
- name = "type-is";
- packageName = "type-is";
- version = "1.6.18";
- src = fetchurl {
- url = "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz";
- sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==";
- };
- };
- "ulimit-0.0.2" = {
- name = "ulimit";
- packageName = "ulimit";
- version = "0.0.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/ulimit/-/ulimit-0.0.2.tgz";
- sha1 = "2b51f9dc8381ae4102636cec5eb338c2630588a0";
- };
- };
- "ultron-1.1.1" = {
- name = "ultron";
- packageName = "ultron";
- version = "1.1.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz";
- sha512 = "UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==";
- };
- };
- "universalify-0.1.2" = {
- name = "universalify";
- packageName = "universalify";
- version = "0.1.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz";
- sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==";
- };
- };
- "unpipe-1.0.0" = {
- name = "unpipe";
- packageName = "unpipe";
- version = "1.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz";
- sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec";
- };
- };
- "utils-merge-1.0.1" = {
- name = "utils-merge";
- packageName = "utils-merge";
- version = "1.0.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz";
- sha1 = "9f95710f50a267947b2ccc124741c1028427e713";
- };
- };
- "vary-1.1.2" = {
- name = "vary";
- packageName = "vary";
- version = "1.1.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz";
- sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc";
- };
- };
- "ws-3.3.3" = {
- name = "ws";
- packageName = "ws";
- version = "3.3.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz";
- sha512 = "nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==";
- };
- };
- };
-in
-{
- "cryptpad-git+https://github.com/xwiki-labs/cryptpad.git#4.11.0" = nodeEnv.buildNodePackage {
- name = "cryptpad";
- packageName = "cryptpad";
- version = "4.11.0";
- src = fetchgit {
- url = "https://github.com/xwiki-labs/cryptpad.git";
- rev = "390e38acf63a9d7ae581eaa926ea678a519fcc14";
- sha256 = "d75f0568fd146da6512646d9516138f94b0bbbd9a4691eef11d370bf5810176a";
- };
- dependencies = [
- sources."@mcrowe/minibloom-0.2.0"
- sources."accepts-1.3.7"
- sources."array-flatten-1.1.1"
- sources."async-limiter-1.0.1"
- sources."body-parser-1.18.3"
- sources."bytes-3.0.0"
- (sources."chainpad-crypto-0.2.6" // {
- dependencies = [
- sources."tweetnacl-git+https://github.com/dchest/tweetnacl-js.git#v0.12.2"
- ];
- })
- sources."chainpad-server-5.1.0"
- sources."content-disposition-0.5.2"
- sources."content-type-1.0.4"
- sources."cookie-0.3.1"
- sources."cookie-signature-1.0.6"
- sources."debug-2.6.9"
- sources."depd-1.1.2"
- sources."destroy-1.0.4"
- sources."ee-first-1.1.1"
- sources."encodeurl-1.0.2"
- sources."escape-html-1.0.3"
- sources."etag-1.8.1"
- sources."express-4.16.4"
- sources."finalhandler-1.1.1"
- sources."forwarded-0.2.0"
- sources."fresh-0.5.2"
- sources."fs-extra-7.0.1"
- sources."gar-1.0.4"
- sources."get-folder-size-2.0.1"
- sources."graceful-fs-4.2.8"
- sources."http-errors-1.6.3"
- sources."iconv-lite-0.4.23"
- sources."inherits-2.0.3"
- sources."ipaddr.js-1.9.1"
- sources."jsonfile-4.0.0"
- sources."lex-1.7.9"
- sources."looper-3.0.0"
- sources."media-typer-0.3.0"
- sources."merge-descriptors-1.0.1"
- sources."methods-1.1.2"
- sources."mime-1.4.1"
- sources."mime-db-1.50.0"
- sources."mime-types-2.1.33"
- sources."ms-2.0.0"
- sources."negotiator-0.6.2"
- sources."netflux-websocket-0.1.21"
- sources."nthen-0.1.8"
- sources."on-finished-2.3.0"
- sources."parseurl-1.3.3"
- sources."path-to-regexp-0.1.7"
- sources."proxy-addr-2.0.7"
- sources."pull-stream-3.6.14"
- sources."qs-6.5.2"
- sources."range-parser-1.2.1"
- sources."raw-body-2.3.3"
- sources."safe-buffer-5.1.2"
- sources."safer-buffer-2.1.2"
- sources."saferphore-0.0.1"
- sources."send-0.16.2"
- sources."serve-static-1.13.2"
- sources."setprototypeof-1.1.0"
- sources."sortify-1.0.4"
- sources."statuses-1.4.0"
- sources."stream-to-pull-stream-1.7.3"
- sources."tiny-each-async-2.0.3"
- sources."tweetnacl-0.12.2"
- sources."type-is-1.6.18"
- sources."ulimit-0.0.2"
- sources."ultron-1.1.1"
- sources."universalify-0.1.2"
- sources."unpipe-1.0.0"
- sources."utils-merge-1.0.1"
- sources."vary-1.1.2"
- sources."ws-3.3.3"
- ];
- buildInputs = globalBuildInputs;
- meta = {
- description = "realtime collaborative visual editor with zero knowlege server";
- license = "AGPL-3.0+";
- };
- production = true;
- bypassCache = true;
- reconstructLock = true;
- };
-}
diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.json b/pkgs/servers/web-apps/cryptpad/node-packages.json
deleted file mode 100644
index fc6c498f438e..000000000000
--- a/pkgs/servers/web-apps/cryptpad/node-packages.json
+++ /dev/null
@@ -1,3 +0,0 @@
-[
- { "cryptpad": "git+https://github.com/xwiki-labs/cryptpad.git#4.11.0" }
-]
diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.nix b/pkgs/servers/web-apps/cryptpad/node-packages.nix
deleted file mode 100644
index 0961603968ea..000000000000
--- a/pkgs/servers/web-apps/cryptpad/node-packages.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
-
-{pkgs ? import {
- inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
-
-let
- nodeEnv = import ../../../development/node-packages/node-env.nix {
- inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
- inherit pkgs nodejs;
- libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
- };
-in
-import ./node-packages-generated.nix {
- inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
- inherit nodeEnv;
-}
diff --git a/pkgs/servers/web-apps/whitebophir/node-packages.nix b/pkgs/servers/web-apps/whitebophir/node-packages.nix
index 0961603968ea..862d22340099 100644
--- a/pkgs/servers/web-apps/whitebophir/node-packages.nix
+++ b/pkgs/servers/web-apps/whitebophir/node-packages.nix
@@ -2,7 +2,7 @@
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
let
nodeEnv = import ../../../development/node-packages/node-env.nix {
diff --git a/pkgs/tools/audio/dsp/default.nix b/pkgs/tools/audio/dsp/default.nix
index 6891bfc041d4..01b1ed107be9 100644
--- a/pkgs/tools/audio/dsp/default.nix
+++ b/pkgs/tools/audio/dsp/default.nix
@@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "dsp";
- version = "1.8";
+ version = "1.9";
src = fetchFromGitHub {
owner = "bmc0";
repo = "dsp";
rev = "v${version}";
- sha256 = "sha256-LTgjpzAGi3oL8l5NcJj1ortKFd3vWDfXHr8YyedAxEE=";
+ sha256 = "sha256-S1pzVQ/ceNsx0vGmzdDWw2TjPVLiRgzR4edFblWsekY=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/tools/graphics/ldgallery/viewer/default.nix b/pkgs/tools/graphics/ldgallery/viewer/default.nix
index f4cebde86070..c47abd91f2a0 100644
--- a/pkgs/tools/graphics/ldgallery/viewer/default.nix
+++ b/pkgs/tools/graphics/ldgallery/viewer/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pkgs, nodejs-12_x, pandoc, CoreServices }:
+{ lib, stdenv, fetchFromGitHub, pkgs, nodejs-14_x, pandoc, CoreServices }:
with lib;
@@ -18,7 +18,7 @@ let
inherit (stdenv.hostPlatform) system;
# some native node dependencies still require NodeJS 12 with Python 2
- nodejs = nodejs-12_x;
+ nodejs = nodejs-14_x;
};
nodePkg = nodePackages.package.override {
diff --git a/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix b/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix
index 02fdb925fb1b..0c0b678d98f2 100644
--- a/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix
+++ b/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix
@@ -2,7 +2,7 @@
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
let
nodeEnv = import ../../../../development/node-packages/node-env.nix {
diff --git a/pkgs/tools/misc/barman/default.nix b/pkgs/tools/misc/barman/default.nix
index 699a38f3a879..4ad66a98ad5a 100644
--- a/pkgs/tools/misc/barman/default.nix
+++ b/pkgs/tools/misc/barman/default.nix
@@ -4,17 +4,19 @@
}:
python3Packages.buildPythonApplication rec {
pname = "barman";
- version = "2.17";
+ version = "3.0.0";
src = fetchFromGitHub {
owner = "EnterpriseDB";
repo = pname;
rev = "release/${version}";
- sha256 = "0c4gcs4kglbb2qma4nlvw0ycj1wnsg934p9vs50dvqi9099hxkmb";
+ sha256 = "sha256-WLKtra1kNxvm4iO3NEhMNCSioHL9I8GIgkbtu95IyTQ=";
};
checkInputs = with python3Packages; [
mock
+ python-snappy
+ google-cloud-storage
pytestCheckHook
];
@@ -27,6 +29,11 @@ python3Packages.buildPythonApplication rec {
python-dateutil
];
+ disabledTests = [
+ # Assertion error
+ "test_help_output"
+ ];
+
meta = with lib; {
homepage = "https://www.pgbarman.org/";
description = "Backup and Recovery Manager for PostgreSQL";
diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix
index dadfa61e3cdd..62630e7e7edd 100644
--- a/pkgs/tools/misc/broot/default.nix
+++ b/pkgs/tools/misc/broot/default.nix
@@ -15,14 +15,14 @@
rustPlatform.buildRustPackage rec {
pname = "broot";
- version = "1.14.0";
+ version = "1.14.1";
src = fetchCrate {
inherit pname version;
- sha256 = "sha256-1QL2EUq/lAev1HiXmPZ8n9sCYjWUTd5aWmmyCR6UsDw=";
+ sha256 = "sha256-6t2yJM3LAG1LY5MAXg/7lwmufEEO8dqOZJgQXICmLf8=";
};
- cargoHash = "sha256-pw4eWIwAtrNvCumcjxR7TVdo2Imm+sM1elkUKYVQSkQ=";
+ cargoHash = "sha256-NsKiTsdfC1UPTLKBibVGXSx5wZubAMgIWLiEMzR5p6g=";
nativeBuildInputs = [
installShellFiles
diff --git a/pkgs/tools/misc/foma/default.nix b/pkgs/tools/misc/foma/default.nix
index ea229b20445f..5d82f699e7d8 100644
--- a/pkgs/tools/misc/foma/default.nix
+++ b/pkgs/tools/misc/foma/default.nix
@@ -11,20 +11,23 @@ stdenv.mkDerivation rec {
sha256 = "1vf01l18j8cksnavbabcckp9gg692w6v5lg81xrzv6f5v14zp4nr";
};
- sourceRoot = "source/foma";
+ sourceRoot = "${src.name}/foma";
nativeBuildInputs = [ flex bison ]
++ lib.optional stdenv.isDarwin darwin.cctools;
buildInputs = [ zlib readline ];
makeFlags = [
- "CC=${stdenv.cc.targetPrefix}cc"
+ "CC:=$(CC)"
+ "RANLIB:=$(RANLIB)"
+ "prefix=$(out)"
+ ] ++ lib.optionals (!stdenv.isDarwin) [
+ "AR:=$(AR)" # libtool is used for darwin
];
patchPhase = ''
substituteInPlace Makefile \
- --replace '-ltermcap' ' ' \
- --replace '/usr/local' '$(out)'
+ --replace '-ltermcap' ' '
'';
meta = with lib; {
diff --git a/pkgs/tools/misc/git-town/default.nix b/pkgs/tools/misc/git-town/default.nix
index 1afacc4b4b89..618d627921ba 100644
--- a/pkgs/tools/misc/git-town/default.nix
+++ b/pkgs/tools/misc/git-town/default.nix
@@ -1,10 +1,9 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles, git, testers, git-town, makeWrapper }:
-buildGoPackage rec {
+buildGoModule rec {
pname = "git-town";
version = "7.7.0";
- goPackagePath = "github.com/git-town/git-town";
src = fetchFromGitHub {
owner = "git-town";
repo = "git-town";
@@ -12,12 +11,58 @@ buildGoPackage rec {
sha256 = "sha256-FpBEBx2gb33fGDndvZmvG1A61NoJ4Qy4V3YQSb+Ugsc=";
};
- ldflags = [ "-X github.com/git-town/git-town/src/cmd.version=v${version}" "-X github.com/git-town/git-town/src/cmd.buildDate=nix" ];
+ vendorSha256 = null;
+
+ nativeBuildInputs = [ installShellFiles makeWrapper ];
+
+ buildInputs = [ git ];
+
+ ldflags =
+ let
+ modulePath = "github.com/git-town/git-town/v${lib.versions.major version}"; in
+ [
+ "-s"
+ "-w"
+ "-X ${modulePath}/src/cmd.version=v${version}"
+ "-X ${modulePath}/src/cmd.buildDate=nix"
+ ];
+
+ checkInputs = [ git ];
+ preCheck =
+ let
+ skippedTests = [
+ "TestGodog"
+ "TestRunner_CreateChildFeatureBranch"
+ "TestShellRunner_RunStringWith_Dir"
+ "TestMockingShell_MockCommand"
+ "TestShellRunner_RunStringWith_Input"
+ ];
+ in
+ ''
+ HOME=$(mktemp -d)
+ # Disable tests requiring local operations
+ buildFlagsArray+=("-run" "[^(${builtins.concatStringsSep "|" skippedTests})]")
+ '';
+
+ postInstall = ''
+ installShellCompletion --cmd git-town \
+ --bash <($out/bin/git-town completion bash) \
+ --fish <($out/bin/git-town completion fish) \
+ --zsh <($out/bin/git-town completion zsh)
+
+ wrapProgram $out/bin/git-town --prefix PATH : ${lib.makeBinPath [ git ]}
+ '';
+
+ passthru.tests.version = testers.testVersion {
+ package = git-town;
+ command = "git-town version";
+ version = "v${version}";
+ };
meta = with lib; {
description = "Generic, high-level git support for git-flow workflows";
homepage = "https://www.git-town.com/";
- maintainers = [ maintainers.allonsy maintainers.blaggacao ];
license = licenses.mit;
+ maintainers = with maintainers; [ allonsy blaggacao ];
};
}
diff --git a/pkgs/tools/misc/linux-logo/default.nix b/pkgs/tools/misc/linux-logo/default.nix
new file mode 100644
index 000000000000..a37f25c17d0a
--- /dev/null
+++ b/pkgs/tools/misc/linux-logo/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, gettext
+, which
+, nix-update-script
+}:
+
+stdenv.mkDerivation rec {
+ pname = "linux_logo";
+ version = "6.0";
+
+ src = fetchFromGitHub {
+ owner = "deater";
+ repo = pname;
+ rev = version;
+ sha256 = "sha256-q8QznEgnALJS//l7XXHZlq07pI2jCCm2USEU96rO8N0=";
+ };
+
+ nativeBuildInputs = [ gettext which ];
+
+ passthru.updateScript = nix-update-script {
+ attrPath = pname;
+ };
+
+ meta = with lib; {
+ description = "Prints an ASCII logo and some system info";
+ homepage = "http://www.deater.net/weave/vmwprod/linux_logo";
+ changelog = "https://github.com/deater/linux_logo/blob/${version}/CHANGES_IN_${version}";
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ azahi ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/tools/networking/airfield/deps.sh b/pkgs/tools/networking/airfield/deps.sh
index 81767110283f..a880801d1a91 100755
--- a/pkgs/tools/networking/airfield/deps.sh
+++ b/pkgs/tools/networking/airfield/deps.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env nix-shell
#! nix-shell -i bash -p nodePackages.node2nix
-node2nix --nodejs-12 -i deps.json \
+node2nix --nodejs-16 -i deps.json \
--no-copy-node-env \
-e ../../../development/node-packages/node-env.nix -c node.nix
diff --git a/pkgs/tools/networking/airfield/node.nix b/pkgs/tools/networking/airfield/node.nix
index 9f0040e2f446..f9a1999f36d7 100644
--- a/pkgs/tools/networking/airfield/node.nix
+++ b/pkgs/tools/networking/airfield/node.nix
@@ -2,7 +2,7 @@
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
let
nodeEnv = import ../../../development/node-packages/node-env.nix {
diff --git a/pkgs/tools/networking/boundary/default.nix b/pkgs/tools/networking/boundary/default.nix
index 4a20273153b6..4792deedace8 100644
--- a/pkgs/tools/networking/boundary/default.nix
+++ b/pkgs/tools/networking/boundary/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "boundary";
- version = "0.9.0";
+ version = "0.9.1";
src =
let
@@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
aarch64-darwin = "darwin_arm64";
};
sha256 = selectSystem {
- x86_64-linux = "sha256-+Ewk+tLLwp8xszDS3RadeAOpS261wSG5NC8Gk2OwHiY=";
- aarch64-linux = "sha256-knEI3a4xL+kAllNColEXBCKhnWoM3Fcso3cwFGaA1fQ=";
- x86_64-darwin = "sha256-jPdW3ovcb5yhQHJGUEBB2hou2og4tMIGtr5V+W6vNlc=";
- aarch64-darwin = "sha256-8Fx6lQUHna5J8M67wSzpRmAGZlZbQdpMxgSa6/07g/Y=";
+ x86_64-linux = "sha256-58CcM1bKjH3uEzJ27SBHrZQEUTEFj3U4BS5udd9IL4w=";
+ aarch64-linux = "sha256-/orLwUCco+iSgvGhJ0s0N4BjA4FYsEi9HgeKHHqKw74=";
+ x86_64-darwin = "sha256-twsrQkRWfhFZzc+CTetIUx1hGczrAH91C/0jKPe6kPg=";
+ aarch64-darwin = "sha256-g7pALQ4y4LymAggyHuJSJn0Owhs2BzoNQb1rb9+ZJmw=";
};
in
fetchzip {
diff --git a/pkgs/tools/networking/godns/default.nix b/pkgs/tools/networking/godns/default.nix
index 063a8c34cffe..8879f8459e54 100644
--- a/pkgs/tools/networking/godns/default.nix
+++ b/pkgs/tools/networking/godns/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "godns";
- version = "2.7.9";
+ version = "2.8.1";
src = fetchFromGitHub {
owner = "TimothyYe";
repo = "godns";
rev = "v${version}";
- sha256 = "sha256-gFleIRXYfO/gocyVyVzp3ZnJ6gUVmR7IAc0Z985YnVI=";
+ sha256 = "sha256-dZnCvpidQsQ2eLULkcMuKqFcBwYoy6Pd1NOCXv+Umzo=";
};
- vendorSha256 = "sha256-tXH62HyA/pJxt69GWkVrJ4VrA16KfpEtpK/YKiUkvtU=";
+ vendorSha256 = "sha256-PGqknRGtN0XRGPnAsWzQrlJZG5BzQIhlSysGefkxysE=";
# Some tests require internet access, broken in sandbox
doCheck = false;
diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
index 3e68b54b9b50..e980c8a76b81 100644
--- a/pkgs/tools/networking/mu/default.nix
+++ b/pkgs/tools/networking/mu/default.nix
@@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "mu";
- version = "1.8.3";
+ version = "1.8.5";
src = fetchFromGitHub {
owner = "djcb";
repo = "mu";
rev = "v${version}";
- sha256 = "gEqhk600pYHOcYhwr8LGvXHH8KcinX5MbMqYGyYOsnY=";
+ sha256 = "BbH8P5l3zoBKeyFUxJqXIn0sUqg80BApdJCoz+bG/uc=";
};
postPatch = ''
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 022aa22260df..55aec86bee57 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -47,32 +47,24 @@ in
openssh_gssapi = common rec {
pname = "openssh-with-gssapi";
- version = "8.4p1";
+ version = "9.0p1";
extraDesc = " with GSSAPI support";
src = fetchurl {
url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz";
- sha256 = "091b3pxdlj47scxx6kkf4agkx8c8sdacdxx8m1dw1cby80pd40as";
+ sha256 = "12m2f9czvgmi7akp7xah6y7mrrpi280a3ksk47iwr7hy2q1475q3";
};
extraPatches = [
- ./ssh-keysign-8.4.patch
-
- # See https://github.com/openssh/openssh-portable/pull/206
- ./ssh-copy-id-fix-eof.patch
+ ./ssh-keysign-8.5.patch
(fetchpatch {
name = "openssh-gssapi.patch";
- url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%25${version}-2/debian/patches/gssapi.patch";
- sha256 = "1z1ckzimlkm1dmr9f5fqjnjg28gsqcwx6xka0klak857548d2lp2";
+ url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%25${version}-1/debian/patches/gssapi.patch";
+ sha256 = "sha256-VG7+2dfu09nvHWuSAB6sLGMmjRCDCysl/9FR1WSF21k=";
})
];
extraNativeBuildInputs = [ autoreconfHook ];
-
- extraMeta.knownVulnerabilities = [
- "CVE-2021-28041"
- "CVE-2021-41617"
- ];
};
}
diff --git a/pkgs/tools/networking/openssh/ssh-copy-id-fix-eof.patch b/pkgs/tools/networking/openssh/ssh-copy-id-fix-eof.patch
deleted file mode 100644
index 4ba2b562f556..000000000000
--- a/pkgs/tools/networking/openssh/ssh-copy-id-fix-eof.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
-index 392f64f..a769077 100644
---- a/contrib/ssh-copy-id
-+++ b/contrib/ssh-copy-id
-@@ -247,7 +247,7 @@ installkeys_sh() {
- # the -z `tail ...` checks for a trailing newline. The echo adds one if was missing
- # the cat adds the keys we're getting via STDIN
- # and if available restorecon is used to restore the SELinux context
-- INSTALLKEYS_SH=$(tr '\t\n' ' ' <<-EOF)
-+ INSTALLKEYS_SH=$(tr '\t\n' ' ' <<-EOF
- cd;
- umask 077;
- mkdir -p $(dirname "${AUTH_KEY_FILE}") &&
-@@ -258,6 +258,7 @@ installkeys_sh() {
- restorecon -F .ssh ${AUTH_KEY_FILE};
- fi
- EOF
-+ )
-
- # to defend against quirky remote shells: use 'exec sh -c' to get POSIX;
- printf "exec sh -c '%s'" "${INSTALLKEYS_SH}"
diff --git a/pkgs/tools/networking/openssh/ssh-keysign-8.4.patch b/pkgs/tools/networking/openssh/ssh-keysign-8.4.patch
deleted file mode 100644
index 7258f4a4db15..000000000000
--- a/pkgs/tools/networking/openssh/ssh-keysign-8.4.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/pathnames.h b/pathnames.h
-index cb44caa4..354fdf05 100644
---- a/pathnames.h
-+++ b/pathnames.h
-@@ -124,7 +124,7 @@
-
- /* Location of ssh-keysign for hostbased authentication */
- #ifndef _PATH_SSH_KEY_SIGN
--#define _PATH_SSH_KEY_SIGN "/usr/libexec/ssh-keysign"
-+#define _PATH_SSH_KEY_SIGN "ssh-keysign"
- #endif
-
- /* Location of ssh-pkcs11-helper to support keys in tokens */
-diff --git a/sshconnect2.c b/sshconnect2.c
-index dffee90b..e9a86e59 100644
---- a/sshconnect2.c
-+++ b/sshconnect2.c
-@@ -1879,7 +1879,7 @@ ssh_keysign(struct ssh *ssh, struct sshkey *key, u_char **sigp, size_t *lenp,
- closefrom(sock + 1);
- debug3("%s: [child] pid=%ld, exec %s",
- __func__, (long)getpid(), _PATH_SSH_KEY_SIGN);
-- execl(_PATH_SSH_KEY_SIGN, _PATH_SSH_KEY_SIGN, (char *)NULL);
-+ execlp(_PATH_SSH_KEY_SIGN, _PATH_SSH_KEY_SIGN, (char *)NULL);
- fatal("%s: exec(%s): %s", __func__, _PATH_SSH_KEY_SIGN,
- strerror(errno));
- }
---
-2.22.0
-
diff --git a/pkgs/tools/security/aws-iam-authenticator/default.nix b/pkgs/tools/security/aws-iam-authenticator/default.nix
index 8a7bb408f221..b6ae17a61176 100644
--- a/pkgs/tools/security/aws-iam-authenticator/default.nix
+++ b/pkgs/tools/security/aws-iam-authenticator/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "aws-iam-authenticator";
- version = "0.5.7";
+ version = "0.5.9";
src = fetchFromGitHub {
owner = "kubernetes-sigs";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-nFHshmGZZMzssF2INdEqpvARkFjBpd7qNV9tabySABU=";
+ sha256 = "sha256-lopOFEWqRWZox/XniQX6OiQPWlmWJpnQ7yFueiTZpss=";
};
# Upstream has inconsistent vendoring, see https://github.com/kubernetes-sigs/aws-iam-authenticator/issues/377
diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix
index 8c4f0a80545d..496655251c1c 100644
--- a/pkgs/tools/security/gitleaks/default.nix
+++ b/pkgs/tools/security/gitleaks/default.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "gitleaks";
- version = "8.8.8";
+ version = "8.8.11";
src = fetchFromGitHub {
owner = "zricethezav";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-NMlUk0tofQoJSiv3tHGyyad61624Losyv2YnxngAlrY=";
+ sha256 = "sha256-KBUKdtwSYktySmhZYE3VSVu2tjCwUHuNSNwoxLHWQrg=";
};
vendorSha256 = "sha256-X8z9iKRR3PptNHwy1clZG8QsClsjbW45nZb2fHGfSYk=";
diff --git a/pkgs/tools/security/gnupg/23.nix b/pkgs/tools/security/gnupg/23.nix
index b07a3550c76d..13364f5498a8 100644
--- a/pkgs/tools/security/gnupg/23.nix
+++ b/pkgs/tools/security/gnupg/23.nix
@@ -37,6 +37,9 @@ stdenv.mkDerivation rec {
# Patch from upstream 34c649b36013, https://dev.gnupg.org/T6027
./CVE-2022-34903-g10-fix-garbled-status-messages-in-NOTATION_DATA.patch
+
+ # Patch for DoS vuln from https://seclists.org/oss-sec/2022/q3/27
+ ./v3-0001-Disallow-compressed-signatures-and-certificates.patch
];
postPatch = ''
sed -i 's,\(hkps\|https\)://keyserver.ubuntu.com,hkps://keys.openpgp.org,g' configure configure.ac doc/dirmngr.texi doc/gnupg.info-1
diff --git a/pkgs/tools/security/gnupg/v3-0001-Disallow-compressed-signatures-and-certificates.patch b/pkgs/tools/security/gnupg/v3-0001-Disallow-compressed-signatures-and-certificates.patch
new file mode 100644
index 000000000000..267085dff4c8
--- /dev/null
+++ b/pkgs/tools/security/gnupg/v3-0001-Disallow-compressed-signatures-and-certificates.patch
@@ -0,0 +1,216 @@
+From 459b61fa21db755d6c879c3ef9ab85b3d1786c9f Mon Sep 17 00:00:00 2001
+From: Demi Marie Obenour
+Date: Fri, 27 May 2022 19:51:19 -0400
+Subject: [PATCH GnuPG v3] Disallow compressed signatures and certificates
+
+Compressed packets have significant attack surface, due to the potential
+for both denial of service (zip bombs and the like) and for code
+execution via memory corruption vulnerabilities in the decompressor.
+Furthermore, I am not aware of any implementation that uses them in keys
+or detached signatures. Therefore, disallow their use in such contexts
+entirely. This includes signatures that are part of a cleartext-signed
+message.
+
+When parsing detached signatures, forbid any packet that is not a
+signature or marker packet. When parsing keys, return an error when
+encountering a compressed packet, instead of decompressing the packet.
+
+Furthermore, certificates, keys, and signatures are not allowed to
+contain partial-length or indeterminate-length packets. Reject those in
+parse_packet, rather than activating the partial-length filter code.
+This is not (yet) implemented for cleartext-signed messages, as these
+messages are internally represented as inline-signed messages.
+
+GnuPG-bug-id: T5993
+Signed-off-by: Demi Marie Obenour
+---
+ g10/import.c | 18 ++----------------
+ g10/mainproc.c | 24 +++++++++++++++++++++---
+ g10/packet.h | 2 ++
+ g10/parse-packet.c | 44 +++++++++++++++++++++++++++++++++++++++++++-
+ 4 files changed, 68 insertions(+), 20 deletions(-)
+
+diff --git a/g10/import.c b/g10/import.c
+index bb0bf67934a8316130cde182cd43d56353e0171d..a8136351f6f7dae8c65634ed8e1c242d323e2009 100644
+--- a/g10/import.c
++++ b/g10/import.c
+@@ -1042,22 +1042,8 @@ read_block( IOBUF a, unsigned int options,
+ switch (pkt->pkttype)
+ {
+ case PKT_COMPRESSED:
+- if (check_compress_algo (pkt->pkt.compressed->algorithm))
+- {
+- rc = GPG_ERR_COMPR_ALGO;
+- goto ready;
+- }
+- else
+- {
+- compress_filter_context_t *cfx = xmalloc_clear( sizeof *cfx );
+- pkt->pkt.compressed->buf = NULL;
+- if (push_compress_filter2 (a, cfx,
+- pkt->pkt.compressed->algorithm, 1))
+- xfree (cfx); /* e.g. in case of compression_algo NONE. */
+- }
+- free_packet (pkt, &parsectx);
+- init_packet(pkt);
+- break;
++ rc = GPG_ERR_UNEXPECTED;
++ goto ready;
+
+ case PKT_RING_TRUST:
+ /* Skip those packets unless we are in restore mode. */
+diff --git a/g10/mainproc.c b/g10/mainproc.c
+index af11877aa257e46662c42b6ff573ee01c3ad1547..3629fc921b742afd131e8d8e2664b201095990f0 100644
+--- a/g10/mainproc.c
++++ b/g10/mainproc.c
+@@ -152,6 +152,7 @@ add_onepass_sig (CTX c, PACKET *pkt)
+ {
+ kbnode_t node;
+
++ log_assert(!(c->sigs_only && c->signed_data.used));
+ if (c->list) /* Add another packet. */
+ add_kbnode (c->list, new_kbnode (pkt));
+ else /* Insert the first one. */
+@@ -1076,8 +1077,16 @@ proc_compressed (CTX c, PACKET *pkt)
+ int rc;
+
+ /*printf("zip: compressed data packet\n");*/
+- if (c->sigs_only)
+- rc = handle_compressed (c->ctrl, c, zd, proc_compressed_cb, c);
++ if ( literals_seen )
++ {
++ log_error ("Compressed packet follows literal data packet\n");
++ rc = GPG_ERR_UNEXPECTED;
++ }
++ else if ( c->sigs_only )
++ {
++ log_assert(!c->signed_data.used);
++ rc = handle_compressed (c->ctrl, c, zd, proc_compressed_cb, c);
++ }
+ else if( c->encrypt_only )
+ rc = handle_compressed (c->ctrl, c, zd, proc_encrypt_cb, c);
+ else
+@@ -1596,6 +1605,7 @@ do_proc_packets (CTX c, iobuf_t a)
+ c->iobuf = a;
+ init_packet(pkt);
+ init_parse_packet (&parsectx, a);
++ parsectx.sigs_only = c->sigs_only && c->signed_data.used;
+ while ((rc=parse_packet (&parsectx, pkt)) != -1)
+ {
+ any_data = 1;
+@@ -1607,6 +1617,12 @@ do_proc_packets (CTX c, iobuf_t a)
+ if (gpg_err_code (rc) == GPG_ERR_INV_PACKET
+ && opt.list_packets == 0)
+ break;
++
++ if (gpg_err_code (rc) == GPG_ERR_UNEXPECTED)
++ {
++ write_status_text( STATUS_UNEXPECTED, "0" );
++ goto leave;
++ }
+ continue;
+ }
+ newpkt = -1;
+@@ -1644,7 +1660,9 @@ do_proc_packets (CTX c, iobuf_t a)
+ case PKT_COMPRESSED: rc = proc_compressed (c, pkt); break;
+ case PKT_ONEPASS_SIG: newpkt = add_onepass_sig (c, pkt); break;
+ case PKT_GPG_CONTROL: newpkt = add_gpg_control (c, pkt); break;
+- default: newpkt = 0; break;
++ default:
++ log_assert(!c->signed_data.used);
++ newpkt = 0; break;
+ }
+ }
+ else if (c->encrypt_only)
+diff --git a/g10/packet.h b/g10/packet.h
+index 5a14015a16c872fe7b0b15468598daf7a05ffc02..82dfe786b46051491e7015e64441678140defa9e 100644
+--- a/g10/packet.h
++++ b/g10/packet.h
+@@ -657,6 +657,7 @@ struct parse_packet_ctx_s
+ int free_last_pkt; /* Indicates that LAST_PKT must be freed. */
+ int skip_meta; /* Skip ring trust packets. */
+ unsigned int n_parsed_packets; /* Number of parsed packets. */
++ int sigs_only; /* Only accept detached signature packets */
+ };
+ typedef struct parse_packet_ctx_s *parse_packet_ctx_t;
+
+@@ -667,6 +668,7 @@ typedef struct parse_packet_ctx_s *parse_packet_ctx_t;
+ (a)->free_last_pkt = 0; \
+ (a)->skip_meta = 0; \
+ (a)->n_parsed_packets = 0; \
++ (a)->sigs_only = 0; \
+ } while (0)
+
+ #define deinit_parse_packet(a) do { \
+diff --git a/g10/parse-packet.c b/g10/parse-packet.c
+index cea1f7ebc5daec3863ae963c1ab25500f86796fe..dca66ff427ea6778e536782ec6bda83584877342 100644
+--- a/g10/parse-packet.c
++++ b/g10/parse-packet.c
+@@ -738,6 +738,20 @@ parse (parse_packet_ctx_t ctx, PACKET *pkt, int onlykeypkts, off_t * retpos,
+ case PKT_ENCRYPTED_MDC:
+ case PKT_ENCRYPTED_AEAD:
+ case PKT_COMPRESSED:
++ if (ctx->sigs_only)
++ {
++ log_error (_("partial length packet of type %d in detached"
++ " signature\n"), pkttype);
++ rc = gpg_error (GPG_ERR_UNEXPECTED);
++ goto leave;
++ }
++ if (onlykeypkts)
++ {
++ log_error (_("partial length packet of type %d in keyring\n"),
++ pkttype);
++ rc = gpg_error (GPG_ERR_UNEXPECTED);
++ goto leave;
++ }
+ iobuf_set_partial_body_length_mode (inp, c & 0xff);
+ pktlen = 0; /* To indicate partial length. */
+ partial = 1;
+@@ -775,6 +789,20 @@ parse (parse_packet_ctx_t ctx, PACKET *pkt, int onlykeypkts, off_t * retpos,
+ rc = gpg_error (GPG_ERR_INV_PACKET);
+ goto leave;
+ }
++ else if (ctx->sigs_only)
++ {
++ log_error (_("indeterminate length packet of type %d in detached"
++ " signature\n"), pkttype);
++ rc = gpg_error (GPG_ERR_UNEXPECTED);
++ goto leave;
++ }
++ else if (onlykeypkts)
++ {
++ log_error (_("indeterminate length packet of type %d in"
++ " keyring\n"), pkttype);
++ rc = gpg_error (GPG_ERR_UNEXPECTED);
++ goto leave;
++ }
+ }
+ else
+ {
+@@ -828,7 +856,21 @@ parse (parse_packet_ctx_t ctx, PACKET *pkt, int onlykeypkts, off_t * retpos,
+ goto leave;
+ }
+
+- if (with_uid && pkttype == PKT_USER_ID)
++ if (ctx->sigs_only)
++ switch (pkttype)
++ {
++ case PKT_SIGNATURE:
++ case PKT_MARKER:
++ break;
++ default:
++ log_error(_("Packet type %d not allowed in detached signature\n"),
++ pkttype);
++ iobuf_skip_rest (inp, pktlen, partial);
++ *skip = 1;
++ rc = GPG_ERR_UNEXPECTED;
++ goto leave;
++ }
++ else if (with_uid && pkttype == PKT_USER_ID)
+ /* If ONLYKEYPKTS is set to 2, then we never skip user id packets,
+ even if DO_SKIP is set. */
+ ;
+--
+2.36.1
+
diff --git a/pkgs/tools/security/kubesec/default.nix b/pkgs/tools/security/kubesec/default.nix
index 001e851912a7..9a3e2df02b1d 100644
--- a/pkgs/tools/security/kubesec/default.nix
+++ b/pkgs/tools/security/kubesec/default.nix
@@ -1,29 +1,54 @@
{ lib
, buildGoModule
, fetchFromGitHub
+, installShellFiles
}:
buildGoModule rec {
pname = "kubesec";
- version = "2.11.4";
+ version = "2.11.5";
src = fetchFromGitHub {
owner = "controlplaneio";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-z1v+xm0ZWs8F5KtltBSDx9W+xNqRsfvAgQUKgrZa+28=";
+ sha256 = "sha256-SxXYtIoyKe9/M3Ct1qy2QC6pYpt9GOefGsC5nUCoTEA=";
};
+ vendorSha256 = "sha256-pq4s/Rqu1I1nrTxy5Cn1rt5HO6z7ziKz/9LLpXLYpPc=";
- vendorSha256 = "sha256-t2GZaLa/Pc/TCjqTNGuLnOFSepExmE2xA8pc9HkUtcs=";
+ nativeBuildInputs = [ installShellFiles ];
+
+ ldflags = [
+ "-s"
+ "-w"
+ "-X github.com/controlplaneio/kubesec/v${lib.versions.major version}/cmd.version=v${version}"
+ ];
# Tests wants to download the kubernetes schema for use with kubeval
doCheck = false;
+ postInstall = ''
+ installShellCompletion --cmd kubesec \
+ --bash <($out/bin/kubesec completion bash) \
+ --fish <($out/bin/kubesec completion fish) \
+ --zsh <($out/bin/kubesec completion zsh)
+ '';
+
+ doInstallCheck = true;
+ installCheckPhase = ''
+ runHook preInstallCheck
+
+ $out/bin/kubesec --help
+ $out/bin/kubesec version | grep "${version}"
+
+ runHook postInstallCheck
+ '';
+
meta = with lib; {
description = "Security risk analysis tool for Kubernetes resources";
homepage = "https://github.com/controlplaneio/kubesec";
changelog = "https://github.com/controlplaneio/kubesec/blob/v${version}/CHANGELOG.md";
license = with licenses; [ asl20 ];
- maintainers = with maintainers; [ fab ];
+ maintainers = with maintainers; [ fab jk ];
};
}
diff --git a/pkgs/tools/system/btop/default.nix b/pkgs/tools/system/btop/default.nix
index 7b18f0ec604f..4dc469846cc8 100644
--- a/pkgs/tools/system/btop/default.nix
+++ b/pkgs/tools/system/btop/default.nix
@@ -8,8 +8,8 @@
stdenv.mkDerivation rec {
pname = "btop";
- version = "1.2.7";
- hash = "sha256-zQpt/CEWW3oPqPo6SPuawyfLa50y6M4hL07uRO7YjLo=";
+ version = "1.2.8";
+ hash = "sha256-X+JJXv+8EIh0hjYnKkeQ3+XQ6CerHrEvPCok5DYxcwc=";
src = fetchFromGitHub {
owner = "aristocratos";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a9c0377ba5bc..24f0572f5e04 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -220,6 +220,7 @@ mapAliases ({
cpuminer-multi = throw "cpuminer-multi has been removed: deleted by upstream"; # Added 2022-01-07
crafty = throw "crafty has been removed: deleted by upstream"; # Added 2022-01-07
cryptol = throw "cryptol was removed due to prolonged broken build"; # Added 2020-08-21
+ cryptpad = throw "cryptpad has been removed, because it was unmaintained in nixpkgs"; # Added 2022-07-04
ctl = throw "ctl has been removed: abandoned by upstream"; # Added 2022-05-13
# CUDA Toolkit
@@ -952,7 +953,8 @@ mapAliases ({
nmap-unfree = nmap; # Added 2021-04-06
nmap-graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Added 2022-04-26
nmap_graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Modified 2022-04-26
- nodejs-10_x = throw "nodejs-10_X has been removed. Use a newer version instead."; # Added 2022-05-31
+ nodejs-10_x = throw "nodejs-10_x has been removed. Use a newer version instead."; # Added 2022-05-31
+ nodejs-12_x = throw "nodejs-12_x has been removed. Use a newer version instead."; # Added 2022-07-04
nologin = throw "'nologin' has been renamed to/replaced by 'shadow'"; # Converted to throw 2022-02-22
nomad_1_1 = throw "nomad_1_1 has been removed because it's outdated. Use a a newer version instead"; # Added 2022-05-22
nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # Added 2021-05-27
@@ -1200,6 +1202,7 @@ mapAliases ({
### R ###
radare2-cutter = cutter; # Added 2021-03-30
+ railcar = throw "'railcar' has been removed, as the upstream project has been abandoned"; # Added 2022-06-27
raspberrypi-tools = throw "raspberrypi-tools has been removed in favor of identical 'libraspberrypi'"; # Added 2020-12-24
rawdog = throw "rawdog has been removed from nixpkgs as it still requires python2"; # Added 2022-01-01
rdiff_backup = throw "'rdiff_backup' has been renamed to/replaced by 'rdiff-backup'"; # Converted to throw 2022-02-22
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6508ddc8b2f7..9bc8abaa572c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -426,6 +426,8 @@ with pkgs;
glade = callPackage ../development/tools/glade { };
+ goda = callPackage ../development/tools/goda { };
+
gojq = callPackage ../development/tools/gojq { };
gpick = callPackage ../tools/misc/gpick { };
@@ -4920,10 +4922,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
};
- cryptpad = callPackage ../servers/web-apps/cryptpad {
- nodejs = nodejs-12_x;
- };
-
ethash = callPackage ../development/libraries/ethash { };
ethminer = callPackage ../tools/misc/ethminer { cudaSupport = config.cudaSupport or true; };
@@ -8083,10 +8081,6 @@ with pkgs;
nodejs-slim = nodejs-slim-16_x;
- nodejs-12_x = callPackage ../development/web/nodejs/v12.nix { };
- nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix {
- enableNpm = false;
- };
nodejs-14_x = callPackage ../development/web/nodejs/v14.nix { };
nodejs-slim-14_x = callPackage ../development/web/nodejs/v14.nix {
enableNpm = false;
@@ -8317,9 +8311,7 @@ with pkgs;
librest_1_0 = callPackage ../development/libraries/librest/1.0.nix { };
- inherit (callPackages ../development/libraries/libwebsockets { })
- libwebsockets_4_3;
- libwebsockets = libwebsockets_4_3;
+ libwebsockets = callPackage ../development/libraries/libwebsockets { };
licensee = callPackage ../tools/package-management/licensee { };
@@ -14181,7 +14173,8 @@ with pkgs;
sbcl_2_1_10 = callPackage ../development/compilers/sbcl/2.1.10.nix {};
sbcl_2_1_11 = callPackage ../development/compilers/sbcl/2.1.11.nix {};
sbcl_2_2_4 = callPackage ../development/compilers/sbcl/2.2.4.nix {};
- sbcl = sbcl_2_2_4;
+ sbcl_2_2_6 = callPackage ../development/compilers/sbcl/2.2.6.nix {};
+ sbcl = sbcl_2_2_6;
roswell = callPackage ../development/tools/roswell { };
@@ -18392,6 +18385,8 @@ with pkgs;
jsonnet-bundler = callPackage ../development/tools/jsonnet-bundler { };
+ jsonnet-language-server = callPackage ../development/tools/jsonnet-language-server { };
+
jrsonnet = callPackage ../development/compilers/jrsonnet { };
go-jsonnet = callPackage ../development/compilers/go-jsonnet { };
@@ -23939,6 +23934,8 @@ with pkgs;
quicktemplate = callPackage ../development/tools/quicktemplate { };
+ linux_logo = callPackage ../tools/misc/linux-logo { };
+
linux-pam = callPackage ../os-specific/linux/pam { };
nss_ldap = callPackage ../os-specific/linux/nss_ldap { };
@@ -25081,6 +25078,8 @@ with pkgs;
inherit (plasma5Packages) breeze-icons;
};
+ papirus-folders = callPackage ../data/misc/papirus-folders { };
+
plasma-overdose-kde-theme = callPackage ../data/themes/plasma-overdose-kde-theme { };
papis = with python3Packages; toPythonApplication papis;
@@ -25499,6 +25498,8 @@ with pkgs;
adobe-reader = pkgsi686Linux.callPackage ../applications/misc/adobe-reader { };
+ adl = callPackage ../applications/video/adl { };
+
appvm = callPackage ../applications/virtualization/appvm { };
yggdrasil = callPackage ../tools/networking/yggdrasil { };
@@ -27301,6 +27302,10 @@ with pkgs;
google-chrome-dev = google-chrome.override { chromium = chromiumDev; channel = "dev"; };
+ go-graft = callPackage ../applications/networking/go-graft {
+ buildGoModule = buildGo118Module;
+ };
+
gosmore = callPackage ../applications/misc/gosmore { stdenv = gcc10StdenvCompat; };
gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { };
@@ -29722,8 +29727,6 @@ with pkgs;
wxGTK = wxGTK30;
};
- railcar = callPackage ../applications/virtualization/railcar {};
-
raiseorlaunch = callPackage ../applications/misc/raiseorlaunch {};
rapid-photo-downloader = libsForQt5.callPackage ../applications/graphics/rapid-photo-downloader { };
@@ -30272,7 +30275,7 @@ with pkgs;
inherit (haskell.packages.ghc8107) ghcWithPackages taffybar;
};
- tagainijisho = callPackage ../applications/office/tagainijisho {};
+ tagainijisho = libsForQt5.callPackage ../applications/office/tagainijisho {};
tahoe-lafs = callPackage ../tools/networking/p2p/tahoe-lafs {};
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 10723fbc7a6d..fa2b83b0a47a 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -519,7 +519,9 @@ let
hpack = callPackage ../development/ocaml-modules/hpack { };
- hxd = callPackage ../development/ocaml-modules/hxd { };
+ hxd = callPackage ../development/ocaml-modules/hxd {
+ cmdliner = cmdliner_1_1;
+ };
imagelib = callPackage ../development/ocaml-modules/imagelib { };