diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-09-17 12:02:15 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-09-17 12:02:15 +0000 |
commit | 318db82ea70c8ddce23e5ac5e3831741f6f67adf (patch) | |
tree | f31ce5d78a995b9c5195f1c86dc69719507ad05a | |
parent | 7316bc7b10b5aa3598c2408726dc9b3443578def (diff) | |
parent | 568df7e30ad53e2b15aaa9b717e1b1c41443a10f (diff) |
Merge staging-next into staging
50 files changed, 358 insertions, 86 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4ad1b83c20c3..79dacff88b1c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8104,6 +8104,13 @@ githubId = 109141; name = "Georges Dubus"; }; + madonius = { + email = "nixos@madoni.us"; + github = "madonius"; + githubId = 1246752; + name = "madonius"; + matrix = "@madonius:entropia.de"; + }; Madouura = { email = "madouura@gmail.com"; github = "Madouura"; diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 931361984139..d721fb5dd83b 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -125,6 +125,13 @@ </listitem> <listitem> <para> + Perl has been updated to 5.36, and its core module + <literal>HTTP::Tiny</literal> was patched to verify SSL/TLS + certificates by default. + </para> + </listitem> + <listitem> + <para> Cinnamon has been updated to 5.4. While at it, the cinnamon module now defaults to blueman as bluetooth manager and slick-greeter as lightdm greeter to match upstream. @@ -227,6 +234,13 @@ </listitem> <listitem> <para> + <link xlink:href="https://git.sr.ht/~migadu/alps">alps</link>, + a simple and extensible webmail. Available as + <link linkend="opt-services.alps.enable">services.alps</link>. + </para> + </listitem> + <listitem> + <para> <link xlink:href="https://netbird.io">netbird</link>, a zero configuration VPN. Available as <link xlink:href="options.html#opt-services.netbird.enable">services.netbird</link>. diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index ecebaae0d258..53f26c4ccc21 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -50,6 +50,8 @@ In addition to numerous new and upgraded packages, this release has the followin - PHP now defaults to PHP 8.1, updated from 8.0. +- Perl has been updated to 5.36, and its core module `HTTP::Tiny` was patched to verify SSL/TLS certificates by default. + - Cinnamon has been updated to 5.4. While at it, the cinnamon module now defaults to blueman as bluetooth manager and slick-greeter as lightdm greeter to match upstream. @@ -83,6 +85,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [Outline](https://www.getoutline.com/), a wiki and knowledge base similar to Notion. Available as [services.outline](#opt-services.outline.enable). +- [alps](https://git.sr.ht/~migadu/alps), a simple and extensible webmail. Available as [services.alps](#opt-services.alps.enable). + - [netbird](https://netbird.io), a zero configuration VPN. Available as [services.netbird](options.html#opt-services.netbird.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index d5ab997bda38..998919f2a43a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1054,6 +1054,7 @@ ./services/video/epgstation/default.nix ./services/video/mirakurun.nix ./services/video/replay-sorcery.nix + ./services/web-apps/alps.nix ./services/web-apps/atlassian/confluence.nix ./services/web-apps/atlassian/crowd.nix ./services/web-apps/atlassian/jira.nix diff --git a/nixos/modules/services/web-apps/alps.nix b/nixos/modules/services/web-apps/alps.nix new file mode 100644 index 000000000000..b171729fd0a3 --- /dev/null +++ b/nixos/modules/services/web-apps/alps.nix @@ -0,0 +1,96 @@ +{ lib, pkgs, config, ... }: + +with lib; + +let + cfg = config.services.alps; +in { + options.services.alps = { + enable = mkEnableOption (lib.mdDoc "alps"); + + port = mkOption { + type = types.port; + default = 1323; + description = lib.mdDoc '' + TCP port the service should listen on. + ''; + }; + + bindIP = mkOption { + default = "[::]"; + type = types.str; + description = lib.mdDoc '' + The IP the service should listen on. + ''; + }; + + theme = mkOption { + type = types.enum [ "alps" "sourcehut" ]; + default = "sourcehut"; + description = lib.mdDoc '' + The frontend's theme to use. + ''; + }; + + imaps = { + port = mkOption { + type = types.port; + default = 993; + description = lib.mdDoc '' + The IMAPS server port. + ''; + }; + + host = mkOption { + type = types.str; + default = "[::1]"; + example = "mail.example.org"; + description = lib.mdDoc '' + The IMAPS server address. + ''; + }; + }; + + smtps = { + port = mkOption { + type = types.port; + default = 445; + description = lib.mdDoc '' + The SMTPS server port. + ''; + }; + + host = mkOption { + type = types.str; + default = cfg.imaps.host; + defaultText = "services.alps.imaps.host"; + example = "mail.example.org"; + description = lib.mdDoc '' + The SMTPS server address. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.alps = { + description = "alps is a simple and extensible webmail."; + documentation = [ "https://git.sr.ht/~migadu/alps" ]; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "network-online.target" ]; + + serviceConfig = { + ExecStart = '' + ${pkgs.alps}/bin/alps \ + -addr ${cfg.bindIP}:${toString cfg.port} \ + -theme ${cfg.theme} \ + imaps://${cfg.imaps.host}:${toString cfg.imaps.port} \ + smpts://${cfg.smtps.host}:${toString cfg.smtps.port} + ''; + StateDirectory = "alps"; + WorkingDirectory = "/var/lib/alps"; + DynamicUser = true; + }; + }; + }; +} diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 509ee0aedd0d..84cc0ee0f09a 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "argocd"; - version = "2.4.11"; + version = "2.4.12"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "sha256-o4mDqLbGsrlpPNEBqsvIGpelL5IocHnFpRrvoLExGes="; + sha256 = "sha256-U3Qct7wL/oJDgU+PXL5UMMTsQo4maeKShDwU2crSWxk="; }; vendorSha256 = "sha256-n6elT6ETOtbZsFqfwMo9d2qqamS8jdrROjFjStNkalc="; diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 605160e3d5ed..3b95b4e8cd95 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -12,9 +12,9 @@ buildGoModule rec { pname = "minikube"; - version = "1.26.1"; + version = "1.27.0"; - vendorSha256 = "sha256-aw2B5wdhEQiTDp/BpJdXzY3XBm3eXlSQt83j4RHhMg0="; + vendorSha256 = "sha256-wAjgeq//vRUDUyVNTsVIxLXhA6fzTrYvn4klAPAv7DE="; doCheck = false; @@ -22,7 +22,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "sha256-08q/IdQEq1/KaIBN6ss8r1KbjSjZnhOW/BeaJ8BuYZM="; + sha256 = "sha256-Pn0F3363YJoOdWyoPy46HmIUwWr/I5TekalBp9hHg7I="; }; nativeBuildInputs = [ installShellFiles pkg-config which makeWrapper ]; diff --git a/pkgs/applications/science/electronics/nanovna-saver/default.nix b/pkgs/applications/science/electronics/nanovna-saver/default.nix index 817a3b1c0870..22950326e867 100644 --- a/pkgs/applications/science/electronics/nanovna-saver/default.nix +++ b/pkgs/applications/science/electronics/nanovna-saver/default.nix @@ -6,13 +6,13 @@ }: python3.pkgs.buildPythonApplication rec { pname = "nanovna-saver"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "NanoVNA-Saver"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-PP4VHEp6NSSLsuYABr0/S3+YuhpAyvh/xGnQGyszCtM="; + sha256 = "sha256-wKKjMcOx7NS2VAIk3OTAj7KWE1+CeAzctdgdidT+HMA="; }; nativeBuildInputs = [ wrapQtAppsHook ]; diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index 507f6059b768..f27c791d4cb8 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202209080101"; + version = "202209150105"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "2e77e5d149f0a8f9c284333b206d0f017b0b66ef"; - sha256 = "sha256-vkWRBSwLpCqZWMlfwOyPWn2MF+/lG+VXnSrDCSR+dak="; + rev = "6666b85fc48179414d59613cdfd6f83354f778bc"; + sha256 = "sha256-iBQvfVvfTG8zQdoTGOFxME0tr/YWCVxjXFQhP/zmRVU="; }; installPhase = '' diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix index 72d895449111..17ff68e892a2 100644 --- a/pkgs/development/compilers/glslang/default.nix +++ b/pkgs/development/compilers/glslang/default.nix @@ -36,6 +36,12 @@ stdenv.mkDerivation rec { mkdir $out/include/External ''; + # Fix the paths in .pc, even though it's unclear if these .pc are really useful. + postFixup = '' + substituteInPlace "$out"/lib/pkgconfig/SPIRV-Tools{,-shared}.pc \ + --replace '=''${prefix}//' '=' + ''; + meta = with lib; { inherit (src.meta) homepage; description = "Khronos reference front-end for GLSL and ESSL"; diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 49cba2ca6214..27aefa9e2849 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.11.1.1149"; + version = "1.11.1.1161"; src = fetchurl { # https://clojure.org/releases/tools url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "sha256-IIhonPSwpADNAuv9DQIKrdsJcGAlX+6uHe+jvA6i3KQ="; + sha256 = "sha256-B+NSIS1lHLqtLImY2gRYwYTrilJrbmDUvqd2H8UunA4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/scope-lite/default.nix b/pkgs/development/libraries/scope-lite/default.nix new file mode 100644 index 000000000000..40cad6a5fc3c --- /dev/null +++ b/pkgs/development/libraries/scope-lite/default.nix @@ -0,0 +1,22 @@ +{ stdenv, cmake, fetchFromGitHub, lib }: let + version = "0.2.0"; +in stdenv.mkDerivation { + name = "scope-lite-${version}"; + + src = fetchFromGitHub { + owner = "martinmoene"; + repo = "scope-lite"; + rev = "v${version}"; + hash = "sha256-/Vu3blgyEOQRFqhQjuT/6ukV0iWA0TdPrLnt2Z/gd6E="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = { + description = "A migration path to C++ library extensions scope_exit, scope_fail, scope_success, unique_resource"; + license = lib.licenses.boost; + maintainers = [ lib.maintainers.shlevy ]; + homepage = "https://github.com/martinmoene/scope-lite"; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/stduuid/default.nix b/pkgs/development/libraries/stduuid/default.nix new file mode 100644 index 000000000000..07e43bb952c4 --- /dev/null +++ b/pkgs/development/libraries/stduuid/default.nix @@ -0,0 +1,22 @@ +{ stdenv, cmake, fetchFromGitHub, lib }: let + version = "1.2.2"; +in stdenv.mkDerivation { + name = "stduuid-${version}"; + + src = fetchFromGitHub { + owner = "mariusbancila"; + repo = "stduuid"; + rev = "v${version}"; + hash = "sha256-itx1OF1gmEEMy2tJlkN5dpF6o0dlesecuHYfpJdhf7c="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = { + description = "A C++17 cross-platform implementation for UUIDs"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.shlevy ]; + homepage = "https://github.com/mariusbancila/stduuid"; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix index 5c88d8f8591a..d5b1aa4287b6 100644 --- a/pkgs/development/python-modules/aioswitcher/default.nix +++ b/pkgs/development/python-modules/aioswitcher/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "aioswitcher"; - version = "2.0.10"; + version = "3.0.0"; format = "pyproject"; src = fetchFromGitHub { owner = "TomerFi"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-Me0BvmCfj9bA7TXUHXLYe9a+d7nFnm7RpNVGtAzkBZM="; + sha256 = "sha256-zJS09YQRMv3B0daW0cgBRPoLQkPyGuBgMohf6E2yqaM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index 47f667a4688d..ac820337af02 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "2.0.5"; + version = "2.0.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - sha256 = "sha256-ThUkDCoRKefAqTmOxCk9W9LZlCqUU+jxF0egjthH4JI="; + sha256 = "sha256-tmvt5jqgfKxCW+/XvmSu7bTsT1Qk902c1qfR4IK66vg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/astor/default.nix b/pkgs/development/python-modules/astor/default.nix index ab68c91d5d6b..fec7e2aa3b7e 100644 --- a/pkgs/development/python-modules/astor/default.nix +++ b/pkgs/development/python-modules/astor/default.nix @@ -1,8 +1,13 @@ -{ lib, buildPythonPackage, fetchPypi, pytestCheckHook }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: buildPythonPackage rec { pname = "astor"; version = "0.8.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; @@ -10,14 +15,15 @@ buildPythonPackage rec { }; # disable tests broken with python3.6: https://github.com/berkerpeksag/astor/issues/89 - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; + disabledTests = [ - "check_expressions" - "check_astunparse" - "convert_stdlib" - "codegen_as_submodule" - "positional_only_arguments" - "codegen_from_root" + # https://github.com/berkerpeksag/astor/issues/196 + "test_convert_stdlib" + # https://github.com/berkerpeksag/astor/issues/212 + "test_huge_int" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/asysocks/default.nix b/pkgs/development/python-modules/asysocks/default.nix index 55cc6619e63e..e4f5f8758b1c 100644 --- a/pkgs/development/python-modules/asysocks/default.nix +++ b/pkgs/development/python-modules/asysocks/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "asysocks"; - version = "0.2.1"; + version = "0.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-j0UWCI6+x/CNjFSeXnXnqGtB5gQ6+SC6SJXPP2xlQVA="; + sha256 = "sha256-rhqML/w8Hp8xZogjc2ZD+Y9C9c/w1e4X7WNoFaLz9Ps="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index 731aef1c647f..7704e7b8d5a4 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -6,6 +6,7 @@ , lxml , packageurl-python , poetry-core +, pytestCheckHook , python , pythonOlder , requirements-parser @@ -14,7 +15,6 @@ , toml , types-setuptools , types-toml -, unittestCheckHook , xmldiff }: @@ -48,7 +48,7 @@ buildPythonPackage rec { ]; checkInputs = [ - unittestCheckHook + pytestCheckHook jsonschema lxml xmldiff @@ -59,9 +59,17 @@ buildPythonPackage rec { ]; preCheck = '' - rm tests/test_output_json.py + export PYTHONPATH=tests''${PYTHONPATH+:$PYTHONPATH} ''; + pytestFlagsArray = [ "tests/" ]; + + disabledTests = [ + # These tests require network access. + "test_bom_v1_3_with_metadata_component" + "test_bom_v1_4_with_metadata_component" + ]; + meta = with lib; { description = "Python library for generating CycloneDX SBOMs"; homepage = "https://github.com/CycloneDX/cyclonedx-python-lib"; diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index c8a6c42077fe..1fd3af291fec 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.5.26"; + version = "1.5.27"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "fastai"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-WA6EgdyZ6zQGCzeQsHUD304WMCarjhGEpqXXBhBsxNw="; + sha256 = "sha256-LFkjxcotJoHIX0GdKKqUSFF4/HSWc/sLwb34iuBrQIg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix index e2b1e11278b7..28a089296481 100644 --- a/pkgs/development/python-modules/gevent/default.nix +++ b/pkgs/development/python-modules/gevent/default.nix @@ -5,6 +5,7 @@ , python , libev , greenlet +, setuptools , zope_event , zope_interface , pythonOlder @@ -22,6 +23,10 @@ buildPythonPackage rec { hash = "sha256-9ItkV4w2e5H6eTv46qr0mVy5PIvEWGDkc7+GgHCtCU4="; }; + nativeBuildInputs = [ + setuptools + ]; + buildInputs = [ libev ]; |