diff options
67 files changed, 2527 insertions, 2170 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a8888b9cc74f..98451bcfda1b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4647,10 +4647,11 @@ }; felipeqq2 = { name = "Felipe Silva"; - email = "felipeqq2@outlook.com"; + email = "nixpkgs@felipeqq2.rocks"; github = "felipeqq2"; githubId = 71830138; keys = [{ fingerprint = "F5F0 2BCE 3580 BF2B 707A AA8C 2FD3 4A9E 2671 91B8"; }]; + matrix = "@felipeqq2:pub.solar"; }; felixscheinost = { name = "Felix Scheinost"; diff --git a/nixos/lib/make-options-doc/generateDoc.py b/nixos/lib/make-options-doc/generateDoc.py index 1fe4eb0253ad..07884ed657e4 100644 --- a/nixos/lib/make-options-doc/generateDoc.py +++ b/nixos/lib/make-options-doc/generateDoc.py @@ -21,18 +21,22 @@ parser.add_argument( args = parser.parse_args() -# Pretty-print certain Nix types, like literal expressions. -def render_types(obj): - if '_type' not in obj: return obj +class OptionsEncoder(json.JSONEncoder): + def encode(self, obj): + # Unpack literal expressions and other Nix types. + # Don't escape the strings: they were escaped when initially serialized to JSON. + if isinstance(obj, dict): + _type = obj.get('_type') + if _type is not None: + if _type == 'literalExpression' or _type == 'literalDocBook': + return obj['text'] - _type = obj['_type'] - if _type == 'literalExpression' or _type == 'literalDocBook': - return obj['text'] + if _type == 'derivation': + return obj['name'] - if _type == 'derivation': - return obj['name'] + raise Exception(f'Unexpected type `{_type}` in {json.dumps(obj)}') - raise Exception(f'Unexpected type `{_type}` in {json.dumps(obj)}') + return super().encode(obj) def generate_commonmark(options): for (name, value) in options.items(): @@ -49,14 +53,14 @@ def generate_commonmark(options): if 'default' in value: print('*_Default_*') print('```') - print(json.dumps(value['default'], ensure_ascii=False, separators=(',', ':'))) + print(json.dumps(value['default'], cls=OptionsEncoder, ensure_ascii=False, separators=(',', ':'))) print('```') print() print() if 'example' in value: print('*_Example_*') print('```') - print(json.dumps(value['example'], ensure_ascii=False, separators=(',', ':'))) + print(json.dumps(value['example'], cls=OptionsEncoder, ensure_ascii=False, separators=(',', ':'))) print('```') print() print() @@ -76,7 +80,7 @@ def generate_asciidoc(options): print('Default::') print('+') print('----') - print(json.dumps(value['default'], ensure_ascii=False, separators=(',', ':'))) + print(json.dumps(value['default'], cls=OptionsEncoder, ensure_ascii=False, separators=(',', ':'))) print('----') print() else: @@ -89,7 +93,7 @@ def generate_asciidoc(options): print('Example::') print('+') print('----') - print(json.dumps(value['example'], ensure_ascii=False, separators=(',', ':'))) + print(json.dumps(value['example'], cls=OptionsEncoder, ensure_ascii=False, separators=(',', ':'))) print('----') print() else: @@ -97,7 +101,7 @@ def generate_asciidoc(options): print() with open(args.nix_options_path) as nix_options_json: - options = json.load(nix_options_json, object_hook=render_types) + options = json.load(nix_options_json) if args.format == 'commonmark': generate_commonmark(options) diff --git a/nixos/modules/services/misc/n8n.nix b/nixos/modules/services/misc/n8n.nix index f59df471e1e0..cdfe9dc8482c 100644 --- a/nixos/modules/services/misc/n8n.nix +++ b/nixos/modules/services/misc/n8n.nix @@ -9,7 +9,6 @@ let in { options.services.n8n = { - enable = mkEnableOption (lib.mdDoc "n8n server"); openFirewall = mkOption { @@ -22,7 +21,7 @@ in type = format.type; default = {}; description = lib.mdDoc '' - Configuration for n8n, see <https://docs.n8n.io/reference/configuration.html> + Configuration for n8n, see <https://docs.n8n.io/hosting/environment-variables/configuration-methods/> for supported values. ''; }; @@ -45,6 +44,10 @@ in N8N_USER_FOLDER = "/var/lib/n8n"; HOME = "/var/lib/n8n"; N8N_CONFIG_FILES = "${configFile}"; + + # Don't phone home + N8N_DIAGNOSTICS_ENABLED = "false"; + N8N_VERSION_NOTIFICATIONS_ENABLED = "false"; }; serviceConfig = { Type = "simple"; diff --git a/nixos/tests/n8n.nix b/nixos/tests/n8n.nix index c1753a418f67..044240fbce7f 100644 --- a/nixos/tests/n8n.nix +++ b/nixos/tests/n8n.nix @@ -19,7 +19,7 @@ in testScript = '' machine.wait_for_unit("n8n.service") - machine.wait_for_open_port(${toString port}) - machine.succeed("curl --fail http://localhost:${toString port}/") + machine.wait_for_console_text("Editor is now accessible via") + machine.succeed("curl --fail -vvv http://localhost:${toString port}/") ''; }) diff --git a/pkgs/applications/audio/csound/csound-qt/default.nix b/pkgs/applications/audio/csound/csound-qt/default.nix index 953a919d0c70..e48b45aec3e4 100644 --- a/pkgs/applications/audio/csound/csound-qt/default.nix +++ b/pkgs/applications/audio/csound/csound-qt/default.nix @@ -1,28 +1,23 @@ { lib, stdenv, csound, desktop-file-utils, fetchFromGitHub, python, python-qt, qmake, - qtwebengine, qtxmlpatterns, rtmidi, fetchpatch }: + qtwebengine, qtxmlpatterns, rtmidi, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "csound-qt"; - version = "0.9.6-beta3"; + version = "1.1.1"; src = fetchFromGitHub { owner = "CsoundQt"; repo = "CsoundQt"; - rev = version; - sha256 = "007jhkh0k6qk52r77i067999dwdiimazix6ggp2hvyc4pj6n5dip"; + rev = "v${version}"; + hash = "sha256-PdylVOnunbB36dbZX/wzd9A8CJPDv/xH5HPLAUkRu28="; }; patches = [ - (fetchpatch { - name = "examplepath.patch"; - url = "https://github.com/CsoundQt/CsoundQt/commit/09f2d515bff638cbcacb450979d66e273a59fdec.diff"; - sha256 = "0y23kf8m1mh9mklsvf908b2b8m2w2rji8qvws44paf1kpwnwdmgm"; - }) ./rtmidipath.patch ]; - nativeBuildInputs = [ qmake qtwebengine qtxmlpatterns ]; + nativeBuildInputs = [ qmake qtwebengine qtxmlpatterns wrapQtAppsHook ]; buildInputs = [ csound desktop-file-utils rtmidi ]; @@ -35,13 +30,11 @@ stdenv.mkDerivation rec { "PYTHONQT_LIB_DIR=${python-qt}/lib" "LIBS+=-L${python-qt}/lib" "INCLUDEPATH+=${python-qt}/include/PythonQt" - "INCLUDEPATH+=${python}/include/python2.7" + "INCLUDEPATH+=${python}/include/python${python.pythonVersion}" "INSTALL_DIR=${placeholder "out"}" "SHARE_DIR=${placeholder "out"}/share" ]; - dontWrapQtApps = true; - meta = with lib; { description = "CsoundQt is a frontend for Csound with editor, integrated help, widgets and other features"; homepage = "https://csoundqt.github.io/"; diff --git a/pkgs/applications/audio/csound/csound-qt/rtmidipath.patch b/pkgs/applications/audio/csound/csound-qt/rtmidipath.patch index 4cbab8a128fc..4e22295d43ff 100644 --- a/pkgs/applications/audio/csound/csound-qt/rtmidipath.patch +++ b/pkgs/applications/audio/csound/csound-qt/rtmidipath.patch @@ -1,8 +1,8 @@ -diff --git a/src/src.pri b/src/src.pri -index e5e0c896..9a9fa513 100644 ---- a/src/src.pri -+++ b/src/src.pri -@@ -155,9 +155,9 @@ pythonqt { +diff --git a/src/src.pri b/src/src.pri
+index e5e0c896..9a9fa513 100644
+--- a/src/src.pri
++++ b/src/src.pri
+@@ -155,9 +155,9 @@ pythonqt {
"src/pyqcsobject.cpp"
}
rtmidi {
diff --git a/pkgs/applications/audio/tageditor/default.nix b/pkgs/applications/audio/tageditor/default.nix index 46f75442157c..47c6a32ad1f2 100644 --- a/pkgs/applications/audio/tageditor/default.nix +++ b/pkgs/applications/audio/tageditor/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "tageditor"; - version = "3.7.5"; + version = "3.7.7"; src = fetchFromGitHub { owner = "martchus"; repo = pname; rev = "v${version}"; - hash = "sha256-/0zzzOEkzNr1aIpPFdflFaM/0HTs3TlIRxau3Yt+Hog="; + hash = "sha256-CjbV/Uwpe+x7LBDUDY+NRonUt549MrjGnlJ2olIrKQ4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index b3ca8032b196..245e0565e7c0 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -1,16 +1,20 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libmediainfo, wxGTK30 -, desktop-file-utils, libSM, imagemagick }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libmediainfo, wxGTK32 +, desktop-file-utils, libSM, imagemagick, darwin }: +let + inherit (darwin.apple_sdk.frameworks) Cocoa; +in stdenv.mkDerivation rec { - version = "22.06"; + version = "22.12"; pname = "mediainfo-gui"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "sha256-mGowC8wnNJij5dpOlwHX3m7uGZ7TbUInPdP+nsesi30="; + sha256 = "sha256-kyuCc59zjn22A89bsXByBzGp58YdFFwqVKq7PNC3U7w="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libmediainfo wxGTK30 desktop-file-utils libSM imagemagick ]; + buildInputs = [ libmediainfo wxGTK32 desktop-file-utils libSM imagemagick ] + ++ lib.optionals stdenv.isDarwin [ Cocoa ]; sourceRoot = "./MediaInfo/Project/GNU/GUI/"; @@ -24,7 +28,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://mediaarea.net/"; license = licenses.bsd2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.devhell ]; }; } diff --git a/pkgs/applications/misc/sticky/default.nix b/pkgs/applications/misc/sticky/default.nix index 384e4f10940e..6b90e9689d44 100644 --- a/pkgs/applications/misc/sticky/default.nix +++ b/pkgs/applications/misc/sticky/default.nix @@ -12,14 +12,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sticky"; - version = "1.13"; + version = "1.14"; format = "other"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-oirTDIbvG9/iAkYrquX+ciujAnLUmubkBVvTyaiz2g8="; + hash = "sha256-7UZbCbzQ1ZrSzxTUdbA+wsH3p27qj/c/cM4GY/kzG6E="; }; postPatch = '' diff --git a/pkgs/applications/misc/tellico/default.nix b/pkgs/applications/misc/tellico/default.nix index d1286fe7179d..af8a538a822b 100644 --- a/pkgs/applications/misc/tellico/default.nix +++ b/pkgs/applications/misc/tellico/default.nix @@ -24,14 +24,14 @@ mkDerivation rec { pname = "tellico"; - version = "3.4.4"; + version = "3.4.5"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "office"; repo = pname; rev = "v${version}"; - hash = "sha256-Qgan0mnDTQx+KKCAnRpgi9CCbXIRBMQtAyH/Mr20VSw="; + hash = "sha256-XWzSbtyxOkASTwT5b7+hIEwaKe2bEo6ij+CnPbYNEc0="; }; postPatch = '' diff --git a/pkgs/applications/networking/cluster/karmor/default.nix b/pkgs/applications/networking/cluster/karmor/default.nix index 220d38c36f80..f754de56554c 100644 --- a/pkgs/applications/networking/cluster/karmor/default.nix +++ b/pkgs/applications/networking/cluster/karmor/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "karmor"; - version = "0.11.1"; + version = "0.11.4"; src = fetchFromGitHub { owner = "kubearmor"; repo = "kubearmor-client"; rev = "v${version}"; - hash = "sha256-s1G5ZcXtjL9TxYpEUvnqiQXaY7OFUwCDXFongRM48Xk="; + hash = "sha256-UN0b4OFyszM6F0vut70pnoxhI8Qf2Ed4/BdBeWLWEOA="; }; - vendorHash = "sha256-VvjcGiBxK2OVvIEc/ScwUT6zJZTccnXu/JfXKXc5WNY="; + vendorHash = "sha256-eShJFjSmyny8eWmj6G/cXwFkThlXqxeef5tjqe3srxw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index 464883ef8fca..7e06a7595903 100644 --- a/ |