cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2022-11-27 06:01:56 +00:00 committed by GitHub
commit d3e80e4be3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 275 additions and 229 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/virtualization/nixpacks/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "nixpacks"; pname = "nixpacks";
version = "0.14.0"; version = "0.15.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "railwayapp"; owner = "railwayapp";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-az4DllTkGP80Jf0NeaKrBI0zz56chPizJGu97cqXrJ4="; sha256 = "sha256-c1AqqbeBKXfXUKgalbo5OXc0oVyQyntqwmpB0AFlwRs=";
}; };
cargoSha256 = "sha256-ghbJBhoU41yJ3qZBaKzEybNuCLdSqoL30+1h9d56b4A="; cargoSha256 = "sha256-SybFjc1oyfJpen+KH2xj/u3i1S5SLiprwkUPp9IpMfc=";
# skip test due FHS dependency # skip test due FHS dependency
doCheck = false; doCheck = false;

4
pkgs/applications/window-managers/picom/default.nix
View file

@ -32,13 +32,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "picom"; pname = "picom";
version = "10"; version = "10.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "yshui"; owner = "yshui";
repo = "picom"; repo = "picom";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-ACQBgAYtJ4OOQIismNYJB3z426GmlyUtXXbH06eRsgg="; hash = "sha256-EYNLLAz7CkbVGv2XMT+73RR58HzxG+Gy7b5x1qahAgo=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

8
pkgs/build-support/appimage/default.nix
View file

@ -61,6 +61,14 @@ rec {
(args // { (args // {
inherit name extraPkgs; inherit name extraPkgs;
src = extract { inherit name src; }; src = extract { inherit name src; };
# passthru src to make nix-update work
# hack to keep the origin position (unsafeGetAttrPos)
passthru = lib.pipe args [
lib.attrNames
(lib.remove "src")
(removeAttrs args)
] // args.passthru or { };
}); });
defaultFhsEnvArgs = { defaultFhsEnvArgs = {

12
pkgs/development/libraries/audio/lvtk/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, boost, gtkmm2, lv2, pkg-config, python2, wafHook }: { lib, stdenv, fetchFromGitHub, boost, gtkmm2, lv2, pkg-config, python3, wafHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "lvtk"; pname = "lvtk";
@ -11,14 +11,20 @@ stdenv.mkDerivation rec {
sha256 = "sha256-6IoyhBig3Nvc4Y8F0w8b1up6sn8O2RmoUVaBQ//+Aaw="; sha256 = "sha256-6IoyhBig3Nvc4Y8F0w8b1up6sn8O2RmoUVaBQ//+Aaw=";
}; };
nativeBuildInputs = [ pkg-config python2 wafHook ]; nativeBuildInputs = [ pkg-config python3 wafHook ];
buildInputs = [ boost gtkmm2 lv2 ]; buildInputs = [ boost gtkmm2 lv2 ];
enableParallelBuilding = true; enableParallelBuilding = true;
# Fix including the boost libraries during linking
postPatch = '' postPatch = ''
# Fix including the boost libraries during linking
sed -i '/target[ ]*= "ttl2c"/ ilib=["boost_system"],' tools/wscript_build sed -i '/target[ ]*= "ttl2c"/ ilib=["boost_system"],' tools/wscript_build
# don't use bundled waf
rm waf
# remove (useless) python2 based print
sed -e '/print/d' -i wscript
''; '';
wafConfigureFlags = [ wafConfigureFlags = [

4
pkgs/development/libraries/drogon/default.nix
View file

@ -9,13 +9,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "drogon"; pname = "drogon";
version = "1.8.1"; version = "1.8.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "drogonframework"; owner = "drogonframework";
repo = "drogon"; repo = "drogon";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-XzSJABYuZaYlNL12bi0ykQ1OyNsvB1AQiSTBPWiTNYU="; sha256 = "sha256-IpECYpPuheoLelEdgV+J26b+95fMfRmeQ44q6JvqRtw=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

4
pkgs/development/libraries/simdjson/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "simdjson"; pname = "simdjson";
version = "3.0.0"; version = "3.0.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "simdjson"; owner = "simdjson";
repo = "simdjson"; repo = "simdjson";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-Ub0gHxnc4ljVqbAWuFJYBuhA4FjX4ypg1gaPXUrcWkE="; sha256 = "sha256-e5u9+H4rILIDpnZxzVV9wbjhR9tRqnf11i2Kn39DTzo=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

2
pkgs/development/lua-modules/overrides.nix
View file

@ -497,7 +497,7 @@ with prev;
# we override 'luarocks test' because otherwise neovim doesn't find/load the plenary plugin # we override 'luarocks test' because otherwise neovim doesn't find/load the plenary plugin
checkPhase = '' checkPhase = ''
export LIBSQLITE="${sqlite.out}/lib/libsqlite3.so" export LIBSQLITE="${sqlite.out}/lib/libsqlite3${stdenv.hostPlatform.extensions.sharedLibrary}"
export HOME="$TMPDIR"; export HOME="$TMPDIR";
nvim --headless -i NONE \ nvim --headless -i NONE \

14
pkgs/development/python-modules/cryptography/cryptography-py27-warning.patch
View file

@ -1,14 +0,0 @@
Delete the warning that breaks tests of dependent projects.
--- a/src/cryptography/__init__.py
+++ b/src/cryptography/__init__.py
@@ -33,9 +32,0 @@ __all__ = [
-
-if sys.version_info[0] == 2:
- warnings.warn(
- "Python 2 is no longer supported by the Python core team. Support for "
- "it is now deprecated in cryptography, and will be removed in the "
- "next release.",
- CryptographyDeprecationWarning,
- stacklevel=2,
- )

4
pkgs/development/tools/ocaml/dune/3.nix
View file

@ -6,11 +6,11 @@ else
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "dune"; pname = "dune";
version = "3.6.0"; version = "3.6.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
sha256 = "sha256-CKDGyVIWBOYM82r7oDbs8bEH31Hu0Uovt+72z90r8ng="; sha256 = "sha256-8dWsBLegJ/PVSeJc+IXr96zBNeApHBjmtDEjp5nBQ84=";
}; };
nativeBuildInputs = [ ocaml findlib ]; nativeBuildInputs = [ ocaml findlib ];

8
pkgs/development/tools/oh-my-posh/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "oh-my-posh"; pname = "oh-my-posh";
version = "12.17.2"; version = "12.20.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jandedobbeleer"; owner = "jandedobbeleer";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-3/spbZhFa9IwScjJqdiwASiojXxuFLW+WXCteOAePOM="; hash = "sha256-nGhPfwZw73w0iJLdBiXjRQnKPnKIuk6K/5GFKeHlcVw=";
}; };
vendorSha256 = "sha256-OrtKFkWXqVoXKmN6BT8YbCNjR1gRTT4gPNwmirn7fjU="; vendorHash = "sha256-OrtKFkWXqVoXKmN6BT8YbCNjR1gRTT4gPNwmirn7fjU=";
sourceRoot = "source/src"; sourceRoot = "source/src";
@ -34,6 +34,6 @@ buildGoModule rec {
description = "A prompt theme engine for any shell"; description = "A prompt theme engine for any shell";
homepage = "https://ohmyposh.dev"; homepage = "https://ohmyposh.dev";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ lucperkins ]; maintainers = with maintainers; [ lucperkins urandom ];
}; };
} }

10
pkgs/servers/home-assistant/default.nix
View file

@ -41,6 +41,16 @@ let
}; };
}); });
arcam-fmj = super.arcam-fmj.overridePythonAttrs (old: rec {
disabledTestPaths = [
# incompatible with pytest-aiohttp 0.3.0
# see https://github.com/elupus/arcam_fmj/pull/12
"tests/test_fake.py"
"tests/test_standard.py"
"tests/test_utils.py"
];
});
backoff = super.backoff.overridePythonAttrs (oldAttrs: rec { backoff = super.backoff.overridePythonAttrs (oldAttrs: rec {
version = "1.11.1"; version = "1.11.1";
src = fetchFromGitHub { src = fetchFromGitHub {

4
pkgs/servers/metabase/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "metabase"; pname = "metabase";
version = "0.44.3"; version = "0.44.5";
src = fetchurl { src = fetchurl {
url = "https://downloads.metabase.com/v${version}/metabase.jar"; url = "https://downloads.metabase.com/v${version}/metabase.jar";
hash = "sha256-74/G0SJRvyBiIIsCgh9LlINF6MS5UrCKmnfTKPLIpr0="; hash = "sha256-YFFUPWFVHrHpY/QT0IlJv5PGtms6RuE5Wp17CQNG/Aw=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

4
pkgs/servers/nats-server/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "nats-server"; pname = "nats-server";
version = "2.9.7"; version = "2.9.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nats-io"; owner = "nats-io";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-HsVJ5F0vOWeJoIXwWQEiYDZdKVqUL5enH7LNEkC0DTM="; sha256 = "sha256-yJF5azPsTw6DN2c7Rf3cAeydaQh2kxqniEasPgkRS/E=";
}; };
vendorSha256 = "sha256-ASLy0rPuCSYGyy5Pw9fj559nxO4vPPagDKAe8wM29lo="; vendorSha256 = "sha256-ASLy0rPuCSYGyy5Pw9fj559nxO4vPPagDKAe8wM29lo=";

10
pkgs/servers/web-apps/moodle/default.nix
View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, writeText, plugins ? [ ] }: { lib, stdenv, fetchurl, writeText, plugins ? [ ], nixosTests }:
let let
version = "4.0.4"; version = "4.0.5";
versionParts = lib.take 2 (lib.splitVersion version); versionParts = lib.take 2 (lib.splitVersion version);
# 4.2 -> 402, 3.11 -> 311 # 4.2 -> 402, 3.11 -> 311
@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz"; url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz";
sha256 = "sha256-mwfUTMjNj9BKqIFezaekUtR9lwAMmsHaAUt6rkqfW8k="; sha256 = "sha256-m4LyAg/C/ZV3nBD4gNFNjwI6glg7ZAH2nSGg0mU2DsI=";
}; };
phpConfig = writeText "config.php" '' phpConfig = writeText "config.php" ''
@ -56,6 +56,10 @@ in stdenv.mkDerivation rec {
runHook postInstall runHook postInstall
''; '';
passthru.tests = {
inherit (nixosTests) moodle;
};
meta = with lib; { meta = with lib; {
description = description =
"Free and open-source learning management system (LMS) written in PHP"; "Free and open-source learning management system (LMS) written in PHP";

4
pkgs/tools/filesystems/ntfs-3g/default.nix
View file

@ -5,7 +5,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ntfs3g"; pname = "ntfs3g";
version = "2022.5.17"; version = "2022.10.3";
outputs = [ "out" "dev" "man" "doc" ]; outputs = [ "out" "dev" "man" "doc" ];
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
owner = "tuxera"; owner = "tuxera";
repo = "ntfs-3g"; repo = "ntfs-3g";
rev = version; rev = version;
sha256 = "sha256-xh8cMNIHeJ1rtk5zwOsmcxeedgZ3+MSiWn2UC7y+gtQ="; sha256 = "sha256-nuFTsGkm3zmSzpwmhyY7Ke0VZfZU0jHOzEWaLBbglQk=";
}; };
buildInputs = [ gettext libuuid ] buildInputs = [ gettext libuuid ]

6
pkgs/tools/misc/apkeep/default.nix
View file

@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "apkeep"; pname = "apkeep";
version = "0.13.0"; version = "0.14.1";
src = fetchCrate { src = fetchCrate {
inherit pname version; inherit pname version;
sha256 = "sha256-wFrpzemqBdhEO8cahSV9Qjw4HxCk+TgAVpGaa/IaO0Q="; sha256 = "sha256-ikI178fExFHYapg95NKtMxKT/4mXfVH+Jvaw8i1pSu4=";
}; };
cargoSha256 = "sha256-6DAzNiNHmzOwg7RlRCorUCW33FTYdfLf6PnTygcL1ok="; cargoSha256 = "sha256-hA/GIj5MunflLlwa0S4o4EEr6Us+34dgYAAc43C6EXo=";
prePatch = '' prePatch = ''
rm .cargo/config.toml rm .cargo/config.toml

113
pkgs/tools/misc/fluentd/Gemfile.lock
View file

@ -1,79 +1,84 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
addressable (2.8.0) addressable (2.8.1)
public_suffix (>= 2.0.2, < 5.0) public_suffix (>= 2.0.2, < 6.0)
aws-eventstream (1.2.0) aws-eventstream (1.2.0)
aws-partitions (1.540.0) aws-partitions (1.661.0)
aws-sdk-cloudwatchlogs (1.49.0) aws-sdk-cloudwatchlogs (1.56.0)
aws-sdk-core (~> 3, >= 3.122.0) aws-sdk-core (~> 3, >= 3.165.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-core (3.124.0) aws-sdk-core (3.167.0)
aws-eventstream (~> 1, >= 1.0.2) aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0) aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.5)
jmespath (~> 1, >= 1.6.1)
aws-sdk-firehose (1.49.0)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
jmespath (~> 1.0) aws-sdk-kinesis (1.42.0)
aws-sdk-firehose (1.45.0) aws-sdk-core (~> 3, >= 3.165.0)
aws-sdk-core (~> 3, >= 3.122.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-kinesis (1.38.0) aws-sdk-kms (1.59.0)
aws-sdk-core (~> 3, >= 3.122.0) aws-sdk-core (~> 3, >= 3.165.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-kms (1.52.0) aws-sdk-s3 (1.117.1)
aws-sdk-core (~> 3, >= 3.122.0) aws-sdk-core (~> 3, >= 3.165.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.109.0)
aws-sdk-core (~> 3, >= 3.122.0)
aws-sdk-kms (~> 1) aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4) aws-sigv4 (~> 1.4)
aws-sdk-sqs (1.48.0) aws-sdk-sqs (1.52.0)
aws-sdk-core (~> 3, >= 3.122.0) aws-sdk-core (~> 3, >= 3.165.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sigv4 (1.4.0) aws-sigv4 (1.5.2)
aws-eventstream (~> 1, >= 1.0.2) aws-eventstream (~> 1, >= 1.0.2)
bson (4.12.1) bson (4.15.0)
concurrent-ruby (1.1.9) concurrent-ruby (1.1.10)
cool.io (1.7.1) cool.io (1.7.1)
digest-crc (0.6.4) digest-crc (0.6.4)
rake (>= 12.0.0, < 14.0.0) rake (>= 12.0.0, < 14.0.0)
elasticsearch (7.16.0) elastic-transport (8.1.0)
elasticsearch-api (= 7.16.0) faraday (< 3)
elasticsearch-transport (= 7.16.0)
elasticsearch-api (7.16.0)
multi_json multi_json
elasticsearch-transport (7.16.0) elasticsearch (8.5.1)
faraday (~> 1) elastic-transport (~> 8)
elasticsearch-api (= 8.5.1)
elasticsearch-api (8.5.1)
multi_json multi_json
excon (0.89.0) excon (0.94.0)
faraday (1.8.0) faraday (1.10.2)
faraday-em_http (~> 1.0) faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0) faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1) faraday-excon (~> 1.1)
faraday-httpclient (~> 1.0.1) faraday-httpclient (~> 1.0)
faraday-multipart (~> 1.0)
faraday-net_http (~> 1.0) faraday-net_http (~> 1.0)
faraday-net_http_persistent (~> 1.1) faraday-net_http_persistent (~> 1.0)
faraday-patron (~> 1.0) faraday-patron (~> 1.0)
faraday-rack (~> 1.0) faraday-rack (~> 1.0)
multipart-post (>= 1.2, < 3) faraday-retry (~> 1.0)
ruby2_keywords (>= 0.0.4) ruby2_keywords (>= 0.0.4)
faraday-em_http (1.0.0) faraday-em_http (1.0.0)
faraday-em_synchrony (1.0.0) faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0) faraday-excon (1.1.0)
faraday-httpclient (1.0.1) faraday-httpclient (1.0.1)
faraday-multipart (1.0.4)
multipart-post (~> 2)
faraday-net_http (1.0.1) faraday-net_http (1.0.1)
faraday-net_http_persistent (1.2.0) faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0) faraday-patron (1.0.0)
faraday-rack (1.0.0) faraday-rack (1.0.0)
faraday-retry (1.0.3)
fluent-config-regexp-type (1.0.0) fluent-config-regexp-type (1.0.0)
fluentd (> 1.0.0, < 2) fluentd (> 1.0.0, < 2)
fluent-plugin-cloudwatch-logs (0.14.2) fluent-plugin-cloudwatch-logs (0.14.3)
aws-sdk-cloudwatchlogs (~> 1.0) aws-sdk-cloudwatchlogs (~> 1.0)
fluentd (>= 1.8.0) fluentd (>= 1.8.0)
fluent-plugin-elasticsearch (5.1.4) fluent-plugin-elasticsearch (5.2.4)
elasticsearch elasticsearch
excon excon
faraday (~> 1.10)
fluentd (>= 0.14.22) fluentd (>= 0.14.22)
fluent-plugin-kafka (0.17.3) fluent-plugin-kafka (0.18.1)
fluentd (>= 0.10.58, < 2) fluentd (>= 0.10.58, < 2)
ltsv ltsv
ruby-kafka (>= 1.4.0, < 2) ruby-kafka (>= 1.4.0, < 2)
@ -82,59 +87,59 @@ GEM
aws-sdk-kinesis (~> 1, != 1.5, != 1.4, != 1.14) aws-sdk-kinesis (~> 1, != 1.5, != 1.4, != 1.14)
fluentd (>= 0.14.22, < 2) fluentd (>= 0.14.22, < 2)
google-protobuf (~> 3) google-protobuf (~> 3)
fluent-plugin-mongo (1.5.0) fluent-plugin-mongo (1.6.0)
fluentd (>= 0.14.22, < 2) fluentd (>= 0.14.22, < 2)
mongo (~> 2.6.0) mongo (>= 2.15.0, < 2.19.0)
fluent-plugin-record-reformer (0.9.1) fluent-plugin-record-reformer (0.9.1)
fluentd fluentd
fluent-plugin-rewrite-tag-filter (2.4.0) fluent-plugin-rewrite-tag-filter (2.4.0)
fluent-config-regexp-type fluent-config-regexp-type
fluentd (>= 0.14.2, < 2) fluentd (>= 0.14.2, < 2)
fluent-plugin-s3 (1.6.1) fluent-plugin-s3 (1.7.2)
aws-sdk-s3 (~> 1.60) aws-sdk-s3 (~> 1.60)
aws-sdk-sqs (~> 1.23) aws-sdk-sqs (~> 1.23)
fluentd (>= 0.14.22, < 2) fluentd (>= 0.14.22, < 2)
fluent-plugin-webhdfs (1.5.0) fluent-plugin-webhdfs (1.5.0)
fluentd (>= 0.14.22) fluentd (>= 0.14.22)
webhdfs (>= 0.10.0) webhdfs (>= 0.10.0)
fluentd (1.14.3) fluentd (1.15.3)
bundler bundler
cool.io (>= 1.4.5, < 2.0.0) cool.io (>= 1.4.5, < 2.0.0)
http_parser.rb (>= 0.5.1, < 0.9.0) http_parser.rb (>= 0.5.1, < 0.9.0)
msgpack (>= 1.3.1, < 2.0.0) msgpack (>= 1.3.1, < 2.0.0)
serverengine (>= 2.2.2, < 3.0.0) serverengine (>= 2.3.0, < 3.0.0)
sigdump (~> 0.2.2) sigdump (~> 0.2.2)
strptime (>= 0.2.4, < 1.0.0) strptime (>= 0.2.4, < 1.0.0)
tzinfo (>= 1.0, < 3.0) tzinfo (>= 1.0, < 3.0)
tzinfo-data (~> 1.0) tzinfo-data (~> 1.0)
webrick (>= 1.4.2, < 1.8.0) webrick (>= 1.4.2, < 1.8.0)
yajl-ruby (~> 1.0) yajl-ruby (~> 1.0)
google-protobuf (3.19.1) google-protobuf (3.21.9)
http_parser.rb (0.8.0) http_parser.rb (0.8.0)
jmespath (1.4.0) jmespath (1.6.1)
ltsv (0.1.2) ltsv (0.1.2)
mongo (2.6.4) mongo (2.18.1)
bson (>= 4.3.0, < 5.0.0) bson (>= 4.14.1, < 5.0.0)
msgpack (1.4.2) msgpack (1.6.0)
multi_json (1.15.0) multi_json (1.15.0)
multipart-post (2.1.1) multipart-post (2.2.3)
public_suffix (4.0.6) public_suffix (5.0.0)
rake (13.0.6) rake (13.0.6)
ruby-kafka (1.4.0) ruby-kafka (1.5.0)
digest-crc digest-crc
ruby2_keywords (0.0.5) ruby2_keywords (0.0.5)
serverengine (2.2.4) serverengine (2.3.0)
sigdump (~> 0.2.2) sigdump (~> 0.2.2)
sigdump (0.2.4) sigdump (0.2.4)
strptime (0.2.5) strptime (0.2.5)
tzinfo (2.0.4) tzinfo (2.0.5)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
tzinfo-data (1.2021.5) tzinfo-data (1.2022.6)
tzinfo (>= 1.0.0) tzinfo (>= 1.0.0)
webhdfs (0.10.2) webhdfs (0.10.2)
addressable addressable
webrick (1.7.0) webrick (1.7.0)
yajl-ruby (1.4.1) yajl-ruby (1.4.3)
PLATFORMS PLATFORMS
ruby ruby
@ -152,4 +157,4 @@ DEPENDENCIES
fluentd fluentd
BUNDLED WITH BUNDLED WITH
2.2.24 2.3.24

183
pkgs/tools/misc/fluentd/gemset.nix
View file

@ -5,10 +5,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw";
type = "gem"; type = "gem";
}; };
version = "2.8.0"; version = "2.8.1";
}; };
aws-eventstream = { aws-eventstream = {
groups = ["default"]; groups = ["default"];
@ -25,10 +25,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1ns0378h8qa5vwrq7a7i0xji17japs95mddpvam351k19a79vbwh"; sha256 = "15bw7jm2n7kxjz65amg9s837zlxsf98fn6wf6x20ngz1x4i8n0j6";
type = "gem"; type = "gem";
}; };
version = "1.540.0"; version = "1.661.0";
}; };
aws-sdk-cloudwatchlogs = { aws-sdk-cloudwatchlogs = {
dependencies = ["aws-sdk-core" "aws-sigv4"]; dependencies = ["aws-sdk-core" "aws-sigv4"];
@ -36,10 +36,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "075qkjzjbi37hnp4qq9gkxy2cfb9v29c66qclfmxqyvfcw5s04b1"; sha256 = "1iy8r65hwqlqaifhv7yxwapizrf02ch800xl90i9vg9293p5545w";
type = "gem"; type = "gem";
}; };
version = "1.49.0"; version = "1.56.0";
}; };
aws-sdk-core = { aws-sdk-core = {
dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
@ -47,10 +47,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1chpydvgwa48rbd67k39fpg2vjp21v3kmjygbjqv1l1sqn6rjbvw"; sha256 = "095nj7sf8914y60m1grnpy7cm6ybnw4ywnc0j84gz2vgv1m8awfk";
type = "gem"; type = "gem";
}; };
version = "3.124.0"; version = "3.167.0";
}; };
aws-sdk-firehose = { aws-sdk-firehose = {
dependencies = ["aws-sdk-core" "aws-sigv4"]; dependencies = ["aws-sdk-core" "aws-sigv4"];
@ -58,10 +58,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "01vf0xzyj1j85vvl16mhazkgs5zz9ym6rk5v7396mlzm8a67796g"; sha256 = "0vhrld6gpa8idw51qfpvy2d624jbwmvickpfr8bnb4a5b06im80a";
type = "gem"; type = "gem";
}; };
version = "1.45.0"; version = "1.49.0";
}; };
aws-sdk-kinesis = { aws-sdk-kinesis = {
dependencies = ["aws-sdk-core" "aws-sigv4"]; dependencies = ["aws-sdk-core" "aws-sigv4"];
@ -69,10 +69,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1xgjmpm2k60sl734g6lv7g8qlm4d6g9pjzgr1825fhd1h492p3dl"; sha256 = "0n6jdkcyh9cm4f15zmmgpzwxbal5dg2w17xcm65d1gf9dwajsjda";
type = "gem"; type = "gem";
}; };
version = "1.38.0"; version = "1.42.0";
}; };
aws-sdk-kms = { aws-sdk-kms = {
dependencies = ["aws-sdk-core" "aws-sigv4"]; dependencies = ["aws-sdk-core" "aws-sigv4"];
@ -80,10 +80,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1br4h5zwb5ir2bf6y0hnlwafkmghxi2fbjqx86agyv838ndy9npd"; sha256 = "0lq1f03gy02f8z5fpc61kngkja8kkgk2m8cc6g42aij0iszjw03c";
type = "gem"; type = "gem";
}; };
version = "1.52.0"; version = "1.59.0";
}; };
aws-sdk-s3 = { aws-sdk-s3 = {
dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
@ -91,10 +91,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0yc96imi4v043rdxa94ncg15aapzp1i5qx076rv25zxqcbkdwzwd"; sha256 = "17ah9j82313ynb8nkcbq21fa3dy1a3v6lk5kdrhphazbpb2xmxkn";
type = "gem"; type = "gem";
}; };
version = "1.109.0"; version = "1.117.1";
}; };
aws-sdk-sqs = { aws-sdk-sqs = {
dependencies = ["aws-sdk-core" "aws-sigv4"]; dependencies = ["aws-sdk-core" "aws-sigv4"];
@ -102,10 +102,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0vzff2v18098cz8c6pvgfh1lc4l1kk4w5gq76rwjdxw2ahnxf4h9"; sha256 = "1jf878ncdkxz3z507pa2fl47h2a9yvi01cx2pg3camqmal1nd1x7";
type = "gem"; type = "gem";
}; };
version = "1.48.0"; version = "1.52.0";
}; };
aws-sigv4 = { aws-sigv4 = {
dependencies = ["aws-eventstream"]; dependencies = ["aws-eventstream"];
@ -113,30 +113,30 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1wh1y79v0s4zgby2m79bnifk65hwf5pvk2yyrxzn2jkjjq8f8fqa"; sha256 = "11hkna2av47bl0yprgp8k4ya70rc3m2ib5w10fn0piplgkkmhz7m";
type = "gem"; type = "gem";
}; };
version = "1.4.0"; version = "1.5.2";
}; };
bson = { bson = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0pnr0b7phdzhkw9xqhmqnw5673ndi13ks3dqwqmbxq6v0rsxiapc"; sha256 = "19vgs9rzzyvd7jfrzynjnc6518q0ffpfciyicfywbp77zl8nc9hk";
type = "gem"; type = "gem";
}; };
version = "4.12.1"; version = "4.15.0";
}; };
concurrent-ruby = { concurrent-ruby = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14";
type = "gem"; type = "gem";
}; };
version = "1.1.9"; version = "1.1.10";
}; };
"cool.io" = { "cool.io" = {
groups = ["default"]; groups = ["default"];
@ -159,16 +159,27 @@
}; };
version = "0.6.4"; version = "0.6.4";
}; };
elasticsearch = { elastic-transport = {
dependencies = ["elasticsearch-api" "elasticsearch-transport"]; dependencies = ["faraday" "multi_json"];
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "06vyavz2lcswj32jdcnjccax3flpcb2xnx9f5jxxm95clkpsqnwa"; sha256 = "0w5l26fwyby8pjcyyap015q5lxc619j8ig6af5slbp9l2x7kjaby";
type = "gem"; type = "gem";
}; };
version = "7.16.0"; version = "8.1.0";
};
elasticsearch = {
dependencies = ["elastic-transport" "elasticsearch-api"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "19jbvm6rzm19vzd3d83icchs0l4qgh7kp3cfi4pd2lcfiy635qil";
type = "gem";
};
version = "8.5.1";
}; };
elasticsearch-api = { elasticsearch-api = {
dependencies = ["multi_json"]; dependencies = ["multi_json"];
@ -176,42 +187,31 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1vp09waa4bi1xk7ixwldiix27g52fd6xcij6826xgypmzrxrn1hc"; sha256 = "00b6lhfs4r9jp3dkphly9qqyyrd7sx4s1186kcjf8zhsxyq0m310";
type = "gem"; type = "gem";
}; };
version = "7.16.0"; version = "8.5.1";
};
elasticsearch-transport = {
dependencies = ["faraday" "multi_json"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1kpcy250crl9w1jspqw9ykv0ixlnscym93mi9kvgljis2yql0qlx";
type = "gem";
};
version = "7.16.0";
}; };
excon = { excon = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0153rr745g48h48vaplgmx7xkfjbc79acpq5jsl7agdrk4yf75ih"; sha256 = "094kbi32i56p08348b95amg9dz5c9prn5jywhkcghsd3d6kll981";
type = "gem"; type = "gem";
}; };
version = "0.89.0"; version = "0.94.0";
}; };
faraday = { faraday = {
dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "multipart-post" "ruby2_keywords"]; dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"];
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0afhlqgby2cizcwgh7h2sq5f77q01axjbdl25bsvfwsry9n7gyyi"; sha256 = "1d5ipsv069dhgv9zhxgj8pz4j52yhgvfm01aq881yz7qgjd7ilxp";
type = "gem"; type = "gem";
}; };
version = "1.8.0"; version = "1.10.2";
}; };
faraday-em_http = { faraday-em_http = {
groups = ["default"]; groups = ["default"];
@ -253,6 +253,17 @@
}; };
version = "1.0.1"; version = "1.0.1";
}; };
faraday-multipart = {
dependencies = ["multipart-post"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09871c4hd7s5ws1wl4gs7js1k2wlby6v947m2bbzg43pnld044lh";
type = "gem";
};
version = "1.0.4";
};
faraday-net_http = { faraday-net_http = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
@ -293,6 +304,16 @@
}; };
version = "1.0.0"; version = "1.0.0";
}; };
faraday-retry = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd";
type = "gem";
};
version = "1.0.3";
};
fluent-config-regexp-type = { fluent-config-regexp-type = {
dependencies = ["fluentd"]; dependencies = ["fluentd"];
groups = ["default"]; groups = ["default"];
@ -310,21 +331,21 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0z1i1n921i5w43bl6rcsj526a22dzv6lrninwj8ygaksgrg5rr45"; sha256 = "139d7qv4my818mhjp0104ns9dlndlvrb6dgxa2rkv6jlzlamjpjb";
type = "gem"; type = "gem";
}; };
version = "0.14.2"; version = "0.14.3";
}; };
fluent-plugin-elasticsearch = { fluent-plugin-elasticsearch = {
dependencies = ["elasticsearch" "excon" "fluentd"]; dependencies = ["elasticsearch" "excon" "faraday" "fluentd"];
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1gfqpl2izz036faaz3qlq61da87avhmc2406s21shayhkf8sx0p9"; sha256 = "136nsmi15vcn0var59j1vqkysvmcp7y8fva25gkcx3hx1l92bxwh";
type = "gem"; type = "gem";
}; };
version = "5.1.4"; version = "5.2.4";
}; };
fluent-plugin-kafka = { fluent-plugin-kafka = {
dependencies = ["fluentd" "ltsv" "ruby-kafka"]; dependencies = ["fluentd" "ltsv" "ruby-kafka"];
@ -332,10 +353,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "15hdd140nqh9zg10wqdwp3m0k1l5w1xhllvbfs5z21aqwrvwc0mp"; sha256 = "1ggiq89brahyamnw4sn4pmfqsw8xjz2k9k9hajsjlzkm9djppdwf";
type = "gem"; type = "gem";
}; };
version = "0.17.3"; version = "0.18.1";
}; };
fluent-plugin-kinesis = { fluent-plugin-kinesis = {
dependencies = ["aws-sdk-firehose" "aws-sdk-kinesis" "fluentd" "google-protobuf"]; dependencies = ["aws-sdk-firehose" "aws-sdk-kinesis" "fluentd" "google-protobuf"];
@ -354,10 +375,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1rpaglr8hka0prvj5xsrl1af3137c7ma1d1xf1mvib5k9h0aax1f"; sha256 = "1m3fa6fwpzxw08lnczsif5c7v33yryyvgb1lbp7a7qjhipvb6jfm";
type = "gem"; type = "gem";
}; };
version = "1.5.0"; version = "1.6.0";
}; };
fluent-plugin-record-reformer = { fluent-plugin-record-reformer = {
dependencies = ["fluentd"]; dependencies = ["fluentd"];
@ -387,10 +408,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "191j1y76irfgrsj259mj062izkfxrr5kajixdf17h26m3l9n5pgh"; sha256 = "04yvxhynjqm35dycrxqwfw9r7mv6ycyda1wvki27z5hpsdy57b1m";
type = "gem"; type = "gem";
}; };
version = "1.6.1"; version = "1.7.2";
}; };
fluent-plugin-webhdfs = { fluent-plugin-webhdfs = {
dependencies = ["fluentd" "webhdfs"]; dependencies = ["fluentd" "webhdfs"];
@ -409,20 +430,20 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1vrw0i286ssrr33g1zayqjk9fxmjz8a4xhrka0id2a9w3ncq275z"; sha256 = "1jn1i14zaw2pf4j6i7g7cj0h8j94wrcbn0an8w44h7g5mazl98nn";
type = "gem"; type = "gem";
}; };
version = "1.14.3"; version = "1.15.3";
}; };
google-protobuf = { google-protobuf = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1dwx4ns39bpmzmhglyip9d68i117zspf5lp865pf6hrsmmdf2k53"; sha256 = "1p4aa5nnkkrdd3v3i57092vj2agj7ih3zavymw451j52k8anqras";
type = "gem"; type = "gem";
}; };
version = "3.19.1"; version = "3.21.9";
}; };
"http_parser.rb" = { "http_parser.rb" = {
groups = ["default"]; groups = ["default"];
@ -439,10 +460,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf"; sha256 = "1mnvb80cdg7fzdcs3xscv21p28w4igk5sj5m7m81xp8v2ks87jj0";
type = "gem"; type = "gem";
}; };
version = "1.4.0"; version = "1.6.1";
}; };
ltsv = { ltsv = {
groups = ["default"]; groups = ["default"];
@ -460,20 +481,20 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0k0f1826hixqfqgsc9g6rdqrzr5pzy46hszmk6869pmvm638jah1"; sha256 = "16dzacmhz4g4n4kmw9qfg7hjh4xj71rzb7nd7n8vl1788x9h3sp5";
type = "gem"; type = "gem";
}; };
version = "2.6.4"; version = "2.18.1";
}; };
msgpack = { msgpack = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "06iajjyhx0rvpn4yr3h1hc4w4w3k59bdmfhxnjzzh76wsrdxxrc6"; sha256 = "1q03pb0vq8388s431nbxabsfxnch6p304c8vnjlk0zzpcv713yr3";
type = "gem"; type = "gem";
}; };
version = "1.4.2"; version = "1.6.0";
}; };
multi_json = { multi_json = {
groups = ["default"]; groups = ["default"];
@ -490,20 +511,20 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj"; sha256 = "1n0kvnrcrjn31jb97kcx3wj1f5kkjza7yygfq8rxzf3i57g7jaa6";
type = "gem"; type = "gem";
}; };
version = "2.1.1"; version = "2.2.3";
}; };
public_suffix = { public_suffix = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; sha256 = "0sqw1zls6227bgq38sxb2hs8nkdz4hn1zivs27mjbniswfy4zvi6";
type = "gem"; type = "gem";
}; };
version = "4.0.6"; version = "5.0.0";
}; };
rake = { rake = {
groups = ["default"]; groups = ["default"];
@ -521,10 +542,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1bmp3nsf836z3392drhlfmhav2025k46yj8sbhphpphr22v3ka7k"; sha256 = "13i3fvjy0n1n1aa71b30nwx2xchhsps3yhi17r0s6ay7wr26jr7p";
type = "gem"; type = "gem";
}; };
version = "1.4.0"; version = "1.5.0";
}; };
ruby2_keywords = { ruby2_keywords = {
groups = ["default"]; groups = ["default"];
@ -542,10 +563,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1gzhggx40a53mnv4f32xag4h6ai0s5m3w06s59b0h6ih7rqvwns9"; sha256 = "1snxfmkmmxpdica8629gdl6qj3xradcx787ccvhfa90gh8wyfqqj";
type = "gem"; type = "gem";
}; };
version = "2.2.4"; version = "2.3.0";
}; };
sigdump = { sigdump = {
groups = ["default"]; groups = ["default"];
@ -573,10 +594,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z"; sha256 = "0rx114mpqnw2k4h98vc0rs0x0bmf0img84yh8mkkjkal07cjydf5";
type = "gem"; type = "gem";
}; };
version = "2.0.4"; version = "2.0.5";
}; };
tzinfo-data = { tzinfo-data = {
dependencies = ["tzinfo"]; dependencies = ["tzinfo"];
@ -584,10 +605,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0w1iyvw0m2xvdr4654jnn1g27jwj84y94dvaj1k2p3lcrvndm698"; sha256 = "0dpwi70x9jrpvc7p103ci0kppam79wqqrskq9n39r3jrp4b4j27w";
type = "gem"; type = "gem";
}; };
version = "1.2021.5"; version = "1.2022.6";
}; };
webhdfs = { webhdfs = {
dependencies = ["addressable"]; dependencies = ["addressable"];
@ -615,9 +636,9 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "16v0w5749qjp13xhjgr2gcsvjv6mf35br7iqwycix1n2h7kfcckf"; sha256 = "1lni4jbyrlph7sz8y49q84pb0sbj82lgwvnjnsiv01xf26f4v5wc";
type = "gem"; type = "gem";
}; };
version = "1.4.1"; version = "1.4.3";
}; };
} }

4
pkgs/tools/misc/ostree/default.nix
View file

@ -43,13 +43,13 @@ let
])); ]));
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "ostree"; pname = "ostree";
version = "2022.6"; version = "2022.7";
outputs = [ "out" "dev" "man" "installedTests" ]; outputs = [ "out" "dev" "man" "installedTests" ];
src = fetchurl { src = fetchurl {
url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"; url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz";
sha256 = "sha256-g170fZoLNaEMd//X8PvS4rh/fMy1iNonRCoF/3H/rYw="; sha256 = "sha256-i+KpJhyU6LnsQRM4D/xID4WYJF+zIaAJutT65LgiQR8=";
}; };
patches = [ patches = [

4
pkgs/tools/networking/dropbear/default.nix
View file

@ -16,11 +16,11 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "dropbear"; pname = "dropbear";
version = "2020.81"; version = "2022.82";
src = fetchurl { src = fetchurl {
url = "https://matt.ucc.asn.au/dropbear/releases/dropbear-${version}.tar.bz2"; url = "https://matt.ucc.asn.au/dropbear/releases/dropbear-${version}.tar.bz2";
sha256 = "0fy5ma4cfc2pk25mcccc67b2mf1rnb2c06ilb7ddnxbpnc85s8s8"; sha256 = "sha256-OgONK7wCvyi73SDAEgkfdBo+xcvkYGkYEdcUh2qtddE=";
}; };
dontDisableStatic = enableStatic; dontDisableStatic = enableStatic;

33
pkgs/tools/networking/dropbear/pass-path.patch
View file

@ -1,36 +1,39 @@
diff --git a/svr-chansession.c b/svr-chansession.c diff --git a/svr-chansession.c b/svr-chansession.c
index e44299e..7ef750a 100644 index 9ae2e60..2db7598 100644
--- a/svr-chansession.c --- a/svr-chansession.c
+++ b/svr-chansession.c +++ b/svr-chansession.c
@@ -893,6 +893,8 @@ static void addchildpid(struct ChanSess *chansess, pid_t pid) { @@ -948,6 +948,8 @@ static void addchildpid(struct ChanSess *chansess, pid_t pid) {
static void execchild(void *user_data) { static void execchild(const void *user_data) {
struct ChanSess *chansess = user_data; const struct ChanSess *chansess = user_data;
char *usershell = NULL; char *usershell = NULL;
+ const char *path = DEFAULT_PATH; + const char *path = (getuid() == 0) ? DEFAULT_ROOT_PATH : DEFAULT_PATH;
+ const char *ldpath = NULL; + const char *ldpath = NULL;
char *cp = NULL;
/* with uClinux we'll have vfork()ed, so don't want to overwrite the char *envcp = getenv("LANG");
* hostkey. can't think of a workaround to clear it */ if (envcp != NULL) {
@@ -905,6 +907,10 @@ static void execchild(void *user_data) { @@ -965,6 +967,11 @@ static void execchild(const void *user_data) {
seedrandom(); seedrandom();
#endif #endif
+ if (getenv("PATH")) + if (getenv("PATH")) {
+ path = getenv("PATH"); + path = getenv("PATH");
+ }
+ ldpath = getenv("LD_LIBRARY_PATH"); + ldpath = getenv("LD_LIBRARY_PATH");
+ +
/* clear environment */ /* clear environment if -e was not set */
/* if we're debugging using valgrind etc, we need to keep the LD_PRELOAD /* if we're debugging using valgrind etc, we need to keep the LD_PRELOAD
* etc. This is hazardous, so should only be used for debugging. */ * etc. This is hazardous, so should only be used for debugging. */
@@ -948,7 +954,10 @@ static void execchild(void *user_data) { @@ -1012,10 +1019,9 @@ static void execchild(const void *user_data) {
addnewvar("LOGNAME", ses.authstate.pw_name); addnewvar("LOGNAME", ses.authstate.pw_name);
addnewvar("HOME", ses.authstate.pw_dir); addnewvar("HOME", ses.authstate.pw_dir);
addnewvar("SHELL", get_user_shell()); addnewvar("SHELL", get_user_shell());
- if (getuid() == 0) {
- addnewvar("PATH", DEFAULT_ROOT_PATH);
- } else {
- addnewvar("PATH", DEFAULT_PATH); - addnewvar("PATH", DEFAULT_PATH);
+ addnewvar("PATH", path); + addnewvar("PATH", path);
+ if (ldpath != NULL) { + if (ldpath != NULL) {
+ addnewvar("LD_LIBRARY_PATH", ldpath); + addnewvar("LD_LIBRARY_PATH", ldpath);
+ }
if (chansess->term != NULL) {
addnewvar("TERM", chansess->term);
} }
if (cp != NULL) {
addnewvar("LANG", cp);

6
pkgs/tools/networking/netbird/default.nix
View file

@ -14,16 +14,16 @@ let
in in
buildGoModule rec { buildGoModule rec {
pname = "netbird"; pname = "netbird";
version = "0.10.9"; version = "0.11.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "netbirdio"; owner = "netbirdio";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-i9vbzb/FKaT8Aqqqb8Nlb24Mdu8epPprOiGlt1ER39I="; sha256 = "sha256-9dp/OMHIA1qYM4XLWOTPmlUm6+7EOE9PFsIa8IcZ/8M=";
}; };
vendorSha256 = "sha256-c4LyIEyFNseFuHIGZanzIYSBkDtV0XtEvohAkRCBDbo="; vendorSha256 = "sha256-TfHBvcG3e+yjifPVo0ZgcvLvD16fni4m71nCr4cCBD4=";
nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config;

2
pkgs/tools/security/mkpasswd/default.nix
View file

@ -16,6 +16,6 @@ stdenv.mkDerivation {
description = "Overfeatured front-end to crypt, from the Debian whois package"; description = "Overfeatured front-end to crypt, from the Debian whois package";
license = licenses.gpl2; license = licenses.gpl2;
maintainers = with maintainers; [ cstrahan fpletz ]; maintainers = with maintainers; [ cstrahan fpletz ];
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

4
pkgs/tools/security/swtpm/default.nix
View file

@ -16,13 +16,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "swtpm"; pname = "swtpm";
version = "0.7.3"; version = "0.8.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "stefanberger"; owner = "stefanberger";
repo = "swtpm"; repo = "swtpm";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-YaNQgxk0uT8FLUIxF80jpgO/L9ygGRHaABEcs5ukq5E="; sha256 = "sha256-O+sHkmQ47FbqsgWpaqAc/j2AJ5xzsvpBj/p0Zea1nSI=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

49
pkgs/tools/text/txt2tags/default.nix
View file

@ -1,35 +1,38 @@
{ lib, stdenv, fetchurl, python2 }: { lib
, python3
, fetchFromGitHub
, fetchpatch
}:
stdenv.mkDerivation rec { python3.pkgs.buildPythonApplication rec {
version = "2.6";
pname = "txt2tags"; pname = "txt2tags";
version = "unstable-2022-10-17";
dontBuild = true; format = "setuptools";
# Python script, needs the interpreter src = fetchFromGitHub {
propagatedBuildInputs = [ python2 ]; owner = "txt2tags";
repo = "txt2tags";
rev = "114ab24ea9111060df136bfc1c8b1a35a59fe0f2";
hash = "sha256-h2OtlUMzEHKyJ9AIO1Uo9Lx7jMYZNMtC6U+usBu7gNU=";
};
installPhase = '' postPatch = ''
mkdir -p "$out/bin" substituteInPlace test/lib.py \
mkdir -p "$out/share/doc" --replace 'TXT2TAGS = os.path.join(TEST_DIR, "..", "txt2tags.py")' \
mkdir -p "$out/share/man/man1/" 'TXT2TAGS = "${placeholder "out"}/bin/txt2tags"' \
sed '1s|/usr/bin/env python|${python2}/bin/python|' < txt2tags > "$out/bin/txt2tags" --replace "[PYTHON] + TXT2TAGS" "TXT2TAGS"
chmod +x "$out/bin/txt2tags"
gzip - < doc/manpage.man > "$out/share/man/man1/txt2tags.1.gz"
cp doc/userguide.pdf "$out/share/doc"
cp -r extras/ samples/ test/ "$out/share"
''; '';
src = fetchurl { checkPhase = ''
url = "http://txt2tags.googlecode.com/files/${pname}-${version}.tgz"; ${python3.interpreter} test/run.py
sha256 = "0p5hql559pk8v5dlzgm75yrcxwvz4z30f1q590yzng0ghvbnf530"; '';
};
meta = { meta = {
changelog = "https://github.com/txt2tags/txt2tags/blob/${src.rev}/CHANGELOG.md";
description = "Convert between markup languages";
homepage = "https://txt2tags.org/"; homepage = "https://txt2tags.org/";
description = "A KISS markup language"; license = lib.licenses.gpl2Plus;
license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ dotlambda kovirobi ];
maintainers = with lib.maintainers; [ kovirobi ];
platforms = with lib.platforms; unix;
}; };
} }