Merge master into staging-next

main
github-actions[bot] 2 years ago committed by GitHub
commit b7aba4fb0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      doc/languages-frameworks/coq.section.md
  2. 1
      maintainers/scripts/luarocks-packages.csv
  3. 1
      nixos/tests/all-tests.nix
  4. 25
      nixos/tests/zeronet-conservancy.nix
  5. 6
      pkgs/applications/audio/amberol/default.nix
  6. 2
      pkgs/applications/editors/vim/plugins/overrides.nix
  7. 3
      pkgs/applications/networking/browsers/microsoft-edge/browser.nix
  8. 12
      pkgs/applications/networking/browsers/microsoft-edge/default.nix
  9. 4
      pkgs/applications/networking/cluster/arkade/default.nix
  10. 8
      pkgs/applications/networking/cluster/terraform-providers/providers.json
  11. 4
      pkgs/applications/networking/gopher/sacc/default.nix
  12. 9
      pkgs/applications/networking/p2p/zeronet-conservancy/default.nix
  13. 2
      pkgs/build-support/coq/default.nix
  14. 2
      pkgs/development/compilers/juniper/default.nix
  15. 3
      pkgs/development/coq-modules/hierarchy-builder/default.nix
  16. 24
      pkgs/development/interpreters/lua-5/build-lua-package.nix
  17. 5
      pkgs/development/interpreters/lua-5/hooks/default.nix
  18. 18
      pkgs/development/interpreters/lua-5/hooks/luarocks-check-hook.sh
  19. 32
      pkgs/development/lua-modules/generated-packages.nix
  20. 31
      pkgs/development/lua-modules/overrides.nix
  21. 28
      pkgs/development/python-modules/infinity/default.nix
  22. 91
      pkgs/games/titanion/default.nix
  23. 6
      pkgs/servers/tailscale/default.nix
  24. 6
      pkgs/tools/admin/trivy/default.nix
  25. 4
      pkgs/tools/misc/svtplay-dl/default.nix
  26. 30
      pkgs/tools/networking/dnsmon-go/default.nix
  27. 10
      pkgs/tools/security/rage/default.nix
  28. 31
      pkgs/tools/security/secrets-extractor/default.nix
  29. 6
      pkgs/tools/system/netdata/default.nix
  30. 25
      pkgs/tools/system/netdata/no-files-in-etc-and-var.patch
  31. 4
      pkgs/tools/text/chroma/default.nix
  32. 8
      pkgs/tools/text/chroma/src.json
  33. 4
      pkgs/tools/typesetting/lowdown/default.nix
  34. 4
      pkgs/tools/typesetting/sile/default.nix
  35. 8
      pkgs/top-level/all-packages.nix
  36. 2
      pkgs/top-level/lua-packages.nix
  37. 2
      pkgs/top-level/python-packages.nix

@ -41,7 +41,7 @@ The recommended way of defining a derivation for a Coq library, is to use the `c
* `useDune2` (optional, defaults to `false`) uses Dune2 to build the package if set to true, the presence of this attribute overrides the behavior of the previous one.
* `opam-name` (optional, defaults to concatenating with a dash separator the components of `namePrefix` and `pname`), name of the Dune package to build.
* `enableParallelBuilding` (optional, defaults to `true`), since it is activated by default, we provide a way to disable it.
* `extraInstallFlags` (optional), allows to extend `installFlags` which initializes the variables `DESTDIR` and `COQMF_COQLIB` so as to install in the proper subdirectory. Indeed Coq libraries should be installed in `$(out)/lib/coq/${coq.coq-version}/user-contrib/`. Such directories are automatically added to the `$COQPATH` environment variable by the hook defined in the Coq derivation.
* `extraInstallFlags` (optional), allows to extend `installFlags` which initializes the variable `COQMF_COQLIB` so as to install in the proper subdirectory. Indeed Coq libraries should be installed in `$(out)/lib/coq/${coq.coq-version}/user-contrib/`. Such directories are automatically added to the `$COQPATH` environment variable by the hook defined in the Coq derivation.
* `setCOQBIN` (optional, defaults to `true`), by default, the environment variable `$COQBIN` is set to the current Coq's binary, but one can disable this behavior by setting it to `false`,
* `useMelquiondRemake` (optional, default to `null`) is an attribute set, which, if given, overloads the `preConfigurePhases`, `configureFlags`, `buildPhase`, and `installPhase` attributes of the derivation for a specific use in libraries using `remake` as set up by Guillaume Melquiond for `flocq`, `gappalib`, `interval`, and `coquelicot` (see the corresponding derivation for concrete examples of use of this option). For backward compatibility, the attribute `useMelquiondRemake.logpath` must be set to the logical root of the library (otherwise, one can pass `useMelquiondRemake = {}` to activate this without backward compatibility).
* `dropAttrs`, `keepAttrs`, `dropDerivationAttrs` are all optional and allow to tune which attribute is added or removed from the final call to `mkDerivation`.

@ -86,6 +86,7 @@ plenary.nvim,https://github.com/nvim-lua/plenary.nvim.git,,,,lua5_1,
rapidjson,https://github.com/xpol/lua-rapidjson.git,,,,,
readline,,,,,,
say,https://github.com/Olivine-Labs/say.git,,,,,
sqlite,,,,,,
std._debug,https://github.com/lua-stdlib/_debug.git,,,,,
std.normalize,https://github.com/lua-stdlib/normalize.git,,,,,
stdlib,,,,41.2.2,,vyp

Can't render this file because it has a wrong number of fields in line 72.

@ -613,6 +613,7 @@ in {
yabar = handleTest ./yabar.nix {};
yggdrasil = handleTest ./yggdrasil.nix {};
zammad = handleTest ./zammad.nix {};
zeronet-conservancy = handleTest ./zeronet-conservancy.nix {};
zfs = handleTest ./zfs.nix {};
zigbee2mqtt = handleTest ./zigbee2mqtt.nix {};
zoneminder = handleTest ./zoneminder.nix {};

@ -0,0 +1,25 @@
let
port = 43110;
in
import ./make-test-python.nix ({ pkgs, ... }: {
name = "zeronet-conservancy";
meta = with pkgs.lib.maintainers; {
maintainers = [ fgaz ];
};
nodes.machine = { config, pkgs, ... }: {
services.zeronet = {
enable = true;
package = pkgs.zeronet-conservancy;
inherit port;
};
};
testScript = ''
machine.wait_for_unit("zeronet.service")
machine.wait_for_open_port(${toString port})
machine.succeed("curl --fail -H 'Accept: text/html, application/xml, */*' localhost:${toString port}/Stats")
'';
})

@ -19,20 +19,20 @@
stdenv.mkDerivation rec {
pname = "amberol";
version = "0.7.0";
version = "0.8.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = pname;
rev = version;
hash = "sha256-cBHFyPqhgcFOeYqMhF1aX3XCGAtqEZpI7Mj7b78Etmo=";
hash = "sha256-spVZOFqnY4cNbIY1ED3Zki6yPMoFDNG5BtuD456hPs4=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-GaMJsIrTbhI1tmahEMlI1v5hmjw+tFEv9Wdne/kiYIA=";
hash = "sha256-8PEAyQ8JW45d/Lut3hUSKCzV7JjFTpvKGra5dj3byo4=";
};
postPatch = ''

@ -103,7 +103,6 @@
, golint
, gomodifytags
, gopls
, gotags
, gotools
, iferr
, impl
@ -1042,7 +1041,6 @@ self: super: {
gomodifytags
gopls
# gorename
# gotags
gotools # contains staticcheck
# guru
iferr

@ -30,6 +30,7 @@
, at-spi2-core
, libuuid
, systemd
, wayland
}:
let
@ -76,7 +77,7 @@ stdenv.mkDerivation rec {
xorg.libXcomposite xorg.libXdamage xorg.libXext
xorg.libXfixes xorg.libXrandr libxkbcommon
gtk3 pango cairo gdk-pixbuf mesa
alsa-lib at-spi2-core xorg.libxshmfence systemd
alsa-lib at-spi2-core xorg.libxshmfence systemd wayland
];
naclHelper = lib.makeLibraryPath [
glib nspr atk libdrm xorg.libxcb mesa xorg.libX11

@ -1,20 +1,20 @@
{
beta = import ./browser.nix {
channel = "beta";
version = "101.0.1210.19";
version = "103.0.1264.21";
revision = "1";
sha256 = "sha256:1kgc19ryw69xiqppz90d6sa45g99hzkh7x5yk9d3xlh1gc1xn54p";
sha256 = "sha256:1336i0hy7xnla0pi4vahaxshhmivi1zljhaxyg63352bc7w9j64f";
};
dev = import ./browser.nix {
channel = "dev";
version = "102.0.1227.0";
version = "104.0.1287.1";
revision = "1";
sha256 = "sha256:0dnyandri7yg7c9812pnsxqszxyqcssxf87yskjg2vw95hawf11x";
sha256 = "sha256:10h360vfsfql42i6mpdvf8d0219506ipbk3hdpwl0jhlsphmhw61";
};
stable = import ./browser.nix {
channel = "stable";
version = "100.0.1185.44";
version = "102.0.1245.44";
revision = "1";
sha256 = "sha256:0zv1zyijh620xz36a6nmhv7rbv4ln5f245hyh0w1sngynsl1rz89";
sha256 = "sha256:10r12xlkcnag5jdmnwpqsbkjx1ih1027l573vxmcxmvpmj6y4373";
};
}

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "arkade";
version = "0.8.25";
version = "0.8.28";
src = fetchFromGitHub {
owner = "alexellis";
repo = "arkade";
rev = version;
sha256 = "sha256-m4vgQ4K73qmUMwPtviUQuRC2jNIDlE516WEZkFr3Upw=";
sha256 = "sha256-Tw/FxrmBpC+FDvfvDT1xQtcQwlxUpQHDMzTs3TrugYg=";
};
CGO_ENABLED = 0;

@ -1253,10 +1253,10 @@
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/vsphere",
"repo": "terraform-provider-vsphere",
"rev": "v2.1.1",
"sha256": "sha256-Xu5BMmOHEX+ctPu8374BDGsRC5hnvzji5oI69ptIi3Y=",
"vendorSha256": null,
"version": "2.1.1"
"rev": "v2.2.0",
"sha256": "sha256-UwhIGK1zQ++IuwAKH9i+Dlu2vvXkMYL+s1P03qKSe3E=",
"vendorSha256": "sha256-160GDEQfymeCJpjYOoWP5sGQ0PJHw9kKPaefmbF5Ig4=",
"version": "2.2.0"
},
"vultr": {
"owner": "vultr",

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "sacc";
version = "1.05";
version = "1.06";
src = fetchurl {
url = "ftp://bitreich.org/releases/sacc/sacc-${version}.tar.gz";
sha512 = "080vpacipdis396lrw3fxc1z7h2d0njm2zi63kvlk0n2m1disv97c968zx8dp76kfw1s03nvvr6v3vnpfkkywiz1idjc92s5rgcbsk1";
sha512 = "7a895e432e1d28b7d9b2bb2a5326ca32350876a2c80d39dc6c19e75347d72a4847f1aa4ff11f07e8a9adea14ea71b84d70890dcc170ff6ce0b779e1d6586b4fa";
};
inherit patches;

@ -1,18 +1,19 @@
{ lib
, fetchFromGitHub
, python3Packages
, nixosTests
}:
python3Packages.buildPythonApplication rec {
pname = "zeronet-conservancy";
version = "0.7.5";
version = "0.7.6";
format = "other";
src = fetchFromGitHub {
owner = "zeronet-conservancy";
repo = "zeronet-conservancy";
rev = "v${version}";
sha256 = "sha256-cq0q5hXEhazHPJODNJ8iL0qAB5DJW6ANST4r/rslvXk=";
sha256 = "sha256-tWNU7UJVWB+aRLam6WKV/HaRRTIQvlEgxe4xJYKpXJY=";
};
propagatedBuildInputs = with python3Packages; [
@ -35,6 +36,10 @@ python3Packages.buildPythonApplication rec {
--set PATH ${python3Packages.python}/bin
'';
passthru.tests = {
nixos-test = nixosTests.zeronet-conservancy;
};
meta = with lib; {
description = "A fork/continuation of the ZeroNet project";
longDescription = ''

@ -104,7 +104,7 @@ stdenv.mkDerivation (removeAttrs ({
// (optionalAttrs setCOQBIN { COQBIN = "${coq}/bin/"; })
// (optionalAttrs (!args?installPhase && !args?useMelquiondRemake) {
installFlags =
[ "DESTDIR=$(out)" ] ++ coqlib-flags ++ docdir-flags ++
coqlib-flags ++ docdir-flags ++
extraInstallFlags;
})
// (optionalAttrs useDune2 {

@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://www.juniper-lang.org/";
license = licenses.mit;
maintainers = with maintainers; [ wunderbrick ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}

@ -32,4 +32,7 @@ with lib; let hb = mkCoqDerivation {
hb.overrideAttrs (o:
optionalAttrs (versions.isGe "1.2.0" o.version || o.version == "dev")
{ buildPhase = "make build"; }
//
optionalAttrs (versions.isGe "1.1.0" o.version || o.version == "dev")
{ installFlags = [ "DESTDIR=$(out)" ] ++ o.installFlags; }
)

@ -4,6 +4,7 @@
, wrapLua
# Whether the derivation provides a lua module or not.
, toLuaModule
, luarocksCheckHook
}:
{
@ -42,6 +43,7 @@ pname
, passthru ? {}
, doCheck ? false
, doInstallCheck ? false
# Non-Lua / system (e.g. C library) dependencies. Is a list of deps, where
# each dep is either a derivation, or an attribute set like
@ -97,10 +99,12 @@ let
# Filter out the lua derivation itself from the Lua module dependency
# closure, as it doesn't have a rock tree :)
requiredLuaRocks = lib.filter (d: d ? luaModule)
(lua.pkgs.requiredLuaModules luarocksDrv.propagatedBuildInputs);
(lua.pkgs.requiredLuaModules (luarocksDrv.nativeBuildInputs ++ luarocksDrv.propagatedBuildInputs));
# example externalDeps': [ { name = "CRYPTO"; dep = pkgs.openssl; } ]
externalDepsGenerated = lib.unique (lib.filter (drv: !drv ? luaModule) (luarocksDrv.propagatedBuildInputs ++ luarocksDrv.buildInputs));
externalDepsGenerated = lib.unique (lib.filter (drv: !drv ? luaModule) (
luarocksDrv.nativeBuildInputs ++ luarocksDrv.propagatedBuildInputs ++ luarocksDrv.buildInputs)
);
externalDeps' = lib.filter (dep: !lib.isDerivation dep) externalDeps;
luarocksDrv = toLuaModule ( lua.stdenv.mkDerivation (
@ -108,15 +112,17 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariab
name = namePrefix + pname + "-" + version;
buildInputs = [ wrapLua lua.pkgs.luarocks ]
nativeBuildInputs = [
wrapLua
lua.pkgs.luarocks
]
++ buildInputs
++ lib.optionals doCheck checkInputs
++ lib.optionals doCheck ([ luarocksCheckHook ] ++ checkInputs)
++ (map (d: d.dep) externalDeps')
;
# propagate lua to active setup-hook in nix-shell
propagatedBuildInputs = propagatedBuildInputs ++ [ lua ];
inherit doCheck;
# @-patterns do not capture formal argument default values, so we need to
# explicitly inherit this for it to be available as a shell variable in the
@ -190,6 +196,14 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariab
runHook postCheck
'';
LUAROCKS_CONFIG="$PWD/${luarocks_config}";
shellHook = ''
runHook preShell
export LUAROCKS_CONFIG="$PWD/${luarocks_config}";
runHook postShell
'';
passthru = {
inherit lua; # The lua interpreter
inherit externalDeps;

@ -24,4 +24,9 @@ in {
mv hook.sh $out
'';
luarocksCheckHook = callPackage ({ luarocks }:
makeSetupHook {
name = "luarocks-check-hook";
deps = [ luarocks ];
} ./luarocks-check-hook.sh) {};
}

@ -0,0 +1,18 @@
# Setup hook for checking whether Python imports succeed
echo "Sourcing luarocks-check-hook.sh"
luarocksCheckPhase () {
echo "Executing luarocksCheckPhase"
runHook preCheck
luarocks test
runHook postCheck
echo "Finished executing luarocksCheckPhase"
}
if [ -z "${dontLuarocksCheck-}" ] && [ -z "${checkPhase-}" ]; then
echo "Using luarocksCheckPhase"
checkPhase+=" luarocksCheckPhase"
fi

@ -2546,6 +2546,38 @@ buildLuarocksPackage {
};
}) {};
sqlite = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, fetchgit, luv
}:
buildLuarocksPackage {
pname = "sqlite";
version = "v1.2.2-0";
knownRockspec = (fetchurl {
url = "mirror://luarocks/sqlite-v1.2.2-0.rockspec";
sha256 = "0jxsl9lpxsbzc6s5bwmh27mglkqz1299lz68vfxayvailwl3xbxm";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/tami5/sqlite.lua.git",
"rev": "6c00ab414dc1b69621b145908c582b747f24b46e",
"date": "2022-06-17T15:57:13+03:00",
"path": "/nix/store/637s46bsvsxfnzmy6ygig3y0vqmf3r8p-sqlite.lua",
"sha256": "0ckifx6xxrannn9szacgiiqjsp4rswghxscdl3s411dhas8djj1m",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
}
'') ["date" "path"]) ;
propagatedBuildInputs = [ luv ];
meta = {
homepage = "https://github.com/tami5/sqlite.lua";
description = "SQLite/LuaJIT binding and a highly opinionated wrapper for storing, retrieving, caching, and persisting [SQLite] databases";
license.fullName = "MIT";
};
}) {};
std-_debug = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, fetchgit, lua
}:

@ -15,7 +15,7 @@ with prev;
});
busted = prev.busted.overrideAttrs(oa: {
nativeBuildInputs = [
nativeBuildInputs = oa.nativeBuildInputs ++ [
pkgs.installShellFiles
];
postConfigure = ''
@ -30,9 +30,6 @@ with prev;
});
cqueues = (prev.lib.overrideLuarocks prev.cqueues (drv: {
nativeBuildInputs = [
pkgs.gnum4
];
externalDeps = [
{ name = "CRYPTO"; dep = pkgs.openssl; }
{ name = "OPENSSL"; dep = pkgs.openssl; }
@ -46,6 +43,11 @@ with prev;
date = head rel;
rev = last (splitString "-" (last rel));
in "${date}-${rev}";
nativeBuildInputs = oa.nativeBuildInputs ++ [
pkgs.gnum4
];
# Upstream rockspec is pointlessly broken into separate rockspecs, per Lua
# version, which doesn't work well for us, so modify it
postConfigure = let inherit (prev.cqueues) pname; in ''
@ -111,8 +113,8 @@ with prev;
propagatedBuildInputs = with pkgs.lib; optional (!isLuaJIT) luaffi;
});
lgi = prev.lib.overrideLuarocks prev.lgi (drv: {
nativeBuildInputs = [
lgi = prev.lgi.overrideAttrs (oa: {
nativeBuildInputs = oa.nativeBuildInputs ++ [
pkgs.pkg-config
];
buildInputs = [
@ -415,6 +417,23 @@ with prev;
'';
});
sqlite = prev.lib.overrideLuarocks prev.sqlite (drv: {
doCheck = true;
checkInputs = [ final.plenary-nvim pkgs.neovim-unwrapped ];
# we override 'luarocks test' because otherwise neovim doesn't find/load the plenary plugin
checkPhase = ''
export LIBSQLITE="${pkgs.sqlite.out}/lib/libsqlite3.so"
export HOME="$TMPDIR";
nvim --headless -i NONE \
-u test/minimal_init.vim --cmd "set rtp+=${pkgs.vimPlugins.plenary-nvim}" \
-c "PlenaryBustedDirectory test/auto/ { minimal_init = './test/minimal_init.vim' }"
'';
});
std-_debug = prev.std-_debug.overrideAttrs(oa: {
# run make to generate lib/std/_debug/version.lua
preConfigure = ''

@ -0,0 +1,28 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytestCheckHook
, six
}:
buildPythonPackage rec {
pname = "infinity";
version = "1.5";
src = fetchPypi {
inherit pname version;
sha256 = "1npcc4adcc3c9diw4kgmd5c0ikym1iz364p2zp6gs011rqaprald";
};
checkInputs = [
pytestCheckHook
six
];
meta = with lib; {
description = "All-in-one infinity value for Python. Can be compared to any object.";
homepage = "https://github.com/kvesteri/infinity";
license = licenses.bsd3;
maintainers = with maintainers; [ mupdt ];
};
}

@ -0,0 +1,91 @@
{ lib
, stdenv
, fetchpatch
, fetchurl
, unzip
, gdc
, SDL
, SDL_mixer
, bulletml
}:
let
debianPatch = patchname: hash: fetchpatch {
name = "${patchname}.patch";
url = "https://sources.debian.org/data/main/t/titanion/0.3.dfsg1-7/debian/patches/${patchname}";
sha256 = hash;
};
in stdenv.mkDerivation rec {
pname = "titanion";
version = "0.3";
src = fetchurl {
url = "http://abagames.sakura.ne.jp/windows/ttn${lib.replaceStrings ["."] ["_"] version}.zip";
sha256 = "sha256-fR0cufi6dU898wP8KGl/vxbfQJzMmMxlYZ3QNGLajfM=";
};
patches = [
(debianPatch
"imports.patch"
"sha256-kSXpaTpYq6w9e0yLES2QGNQ8+vFIiOpw2P9MA8gZr8s=")
(debianPatch
"fix.diff"
"sha256-0WkkfuhJaAMY46VVyc3ldMQwgOVoQJDw/8zbm6H2sHU=")
(debianPatch
"directories.patch"
"sha256-fhQJuy2+r0YOQNwMqG85Gr7fJehmf00Scran+NPYQrw=")
(debianPatch
"windowed.patch"
"sha256-xouXIuIKfKFGsoOEJqL9jdsdnkX4nqwPGcoB+32Wvgo=")
(debianPatch
"dotfile.patch"
"sha256-sAml53Hh0ltbqN8xZDZuUJcaPfjK56jf4ymFXYD38v0=")
(debianPatch
"window-resize.patch"
"sha256-WwAi1aU4CmaX+O8fw0TfLhNSXFaObExrn7nuhesVkKM=")
(debianPatch
"makefile.patch"
"sha256-g0jDPmc0SWXkTLhiczeTse/WGCtgMUsbyPNZzwK3U+o=")
(debianPatch
"dlang_v2.patch"
"sha256-tfTAAKlPFSjbfAK1EjeB3unj9tbMlNaajJ+VVSMMiYw=")
(debianPatch
"gdc-8.patch"
"sha256-BxkPfSEymq7TDA+yjJHaYsjtGr0Tuu1/sWLwRBAMga4=")
];
postPatch = ''
rm *.dll ttn.exe
rm -r lib
for f in src/abagames/ttn/screen.d src/abagames/util/sdl/sound.d src/abagames/util/sdl/texture.d; do
substituteInPlace $f \
--replace "/usr/" "$out/"
done
'';
nativeBuildInputs = [
unzip
gdc
];
buildInputs = [
SDL
SDL_mixer
bulletml
];
installPhase = ''
install -Dm755 titanion $out/bin/titanion
mkdir -p $out/share/games/titanion
cp -r sounds images $out/share/games/titanion/
'';
meta = with lib; {
homepage = "http://www.asahi-net.or.jp/~cs8k-cyu/windows/ttn_e.html";
description = "Strike down super high-velocity swooping insects";
license = licenses.bsd2;
maintainers = with maintainers; [ fgaz ];
platforms = platforms.all;
};
}

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "tailscale";
version = "1.26.0";
version = "1.26.1";
src = fetchFromGitHub {
owner = "tailscale";
repo = "tailscale";
rev = "v${version}";
sha256 = "sha256-n8g8ciK3QZYeoGdD6SUAkATlklAzjH9QYnXLyOGB1Bw=";
sha256 = "sha256-3WBvJI9uyzreUbk8ROYxXQgvttZ95OEepdzA4ZhdaJ0=";
};
vendorSha256 = "sha256-rIYDpGrUPVrDQjiT3zsNmiojNXrIM1wV5/Ci5+lQDqc=";
vendorSha256 = "sha256-NHmMkYfGgAEFjvFvKaPoaAuzeDbTJAw+85fZcxVA2jY=";
nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ];

@ -6,15 +6,15 @@
buildGoModule rec {
pname = "trivy";
version = "0.28.1";
version = "0.29.0";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
sha256 = "sha256-x9mojwA86zgXRwKDp1kIh5/LRdHjm02119CKYlIkZgw=";
sha256 = "sha256-iGUBqO2BMJF6cySmIMXNY6mjdmaPnOV372AJL0Mr+yU=";
};
vendorSha256 = "sha256-7rX4j188IXhSS4E4NStAsJq4FEfAFxIys7jucDCCe+4=";
vendorSha256 = "sha256-wM8OOOVw8Pb37/JMpz0AWbpJyHeDBQ0+DO15AiDduUU=";
excludedPackages = "misc";

@ -9,13 +9,13 @@ let
in stdenv.mkDerivation rec {
pname = "svtplay-dl";
version = "4.12";
version = "4.13";
src = fetchFromGitHub {
owner = "spaam";
repo = "svtplay-dl";
rev = version;
sha256 = "0vkrbizfgchnzinyyl5ppmbqs156j6mmy1gqxj41d3082w1gqr09";
sha256 = "sha256-0Lqm6zN/H6yPIhkVvULmoQsV9SDG25LDiGWmtyiXHxI=";
};
pythonPaths = [ cryptography pyyaml requests ];

@ -0,0 +1,30 @@
{ lib
, buildGoModule
, fetchFromGitHub
, libpcap
}:
buildGoModule rec {
pname = "dnsmon-go";
version = "unstable-2022-05-13";
src = fetchFromGitHub {
owner = "jonpulsifer";
repo = pname;
rev = "ec1d59f1f1314ce310ad4c04d2924e0ebd857f1d";
hash = "sha256-lAJ2bjs5VLzrHd09eFK4X0V/cCee2QsgdgiKq+y2c10=";
};
vendorSha256 = "sha256-aiX+NGUsFK0N9vC5baAHHMr28CbF5Xa4WgYLFFLBYTs=";
buildInputs = [
libpcap
];
meta = with lib; {
description = "Tool to collect DNS traffic";
homepage = "https://github.com/jonpulsifer/dnsmon-go";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

@ -4,22 +4,20 @@
, fetchFromGitHub
, installShellFiles
, Foundation
, Security
, libiconv
}:
rustPlatform.buildRustPackage rec {
pname = "rage";
version = "0.8.0";
version = "0.8.1";
src = fetchFromGitHub {
owner = "str4d";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ra68q5gwcbod5iajPIWEIGQceMK8ikSq/UKUfIEYaGE=";
sha256 = "sha256-FexplUdn56TanxAKC+a8uWoR3soJT1/1qi9t2tw19Vw=";
};
cargoSha256 = "sha256-o5HVMRWSIrCsbOEOeUvCvj+mkmjqRY3XaHx82IY73Cc=";
cargoSha256 = "sha256-xlpi6UQTL1p9JSLENKrLjG2DF9mYiV+E8bfjHQtqOyY=";
nativeBuildInputs = [
installShellFiles
@ -27,8 +25,6 @@ rustPlatform.buildRustPackage rec {
buildInputs = lib.optionals stdenv.isDarwin [
Foundation
Security
libiconv
];
# cargo test has an x86-only dependency

@ -0,0 +1,31 @@
{ lib
, buildGoModule
, fetchFromGitHub
, libpcap
}:
buildGoModule rec {
pname = "secrets-extractor";
version = "1.0.1";
src = fetchFromGitHub {
owner = "Xenios91";
repo = "Secrets-Extractor";
rev = "v${version}";
hash = "sha256-cwEG0cXlyhrUSQAuZ/5KVqJtez13GvZghabsooXCM/U=";
};
vendorSha256 = "sha256-KhAaBNSpFu7LAWiHCWD1OssexW9N96ArDb7Oo1AaiWI=";
buildInputs = [
libpcap
];
meta = with lib; {
description = "Tool to check packets for secrets";
homepage = "https://github.com/Xenios91/Secrets-Extractor";
# https://github.com/Xenios91/Secrets-Extractor/issues/1
license = with licenses; [ unfree ];
maintainers = with maintainers; [ fab ];
};
}

@ -16,14 +16,14 @@ with lib;
let
go-d-plugin = callPackage ./go.d.plugin.nix {};
in stdenv.mkDerivation rec {
version = "1.34.1";
version = "1.35.1";
pname = "netdata";
src = fetchFromGitHub {
owner = "netdata";
repo = "netdata";
rev = "v${version}";
sha256 = "sha256-MGXHIbmoPRyjjYHV/RD9sd8Dn74YVlET2V3d/wJ3blo=";
sha256 = "sha256-wYphy3+DlT0UpQ5su/LkMJRIcABiBR+fIL/0w9bUeS0=";
fetchSubmodules = true;
};
@ -101,6 +101,8 @@ in stdenv.mkDerivation rec {
wrapProgram $out/bin/netdata-claim.sh --prefix PATH : ${lib.makeBinPath [ openssl ]}
'';
enableParallelBuild = true;
passthru = {
inherit withIpmi;
tests.netdata = nixosTests.netdata;

@ -1,8 +1,8 @@
diff --git a/collectors/Makefile.am b/collectors/Makefile.am
index 021e2ff23..115b88277 100644
index a0a972e8f..b4a2a5f53 100644
--- a/collectors/Makefile.am
+++ b/collectors/Makefile.am
@@ -33,7 +33,7 @@ usercustompluginsconfigdir=$(configdir)/custom-plugins.d
@@ -32,7 +32,7 @@ usercustompluginsconfigdir=$(configdir)/custom-plugins.d
usergoconfigdir=$(configdir)/go.d
# Explicitly install directories to avoid permission issues due to umask
@ -37,21 +37,8 @@ index 2d5f92a6b..8b11c7502 100644
$(INSTALL) -d $(DESTDIR)$(userebpfconfigdir)
dist_noinst_DATA = \
diff --git a/collectors/node.d.plugin/Makefile.am b/collectors/node.d.plugin/Makefile.am
index c3142d433..95e324455 100644
--- a/collectors/node.d.plugin/Makefile.am
+++ b/collectors/node.d.plugin/Makefile.am
@@ -26,7 +26,7 @@ dist_usernodeconfig_DATA = \
$(NULL)
# Explicitly install directories to avoid permission issues due to umask
-install-exec-local:
+no-install-exec-local:
$(INSTALL) -d $(DESTDIR)$(usernodeconfigdir)
nodeconfigdir=$(libconfigdir)/node.d
diff --git a/collectors/python.d.plugin/Makefile.am b/collectors/python.d.plugin/Makefile.am
index 38eb90f79..ce7079441 100644
index 667f1627c..eb6810057 100644
--- a/collectors/python.d.plugin/Makefile.am
+++ b/collectors/python.d.plugin/Makefile.am
@@ -32,7 +32,7 @@ dist_userpythonconfig_DATA = \
@ -64,10 +51,10 @@ index 38eb90f79..ce7079441 100644
pythonconfigdir=$(libconfigdir)/python.d
diff --git a/collectors/statsd.plugin/Makefile.am b/collectors/statsd.plugin/Makefile.am
index 71f2d468d..2c9ced2bf 100644
index c8144c137..f8aaa89b6 100644
--- a/collectors/statsd.plugin/Makefile.am
+++ b/collectors/statsd.plugin/Makefile.am
@@ -18,5 +18,5 @@ dist_userstatsdconfig_DATA = \
@@ -19,5 +19,5 @@ dist_userstatsdconfig_DATA = \
$(NULL)
# Explicitly install directories to avoid permission issues due to umask
@ -75,7 +62,7 @@ index 71f2d468d..2c9ced2bf 100644
+no-install-exec-local:
$(INSTALL) -d $(DESTDIR)$(userstatsdconfigdir)
diff --git a/health/Makefile.am b/health/Makefile.am
index 349b86d61..514f1874f 100644
index d5eb88468..ab246e77a 100644
--- a/health/Makefile.am
+++ b/health/Makefile.am
@@ -19,7 +19,7 @@ dist_userhealthconfig_DATA = \

@ -6,7 +6,7 @@ in
buildGoModule rec {
pname = "chroma";
version = "0.10.0";
version = "2.2.0";
# To update:
# nix-prefetch-git --rev v${version} https://github.com/alecthomas/chroma.git > src.json
@ -17,7 +17,7 @@ buildGoModule rec {
inherit (srcInfo) sha256;
};
vendorSha256 = "09b718vjd6npg850fr7z6srs2sc5vsr7byzlz5yb5qx0vm3ajxpf";
vendorSha256 = "1f5pv32vg0ci71kj5bbg24ymmm12yi6r07n8blj47qz8203l5yab";
modRoot = "./cmd/chroma";

@ -1,9 +1,9 @@
{
"url": "https://github.com/alecthomas/chroma.git",
"rev": "36bdd4b98823bd1d7be96767cde3dd575e60b406",
"date": "2022-01-12T21:49:38+11:00",
"path": "/nix/store/951ya4wlxp217a2j3qdni29zwqfq0z7v-chroma",
"sha256": "0hjzb61m5lzx95xss82wil9s8f9hbw1zb3jj73ljfwkq5lqk76zq",
"rev": "d18e8a46f25ce0eb40f276410ab6cb3f2def9b7e",
"date": "2022-06-14T21:17:50+10:00",
"path": "/nix/store/mzph49sgiv5xfmpn6d6znlq483k4hyca-chroma",
"sha256": "0rxsi4kdf363p6ysvxvgndbvcb0a5zgm0iaxkkqllj3m8nfwmzlk",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "lowdown";
version = "0.11.1";
version = "1.0.0";
outputs = [ "out" "lib" "dev" "man" ];
src = fetchurl {
url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz";
sha512 = "1l0055g8v0dygyxvk5rchp4sn1g2lakbf6hhq0wkj6nxkfpl43mkyc4vpb02r7v6iqfdwq4461dmdi78blsb3nj8b1gcjx75v7x9pa1";
sha512 = "2izqgzk677y511kms09c0hgar2ax5cd5hspr8djsa3qykaxq0688xkgfad00bl6j0jpixna714ipvqa0gxm480iz2sma7qhdgr6bl4x";
};
# Upstream always passes GNU-style "soname", but cctools expects "install_name".

@ -44,11 +44,11 @@ in
stdenv.mkDerivation rec {
pname = "sile";
version = "0.13.0";
version = "0.13.1";
src = fetchurl {
url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "0ff4gcfabr6259nl1nkyfrn2r7mww2q8srvi0wakwxgh427faby3";
sha256 = "09mvydgv81pkp2nz9rkz32n3df21cfc2aslpqrivf3svr6sp9hxy";
};
configureFlags = [

@ -5218,6 +5218,8 @@ with pkgs;
dnsmasq = callPackage ../tools/networking/dnsmasq { };
dnsmon-go = callPackage ../tools/networking/dnsmon-go { };
dnspeep = callPackage ../tools/security/dnspeep { };
dnsproxy = callPackage ../tools/networking/dnsproxy { };
@ -5485,7 +5487,7 @@ with pkgs;
};
rage = callPackage ../tools/security/rage {
inherit (darwin.apple_sdk.frameworks) Foundation Security;
inherit (darwin.apple_sdk.frameworks) Foundation;
};
rar2fs = callPackage ../tools/filesystems/rar2fs { };
@ -29606,6 +29608,8 @@ with pkgs;
seatd = callPackage ../applications/misc/seatd { };
secrets-extractor = callPackage ../tools/security/secrets-extractor { };
secretscanner = callPackage ../tools/security/secretscanner { };
semiphemeral = callPackage ../tools/misc/semiphemeral { };
@ -32468,6 +32472,8 @@ with pkgs;
tinyfugue = callPackage ../games/tinyfugue { };
titanion = callPackage ../games/titanion { };
tome2 = callPackage ../games/tome2 { };
tome4 = callPackage ../games/tome4 { };

@ -50,7 +50,7 @@ in
getLuaCPath = drv: getPath drv luaLib.luaCPathList;
inherit (callPackage ../development/interpreters/lua-5/hooks { inherit (args) lib;})
lua-setup-hook;
luarocksCheckHook lua-setup-hook;
inherit lua callPackage;
inherit buildLuaPackage buildLuarocksPackage buildLuaApplication;

@ -4251,6 +4251,8 @@ in {
incremental = callPackage ../development/python-modules/incremental { };
infinity = callPackage ../development/python-modules/infinity { };
inflect = callPackage ../development/python-modules/inflect { };
inflection = callPackage ../development/python-modules/inflection { };

Loading…
Cancel
Save