Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2022-05-06 18:01:53 +00:00 committed by GitHub
commit 730d96c6bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
36 changed files with 251 additions and 155 deletions

View File

@ -445,6 +445,19 @@ with lib.maintainers; {
enableFeatureFreezePing = true;
};
numtide = {
members = [
mic92
flokli
jfroche
tazjin
zimbatm
];
enableFeatureFreezePing = true;
scope = "Group registration for Numtide team members who collectively maintain packages.";
shortName = "Numtide team";
};
openstack = {
members = [
emilytrau

View File

@ -30,6 +30,7 @@ let
linux_5_4_hardened
linux_5_10_hardened
linux_5_15_hardened
linux_5_17_hardened
linux_testing;
};

View File

@ -32,8 +32,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
# system one. Overriding this pretty bad default behaviour.
export REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt
export TOOT_LOGIN_CLI_PASSWORD="jamy-password"
toot login_cli -i "pleroma.nixos.test" -e "jamy@nixos.test"
echo "jamy-password" | toot login_cli -i "pleroma.nixos.test" -e "jamy@nixos.test"
echo "Login OK"
# Send a toot then verify it's part of the public timeline
@ -159,6 +158,8 @@ import ./make-test-python.nix ({ pkgs, ... }:
# Waiting for pleroma to be up.
timeout 5m bash -c 'while [[ "$(curl -s -o /dev/null -w '%{http_code}' https://pleroma.nixos.test/api/v1/instance)" != "200" ]]; do sleep 2; done'
# Toremove the RELEASE_COOKIE bit when https://github.com/NixOS/nixpkgs/issues/166229 gets fixed.
RELEASE_COOKIE="/var/lib/pleroma/.cookie" \
pleroma_ctl user new jamy jamy@nixos.test --password 'jamy-password' --moderator --admin -y
'';
@ -168,21 +169,6 @@ import ./make-test-python.nix ({ pkgs, ... }:
cp key.pem cert.pem $out
'';
/* Toot is preventing users from feeding login_cli a password non
interactively. While it makes sense most of the times, it's
preventing us to login in this non-interactive test. This patch
introduce a TOOT_LOGIN_CLI_PASSWORD env variable allowing us to
provide a password to toot login_cli
If https://github.com/ihabunek/toot/pull/180 gets merged at some
point, feel free to remove this patch. */
custom-toot = pkgs.toot.overrideAttrs(old:{
patches = [ (pkgs.fetchpatch {
url = "https://github.com/NinjaTrappeur/toot/commit/b4a4c30f41c0cb7e336714c2c4af9bc9bfa0c9f2.patch";
sha256 = "sha256-0xxNwjR/fStLjjUUhwzCCfrghRVts+fc+fvVJqVcaFg=";
}) ];
});
hosts = nodes: ''
${nodes.pleroma.config.networking.primaryIPAddress} pleroma.nixos.test
${nodes.client.config.networking.primaryIPAddress} client.nixos.test
@ -194,7 +180,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
security.pki.certificateFiles = [ "${tls-cert}/cert.pem" ];
networking.extraHosts = hosts nodes;
environment.systemPackages = with pkgs; [
custom-toot
toot
send-toot
];
};

View File

@ -16,11 +16,11 @@ let
in stdenv.mkDerivation rec {
pname = "nano";
version = "6.2";
version = "6.3";
src = fetchurl {
url = "mirror://gnu/nano/${pname}-${version}.tar.xz";
sha256 = "K8oYBL6taq9K15H3VuR0m7Ve2GDuwQWpf7qGS8anfLM=";
sha256 = "61MtpJhWcnMLUA9oXbqriFpGbQj7v3QVgyuVgF5vhoc=";
};
nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;
@ -41,9 +41,7 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru = {
tests = {
expect = callPackage ./test-with-expect.nix {};
};
tests = { expect = callPackage ./test-with-expect.nix { }; };
updateScript = writeScript "update.sh" ''
#!${stdenv.shell}

View File

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, alsa-lib
, appstream-glib
, desktop-file-utils
, gio-sharp
@ -21,19 +22,20 @@
stdenv.mkDerivation rec {
pname = "rnote";
version = "0.4.0";
version = "0.5.0-hotfix-2";
src = fetchFromGitHub {
owner = "flxzt";
repo = "rnote";
rev = "v${version}";
sha256 = "sha256-J7IW329rWFEoB+44762DAkWA8Hq4IVmXgc+QoDQaxV0=";
fetchSubmodules = true;
hash = "sha256-8sv7GQopUbKv8JS1/UXRFeK++UZKk3CJBOzUMx9vZDU=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-elXaikB/RemMxA4OXyZNQOgP1alImQMJHng5oX2j480=";
hash = "sha256-N0qsph68FAkwOpyr9QUw0bDQKn7t22Hbz9BYYOs4pCM=";
};
nativeBuildInputs = [
@ -51,6 +53,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
alsa-lib
gio-sharp
glib
gstreamer

View File

@ -0,0 +1,19 @@
{ lib, fetchurl, appimageTools }:
appimageTools.wrapType2 rec {
pname = "remnote";
version = "1.7.6";
src = fetchurl {
url = "https://download.remnote.io/RemNote-${version}.AppImage";
sha256 = "sha256-yRUpLev/Fr3mOamkFgevArv2UoXgV4e6zlyv7FaQ4RM=";
};
meta = with lib; {
description = "A note-taking application focused on learning and productivity";
homepage = "https://remnote.com/";
maintainers = with maintainers; [ max-niederman ];
license = licenses.unfree;
platforms = platforms.linux;
};
}

View File

@ -63,11 +63,10 @@ let
kalbasit
marsam
maxeaubrey
timstott
zimbatm
zowoq
techknowlogick
];
timstott
zowoq
] ++ teams.numtide.members;
};
} // attrs');

View File

@ -24,7 +24,7 @@ let
in stdenv.mkDerivation rec {
pname = "signal-desktop";
version = "5.39.0"; # Please backport all updates to the stable channel.
version = "5.42.0"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "sha256-Dy5orMKZvvnHZu/2U5YIJdDR4eDM3SBjXVGHuBv0kgc=";
sha256 = "sha256-xjSj7eKaDV8WB0SiPb4orxKK8mV2a2EWiMBK7BE8mgU=";
};
nativeBuildInputs = [

View File

@ -1,4 +1,4 @@
{ pkgs, nodejs-16_x, stdenv, lib }:
{ pkgs, nodejs-16_x, stdenv, lib, nixosTests }:
let
nodePackages = import ./node-composition.nix {
@ -18,7 +18,10 @@ nodePackages.n8n.override {
ln -s $out/lib/node_modules/n8n/bin/n8n $out/bin/n8n
'';
passthru.updateScript = ./generate-dependencies.sh;
passthru = {
updateScript = ./generate-dependencies.sh;
tests = nixosTests.n8n;
};
meta = with lib; {
description = "Free and open fair-code licensed node based Workflow Automation Tool";

View File

@ -1,30 +1,38 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, makeDesktopItem, unzip, fpc, lazarus,
libX11, glib, gtk2, gdk-pixbuf, pango, atk, cairo, openssl }:
{ lib, stdenv, fetchFromGitHub, pkg-config, makeDesktopItem, fetchpatch, unzip
, fpc, lazarus, libX11, glib, gtk2, gdk-pixbuf, pango, atk, cairo, openssl }:
stdenv.mkDerivation rec {
pname = "transgui";
version = "5.18.0";
version = "unstable-2022-02-02";
src = fetchFromGitHub {
owner = "transmission-remote-gui";
repo = "transgui";
rev = "v${version}";
sha256 = "1dyx778756zhvz5sxgdvy49p2c0x44w4nmcfd90wqrmgfknncnf5";
rev = "0e2c2a07c1b21b1704c0a4945a111a8aa1050a1a";
sha256 = "1x9wzii3q9zanpik4xc99jqsfrqch8vjmlx12jrvczxcfy51b1ba";
};
patches = [
# TDDO: remove when transgui updates for transmission-daemon v3 rpc protocol
(fetchpatch {
url = "https://github.com/transmission-remote-gui/transgui/commit/9275c3fb877dd753a1940d1b900630cdc09a0cc2.patch";
sha256 = "0w2x7gcxp5kqczdz7ckfqhdz9hhkm62k8gcws54d6km7x9vc1023";
})
];
nativeBuildInputs = [ pkg-config unzip ];
buildInputs = [
fpc lazarus stdenv.cc
libX11 glib gtk2 gdk-pixbuf pango atk cairo openssl
fpc lazarus stdenv.cc libX11 glib gtk2 gdk-pixbuf
pango atk cairo openssl
];
NIX_LDFLAGS = "
-L${stdenv.cc.cc.lib}/lib
-lX11 -lglib-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0
-lgdk_pixbuf-2.0 -lpango-1.0 -latk-1.0 -lcairo -lc -lcrypto
";
NIX_LDFLAGS = ''
-L${stdenv.cc.cc.lib}/lib -lX11 -lglib-2.0 -lgtk-x11-2.0
-lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lpango-1.0 -latk-1.0 -lcairo
-lc -lcrypto
'';
prePatch = ''
postPatch = ''
substituteInPlace restranslator.pas --replace /usr/ $out/
'';
@ -33,23 +41,19 @@ stdenv.mkDerivation rec {
lazbuild -B transgui.lpr --lazarusdir=${lazarus}/share/lazarus
'';
makeFlags = [
"FPC=fpc"
"PP=fpc"
"INSTALL_PREFIX=$(out)"
];
makeFlags = [ "FPC=fpc" "PP=fpc" "INSTALL_PREFIX=$(out)" ];
LCL_PLATFORM = "gtk2";
desktopItem = makeDesktopItem rec {
name = "transgui";
exec = name + " %U";
icon = name;
desktopItem = makeDesktopItem {
name = pname;
exec = "${pname} %U";
icon = pname;
type = "Application";
comment = meta.description;
desktopName = "Transmission Remote GUI";
genericName = "BitTorrent Client";
categories = [ "Application" "Network" "FileTransfer" "P2P" "GTK" ];
categories = [ "Network" "FileTransfer" "P2P" "GTK" ];
startupNotify = true;
mimeTypes = [ "application/x-bittorrent" "x-scheme-handler/magnet" ];
};
@ -64,10 +68,11 @@ stdenv.mkDerivation rec {
'';
meta = {
description = "A cross platform front-end for the Transmission Bit-Torrent client";
description = "A cross platform front-end for the Transmission BitTorrent client";
homepage = "https://sourceforge.net/p/transgui";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ ramkromberg ];
platforms = lib.platforms.linux;
mainProgram = "transgui";
platforms = [ "x86_64-linux" "x86_64-darwin" ];
};
}

View File

@ -19,16 +19,16 @@ let
maintainers = with maintainers; [ fliegendewurst ];
};
version = "0.50.3";
version = "0.51.2";
desktopSource = {
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
sha256 = "sha256-0N2+NcdZGxaj4LcG5edyd3ry+0dSQSfUQRqZEYFfWqQ=";
sha256 = "17bqcnpvflpi5dlz9m294diwd6as5wha5jcv9a3qvhh4pq0nyr4z";
};
serverSource = {
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
sha256 = "sha256-za32yRhusReoGIRdbfx30CPH63BVXz2Z7jkhxtb7XSo=";
sha256 = "0jjvg75a4va5d81x8dvpzmzax7p0bqd7psv0alkkl13m91gai6ig";
};
in {

View File

@ -11,21 +11,21 @@ let
name = "cbqn-bytecode-files";
owner = "dzaima";
repo = "CBQN";
rev = "b000b951aa8f3590b196b4c09056604c0b32a168";
hash = "sha256-znW0xOXogP4TfifUmk3cs4aN/9mMSpSD2WJppmeI1Fg=";
rev = "c39653c898531a2cdbf4cc5c764df6e37b1894a4";
hash = "sha256-JCEmkwh5Rv5+NQoxvefSrYnayU892/Wam+gjMgcQmO0=";
};
in
assert genBytecode -> ((bqn-path != null) && (mbqn-source != null));
stdenv.mkDerivation rec {
pname = "cbqn" + lib.optionalString (!genBytecode) "-standalone";
version = "0.pre+date=2021-12-13";
version = "0.pre+date=2022-05-06";
src = fetchFromGitHub {
owner = "dzaima";
repo = "CBQN";
rev = "e7662b0f6a44add0749fba2a6d7309a5c1eb2601";
hash = "sha256-2nfkTZBIGHX5cok6Ea3KSewakZy8Ey8nSO2Fe4xGgvg=";
rev = "3496a939b670f8c9ca2a04927378d6b7e9abd68e";
hash = "sha256-P+PoY4XF9oEw7VIpmybvPp+jxWHEo2zt1Lamayf1mHg=";
};
dontConfigure = true;
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
'' + (if genBytecode then ''
${bqn-path} genRuntime ${mbqn-source}
'' else ''
cp ${cbqn-bytecode-files}/src/gen/{compiler,formatter,runtime0,runtime1,src} src/gen/
cp ${cbqn-bytecode-files}/src/gen/{compiles,formatter,runtime0,runtime1,src} src/gen/
'');
installPhase = ''
@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/dzaima/CBQN/";
description = "BQN implementation in C";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ AndersonTorres sternenseemann synthetica ];
maintainers = with maintainers; [ AndersonTorres sternenseemann synthetica shnarazk ];
platforms = platforms.all;
};
}

View File

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "aioairzone";
version = "0.4.2";
version = "0.4.3";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "Noltari";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-SPxSIcsDjsT7dZQs1CoU7DstQTxYN1c0qAB+XQjVXlo=";
hash = "sha256-QLHM7M3x0QjTTzKNngsNioEzpPh4qG1ntEtSkHQPlfQ=";
};
propagatedBuildInputs = [

View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "aurorapy";
version = "0.2.6";
version = "0.2.7";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "energievalsabbia";
repo = pname;
rev = version;
hash = "sha256-DMlzzLe94dbeHjESmLc045v7vQ//IEsngAv7TeVznHE=";
hash = "sha256-rGwfGq3zdoG9NCGqVN29Q4bWApk5B6CRdsW9ctWgOec=";
};
propagatedBuildInputs = [

View File

@ -3,22 +3,25 @@
, azure-core
, buildPythonPackage
, fetchPypi
, futures ? null
, isodate
, isPy3k
, msrestazure
, pythonOlder
, six
, typing-extensions
, uamqp
}:
buildPythonPackage rec {
pname = "azure-servicebus";
version = "7.6.0";
version = "7.6.1";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "sha256-uZGxQ1Vl6wpBCMW1+80/CBuqelLV02yXf1sNlNtCpHU=";
hash = "sha256-wqt+uWKVklP2AxiQN9PeuOFUixtZuBUIUhN+WZBYrBI=";
};
propagatedBuildInputs = [
@ -26,16 +29,15 @@ buildPythonPackage rec {
azure-core
isodate
msrestazure
six
typing-extensions
uamqp
] ++ lib.optionals (!isPy3k) [
futures
];
# has no tests
# Tests require dev-tools
doCheck = false;
# python2 will fail due to pep 420
pythonImportsCheck = lib.optionals isPy3k [
pythonImportsCheck = [
"azure.servicebus"
];

View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pychromecast";
version = "12.0.0";
version = "12.1.1";
format = "setuptools";
disabled = !isPy3k;
@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "PyChromecast";
inherit version;
sha256 = "sha256-asvEJix8/3glVhenll/rlTwSZdX0LRPMX4uCSURohJ4=";
sha256 = "sha256-lUWiKs2tyWYD9214eMbqF7rxMoJgz1YMiHyMEqrUyCw=";
};
propagatedBuildInputs = [

View File

@ -0,0 +1,50 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, netmiko
, pytestCheckHook
, python
, pythonOlder
, ttp
}:
buildPythonPackage rec {
pname = "ttp-templates";
version = "0.1.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "dmulyalin";
repo = "ttp_templates";
rev = version;
hash = "sha256-Qx+z/srYgD67FjXzYrc8xtA99n8shWK7yWj/r/ETN2U=";
};
propagatedBuildInputs = [
ttp
];
checkInputs = [
netmiko
pytestCheckHook
];
pythonImportsCheck = [
"ttp_templates"
];
pytestFlagsArray = [
# The other tests requires data which is no part of the source
"test/test_ttp_templates_methods.py"
"test/test_yang_openconfig_lldp.py"
];
meta = with lib; {
description = "Template Text Parser Templates collections";
homepage = "https://github.com/dmulyalin/ttp_templates";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -36,7 +36,7 @@ buildGoModule rec {
description = "Build automation for the container era";
homepage = "https://earthly.dev/";
changelog = "https://github.com/earthly/earthly/releases/tag/v${version}";
license = licenses.bsl11;
license = licenses.mpl20;
maintainers = with maintainers; [ zoedsoupe ];
};
}

View File

@ -25,13 +25,13 @@ let makeArcWrapper = toolset: ''
in
stdenv.mkDerivation {
pname = "arcanist";
version = "20200711";
version = "20220425";
src = fetchFromGitHub {
owner = "phacility";
repo = "arcanist";
rev = "2565cc7b4d1dbce6bc7a5b3c4e72ae94be4712fe";
sha256 = "0jiv4aj4m5750dqw9r8hizjkwiyxk4cg4grkr63sllsa2dpiibxw";
rev = "da206314cf59f71334b187283e18823bddc16ddd";
sha256 = "sha256-6VVUjFMwPQvk22Ni1YUSgks4ZM0j1JP+71VnYKD8onM=";
};
patches = [ ./dont-require-python3-in-path.patch ];

View File

@ -16,6 +16,6 @@ rustPlatform.buildRustPackage rec {
description = "one CLI to format the code tree";
homepage = "https://github.com/numtide/treefmt";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ zimbatm ];
maintainers = lib.teams.numtide.members;
};
}

View File

@ -17,10 +17,10 @@ buildGoModule rec {
ldflags = [
"-s" "-w"
"-X github.com/superfly/flyctl/flyctl.Commit=${src.rev}"
"-X github.com/superfly/flyctl/flyctl.BuildDate=1970-01-01T00:00:00+0000"
"-X github.com/superfly/flyctl/flyctl.Environment=production"
"-X github.com/superfly/flyctl/flyctl.Version=${version}"
"-X github.com/superfly/flyctl/internal/buildinfo.commit=${src.rev}"
"-X github.com/superfly/flyctl/internal/buildinfo.buildDate=1970-01-01T00:00:00+0000"
"-X github.com/superfly/flyctl/internal/buildinfo.environment=production"
"-X github.com/superfly/flyctl/internal/buildinfo.version=${version}"
];
preBuild = ''

View File

@ -1,10 +1,10 @@
{ lib, stdenv, fetchurl, bash, jre }:
let
mcVersion = "1.18.1";
buildNum = "132";
mcVersion = "1.18.2";
buildNum = "313";
jar = fetchurl {
url = "https://papermc.io/api/v2/projects/paper/versions/${mcVersion}/builds/${buildNum}/downloads/paper-${mcVersion}-${buildNum}.jar";
sha256 = "af26babef1e9134804bdf61e14eed7677d603516638f5a2ffe97e176ebd9839b";
sha256 = "sha256-wotk0Pu1wKomj83nMCyzzPZ+Y9RkQUbfeWjRGaSt7lE=";
};
in stdenv.mkDerivation {
pname = "papermc";

View File

@ -2,51 +2,61 @@
"4.14": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-4.14.276-hardened1.patch",
"sha256": "1q0w8fqn9z32r35s3lil9dllkykydnpfp1dkhgvmy5rggbm801ay",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.276-hardened1/linux-hardened-4.14.276-hardened1.patch"
"name": "linux-hardened-4.14.277-hardened1.patch",
"sha256": "1jjbywmwglnsj80dbic14bip6wfllsgqgw7lcn9s8n12mdr42ps2",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.277-hardened1/linux-hardened-4.14.277-hardened1.patch"
},
"sha256": "1rxksrmkh5raz930y9khfg85dglgphrgcvkj21n86m333pajs4mf",
"version": "4.14.276"
"sha256": "058vzn1gcsc194hgwrj78afawz2anm7ga8a1x5m5i4cw8p1arp73",
"version": "4.14.277"
},
"4.19": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-4.19.239-hardened1.patch",
"sha256": "1w0h47av90aapz5g5ldny1vrq21n22kxag24byk4b43ndg6q0ksc",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.239-hardened1/linux-hardened-4.19.239-hardened1.patch"
"name": "linux-hardened-4.19.240-hardened1.patch",
"sha256": "1qhrwpjfy5c75zcpvp1b0xb460vyjv04iml2inqrhnj9zcz1kgp8",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.240-hardened1/linux-hardened-4.19.240-hardened1.patch"
},
"sha256": "0fsr9jy8d1rpg6ixp7av01pqz3vq50rgfcjd7vj16ccsdk15sz5z",
"version": "4.19.239"
"sha256": "1hj6vngynx6kjaczjl77jjwqq0kh0lm6jdqjvakd1cgrppaizb3j",
"version": "4.19.240"
},
"5.10": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.10.112-hardened1.patch",
"sha256": "1sryrhl7bblx4r0smvlzw7p4xhc4l8bsqgwzlj2x8qamj544w464",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.112-hardened1/linux-hardened-5.10.112-hardened1.patch"
"name": "linux-hardened-5.10.113-hardened1.patch",
"sha256": "0v6blapny74fkhsm5rksxg632hv3chh81wgc96l6ql4sy7p19riv",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.113-hardened1/linux-hardened-5.10.113-hardened1.patch"
},
"sha256": "19aa7fq8n75gh0vv01mpxg4cxkfpr5lj0sv6lxiyzcgbc71isv4c",
"version": "5.10.112"
"sha256": "1z3dd5hrdbn2axsi2n70n41q1dq2dvg7s8aph1p6yiajpc16llc2",
"version": "5.10.113"
},
"5.15": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.15.35-hardened1.patch",
"sha256": "10x2q01bckmfmgdzfg01khj43pav1drzzp3fr20hk718ywikvgax",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.35-hardened1/linux-hardened-5.15.35-hardened1.patch"
"name": "linux-hardened-5.15.36-hardened1.patch",
"sha256": "1y52bayw2n1lc1vp9jz8a39fz32x81ivaw24kc6hdr23yg0a8q5g",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.36-hardened1/linux-hardened-5.15.36-hardened1.patch"
},
"sha256": "1n05c4c4ish25x483a2p5177zgda8pq7g4752n1b7chfygi5l6ha",
"version": "5.15.35"
"sha256": "1466557034q1fzvpy8vwj8ps3cv2q8s7z76af9y1jz4kgaqmsd1n",
"version": "5.15.36"
},
"5.17": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.17.5-hardened1.patch",
"sha256": "1cv43sp2amai7r75dw07bd2ys6fz1ri9pfra3kaajap55sbalsw0",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.17.5-hardened1/linux-hardened-5.17.5-hardened1.patch"
},
"sha256": "11z95wsgmj97pg77yck26l0383gncbla0zwpzv4gjdj4p62x3g4v",
"version": "5.17.5"
},
"5.4": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.4.190-hardened1.patch",
"sha256": "0z4w05fq20pmiyxf4bip61ywy5xg96klbnj62yxiaha68pfwlm29",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.190-hardened1/linux-hardened-5.4.190-hardened1.patch"
"name": "linux-hardened-5.4.191-hardened1.patch",
"sha256": "117v9xb9y3bmppxmrbya5a4d869fh6l7map25g5n03sca56g7c32",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.191-hardened1/linux-hardened-5.4.191-hardened1.patch"
},
"sha256": "157ifcl59xxj721r302hg82vmbqzx5hjrlihrc5s4maxfw3ygm41",
"version": "5.4.190"
"sha256": "0fharjqasvq76pciwci6qamdadpfjh2n8gdyri8fj65drmgsi318",
"version": "5.4.191"
}
}

View File

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "4.19.240";
version = "4.19.241";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1hj6vngynx6kjaczjl77jjwqq0kh0lm6jdqjvakd1cgrppaizb3j";
sha256 = "04zyi22c2d91k7v2w0s8v112cqqf24km599mn18k2nafq79njqjc";
};
} // (args.argsOverride or {}))

View File

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.15.36";
version = "5.15.37";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -15,6 +15,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1466557034q1fzvpy8vwj8ps3cv2q8s7z76af9y1jz4kgaqmsd1n";
sha256 = "09n0l9ly111r6jbpgz1kw2q4n4mmcv5jxfhs5bcsiyjp44d0kgqq";
};
} // (args.argsOverride or { }))

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "alps";
version = "2021-09-29";
version = "2022-03-01";
src = fetchFromSourcehut {
owner = "~migadu";
repo = "alps";
rev = "d4c35f3c3157bece8e50fd95f2ee1081be30d7ae";
sha256 = "sha256-xKfRLdfeD7lWdmC0iiq4dOIv2SmzbKH7HcAISCJgdug=";
rev = "f4523b51af0787795973b403b978ff74737a47ef";
hash = "sha256-un1RGIABFhHKeXPXtLnGayyoGzfo5PZc8VBSHA0PAaw=";
};
vendorSha256 = "sha256-Vg0k+YSMg6Ree/jkVV2VQ8RbSbQFUhmUN2MeTBxPeLo=";

View File

@ -55,7 +55,7 @@ unwrapped = stdenv.mkDerivation rec {
# http://knot-resolver.readthedocs.io/en/latest/build.html#requirements
buildInputs = [ knot-dns lua.lua libuv gnutls lmdb ]
++ optionals stdenv.isLinux [ systemd libcap_ng ]
++ optionals stdenv.isLinux [ /*lib*/systemd libcap_ng ]
++ [ nghttp2 ]
## optional dependencies; TODO: dnstap
;
@ -79,8 +79,7 @@ unwrapped = stdenv.mkDerivation rec {
rm -r "$out"/lib/sysusers.d/ # ATM more likely to harm than help
'';
doInstallCheck = with stdenv; hostPlatform == buildPlatform
&& !(isDarwin && isAarch64); # avoid luarocks, as it's broken ATM on the platform
doInstallCheck = with stdenv; hostPlatform == buildPlatform;
installCheckInputs = [ cmocka which cacert lua.cqueues lua.basexx lua.http ];
installCheckPhase = ''
meson test --print-errorlogs

View File

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2022.5.0";
version = "2022.5.1";
components = {
"abode" = ps: with ps; [
abodepy
@ -2244,10 +2244,6 @@
"russound_rnet" = ps: with ps; [
]; # missing inputs: russound
"sabnzbd" = ps: with ps; [
aiohttp-cors
ifaddr
netdisco
zeroconf
]; # missing inputs: pysabnzbd
"safe_mode" = ps: with ps; [
pyturbojpeg

View File

@ -179,7 +179,7 @@ let
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
# Don't forget to run parse-requirements.py after updating
hassVersion = "2022.5.0";
hassVersion = "2022.5.1";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@ -197,7 +197,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
hash = "sha256-xlotye/8oeCs/ntNV4osGjcl7fo05ke7nFLQeee/USY=";
hash = "sha256-TsLKcrT31PFik9ZKvl3peMMciR6rma70c2p+dNDn+zk=";
};
# leave this in, so users don't have to constantly update their downstream patch handling

View File

@ -2,17 +2,25 @@
buildGoModule rec {
pname = "VictoriaMetrics";
version = "1.59.0";
version = "1.77.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-2i9rmk9aAnjTJY+w/NKJOaLX+tpkt3vG07iLCsSGzdU=";
sha256 = "sha256-Ike3yO93q/bna/cnHv1sg+gR7iS9cVmNzLViBsfFdVs=";
};
vendorSha256 = null;
postPatch = ''
# main module (github.com/VictoriaMetrics/VictoriaMetrics) does not contain package
# github.com/VictoriaMetrics/VictoriaMetrics/app/vmui/packages/vmui/web
#
# This appears to be some of test server for development purposes only.
rm -f app/vmui/packages/vmui/web/{go.mod,main.go}
'';
ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ];
passthru.tests = { inherit (nixosTests) victoriametrics; };
@ -21,7 +29,7 @@ buildGoModule rec {
homepage = "https://victoriametrics.com/";
description = "fast, cost-effective and scalable time series database, long-term remote storage for Prometheus";
license = licenses.asl20;
maintainers = [ maintainers.yorickvp ];
maintainers = with maintainers; [ yorickvp ivan ];
changelog = "https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v${version}";
platforms = [ "x86_64-linux" ];
};

View File

@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "apkeep";
version = "0.11.0";
version = "0.12.0";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-kwJ4/jkVVgem5Lb+uFDFPk4/6WWSWJs+SQDSyKkhG/8=";
sha256 = "sha256-SmzsFXS/geFpssy18pIluoCYGsJql9TAgYUNgAZlXmI=";
};
cargoSha256 = "sha256-kJ81kY2EmkH3yu8xL1aPxXPMhkDsGKWo0RWn1Ih7z2k=";
cargoSha256 = "sha256-bL79CW6X9pHx/Cn58KDxf8bVDwvrGRKkK9v/+Ygp5D4=";
prePatch = ''
rm .cargo/config.toml

View File

@ -49,6 +49,6 @@ buildGoModule rec {
'';
homepage = "https://direnv.net";
license = licenses.mit;
maintainers = with maintainers; [ zimbatm ];
maintainers = teams.numtide.members;
};
}

View File

@ -1,28 +1,25 @@
{ buildGoModule, fetchFromGitHub, go-bindata, openssh, makeWrapper, lib }:
{ buildGoModule, fetchFromGitHub, lib, makeWrapper, openssh }:
buildGoModule rec {
pname = "morph";
version = "1.6.0";
version = "1.7.0";
src = fetchFromGitHub {
owner = "dbcdk";
repo = "morph";
rev = "v${version}";
sha256 = "0aibs4gsb9pl21nd93bf963kdzf0661qn0liaw8v8ak2xbz7nbs8";
sha256 = "sha256-0CHmjqPxBgALGZYjfJFLoLBnoI0U7oZ8WyCtu1bkzZg=";
};
vendorSha256 = "08zzp0h4c4i5hk4whz06a3da7qjms6lr36596vxz0d8q0n7rspr9";
nativeBuildInputs = [ makeWrapper go-bindata ];
nativeBuildInputs = [ makeWrapper ];
ldflags = [
"-X main.version=${version}"
"-X main.assetRoot=${placeholder "lib"}"
];
postPatch = ''
go-bindata -pkg assets -o assets/assets.go data/
'';
postInstall = ''
mkdir -p $lib
cp -v ./data/*.nix $lib

View File

@ -21869,7 +21869,9 @@ with pkgs;
keycloak = callPackage ../servers/keycloak { };
knot-dns = callPackage ../servers/dns/knot-dns { };
knot-resolver = callPackage ../servers/dns/knot-resolver { };
knot-resolver = callPackage ../servers/dns/knot-resolver {
systemd = systemdMinimal; # in closure already anyway
};
rdkafka = callPackage ../development/libraries/rdkafka { };
@ -29294,6 +29296,8 @@ with pkgs;
rednotebook = python3Packages.callPackage ../applications/editors/rednotebook { };
remnote = callPackage ../applications/misc/remnote { };
remotebox = callPackage ../applications/virtualization/remotebox { };
restique = libsForQt5.callPackage ../applications/backup/restique { };

View File

@ -541,6 +541,7 @@ in {
});
linux_5_10_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_10 { });
linux_5_15_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_15 { });
linux_5_17_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_17 { });
linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);
linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx);

View File

@ -10402,6 +10402,8 @@ in {
ttp = callPackage ../development/python-modules/ttp { };
ttp-templates = callPackage ../development/python-modules/ttp-templates { };
tubes = callPackage ../development/python-modules/tubes { };
tunigo = callPackage ../development/python-modules/tunigo { };