diff --git a/nixos/tests/pleroma.nix b/nixos/tests/pleroma.nix index bf3623fce38..8998716243a 100644 --- a/nixos/tests/pleroma.nix +++ b/nixos/tests/pleroma.nix @@ -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,7 +158,9 @@ 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' - pleroma_ctl user new jamy jamy@nixos.test --password 'jamy-password' --moderator --admin -y + # 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 ''; tls-cert = pkgs.runCommand "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } '' @@ -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 ]; }; diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 658c18e5cb5..20b18814cb7 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -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} diff --git a/pkgs/applications/networking/n8n/default.nix b/pkgs/applications/networking/n8n/default.nix index 86403883631..84ac952846f 100644 --- a/pkgs/applications/networking/n8n/default.nix +++ b/pkgs/applications/networking/n8n/default.nix @@ -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"; diff --git a/pkgs/applications/networking/p2p/transgui/default.nix b/pkgs/applications/networking/p2p/transgui/default.nix index da7633221a5..a0e2388d16c 100644 --- a/pkgs/applications/networking/p2p/transgui/default.nix +++ b/pkgs/applications/networking/p2p/transgui/default.nix @@ -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" ]; }; } diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 7190fe90040..9e2752e163f 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -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 { diff --git a/pkgs/development/interpreters/bqn/cbqn/default.nix b/pkgs/development/interpreters/bqn/cbqn/default.nix index 992caf200a7..0426a72c81a 100644 --- a/pkgs/development/interpreters/bqn/cbqn/default.nix +++ b/pkgs/development/interpreters/bqn/cbqn/default.nix @@ -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; }; } diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix index 4865812023b..1b926074cba 100644 --- a/pkgs/development/python-modules/aioairzone/default.nix +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/aurorapy/default.nix b/pkgs/development/python-modules/aurorapy/default.nix index 7e59d9c8bc9..00eb71e3d7d 100644 --- a/pkgs/development/python-modules/aurorapy/default.nix +++ b/pkgs/development/python-modules/aurorapy/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix index a0864529177..0fd1ca89f08 100644 --- a/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-servicebus/default.nix @@ -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" ]; diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index 27e464f6e5f..7d38d99c696 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/ttp-templates/default.nix b/pkgs/development/python-modules/ttp-templates/default.nix new file mode 100644 index 00000000000..46db94782be --- /dev/null +++ b/pkgs/development/python-modules/ttp-templates/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index 06b17c1ff1f..5838f5e94b4 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -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 ]; }; } diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix index 0fa34c7eefe..16c056bc3ff 100644 --- a/pkgs/development/tools/misc/arcanist/default.nix +++ b/pkgs/development/tools/misc/arcanist/default.nix @@ -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 ]; diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 87b6ddfa923..8850f495027 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -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 = '' diff --git a/pkgs/games/papermc/default.nix b/pkgs/games/papermc/default.nix index 52bd5c00d43..7b7d66f6188 100644 --- a/pkgs/games/papermc/default.nix +++ b/pkgs/games/papermc/default.nix @@ -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"; diff --git a/pkgs/servers/alps/default.nix b/pkgs/servers/alps/default.nix index fb10a5369f1..8b2a605261b 100644 --- a/pkgs/servers/alps/default.nix +++ b/pkgs/servers/alps/default.nix @@ -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="; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index d47b5a3e6a3..1ec5a78ea1a 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -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 diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 0515f9a5198..288d094cc76 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -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 diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index b7d0faca0c1..8b3ad0c2b13 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -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 diff --git a/pkgs/tools/misc/apkeep/default.nix b/pkgs/tools/misc/apkeep/default.nix index f7d3daf9fbc..d1bb7d85d18 100644 --- a/pkgs/tools/misc/apkeep/default.nix +++ b/pkgs/tools/misc/apkeep/default.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5de4b02ecfc..8195d97dd68 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21867,7 +21867,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 { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dee60882cdc..26e4f5623de 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10400,6 +10400,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 { };