Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-04-25 06:05:34 +00:00 committed by GitHub
commit a956f62ea4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 322 additions and 93 deletions

View file

@ -680,6 +680,13 @@ environment.systemPackages = [
All CUDA toolkit versions prior to CUDA 10 have been removed.
</para>
</listitem>
<listitem>
<para>
The <package>babeld</package> service is now being run as an unprivileged user. To achieve that the module configures
<literal>skip-kernel-setup true</literal> and takes care of setting forwarding and rp_filter sysctls by itself as well
as for each interface in <varname>services.babeld.interfaces</varname>.
</para>
</listitem>
</itemizedlist>
</section>

View file

@ -19,7 +19,10 @@ let
"interface ${name} ${paramsString interface}\n";
configFile = with cfg; pkgs.writeText "babeld.conf" (
(optionalString (cfg.interfaceDefaults != null) ''
''
skip-kernel-setup true
''
+ (optionalString (cfg.interfaceDefaults != null) ''
default ${paramsString cfg.interfaceDefaults}
'')
+ (concatMapStrings interfaceConfig (attrNames cfg.interfaces))
@ -84,13 +87,22 @@ in
config = mkIf config.services.babeld.enable {
boot.kernel.sysctl = {
"net.ipv6.conf.all.forwarding" = 1;
"net.ipv6.conf.all.accept_redirects" = 0;
"net.ipv4.conf.all.forwarding" = 1;
"net.ipv4.conf.all.rp_filter" = 0;
} // lib.mapAttrs' (ifname: _: lib.nameValuePair "net.ipv4.conf.${ifname}.rp_filter" (lib.mkDefault 0)) config.services.babeld.interfaces;
systemd.services.babeld = {
description = "Babel routing daemon";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
ExecStart = "${pkgs.babeld}/bin/babeld -c ${configFile} -I /run/babeld/babeld.pid -S /var/lib/babeld/state";
AmbientCapabilities = [ "CAP_NET_ADMIN" ];
CapabilityBoundingSet = [ "CAP_NET_ADMIN" ];
DynamicUser = true;
IPAddressAllow = [ "fe80::/64" "ff00::/8" "::1/128" "127.0.0.0/8" ];
IPAddressDeny = "any";
LockPersonality = true;
@ -98,7 +110,7 @@ in
MemoryDenyWriteExecute = true;
ProtectSystem = "strict";
ProtectClock = true;
ProtectKernelTunables = false; # Couldn't write sysctl: Read-only file system
ProtectKernelTunables = true;
ProtectKernelModules = true;
ProtectKernelLogs = true;
ProtectControlGroups = true;

View file

@ -25,9 +25,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
{
virtualisation.vlans = [ 10 20 ];
boot.kernel.sysctl."net.ipv4.conf.all.forwarding" = 1;
boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = 1;
networking = {
useDHCP = false;
firewall.enable = false;
@ -74,9 +71,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
{
virtualisation.vlans = [ 20 30 ];
boot.kernel.sysctl."net.ipv4.conf.all.forwarding" = 1;
boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = 1;
networking = {
useDHCP = false;
firewall.enable = false;

View file

@ -17,7 +17,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "drawing";
version = "0.4.13";
version = "0.8.0";
format = "other";
@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "maoschanz";
repo = pname;
rev = version;
sha256 = "0mj2nmfrckv89srgkn16fnbrb35f5a655ak8bb3rd9na3hd5bq53";
sha256 = "03cx6acb0ph7b3difshjfddi8ld79wp8d12bdp7dp1q1820j5mz0";
};
nativeBuildInputs = [

View file

@ -11,16 +11,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "himalaya";
version = "0.2.6";
version = "0.2.7";
src = fetchFromGitHub {
owner = "soywod";
repo = pname;
rev = "v${version}";
sha256 = "1fl3lingb4wdh6bz4calzbibixg44wnnwi1qh0js1ijp8b6ll560";
sha256 = "0yp3gc5hmlrs5rcmb2qbi4iqb5ndflgqw20qa7ziqayrdd15kzpn";
};
cargoSha256 = "10p8di71w7hn36b1994wgk33fnj641lsp80zmccinlg5fiwyzncx";
cargoSha256 = "1abz3s9c3byqc0vaws839hjlf96ivq4zbjyijsbg004ffbmbccpn";
nativeBuildInputs = [ ]
++ lib.optionals (enableCompletions) [ installShellFiles ]
@ -34,9 +34,6 @@ rustPlatform.buildRustPackage rec {
openssl
];
# The completions are correctly installed, and there is issue that himalaya
# generate empty completion files without mail configure.
# This supposed to be fixed in 0.2.7
postInstall = lib.optionalString enableCompletions ''
# Install shell function
installShellCompletion --cmd himalaya \

View file

@ -19,6 +19,7 @@ args=()
for arg in "$@"; do
case $arg in
--system=*)
system="${arg#*=}"
systemArg="--system ${arg#*=}"
;;
--version-key=*)
@ -59,6 +60,9 @@ newVersion=${args[1]}
newHash=${args[2]}
newUrl=${args[3]}
# Third-party repositories might not accept arguments in their default.nix.
importTree="(let tree = import ./.; in if builtins.isFunction tree then tree {} else tree)"
if (( "${#args[*]}" < 2 )); then
echo "$scriptName: Too few arguments"
usage
@ -75,11 +79,39 @@ if [[ -z "$versionKey" ]]; then
versionKey=version
fi
# Allow finding packages among flake outputs in repos using flake-compat.
pname=$(nix-instantiate $systemArg --eval --strict -A "$attr.name" || echo)
if [[ -z "$pname" ]]; then
if [[ -z "$system" ]]; then
system=$(nix-instantiate --eval -E 'builtins.currentSystem' | tr -d '"')
fi
pname=$(nix-instantiate $systemArg --eval --strict -A "packages.$system.$attr.name" || echo)
if [[ -n "$pname" ]]; then
attr="packages.$system.$attr"
else
pname=$(nix-instantiate $systemArg --eval --strict -A "legacyPackages.$system.$attr.name" || echo)
if [[ -n "$pname" ]]; then
attr="legacyPackages.$system.$attr"
else
die "Could not find attribute '$attr'!"
fi
fi
fi
if [[ -z "$nixFile" ]]; then
nixFile=$(nix-instantiate $systemArg --eval --strict -A "$attr.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/')
if [[ ! -f "$nixFile" ]]; then
die "Couldn't evaluate '$attr.meta.position' to locate the .nix file!"
fi
# flake-compat will return paths in the Nix store, we need to correct for that.
possiblyOutPath=$(nix-instantiate $systemArg --eval -E "with $importTree; outPath" | tr -d '"')
if [[ -n "$possiblyOutPath" ]]; then
outPathEscaped=$(echo "$possiblyOutPath" | sed 's#[$^*\\.[|]#\\&#g')
pwdEscaped=$(echo "$PWD" | sed 's#[$^*\\.[|]#\\&#g')
nixFile=$(echo "$nixFile" | sed "s|^$outPathEscaped|$pwdEscaped|")
fi
fi
oldHashAlgo=$(nix-instantiate $systemArg --eval --strict -A "$attr.src.drvAttrs.outputHashAlgo" | tr -d '"')
@ -93,17 +125,16 @@ if [[ $(grep --count "$oldHash" "$nixFile") != 1 ]]; then
die "Couldn't locate old source hash '$oldHash' (or it appeared more than once) in '$nixFile'!"
fi
oldUrl=$(nix-instantiate $systemArg --eval -E "with import ./. {}; builtins.elemAt ($attr.src.drvAttrs.urls or [ $attr.src.url ]) 0" | tr -d '"')
oldUrl=$(nix-instantiate $systemArg --eval -E "with $importTree; builtins.elemAt ($attr.src.drvAttrs.urls or [ $attr.src.url ]) 0" | tr -d '"')
if [[ -z "$oldUrl" ]]; then
die "Couldn't evaluate source url from '$attr.src'!"
fi
drvName=$(nix-instantiate $systemArg --eval -E "with import ./. {}; lib.getName $attr" | tr -d '"')
oldVersion=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.${versionKey} or (lib.getVersion $attr)" | tr -d '"')
oldVersion=$(nix-instantiate $systemArg --eval -E "with $importTree; $attr.${versionKey} or (builtins.parseDrvName $attr.name).version" | tr -d '"')
if [[ -z "$drvName" || -z "$oldVersion" ]]; then
die "Couldn't evaluate name and version from '$attr.name'!"
if [[ -z "$oldVersion" ]]; then
die "Couldn't find out the old version of '$attr'!"
fi
if [[ "$oldVersion" = "$newVersion" ]]; then
@ -115,7 +146,7 @@ if [[ "$oldVersion" = "$newVersion" ]]; then
fi
if [[ -n "$newRevision" ]]; then
oldRevision=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.src.rev" | tr -d '"')
oldRevision=$(nix-instantiate $systemArg --eval -E "with $importTree; $attr.src.rev" | tr -d '"')
if [[ -z "$oldRevision" ]]; then
die "Couldn't evaluate source revision from '$attr.src'!"
fi

View file

@ -12,6 +12,14 @@ stdenv.mkDerivation rec {
sha256 = "0has1yd1ns5q5jgcmhrbgwhbwq0wix3p7xv3dyrwdf784p56izkn";
};
patches = [
# Fix build on 32-bit ARM
(fetchpatch {
url = "https://github.com/axboe/liburing/commit/808b6c72ab753bda0c300b5683cfd31750d1d49b.patch";
sha256 = "1x7a9c5a6rwhfsbjqmhbnwh2aiin6yylckrqdjbzljrprzf11wrd";
})
];
separateDebugInfo = true;
enableParallelBuilding = true;
# Upstream's configure script is not autoconf generated, but a hand written one.

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, jdk11, ant, python3, watchman, bash, makeWrapper }:
{ lib, stdenv, fetchFromGitHub, jdk8, ant, python3, watchman, bash, makeWrapper }:
stdenv.mkDerivation rec {
pname = "buck";
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
grep -l -r '/bin/bash' --null | xargs -0 sed -i -e "s!/bin/bash!${bash}/bin/bash!g"
'';
nativeBuildInputs = [ makeWrapper python3 jdk11 ant watchman ];
nativeBuildInputs = [ makeWrapper python3 jdk8 ant watchman ];
buildPhase = ''
# Set correct version, see https://github.com/facebook/buck/issues/2607
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
installPhase = ''
install -D -m755 buck-out/gen/*/programs/buck.pex $out/bin/buck
wrapProgram $out/bin/buck \
--prefix PATH : "${lib.makeBinPath [ jdk11 watchman python3 ]}"
--prefix PATH : "${lib.makeBinPath [ jdk8 watchman python3 ]}"
'';
meta = with lib; {

View file

@ -0,0 +1,2 @@
source 'https://rubygems.org'
gem 'pgsync'

View file

@ -0,0 +1,23 @@
GEM
remote: https://rubygems.org/
specs:
parallel (1.20.1)
pg (1.2.3)
pgsync (0.6.6)
parallel
pg (>= 0.18.2)
slop (>= 4.8.2)
tty-spinner
slop (4.8.2)
tty-cursor (0.7.1)
tty-spinner (0.9.3)
tty-cursor (~> 0.7)
PLATFORMS
ruby
DEPENDENCIES
pgsync
BUNDLED WITH
2.1.4

View file

@ -0,0 +1,15 @@
{ lib, bundlerApp }:
bundlerApp rec {
gemdir = ./.;
pname = "pgsync";
exes = [ "pgsync" ];
meta = with lib; {
description = "Sync data from one Postgres database to another (like `pg_dump`/`pg_restore`)";
homepage = "https://github.com/ankane/pgsync";
license = with licenses; mit;
maintainers = with maintainers; [ fabianhjr ];
platforms = platforms.all;
};
}

View file

@ -0,0 +1,64 @@
{
parallel = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd";
type = "gem";
};
version = "1.20.1";
};
pg = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "13mfrysrdrh8cka1d96zm0lnfs59i5x2g6ps49r2kz5p3q81xrzj";
type = "gem";
};
version = "1.2.3";
};
pgsync = {
dependencies = ["parallel" "pg" "slop" "tty-spinner"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0wjvcfsgm7xxhb2lxil19qjxvvihqxbjd2ykmm5d43p0h2l9wvxr";
type = "gem";
};
version = "0.6.6";
};
slop = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "05d1xv8r9cmd0mmlqpa853yzd7xhcyha063w1g8dpf84scxbxmd3";
type = "gem";
};
version = "4.8.2";
};
tty-cursor = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0j5zw041jgkmn605ya1zc151bxgxl6v192v2i26qhxx7ws2l2lvr";
type = "gem";
};
version = "0.7.1";
};
tty-spinner = {
dependencies = ["tty-cursor"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hh5awmijnzw9flmh5ak610x1d00xiqagxa5mbr63ysggc26y0qf";
type = "gem";
};
version = "0.9.3";
};
}

View file

@ -9,25 +9,22 @@ let
in stdenv.mkDerivation rec {
pname = "stlink";
version = "1.6.0";
version = "1.7.0";
src = fetchFromGitHub {
owner = "texane";
owner = "stlink-org";
repo = "stlink";
rev = "v${version}";
sha256 = "1mlkrxjxg538335g59hjb0zc739dx4mhbspb26z5gz3lf7d4xv6x";
sha256 = "03xypffpbp4imrczbxmq69vgkr7mbp0ps9dk815br5wwlz6vgygl";
};
buildInputs = [ libusb1' ];
nativeBuildInputs = [ cmake ];
patchPhase = ''
sed -i 's@/etc/udev/rules.d@$ENV{out}/etc/udev/rules.d@' CMakeLists.txt
sed -i 's@/etc/modprobe.d@$ENV{out}/etc/modprobe.d@' CMakeLists.txt
'';
preInstall = ''
mkdir -p $out/etc/udev/rules.d
mkdir -p $out/etc/modprobe.d
'';
cmakeFlags = [
"-DSTLINK_MODPROBED_DIR=${placeholder "out"}/etc/modprobe.d"
"-DSTLINK_UDEV_RULES_DIR=${placeholder "out"}/lib/udev/rules.d"
];
meta = with lib; {
description = "In-circuit debug and programming for ST-Link devices";

View file

@ -209,12 +209,12 @@ let
auto-session = buildVimPluginFrom2Nix {
pname = "auto-session";
version = "2021-04-18";
version = "2021-04-24";
src = fetchFromGitHub {
owner = "rmagatti";
repo = "auto-session";
rev = "482329bad5d8e8fbd61ac2041e8a3c88a45dbe20";
sha256 = "1yrccyygnz29p9vx1jvyj4imbq3m9rlm37m3cbb9azxmmvdbm0l3";
rev = "6e87fa2ed6b6fe7ccd14fe4b30cc00be47afc3c6";
sha256 = "00d3ga6rpzwcz2pcdgwrnr2xymh1hizs46zzc8jjmrj58k8sg033";
};
meta.homepage = "https://github.com/rmagatti/auto-session/";
};
@ -389,12 +389,12 @@ let
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
version = "2021-04-23";
version = "2021-04-24";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
rev = "5b286768438921cbc77d6cfb4a7046ea45c8adfc";
sha256 = "1g5g1yqr78l620vr7vslx15j2f4dfg4bb8wwjgfqx0pw5lc982yc";
rev = "e7c2807bf0c029864f346024981f1a7927044393";
sha256 = "063jk33l7yz467b0v00s3h5gb3lbwb0x5gh4r5bignlhm518sfa3";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@ -425,14 +425,14 @@ let
ci_dark = buildVimPluginFrom2Nix {
pname = "ci_dark";
version = "2021-03-03";
version = "2021-04-24";
src = fetchFromGitHub {
owner = "chuling";
owner = "yunlingz";
repo = "ci_dark";
rev = "9063153b05ca47c030a5f656411dbbed33697678";
sha256 = "011017ywcgjcflsl21fjcrz7ap68aqvgx5y5z64075qkrk1pqgz1";
rev = "4c314000b5a21a1b9f52442a0c80e4b3fd4f0a1f";
sha256 = "1wxsgaixdmb8v87kavvyyiyqlkn7ck5g39hkq4j19747jnb6lvqf";
};
meta.homepage = "https://github.com/chuling/ci_dark/";
meta.homepage = "https://github.com/yunlingz/ci_dark/";
};
clang_complete = buildVimPluginFrom2Nix {
@ -485,12 +485,12 @@ let
coc-fzf = buildVimPluginFrom2Nix {
pname = "coc-fzf";
version = "2021-03-21";
version = "2021-04-24";
src = fetchFromGitHub {
owner = "antoinemadec";
repo = "coc-fzf";
rev = "8f27377229c5d2dcee9ae9cda8dea0fad4a5ac3b";
sha256 = "0ri0rlz4fwxli6ssz69zyifrdwhc8yx4p996rw8d2m76nm7hflv0";
rev = "70f0691e14c8e55290e554591c0a2661dea530fa";
sha256 = "1m3kwgng7xi8xycc0dcx0wr9i7q0anx9lpax0r4p2a26vaqam539";
};
meta.homepage = "https://github.com/antoinemadec/coc-fzf/";
};
@ -2170,6 +2170,30 @@ let
meta.homepage = "https://github.com/latex-box-team/latex-box/";
};
lazygit-nvim = buildVimPluginFrom2Nix {
pname = "lazygit-nvim";
version = "2021-03-25";
src = fetchFromGitHub {
owner = "kdheepak";
repo = "lazygit.nvim";
rev = "fb5ab7d26ac414a7e7bfff6b89f69e2dd2fd3884";
sha256 = "1nn6zhjqfk88jmavl9y8li4y08v3wb2m2kskq9yf36hadw29im30";
};
meta.homepage = "https://github.com/kdheepak/lazygit.nvim/";
};
LeaderF = buildVimPluginFrom2Nix {
pname = "LeaderF";
version = "2021-04-16";
src = fetchFromGitHub {
owner = "Yggdroot";
repo = "LeaderF";
rev = "6c49ab524b883495193ff3a4eab5c7846aba4261";
sha256 = "19dyd148silyaiprjrcd23y62kcsp6hpvpansmpxri55x53a772w";
};
meta.homepage = "https://github.com/Yggdroot/LeaderF/";
};
lean-vim = buildVimPluginFrom2Nix {
pname = "lean-vim";
version = "2021-01-02";
@ -3144,24 +3168,24 @@ let
nvim-dap = buildVimPluginFrom2Nix {
pname = "nvim-dap";
version = "2021-04-22";
version = "2021-04-23";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-dap";
rev = "41f982b646b29059749bd588ba783cb99d8fc781";
sha256 = "0z2kl2iqs8vcb8l4r508ny3h7vl3vm1l6cjsl5bi1s7387pizxbl";
rev = "c6cb4fcbc91b0404ae157f1942e305d66073ca1a";
sha256 = "07mncx8bzigbh6yy7nbsgjb3g3fm1kx73wb6p7jl6h9ay3fmgrfc";
};
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
};
nvim-dap-virtual-text = buildVimPluginFrom2Nix {
pname = "nvim-dap-virtual-text";
version = "2021-03-15";
version = "2021-04-24";
src = fetchFromGitHub {
owner = "theHamsta";
repo = "nvim-dap-virtual-text";
rev = "b26acb69a5a4940f9eb3fd6f4bca8e1cc16fa5ce";
sha256 = "16dkgmcfdx1n72khlwrcykwwpcjzz2mdh7dc53vb4j0pbmqmnna2";
rev = "f144a3bb6a39ef5c07173fe08e6f3ce8f5f184ba";
sha256 = "1zax0vx77fqx7jr1xipfy0dp3l05gzbqdvc1wvq2cnjvqd7s8i2v";
};
meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/";
};
@ -3336,12 +3360,12 @@ let
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2021-04-23";
version = "2021-04-24";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "af3537fbe57a2a37ab2b620c9ecc487e31b4da64";
sha256 = "1z4k0a8gyz8ycd6wq8npg056l0axz3vj7pipxcpi1i9xa4kx3j6i";
rev = "b68f0cc70022fedec9b9190904d6035393111cdf";
sha256 = "07zp1fbah65f7lglfkmdzi6cyfchlaf1ap02wzwixiv5hpy6zji4";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@ -4117,12 +4141,12 @@ let
sonokai = buildVimPluginFrom2Nix {
pname = "sonokai";
version = "2021-04-17";
version = "2021-04-24";
src = fetchFromGitHub {
owner = "sainnhe";
repo = "sonokai";
rev = "764bd716f08f1441e0020b8ae0c8d1b53970e4a9";
sha256 = "1f21mn67cdiyq2pi92agvvzfprvr78kqc89bc3wh2k8ij47szmp6";
rev = "784de58d2bcad8b16bce972c1727fb0cb07e43b2";
sha256 = "04wlqd902fy474mk7688y2mysy8vsm3pf36d59bxd3jlspgp6zcl";
};
meta.homepage = "https://github.com/sainnhe/sonokai/";
};
@ -4213,12 +4237,12 @@ let
splitjoin-vim = buildVimPluginFrom2Nix {
pname = "splitjoin-vim";
version = "2021-03-02";
version = "2021-04-24";
src = fetchFromGitHub {
owner = "AndrewRadev";
repo = "splitjoin.vim";
rev = "f0d785f7607be60c282b5f5a5d32a2e51560c07c";
sha256 = "1gbnhl1w0krlf2ppiz4h4fvnrjf8i0552nckhd67gfba2nqha0z4";
rev = "f4773c0d2f7453fea23f5f69f433547f3d62ea0a";
sha256 = "06fsfsvrq6sqyqpmj693vn810c6zvzn16781mw6bb2912cmyrs5z";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/";
@ -4272,6 +4296,18 @@ let
meta.homepage = "https://github.com/darfink/starsearch.vim/";
};
suda-vim = buildVimPluginFrom2Nix {
pname = "suda-vim";
version = "2021-02-20";
src = fetchFromGitHub {
owner = "lambdalisue";
repo = "suda.vim";
rev = "fbb138f5090c3db4dabeba15326397a09df6b73b";
sha256 = "01kys8q3gycxqf760ydq1k8wq20brjvl1gxpl8j87jvnyx87kmnf";
};
meta.homepage = "https://github.com/lambdalisue/suda.vim/";
};
SudoEdit-vim = buildVimPluginFrom2Nix {
pname = "SudoEdit-vim";
version = "2020-02-27";
@ -6290,6 +6326,18 @@ let
meta.homepage = "https://github.com/bitc/vim-hdevtools/";
};
vim-helm = buildVimPluginFrom2Nix {
pname = "vim-helm";
version = "2020-01-02";
src = fetchFromGitHub {
owner = "towolf";
repo = "vim-helm";
rev = "2c2e2e936607ed93f8f75de2066d04feff0e8e81";
sha256 = "1vlaqcxxsbys0ybk2x7ri1flyx412ak0dmanqg1cdig6xzhna2kc";
};
meta.homepage = "https://github.com/towolf/vim-helm/";
};
vim-hexokinase = buildVimPluginFrom2Nix {
pname = "vim-hexokinase";
version = "2021-03-31";
@ -8622,6 +8670,18 @@ let
meta.homepage = "https://github.com/lyokha/vim-xkbswitch/";
};
vim-xtabline = buildVimPluginFrom2Nix {
pname = "vim-xtabline";
version = "2021-01-31";
src = fetchFromGitHub {
owner = "mg979";
repo = "vim-xtabline";
rev = "654675222adde47c9d72caa400e35c7e680fe5a1";
sha256 = "1f7d4vmr7n5v7h5a1bjcvxaqygrdi33y0vdx4yjfdswi835yd45h";
};
meta.homepage = "https://github.com/mg979/vim-xtabline/";
};
vim-yaml = buildVimPluginFrom2Nix {
pname = "vim-yaml";
version = "2021-01-14";
@ -8805,12 +8865,12 @@ let
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
version = "2021-04-15";
version = "2021-04-23";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
rev = "0d8a69f9e16a90cfed591264170dea0c5b686b81";
sha256 = "014f85wg1c20cysn8qayw71d49qmv1vzzbgikzrd9msfqsp4l5qj";
rev = "91c011f6c156f405ed259c9749ea049726ef8912";
sha256 = "1pwq5wxyky38nhs8ckcl6x4yxkia5lk5hcd12l1d5iimddjfsx9i";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};
@ -8899,6 +8959,18 @@ let
meta.homepage = "https://github.com/mattn/webapi-vim/";
};
wildfire-vim = buildVimPluginFrom2Nix {
pname = "wildfire-vim";
version = "2014-11-16";
src = fetchFromGitHub {
owner = "gcmt";
repo = "wildfire.vim";
rev = "e2baded7162260e05d2527f5bca9fca81f0bc8f2";
sha256 = "01i12x8brsnqicj5vclg57nv6ha7nz70gilphf6sr14xr741ra1y";
};
meta.homepage = "https://github.com/gcmt/wildfire.vim/";
};
wmgraphviz-vim = buildVimPluginFrom2Nix {
pname = "wmgraphviz-vim";
version = "2018-04-26";

View file

@ -62,7 +62,6 @@ chriskempson/base16-vim
ChristianChiarulli/nvcode-color-schemes.vim
christoomey/vim-sort-motion
christoomey/vim-tmux-navigator
chuling/ci_dark
ckarnell/antonys-macro-repeater
clojure-vim/vim-jack-in
cloudhead/neovim-fuzzy
@ -140,6 +139,7 @@ fruit-in/vim-nong-theme
fsharp/vim-fsharp
fszymanski/deoplete-emoji
garbas/vim-snipmate
gcmt/wildfire.vim
gennaro-tedesco/nvim-peekup
gentoo/gentoo-syntax
GEverding/vim-hocon
@ -269,6 +269,7 @@ kana/vim-textobj-user
kassio/neoterm
kbenzie/vim-spirv
kchmck/vim-coffee-script
kdheepak/lazygit.nvim
KeitaNakamura/neodark.vim
keith/investigate.vim
keith/rspec.vim
@ -292,6 +293,7 @@ kyazdani42/nvim-tree.lua
kyazdani42/nvim-web-devicons
lambdalisue/fern.vim
lambdalisue/gina.vim
lambdalisue/suda.vim
lambdalisue/vim-gista
lambdalisue/vim-manpager
lambdalisue/vim-pager
@ -366,6 +368,7 @@ mfukar/robotframework-vim
mfussenegger/nvim-dap
mfussenegger/nvim-jdtls
mg979/vim-visual-multi
mg979/vim-xtabline
mhartington/oceanic-next
mhinz/vim-crates
mhinz/vim-grepper
@ -624,6 +627,7 @@ tommcdo/vim-ninja-feet
tomtom/tcomment_vim
tomtom/tlib_vim
tools-life/taskwiki
towolf/vim-helm
tpope/vim-abolish
tpope/vim-capslock
tpope/vim-commentary
@ -749,7 +753,9 @@ Xuyuanp/nerdtree-git-plugin
yamatsum/nvim-nonicons@main
ycm-core/YouCompleteMe
Yggdroot/indentLine
Yggdroot/LeaderF
Yilin-Yang/vim-markbar
yuki-yano/ncm2-dictionary
yunlingz/ci_dark
zah/nim.vim
ziglang/zig.vim

View file

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "telegraf";
version = "1.18.0";
version = "1.18.1";
excludedPackages = "test";
@ -12,7 +12,7 @@ buildGoModule rec {
owner = "influxdata";
repo = "telegraf";
rev = "v${version}";
sha256 = "sha256-1sFl+F3g2anssW59eKbjPdVCIyGq8JuoJGXVQZys854=";
sha256 = "sha256-iFigbnqUXWQrhDovwQYZsr8llkB9553c5LgcKJ78yZ4=";
};
vendorSha256 = "sha256-m53S/L71nyioCBbIDDAWEnqStBdqTFGq16y5ozsXq1c=";

View file

@ -15,16 +15,16 @@
rustPlatform.buildRustPackage rec {
pname = "nushell";
version = "0.29.0";
version = "0.30.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "sha256-RZz8hmcLOJRz0HpPXc3121B1UcbtDgCFv8Zdv29E+XQ=";
sha256 = "104zrj15kmc0a698dc8dxbzhg1rjqn38v3wqcwg2xiickglpgd5f";
};
cargoSha256 = "sha256-V6Qdg8xSm2/6BbSEOH5mH92Gjx+xy0J2CZ9FQxmhI88=";
cargoSha256 = "1c6yhkj1hyr82y82nff6gy9kq9z0mbq3ivlq8rir10pnqy4j5791";
nativeBuildInputs = [ pkg-config ]
++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ];

View file

@ -1,36 +1,27 @@
{ lib, stdenv, fetchurl, pkg-config, ncurses, glib, libmaxminddb, fetchpatch }:
{ lib, stdenv, fetchurl, ncurses, gettext, openssl, withGeolocation ? true, libmaxminddb }:
stdenv.mkDerivation rec {
version = "1.4";
version = "1.4.6";
pname = "goaccess";
src = fetchurl {
url = "https://tar.goaccess.io/goaccess-${version}.tar.gz";
sha256 = "1gkpjg39f3afdwm9128jqjsfap07p8s027czzlnxfmi5hpzvkyz8";
sha256 = "1l3j3i4vb7ni7i047qvi9a3hs43ym24r6hfcnqsbhgrb731jf3qx";
};
patches = [
(fetchpatch {
url = "https://github.com/allinurl/goaccess/commit/514618cdd69453497fbf67913ccb37a0a0b07391.patch";
sha256 = "11lp7mabfl6ibgzsd9nw10k2xvcm0hrimrwidl06r8dqn2jzjxf6";
})
];
configureFlags = [
"--enable-geoip=mmdb"
"--enable-utf8"
];
"--with-openssl"
] ++ lib.optionals withGeolocation [ "--enable-geoip=mmdb" ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [
libmaxminddb
ncurses
glib
];
buildInputs = [ ncurses openssl ]
++ lib.optionals withGeolocation [ libmaxminddb ]
++ lib.optionals stdenv.isDarwin [ gettext ];
meta = {
description = "Real-time web log analyzer and interactive viewer that runs in a terminal in *nix systems";
homepage = "https://goaccess.io";
changelog = "https://github.com/allinurl/goaccess/raw/v${version}/ChangeLog";
license = lib.licenses.mit;
platforms = lib.platforms.linux ++ lib.platforms.darwin;
maintainers = with lib.maintainers; [ ederoyd46 ];

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, nixosTests }:
{ lib, stdenv, fetchurl, fetchpatch, nixosTests }:
stdenv.mkDerivation rec {
pname = "babeld";
@ -9,6 +9,14 @@ stdenv.mkDerivation rec {
sha256 = "01vzhrspnm4sy9ggaz9n3bfl5hy3qlynr218j3mdcddzm3h00kqm";
};
patches = [
(fetchpatch {
# Skip kernel_setup_interface when `skip-kernel-setup` is enabled.
url = "https://github.com/jech/babeld/commit/f9698a5616842467ad08a5f9ed3d6fcfa2dd2898.patch";
sha256 = "00kj2jxsfq0pjk5wrkslyvkww57makxlwa4fd82g7g9hrgahpqwr";
})
];
preBuild = ''
makeFlags="PREFIX=$out ETCDIR=$out/etc"
'';

View file

@ -7491,6 +7491,8 @@ in
pgmetrics = callPackage ../tools/misc/pgmetrics { };
pgsync = callPackage ../development/tools/database/pgsync { };
pdsh = callPackage ../tools/networking/pdsh {
rsh = true; # enable internal rsh implementation
ssh = openssh;