Merge master into staging-next

This commit is contained in:
github-actions[bot] 2022-01-16 00:01:52 +00:00 committed by GitHub
commit f8fb795136
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
33 changed files with 126 additions and 74 deletions

View file

@ -61,9 +61,6 @@ trim_trailing_whitespace = unset
[nixos/modules/services/networking/ircd-hybrid/*.{conf,in}]
trim_trailing_whitespace = unset
[nixos/tests/systemd-networkd-vrf.nix]
trim_trailing_whitespace = unset
[pkgs/build-support/dotnetenv/Wrapper/**]
end_of_line = unset
indent_style = unset

View file

@ -18,6 +18,8 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
enable = true;
user = "alice";
};
# Catch GDM failures that don't happen with AutomaticLoginEnable, e.g. https://github.com/NixOS/nixpkgs/issues/149539
gdm.autoLogin.delay = 1;
};
services.xserver.desktopManager.gnome.enable = true;

View file

@ -161,6 +161,7 @@ in {
# NOTE: please keep in mind that the trailing whitespaces in the following strings
# are intentional as the output is compared against the raw `iproute2`-output.
# editorconfig-checker-disable
client_ipv4_table = """
192.168.1.2 dev vrf1 proto static metric 100
192.168.2.3 dev vrf2 proto static metric 100
@ -177,6 +178,7 @@ in {
local 192.168.2.1 dev eth2 proto kernel scope host src 192.168.2.1
broadcast 192.168.2.255 dev eth2 proto kernel scope link src 192.168.2.1
""".strip()
# editorconfig-checker-enable
# Check that networkd properly configures the main routing table
# and the routing tables for the VRF.

View file

@ -14,11 +14,11 @@ let
in
stdenv.mkDerivation rec {
pname = "mkgmap";
version = "4836";
version = "4855";
src = fetchurl {
url = "https://www.mkgmap.org.uk/download/mkgmap-r${version}-src.tar.gz";
sha256 = "nmEl7pN3LW6nqo5IB6GgzcDMHhdAsMySTdANVbybznY=";
sha256 = "isWweNCL/oslPtO3chtbLmf4aK5Z8ArGpcesqeZCEuE=";
};
patches = [

View file

@ -1,14 +1,14 @@
{ lib, buildGoModule, fetchFromGitHub }:
{ lib, buildGo117Module, fetchFromGitHub }:
buildGoModule rec {
buildGo117Module rec {
pname = "cloudflared";
version = "2021.12.3";
version = "2022.1.2";
src = fetchFromGitHub {
owner = "cloudflare";
repo = "cloudflared";
rev = version;
sha256 = "sha256-+T8BtYc/TBP2qL/Wfi2CDwD6VAqY/0F7QIUEhjOnLUk=";
hash = "sha256-PdmYOFy6CWMqHlcK0PeHPGCVSLhIJOIDnXOAh/qYt+8=";
};
vendorSha256 = null;

View file

@ -2,18 +2,18 @@
buildGoModule rec {
pname = "argocd";
version = "2.2.1";
commit = "122ecefc3abfe8b691a08d9f3cecf9a170cc8c37";
version = "2.2.2";
commit = "03b17e0233e64787ffb5fcf65c740cc2a20822ba";
tag = "v${version}";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo-cd";
rev = tag;
sha256 = "sha256-BI4aoe9XVmuyb4oDPd2Clz5IWVzu4rAMHDi6Cb6spyE=";
sha256 = "sha256-xExtGKM3iNgX849xmLcgIwRbXJSJnGDuVhRMkti+Mkc=";
};
vendorSha256 = "sha256-GeU8uQM+oMottzYsE6oQyKZL3aWB5vQgTDLQiuQdapw=";
vendorSha256 = "sha256-BVhts+gOM6nhcR1lkFzy7OJnainLXw5YdeseBBRF2xE=";
nativeBuildInputs = [ packr makeWrapper installShellFiles ];

View file

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "nerdctl";
version = "0.15.0";
version = "0.16.0";
src = fetchFromGitHub {
owner = "containerd";
repo = pname;
rev = "v${version}";
sha256 = "sha256-LXXTzpG0UDSzEL6RdczvBZHlH5eJTkt7oc3wMFLO1JQ=";
sha256 = "sha256-ZnSDL1a4I3e7z2w5MdG6tFZH0PT4jCYX34f+mOmO0oA=";
};
vendorSha256 = "sha256-jFTtg3p8nS8j267CZ+wuoynruwFTRamwkEpResQSMjk=";
vendorSha256 = "sha256-S0WRLln80pdGWCe6ub3bMZ6G2PbXwvCEGDDzez+nF9E=";
nativeBuildInputs = [ makeWrapper installShellFiles ];

View file

@ -113,6 +113,9 @@ in stdenv.mkDerivation rec {
mkdir -p $out/bin
ln -s $out/lib/Signal/signal-desktop $out/bin/signal-desktop
# Create required symlinks:
ln -s libGLESv2.so $out/lib/Signal/libGLESv2.so.2
runHook postInstall
'';

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "XD";
version = "0.4.0";
version = "0.4.2";
src = fetchFromGitHub {
owner = "majestrate";
repo = "XD";
rev = "v${version}";
sha256 = "sha256-fXENoqhR04TYS/kAJUqsqa0+j+KyzdsMlXIZ2GMPMhc=";
sha256 = "sha256-AavNiFZlpX6XZQLP1kl9igA833i0gxOTYGubo3MvpSU=";
};
vendorSha256 = "1wg3cym2rwrhjsqlgd38l8mdq5alccz808465117n3vyga9m35lq";
vendorSha256 = "sha256-mJZRk3p+D3tCKIYggD5jVBXcKqJotEexljDzLKpn4/E=";
checkInputs = [ perl ];

View file

@ -23,13 +23,13 @@
stdenv.mkDerivation rec {
pname = "horizon-eda";
version = "2.1.0";
version = "2.2.0";
src = fetchFromGitHub {
owner = "horizon-eda";
repo = "horizon";
rev = "v${version}";
sha256 = "sha256-3JNkwKkr/fdz/2UFAHwhn03PHqX9YFOMf3Q7kkbTZYk=";
sha256 = "sha256-MUS1dIsULDJ5DahCtDpbHZq56nltHShli7+uoW1/Tqw=";
};
buildInputs = [

View file

@ -13,10 +13,10 @@ let
in
stdenv.mkDerivation rec {
inherit pname;
version = "10.7.1";
version = "10.7.2";
src = fetchurl {
url = "https://github.com/betaflight/${pname}/releases/download/${version}/${pname}_${version}_linux64.zip";
sha256 = "sha256-mMjy7Ve7wEmPxkAmux0WahUgJ86ylnWZP4smDZeBs8Q=";
sha256 = "sha256-FDmtFRUupPKiHeF3Xvh/VagqMo+FJi8I7mhTz0VDs3o=";
};
nativeBuildInputs = [ wrapGAppsHook unzip ];

View file

@ -81,13 +81,13 @@
}:
let
version = "1.4.2";
version = "1.5.1";
src = fetchFromGitHub {
owner = "HandBrake";
repo = "HandBrake";
rev = version;
sha256 = "sha256-Usz2+U1Wb8yJ5W2HqV0FqBaaE25fuVKk/NwKBHaKzwk=";
sha256 = "1kk11zl1mk37d4cvbc75gfndmma7vy3vkp4gmkyl92kiz6zadhyy";
};
versionFile = writeText "version.txt" ''

View file

@ -8,13 +8,13 @@
buildGoModule rec {
pname = "colima";
version = "0.3.1";
version = "0.3.2";
src = fetchFromGitHub {
owner = "abiosoft";
repo = pname;
rev = "v${version}";
sha256 = "sha256-+P4kxiib1xkS4iGC2HrYAt0YMyXyEYPqoo1BkDs7jp8=";
sha256 = "sha256-hZ5BqNHQAMzL69ptpbTT+fN4NdV4AFhboCL2t1sF5AQ=";
};
nativeBuildInputs = [ installShellFiles makeWrapper ];

View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "swayidle";
version = "1.7";
version = "1.7.1";
src = fetchFromGitHub {
owner = "swaywm";
repo = "swayidle";
rev = version;
sha256 = "0ziya8d5pvvxg16jhy4i04pvq11bdvj68gz5q654ar4dldil17nn";
sha256 = "06iq12p4438d6bv3jlqsf01wjaxrzlnj1bnicn41kad563aq41xl";
};
nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ];

View file

@ -15,13 +15,13 @@
mkDerivation rec {
pname = "lxqt-globalkeys";
version = "1.0.0";
version = "1.0.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "015nrlzlcams4k8svrq7692xbjlai1dmwvjdldncsbrgrmfa702m";
sha256 = "ccvDcEstSUVvJ7gf0bsCxCPPMRXSkZh+tKOKWNnzMt4=";
};
nativeBuildInputs = [

View file

@ -13,13 +13,13 @@ assert enableLTO -> stdenv.cc.isGNU;
stdenv.mkDerivation rec {
pname = "dictu";
version = "0.22.0";
version = "0.23.0";
src = fetchFromGitHub {
owner = "dictu-lang";
repo = pname;
rev = "v${version}";
sha256 = "sha256-bAoSFHX8sQgmV3hAXsR9qT4BnUsyneeynRAByEfzjE4=";
sha256 = "sha256-K/RbkRK8nCkmaNwWplWe2nWtULhn/GCNPXYStfMeUPg=";
};
nativeBuildInputs = [ cmake ];

View file

@ -14,7 +14,7 @@
stdenv.mkDerivation rec {
pname = "intel-media-driver";
version = "22.1.0";
version = "22.1.1";
outputs = [ "out" "dev" ];
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
owner = "intel";
repo = "media-driver";
rev = "intel-media-${version}";
sha256 = "0giba5274kzpjb5rp3d9bbnvcz7fp8ybi4s3hha2idxk0l5yamf1";
sha256 = "1gv89k48s03hwvlcg484li0dznqg93z82xv9lpv3gkncvwfvh9c8";
};
patches = [

View file

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "cx_Freeze";
version = "6.8.4";
version = "6.9";
src = fetchPypi {
inherit pname version;
sha256 = "aec66432bc207b699b252f9468e8cc6d61efda72269cab3a3231d6f95c0328f9";
sha256 = "673aa3199af2ef87fc03a43a30e5d78b27ced2cedde925da89c55b5657da267b";
};
disabled = pythonOlder "3.5";
@ -26,7 +26,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "A set of scripts and modules for freezing Python scripts into executables";
homepage = "http://cx-freeze.sourceforge.net/";
homepage = "https://marcelotduarte.github.io/cx_Freeze/";
license = licenses.psfl;
};
}

View file

@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, cython
, libyaml
, isPy27
, python
}:
buildPythonPackage rec {
pname = "PyYAML";
version = "5.4.1.1";
src = fetchFromGitHub {
owner = "yaml";
repo = "pyyaml";
rev = version;
sha256 = "1v386gzdvsjg0mgix6v03rd0cgs9dl81qvn3m547849jm8r41dx8";
};
nativeBuildInputs = [ cython ];
buildInputs = [ libyaml ];
checkPhase = ''
runHook preCheck
PYTHONPATH=""tests/lib":$PYTHONPATH" ${python.interpreter} -m test_all
runHook postCheck
'';
pythonImportsCheck = [ "yaml" ];
meta = with lib; {
description = "The next generation YAML parser and emitter for Python";
homepage = "https://github.com/yaml/pyyaml";
license = licenses.mit;
};
}

View file

@ -15,13 +15,13 @@
buildPythonPackage rec {
pname = "scikits.odes";
version = "2.6.2";
version = "2.6.3";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "267d8bfa1e18d075d574158053d887562381e88176ebab856516b52b14860983";
sha256 = "9693da78d1bd0bd6af8db59aeaaed92a399c6af36960c6a0a665a2130eab59e7";
};
nativeBuildInputs = [

View file

@ -5,7 +5,7 @@
buildPythonPackage rec {
pname = "tatsu";
version = "5.7.1";
version = "5.7.3";
# upstream only supports 3.10+
disabled = pythonOlder "3.10";
@ -13,7 +13,7 @@ buildPythonPackage rec {
owner = "neogeny";
repo = "TatSu";
rev = "v${version}";
sha256 = "12ljff6l29q92625pgsg4f7xf4dz6iz1c3zdkzz188s4lnwpy8b8";
sha256 = "1d6rnlybj971b5j5glvq288hd4r204nkmssqb0k8rm6cqcwhz292";
};
nativeBuildInputs = [ pytest-runner ];

View file

@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-tarpaulin";
version = "0.18.3";
version = "0.18.5";
src = fetchFromGitHub {
owner = "xd009642";
repo = "tarpaulin";
rev = version;
sha256 = "sha256-n43n9rmLWmGF7JXz/jspT6Stn0fQnkbkxqbuqXiZLHA=";
sha256 = "sha256-vYfoCKHN7kaXSkZI7cdh9pzlX3LqYQNeENaoztKwcII=";
};
nativeBuildInputs = [
@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ curl Security ];
cargoSha256 = "sha256-dJey7z0gRUu5MRKOfR909eQNTt3zpZnoWYvRhHzZlGs=";
cargoSha256 = "sha256-I7a3Vm/+oUqVLPYXvlz+I0Epuems7swePmV8vmmP6TU=";
#checkFlags = [ "--test-threads" "1" ];
doCheck = false;

View file

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, makeWrapper, jre }:
stdenv.mkDerivation rec {
version = "8.45.1";
version = "9.2.1";
pname = "checkstyle";
src = fetchurl {
url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
sha256 = "sha256-H4w/rjVBhZCfBzLavd4/BkojwhCu05VsxrtzyS0wyk4=";
sha256 = "sha256-EqZt/Er9A02ggThXF8y5wCjUgTE8mHPBLs9/XNsJ2vY=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "webdis";
version = "0.1.16";
version = "0.1.19";
src = fetchFromGitHub {
owner = "nicolasff";
repo = pname;
rev = version;
sha256 = "sha256-I+Nq3kjXoQlwfj8r7oNu6KFE6hnB076M9aJMdwCas3k=";
sha256 = "sha256-Q5tFEuyTfjXaa/0JOpNjzokstKaQPwR1szqdzYrqXxc=";
};
buildInputs = [ hiredis http-parser jansson libevent ];

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-expand";
version = "1.0.10";
version = "1.0.13";
src = fetchFromGitHub {
owner = "dtolnay";
repo = pname;
rev = version;
sha256 = "sha256-9Zov1XTU02TjQ707Z/Muv70AGtQL03V1G3suabY3D48=";
sha256 = "sha256-uusPj4lt1tjS2WaFMjSr8MN3NxHXod4t7EoNRIDsjvA=";
};
cargoSha256 = "sha256-toWzjfHU5ce/50kCbuxj6sIG2R3i8q9HBcIzlwW0C9A=";
cargoSha256 = "sha256-iIrnlDKni0kUjp0Qonq98H+UhqV45jnVSOx8BJKyBpg=";
buildInputs = lib.optional stdenv.isDarwin libiconv;

View file

@ -11,17 +11,19 @@
, xdg-user-dirs
, wine
, winetricks
, pciutils
, glxinfo
}:
python3Packages.buildPythonApplication rec {
pname = "grapejuice";
version = "3.64.16";
version = "4.10.2";
src = fetchFromGitLab {
owner = "BrinkerVII";
repo = "grapejuice";
rev = "a5bc65e094bbfb86e6142ac1da59017ddccff69e";
sha256 = "sha256-3+5LWn+UBgLAX683MPHRHQMpW+gC5hGIwTtRVJHRWeE=";
rev = "9a7cf806d35b4d53b3d3762339eba7d861b5043d";
sha256 = "sha256-cKZv9qPCnl7i4kb6PG8RYx3HNLcwgI4d2zkw899MA6E=";
};
nativeBuildInputs = [
@ -43,13 +45,14 @@ python3Packages.buildPythonApplication rec {
packaging
psutil
setuptools
unidecode
];
dontWrapGApps = true;
makeWrapperArgs = [
"\${gappsWrapperArgs[@]}"
"--prefix PATH : ${lib.makeBinPath [ xdg-user-dirs xdg-utils wine winetricks ]}"
"--prefix PATH : ${lib.makeBinPath [ xdg-user-dirs xdg-utils wine winetricks pciutils glxinfo ]}"
];
postPatch = ''
@ -84,7 +87,7 @@ python3Packages.buildPythonApplication rec {
meta = with lib; {
homepage = "https://gitlab.com/brinkervii/grapejuice";
description = "Simple Wine+Roblox management tool";
description = "A wine+Roblox management application";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ artturin ];

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "do-agent";
version = "3.12.0";
version = "3.13.0";
src = fetchFromGitHub {
owner = "digitalocean";
repo = "do-agent";
rev = version;
sha256 = "sha256-9xbtZeufDhci3yTsxAcPcYtnEhOg9k/K8a44SXXiAY0=";
sha256 = "sha256-GJwNJRH7Ib4b3ZP0JHDMZD6h/AZvpRpIaZUDtnLFVoc=";
};
ldflags = [

View file

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "unifiedpush-common-proxies";
version = "1.1.0";
version = "1.1.1";
src = fetchFromGitHub {
owner = "unifiedpush";
repo = "common-proxies";
rev = "v${version}";
sha256 = "sha256-V6LTEwdnVkxc2wm8anlYeYJpk/mMQEsKrq69H8okHBg=";
sha256 = "0wf6kmj8m2c06864qiphf91j5rpaj3bvjrafdk6lqli14p5gmma2";
};
vendorSha256 = "sha256-s0uN6PzIaAHLvRb9T07Xvb6mMAuvKHQ4oFJtl5hsvY4=";
vendorSha256 = "13mxdjc9fvajl0w78a5g1cqadgmxsx74zz8npp5h2s68zkl8sjxk";
meta = with lib; {
description = "A set of rewrite proxies and gateways for UnifiedPush";

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "chezmoi";
version = "2.9.4";
version = "2.9.5";
src = fetchFromGitHub {
owner = "twpayne";
repo = "chezmoi";
rev = "v${version}";
sha256 = "sha256-idkPhBGrLz4xv/DnFt4iiO4jVRTsBmMXGhM0MQmVtpw=";
sha256 = "sha256-do4Vn/+tjklvhE0MdNN4PEDKFAN2pizg9owGIyesWtI=";
};
vendorSha256 = "sha256-9uOlNgMsz4UklSk7UJDKZMjszoxQZK6mLQwhtK8I+Mc=";
vendorSha256 = "sha256-94h02DvhtXIoAC4ZJHm6LysFQKj8ceWuV01Dmiy6Yb8=";
doCheck = false;

View file

@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec {
pname = "mimeo";
version = "2021.2";
version = "2021.11";
src = fetchurl {
url = "https://xyne.archlinux.ca/projects/mimeo/src/${pname}-${version}.tar.xz";
sha256 = "113ip024ggajjdx0l406g6lwypdrddxz6k3640y6lzqjivcgybjf";
url = "https://xyne.dev/projects/mimeo/src/${pname}-${version}.tar.xz";
sha256 = "1fi8svn4hg2hmvv28j026sks1hc0v8wh974g7ixcwfcg2xda6c4p";
};
buildInputs = [ file desktop-file-utils ];
@ -23,9 +23,14 @@ python3Packages.buildPythonApplication rec {
installPhase = "install -Dm755 Mimeo.py $out/bin/mimeo";
doInstallCheck = true;
installCheckPhase = ''
$out/bin/mimeo --help > /dev/null
'';
meta = with lib; {
description = "Open files by MIME-type or file name using regular expressions";
homepage = "https://xyne.archlinux.ca/projects/mimeo/";
homepage = "https://xyne.dev/projects/mimeo/";
license = [ licenses.gpl2 ];
maintainers = [ maintainers.rycee ];
platforms = platforms.unix;

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-release";
version = "0.18.6";
version = "0.19.0";
src = fetchFromGitHub {
owner = "crate-ci";
repo = "cargo-release";
rev = "v${version}";
sha256 = "sha256-4ZXur3Hja5nlJ2GLGei9r7ZPz+bvw41rm9xzaIo68gw=";
sha256 = "sha256-u1XXkenMIflbXACxOeeq7Mg5ubel4oFXpL/uy6McQf0=";
};
cargoSha256 = "sha256-vBr3RYBFoeCJquS8ugVpl29J7CUraN/HuxtKv8Dqi/k=";
cargoSha256 = "sha256-7QOaSEaX2JXtTQQo3RXbMpZg6V2wzfoQbId9QOD9sCA=";
nativeBuildInputs = [ pkg-config ];

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "doppler";
version = "3.36.2";
version = "3.37.0";
src = fetchFromGitHub {
owner = "dopplerhq";
repo = "cli";
rev = version;
sha256 = "sha256-T8WqQTB3ogxGiImkyZUUbKcXTdSgGM0Vb4OkckslzYE=";
sha256 = "sha256-GrrjfuDor92535yzoxAudlI4vUrCittsdQeXxuUwNww=";
};
vendorSha256 = "sha256-VPxHxNtDeP5CFDMTeMsZYED9ZGWMquJdeupeCVldY/E=";

View file

@ -122,6 +122,8 @@ with self; with super; {
pytest-xdist = callPackage ../development/python-modules/pytest-xdist/1.nix { };
pyyaml = callPackage ../development/python-modules/pyyaml/5.nix { };
qpid-python = callPackage ../development/python-modules/qpid-python { };
recoll = disabled super.recoll;