colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-01-22 00:01:46 +00:00 committed by GitHub
commit 1ca0ba653f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
31 changed files with 288 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
View File

@ -557,6 +557,15 @@
usage in non-X11 environments, e.g. Wayland.
</para>
</listitem>
<listitem>
<para>
<link linkend="opt-programs.ssh.knownHosts">programs.ssh.knownHosts</link>
has gained an <literal>extraHostNames</literal> option to
replace <literal>hostNames</literal>.
<literal>hostNames</literal> is deprecated, but still
available for now.
</para>
</listitem>
<listitem>
<para>
The <literal>services.stubby</literal> module was converted to

3
nixos/doc/manual/release-notes/rl-2205.section.md
View File

@ -196,6 +196,9 @@ In addition to numerous new and upgraded packages, this release has the followin
`services.xserver.enable`. This allows easy usage in non-X11 environments,
e.g. Wayland.
- [programs.ssh.knownHosts](#opt-programs.ssh.knownHosts) has gained an `extraHostNames`
option to replace `hostNames`. `hostNames` is deprecated, but still available for now.
- The `services.stubby` module was converted to a [settings-style](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md) configuration.
- The option `services.duplicati.dataDir` has been added to allow changing the location of duplicati's files.

29
nixos/modules/programs/ssh.nix
View File

@ -17,7 +17,7 @@ let
exec ${askPassword} "$@"
'';
knownHosts = map (h: getAttr h cfg.knownHosts) (attrNames cfg.knownHosts);
knownHosts = attrValues cfg.knownHosts;
knownHostsText = (flip (concatMapStringsSep "\n") knownHosts
(h: assert h.hostNames != [];
@ -142,7 +142,7 @@ in
knownHosts = mkOption {
default = {};
type = types.attrsOf (types.submodule ({ name, ... }: {
type = types.attrsOf (types.submodule ({ name, config, options, ... }: {
options = {
certAuthority = mkOption {
type = types.bool;
@ -154,12 +154,22 @@ in
};
hostNames = mkOption {
type = types.listOf types.str;
default = [];
default = [ name ] ++ config.extraHostNames;
defaultText = literalExpression "[ ${name} ] ++ config.${options.extraHostNames}";
description = ''
DEPRECATED, please use <literal>extraHostNames</literal>.
A list of host names and/or IP numbers used for accessing
the host's ssh service.
'';
};
extraHostNames = mkOption {
type = types.listOf types.str;
default = [];
description = ''
A list of additional host names and/or IP numbers used for
accessing the host's ssh service.
'';
};
publicKey = mkOption {
default = null;
type = types.nullOr types.str;
@ -186,9 +196,6 @@ in
'';
};
};
config = {
hostNames = mkDefault [ name ];
};
}));
description = ''
The set of system-wide known SSH hosts.
@ -196,13 +203,10 @@ in
example = literalExpression ''
{
myhost = {
hostNames = [ "myhost" "myhost.mydomain.com" "10.10.1.4" ];
extraHostNames = [ "myhost.mydomain.com" "10.10.1.4" ];
publicKeyFile = ./pubkeys/myhost_ssh_host_dsa_key.pub;
};
myhost2 = {
hostNames = [ "myhost2" ];
publicKeyFile = ./pubkeys/myhost2_ssh_host_dsa_key.pub;
};
"myhost2.net".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILIRuJ8p1Fi+m6WkHV0KWnRfpM1WxoW8XAS+XvsSKsTK";
}
'';
};
@ -275,6 +279,9 @@ in
message = "knownHost ${name} must contain either a publicKey or publicKeyFile";
});
warnings = mapAttrsToList (name: _: ''programs.ssh.knownHosts.${name}.hostNames is deprecated, use programs.ssh.knownHosts.${name}.extraHostNames'')
(filterAttrs (name: {hostNames, extraHostNames, ...}: hostNames != [ name ] ++ extraHostNames) cfg.knownHosts);
# SSH configuration. Slight duplication of the sshd_config
# generation in the sshd service.
environment.etc."ssh/ssh_config".text =

4
pkgs/applications/graphics/drawing/default.nix
View File

@ -17,7 +17,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "drawing";
version = "0.8.3";
version = "0.8.5";
format = "other";
@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "maoschanz";
repo = pname;
rev = version;
sha256 = "sha256-qDLJ+Mw4z66ro9/zoEIzDJpA+jJLYw0WgsP7mA+56XM=";
sha256 = "1q4a1gwmzz0rm10cnd4nzd51zfc2bjc6dsvf90qk1di9x7svis64";
};
nativeBuildInputs = [

28
pkgs/applications/misc/bukut/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ lib, python3, fetchFromGitHub }:
with python3.pkgs; buildPythonApplication rec {
pname = "bukut";
version = "0.11";
src = fetchFromGitHub {
owner = "peterjschroeder";
repo = "bukut";
rev = "v${version}";
sha256 = "sha256-Hp9/tSdRNAoll/fYNJuhYC7cgy5AK3PUtYUsS6zsz1Y=";
};
propagatedBuildInputs = [
asciimatics
beautifulsoup4
natsort
pyperclip
pyxdg
];
meta = with lib; {
description = "Text user interface for buku bookmark manager";
homepage = "https://github.com/peterjschroeder/bukut";
license = licenses.gpl3Only;
maintainers = with maintainers; [ taha ];
};
}

24
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@ -1,8 +1,8 @@
{
"stable": {
"version": "97.0.4692.71",
"sha256": "0z7ximvm4a78kxyp4j0i2jzklxazpw6jcqi9jkaf8bvq9ga8kqca",
"sha256bin64": "1z1d50i5pvqaw6hjdxwasbznzgqwrnd1z8jmy2x05b6i49vd7r9j",
"version": "97.0.4692.99",
"sha256": "1fpc07zvashaqqalwn7wxnswxclrxvhjrxy1rzr6gcq5awhaw6y9",
"sha256bin64": "18afashha667rzcscq3frkp5ixa7nrirs7i3061njqi4z9ql0cs8",
"deps": {
"gn": {
"version": "2021-11-03",
@ -12,10 +12,10 @@
}
},
"chromedriver": {
"version": "97.0.4692.36",
"sha256_linux": "11x28m31bsfq1flqrsa5mawss39kznia2ig5ams5qkm2v5p3y39d",
"sha256_darwin": "1ysnfvj0795yc3g8sbz7g9mhc5j0sxm2r3ad2fh13sarnhn6wrs4",
"sha256_darwin_aarch64": "09m1qpk6901gqs4c7isgryffhb92szfzbxfybxhn2g5i4wrns6j7"
"version": "97.0.4692.71",
"sha256_linux": "0lw74ycw8vh3qz4nxynnvrw8sngy3g0vcaana15y4b2ks73gcvci",
"sha256_darwin": "1zv1ndv1d7a29yvg0b242g8dw5f8s9vxhr454zd9vahn0ar4ksbs",
"sha256_darwin_aarch64": "0jzn75rrjw3y1bqg0ywfjcm2zn9dd2h3lswih51glvdrlcz3vw2a"
}
},
"beta": {
@ -45,9 +45,9 @@
}
},
"ungoogled-chromium": {
"version": "97.0.4692.71",
"sha256": "0z7ximvm4a78kxyp4j0i2jzklxazpw6jcqi9jkaf8bvq9ga8kqca",
"sha256bin64": "1z1d50i5pvqaw6hjdxwasbznzgqwrnd1z8jmy2x05b6i49vd7r9j",
"version": "97.0.4692.99",
"sha256": "1fpc07zvashaqqalwn7wxnswxclrxvhjrxy1rzr6gcq5awhaw6y9",
"sha256bin64": "18afashha667rzcscq3frkp5ixa7nrirs7i3061njqi4z9ql0cs8",
"deps": {
"gn": {
"version": "2021-11-03",
@ -56,8 +56,8 @@
"sha256": "0n0jml8s00ayy186jzrf207hbz70pxiq426znxwxd4gjcp60scsa"
},
"ungoogled-patches": {
"rev": "97.0.4692.71-1",
"sha256": "0a1172kj93lg3ip4im1s5s7bdm2q41w4m6ylyxc92w29rbhbxjxp"
"rev": "97.0.4692.99-1",
"sha256": "1jgxpp3wl24hq39291mgmdwcxbarxg4rpa6il53k8z3rf6gd2s4i"
}
}
}

45
pkgs/applications/networking/cluster/vcluster/default.nix Normal file
View File

@ -0,0 +1,45 @@
{ lib, buildGo117Module, fetchFromGitHub, installShellFiles }:
buildGo117Module rec {
pname = "vcluster";
version = "0.5.3";
src = fetchFromGitHub {
owner = "loft-sh";
repo = pname;
rev = "v${version}";
sha256 = "sha256-+rLDRVfB6wZ1wYoLE2wwRxzS6GmI6KYtOKdXZd+LnnU=";
};
vendorSha256 = null;
subPackages = [ "cmd/vclusterctl" ];
nativeBuildInputs = [ installShellFiles ];
ldflags = [ "-s" "-w" ];
# Test is disabled because e2e tests expect k8s.
doCheck = false;
installPhase = ''
runHook preInstall
mkdir -p $out/bin
install -Dm755 "$GOPATH/bin/vclusterctl" -T $out/bin/vcluster
runHook postInstall
'';
postInstall = ''
installShellCompletion --cmd vcluster \
--bash <($out/bin/vcluster completion bash) \
--zsh <($out/bin/vcluster completion zsh)
'';
meta = with lib; {
description = "Create fully functional virtual Kubernetes clusters";
downloadPage = "https://github.com/loft-sh/vcluster";
homepage = "https://www.vcluster.com/";
license = licenses.asl20;
maintainers = with maintainers; [ peterromfeldhk ];
};
}

4
pkgs/applications/networking/protonvpn-gui/default.nix
View File

@ -3,13 +3,13 @@ wrapGAppsHook, python3Packages, gtk3, networkmanager, webkitgtk }:
python3Packages.buildPythonApplication rec {
pname = "protonvpn-linux-gui";
version = "1.4.1";
version = "1.7.0";
src = fetchFromGitHub {
owner = "ProtonVPN";
repo = "linux-app";
rev = version;
sha256 = "sha256-08gXEKm8udgNltRdqvAMFL0pDCWZu/kfl1xGQtZPBCc=";
sha256 = "sha256-uzooFQBq2mhqTBr/cgea5cVQ889P70sgSk2vjXBQEfw=";
};
strictDeps = false;

4
pkgs/applications/networking/remote/remmina/default.nix
View File

@ -13,13 +13,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "remmina";
version = "1.4.20";
version = "1.4.23";
src = fetchFromGitLab {
owner = "Remmina";
repo = "Remmina";
rev = "v${version}";
sha256 = "sha256-m3DUaoOD8COxMwCVBTipzCAz3mqIdunEbVPjyjAl9So=";
sha256 = "sha256-MyemiSAMZEa9Ng6WHEyHgrze8YtIbzMCR8CTb86PDsg=";
};
nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ];

3
pkgs/applications/networking/remote/waypipe/default.nix
View File

@ -15,8 +15,9 @@ stdenv.mkDerivation rec {
sha256 = "02q8l1qaahmd41h6v3r46akh7xlqz7fpwwsy15qww4jdvypg6vg4";
};
strictDeps = true;
depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [ meson ninja pkg-config scdoc ];
buildInputs = [
# Optional dependencies:
mesa lz4 zstd ffmpeg libva

4
pkgs/applications/office/vnote/default.nix
View File

@ -8,14 +8,14 @@
mkDerivation rec {
pname = "vnote";
version = "3.11.0";
version = "3.12.0";
src = fetchFromGitHub {
owner = "vnotex";
repo = pname;
fetchSubmodules = true;
rev = "v${version}";
sha256 = "sha256-JZqV+ZDYRWiuKLSctB2L2SGPmboLeL3HeecMoaNXY+4=";
sha256 = "sha256-hlB/G7qFYbkdIk9f2N+q1Do3V1ON8UUQZ6AUmBfK8x0=";
};
nativeBuildInputs = [

4
pkgs/applications/video/kodi/addons/dateutil/default.nix
View File

@ -3,11 +3,11 @@
buildKodiAddon rec {
pname = "dateutil";
namespace = "script.module.dateutil";
version = "2.8.1+matrix.1";
version = "2.8.2";
src = fetchzip {
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
sha256 = "1jr77017ihs7j3455i72af71wyvs792kbizq4539ccd98far8lm7";
sha256 = "iQnyS0GjYcPbnBDUxmMrmDxHOA3K8RbTVke/HF4d5u4=";
};
propagatedBuildInputs = [

6
pkgs/applications/video/kodi/addons/iagl/default.nix
View File

@ -3,13 +3,13 @@
buildKodiAddon rec {
pname = "iagl";
namespace = "plugin.program.iagl";
version = "1101521-2";
version = "3.0.5";
src = fetchFromGitHub {
owner = "zach-morris";
repo = "plugin.program.iagl";
rev = "30e82eec1a909b31767f0e298cf77fc970b256d3";
sha256 = "11y05i5f7lzik23w2kr52jdgr8db3gin8i683sy1hzxlmplk4699";
rev = version;
sha256 = "sha256-Ha9wUHURPql6xew5bUd33DpgRt+8vwIHocxPopmXj4c=";
};
propagatedBuildInputs = [

6
pkgs/applications/window-managers/i3/status-rust.nix
View File

@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "i3status-rust";
version = "0.20.7";
version = "0.21.2";
src = fetchFromGitHub {
owner = "greshake";
repo = pname;
rev = "v${version}";
sha256 = "sha256-7RfDNjTUQtVZUeRGBnd2ygSkFJOoPrNF/Bwy8GWo7To=";
sha256 = "sha256-m0Yq6uxo4FAmwvUK/b3zTb79AT9h/fgdm4Q9sf1DYe0=";
};
cargoSha256 = "sha256-alZJm2/hhloKQn7QeUA2IMgGl86Lz8xNpZkoMHCcjVI=";
cargoSha256 = "sha256-J+829GzZ4lKrn3MSip/weaI8pExBt3uex86bKZOofg4=";
nativeBuildInputs = [ pkg-config makeWrapper ];

4
pkgs/development/python-modules/mautrix/default.nix
View File

@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "mautrix";
version = "0.14.4";
version = "0.14.5";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-SipDW1ahPHnC/BYv/I+uuzCYpFtOw3b4Oiu7N9LxFik=";
sha256 = "sha256-dh3uQUBEMqtlrOpnO5Aa7GC5gajwQ12rWyVPwX6xIsQ=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/proton-client/default.nix
View File

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "proton-client";
version = "0.7.0";
version = "0.7.1";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "ProtonMail";
repo = "proton-python-client";
rev = version;
sha256 = "sha256-98tEL3DUYtx27JcI6pPFS2iDJXS8K3yyvCU9UVrg1EM=";
sha256 = "sha256-mhPq9O/LCu3+E1jKlaJmrI8dxbA9BIwlc34qGwoxi5g=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/protonvpn-nm-lib/default.nix
View File

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "protonvpn-nm-lib";
version = "3.5.0";
version = "3.7.0";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "ProtonVPN";
repo = pname;
rev = version;
sha256 = "sha256-E75toza++l5UFdOLGgolH8pL5xvoUkLE7u+8L5RDFbI=";
sha256 = "sha256-RZ10p/Lg9GQj0CohW2v+THch5EaD236rEHETGjNStdY=";
};
propagatedBuildInputs = [

4
pkgs/development/tools/parsing/tree-sitter/update.nix
View File

@ -304,6 +304,10 @@ let
orga = "victorhqc";
repo = "tree-sitter-prisma";
};
"tree-sitter-org" = {
orga = "milisims";
repo = "tree-sitter-org";
};
};
allGrammars =

47
pkgs/games/npush/default.nix Normal file
View File

@ -0,0 +1,47 @@
{ lib
, stdenv
, fetchurl
, ncurses
}:
stdenv.mkDerivation rec {
pname = "npush";
version = "0.7";
src = fetchurl {
url = "mirror://sourceforge/project/npush/${pname}/${version}/${pname}-${version}.tgz";
hash = "sha256-8hbSsyeehzd4T3fUhDyebyI/oTHOHr3a8ArYAquivNk=";
};
outputs = [ "out" "doc" ];
buildInputs = [
ncurses
];
dontConfigure = true;
makeFlags = [
"CC=${stdenv.cc.targetPrefix}c++"
];
installPhase = ''
runHook preInstall
mkdir -p $out/bin $out/share/npush/levels $doc/share/doc/npush
cp npush $out/bin/
cp levels/* $out/share/npush/levels
cp CHANGES COPYING CREDITS index.html \
readme.txt screenshot1.png screenshot2.png $doc/share/doc/npush/
runHook postInstall
'';
meta = with lib; {
homepage = "http://npush.sourceforge.net/";
description = "A Sokoban-like game";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = with platforms; unix;
};
}

31
pkgs/games/npush/run.nix Normal file
View File

@ -0,0 +1,31 @@
{ runtimeShell
, symlinkJoin
, writeShellScriptBin
, npush
}:
let
runScript = writeShellScriptBin "run-npush" ''
set -euo pipefail
CWD=$(pwd)
if [ -d "./levels" ]; then
echo "Directory ./levels found; skipping levelset copy"
else
echo "Directory ./levels not found; copying the official levelset to the current directory"
mkdir -p ./levels
cp ${npush}/share/npush/levels/* levels/
chmod 644 levels/*
fi
echo "Now calling npush"
exec "${npush}/bin/npush"
'';
in
symlinkJoin {
name = "run-npush-${npush.version}";
paths = [
npush
runScript
];
}

36
pkgs/misc/vim-plugins/generated.nix
View File

@ -351,6 +351,18 @@ final: prev:
meta.homepage = "https://github.com/euclidianAce/BetterLua.vim/";
};
bitbake-vim = buildVimPluginFrom2Nix {
pname = "bitbake.vim";
version = "2021-02-06";
src = fetchFromGitHub {
owner = "sblumentritt";
repo = "bitbake.vim";
rev = "faddca1e8768b10c80ee85221fb51a560df5ba45";
sha256 = "1hfly2vxhhvjdiwgfz58hr3523kf9z71i78vk168n3kdqp5vkwrp";
};
meta.homepage = "https://github.com/sblumentritt/bitbake.vim/";
};
blueballs-neovim = buildVimPluginFrom2Nix {
pname = "blueballs-neovim";
version = "2021-11-28";
@ -2361,6 +2373,18 @@ final: prev:
meta.homepage = "https://github.com/junegunn/goyo.vim/";
};
graphviz-vim = buildVimPluginFrom2Nix {
pname = "graphviz.vim";
version = "2021-04-09";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "graphviz.vim";
rev = "12b04c512694ace2fc15735676f5afdd05519466";
sha256 = "1ky9rar3gxvsf0n3y71qfln4pxmz3hpq3dqimbf0r8l8q7sw483r";
};
meta.homepage = "https://github.com/liuchengxu/graphviz.vim/";
};
gruvbox = buildVimPluginFrom2Nix {
pname = "gruvbox";
version = "2020-07-03";
@ -4149,6 +4173,18 @@ final: prev:
meta.homepage = "https://github.com/shaunsingh/nord.nvim/";
};
nordic-nvim = buildVimPluginFrom2Nix {
pname = "nordic.nvim";
version = "2021-12-20";
src = fetchFromGitHub {
owner = "andersevenrud";
repo = "nordic.nvim";
rev = "c348fba712af0c15bfdf23b396fdcb0311dfbae9";
sha256 = "17kmlc92wl1qya76kx9p2lq0v3n2503hlb1cf3kmys0d40xb8rsc";
};
meta.homepage = "https://github.com/andersevenrud/nordic.nvim/";
};
NrrwRgn = buildVimPluginFrom2Nix {
pname = "NrrwRgn";
version = "2021-12-01";

3
pkgs/misc/vim-plugins/vim-plugin-names
View File

@ -19,6 +19,7 @@ alx741/vim-hindent
alx741/vim-stylishask
amiorin/ctrlp-z
andersevenrud/cmp-tmux
andersevenrud/nordic.nvim
andrep/vimacs
andreshazard/vim-logreview
AndrewRadev/sideways.vim
@ -411,6 +412,7 @@ lifepillar/vim-mucomplete
lighttiger2505/deoplete-vim-lsp
lilydjwg/colorizer
lilydjwg/fcitx.vim@fcitx5
liuchengxu/graphviz.vim
liuchengxu/vim-clap
liuchengxu/vim-which-key
liuchengxu/vista.vim
@ -705,6 +707,7 @@ sakhnik/nvim-gdb
saltstack/salt-vim
samoshkin/vim-mergetool
sbdchd/neoformat
sblumentritt/bitbake.vim
scalameta/nvim-metals
sdiehl/vim-ormolu
sebastianmarkow/deoplete-rust

4
pkgs/servers/jackett/default.nix
View File

@ -9,13 +9,13 @@
buildDotnetModule rec {
pname = "jackett";
version = "0.20.285";
version = "0.20.417";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "3TwDzbuXaychz/BQ/AoXjhjXz1TedC2tmh5jNwe3gOM=";
sha256 = "AZSw5kbQT32dU4dlUJRF0oywc3yuA0ObaPy4kksdSjE=";
};
projectFile = "src/Jackett.Server/Jackett.Server.csproj";

1
pkgs/servers/jackett/deps.nix generated
View File

@ -1,5 +1,6 @@
{ fetchNuGet }: [
(fetchNuGet { pname = "AngleSharp"; version = "0.16.1"; sha256 = "11r5fpm8009pwdlr0vblqbvngpm5mb7jc565sqb3rnwbd5yyrrnk"; })
(fetchNuGet { pname = "AngleSharp.Xml"; version = "0.16.0"; sha256 = "1skj9x9njypd4hyajkadsavp3m1vv7l8jb4jhczixa22p8p0cfrq"; })
(fetchNuGet { pname = "Autofac"; version = "6.3.0"; sha256 = "0zg0lsqzb8hh7l97mfd2z3fxdab86sbmxkaprzi41v0hs1x3jd9b"; })
(fetchNuGet { pname = "Autofac.Extensions.DependencyInjection"; version = "7.2.0"; sha256 = "0spr5yn4lhkyg3wm2xqjx857wxim4llc7i8291gw7hkvr6yiw8m6"; })
(fetchNuGet { pname = "AutoMapper"; version = "10.1.1"; sha256 = "1l1p9g7f7finr8laklbm7h2c45k0swl47iq0ik68js5s6pzvd6f8"; })

6
pkgs/servers/mautrix-signal/default.nix
View File

@ -2,13 +2,13 @@
python3.pkgs.buildPythonPackage rec {
pname = "mautrix-signal";
version = "unstable-2022-01-13";
version = "0.2.2";
src = fetchFromGitHub {
owner = "mautrix";
repo = "signal";
rev = "e015852a9969ac169e215c80872199ba3f3d838f";
sha256 = "sha256-7+0JubSGmQDMr7n1PK6i7homR1WknMz9ikC4164XmMo=";
rev = "v${version}";
sha256 = "sha256-gJngGgShW63g5zSyZraod0YTt/pFtVLySDXNXXC5Xxs=";
};
propagatedBuildInputs = with python3.pkgs; [

8
pkgs/servers/monitoring/grafana/default.nix
View File

@ -2,7 +2,7 @@
buildGo117Module rec {
pname = "grafana";
version = "8.3.3";
version = "8.3.4";
excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\|macaron\\)";
@ -10,15 +10,15 @@ buildGo117Module rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
sha256 = "sha256-kfeYAEwHal5bfCmNe2l5iBLM4D3eYFaVtVhXdN90o+I=";
sha256 = "sha256-Ikvl8jsStMGDIc0y4cKWwyXJHTu4V4nCKiLUyERjRsw=";
};
srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
sha256 = "sha256-iUKMUg4AS8ufr3YY3UyB/2JJYGTL8urT4bnbz0dsbxg=";
sha256 = "sha256-UI+NouSRwQVmAgx19OHhWcoDLj9KD05xh57/1gLvWmA=";
};
vendorSha256 = "sha256-FHVlCL4ZyHO7Ebi31K1wXcMiN6hiQjVz+5jkJx8R7jc=";
vendorSha256 = "sha256-gaY6liueEmngxjPSegmycrLpfsB0p1YWWrNGbzpHHOc=";
nativeBuildInputs = [ wire ];

8
pkgs/servers/monitoring/zabbix/versions.nix
View File

@ -1,11 +1,11 @@
generic: {
v50 = generic {
version = "5.0.17";
sha256 = "11ppax0l0m8lzd1872g4l0jhng8bkkq3577kc364fmfxnsvkc60k";
version = "5.0.19";
sha256 = "sha256-esa7DczdaWiG8Ru9py8HlOhvhkjV8IQjMwuiJ6F5c6E=";
};
v40 = generic {
version = "4.0.35";
sha256 = "0qq49658b22xxsjlmldjqwssri16s1y3c0wj3a5hzs8sk5qclcr5";
version = "4.0.37";
sha256 = "sha256-Wuexl8I2zA63jyTRDe8bMSP++imwSOxc4LEdUnH8jps=";
};
}

6
pkgs/tools/filesystems/catcli/default.nix
View File

@ -7,13 +7,13 @@
buildPythonApplication rec {
pname = "catcli";
version = "0.7.4";
version = "0.8.0";
src = fetchFromGitHub {
owner = "deadc0de6";
repo = pname;
rev = "v${version}";
sha256 = "1mzhfcf67dc5m0i9b216m58qg36g63if6273ch5bsckd0yrwdk8x";
sha256 = "1hkgf692h3akdxiwhzm3vqibh1ps661qllilf55nyk109cx79gna";
};
propagatedBuildInputs = [ docopt anytree ];
@ -23,7 +23,7 @@ buildPythonApplication rec {
meta = with lib; {
description = "The command line catalog tool for your offline data";
homepage = "https://github.com/deadc0de6/catcli";
license = licenses.gpl3;
license = licenses.gpl3Only;
maintainers = with maintainers; [ petersjt014 ];
platforms = platforms.all;
};

4
pkgs/tools/networking/dnstwist/default.nix
View File

@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "dnstwist";
version = "20211204";
version = "20220120";
src = fetchFromGitHub {
owner = "elceef";
repo = pname;
rev = version;
sha256 = "sha256-D7qesxkJMx/N0oyaw3ev007SLCm4RKhZSNW22CNgKPw=";
sha256 = "0vrrc0dzivq8sk7ns471r4ws3204d75riq0jzzrnxqvwz2k96wh8";
};
propagatedBuildInputs = with python3.pkgs; [

4
pkgs/tools/networking/linux-router/default.nix
View File

@ -26,13 +26,13 @@
stdenv.mkDerivation rec {
pname = "linux-router";
version = "0.6.2";
version = "0.6.6";
src = fetchFromGitHub {
owner = "garywill";
repo = "linux-router";
rev = "${version}";
sha256 = "193bnlwmjxsk0cri6xdylf218qayldn02pdnppvbd39ls361776z";
sha256 = "sha256-QBxlqKNaCUMVkm8rVTZ5z6tTN9WxgDQxeNkbgCe9KEg=";
};
nativeBuildInputs = [ makeWrapper ];

7
pkgs/top-level/all-packages.nix
View File

@ -3944,6 +3944,8 @@ with pkgs;
buku = callPackage ../applications/misc/buku { };
bukut = callPackage ../applications/misc/bukut { };
byzanz = callPackage ../applications/video/byzanz {};
ori = callPackage ../tools/backup/ori { };
@ -30928,6 +30930,9 @@ with pkgs;
njam = callPackage ../games/njam { };
npush = callPackage ../games/npush { };
run-npush = callPackage ../games/npush/run.nix { };
newtonwars = callPackage ../games/newtonwars { };
nudoku = callPackage ../games/nudoku { };
@ -33684,6 +33689,8 @@ with pkgs;
ib-controller = callPackage ../applications/office/ib/controller { jdk=oraclejdk8; };
vcluster = callPackage ../applications/networking/cluster/vcluster {};
vnote = libsForQt5.callPackage ../applications/office/vnote { };
ssh-audit = callPackage ../tools/security/ssh-audit { };