From 3c2124c471814ba196e82e077ac3235c79430b07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Fri, 2 Dec 2022 11:57:20 +0100 Subject: [PATCH 001/204] lib/strings: simplify `splitString` There's no need to use `unsafeDiscardStringContext` since https://github.com/NixOS/nix/commit/ee7fe64c0ac00f2be11604a2a6509eb86dc19f0a (Nix 1.8). Also the separator can't have a context since `builtins.split` would fail, so we can assume it doesn't. --- lib/strings.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/strings.nix b/lib/strings.nix index b5f5a4d9060b..dd4796a15f36 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -510,7 +510,7 @@ rec { toUpper = replaceChars lowerChars upperChars; /* Appends string context from another string. This is an implementation - detail of Nix. + detail of Nix and should be used carefully. Strings in Nix carry an invisible `context` which is a list of strings representing store paths. If the string is later used in a derivation @@ -533,13 +533,11 @@ rec { splitString "/" "/usr/local/bin" => [ "" "usr" "local" "bin" ] */ - splitString = _sep: _s: + splitString = sep: s: let - sep = builtins.unsafeDiscardStringContext _sep; - s = builtins.unsafeDiscardStringContext _s; - splits = builtins.filter builtins.isString (builtins.split (escapeRegex sep) s); + splits = builtins.filter builtins.isString (builtins.split (escapeRegex (toString sep)) (toString s)); in - map (v: addContextFrom _sep (addContextFrom _s v)) splits; + map (addContextFrom s) splits; /* Return a string without the specified prefix, if the prefix matches. From d4902bcc2cce2a798d5481a60d891230b659aa95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 2 Dec 2022 03:26:52 +0100 Subject: [PATCH 002/204] mailmap: cleanup shortlog stats for nixos-22.11 release Only cleanups the shortlog stats for contributors that appeared before the changes in the top 30 and commiter names had more than 10 commits in an effort to attribute them correct $ git shortlog -se nixos-22.05..nixos-22.11 | sort -nr | nl | head -n30 --- .mailmap | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index d3858d78dde7..d2bf6d0e4769 100644 --- a/.mailmap +++ b/.mailmap @@ -1,3 +1,14 @@ +ajs124 +Anderson Torres Daniel Løvbrøtte Olsen +Fabian Affolter +Janne Heß +Jörg Thalheim +Martin Weinelt R. RyanTM -Sandro +Robert Hensing +Sandro Jäckel +Sandro Jäckel +superherointj <5861043+superherointj@users.noreply.github.com> +Vladimír Čunát +Vladimír Čunát From cda13fae0370e557c094bffb2df5ee9575e092ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Fri, 2 Dec 2022 16:21:52 +0100 Subject: [PATCH 003/204] vimUtils.packdir: only include python3 if needed `makeCustomizable` can be called on vim derivations that don't depend on python, so avoid including python3 in the environment if there are no python3 dependencies. --- pkgs/applications/editors/vim/plugins/vim-utils.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/vim-utils.nix b/pkgs/applications/editors/vim/plugins/vim-utils.nix index 09c5527cd0ec..c04176b22c7e 100644 --- a/pkgs/applications/editors/vim/plugins/vim-utils.nix +++ b/pkgs/applications/editors/vim/plugins/vim-utils.nix @@ -186,9 +186,9 @@ let depsOfOptionalPlugins = lib.subtractLists opt (findDependenciesRecursively opt); startWithDeps = findDependenciesRecursively start; allPlugins = lib.unique (startWithDeps ++ depsOfOptionalPlugins); - python3Env = python3.withPackages (ps: - lib.flatten (builtins.map (plugin: (plugin.python3Dependencies or (_: [])) ps) allPlugins) - ); + allPython3Dependencies = ps: + lib.flatten (builtins.map (plugin: (plugin.python3Dependencies or (_: [])) ps) allPlugins); + python3Env = python3.withPackages allPython3Dependencies; packdirStart = vimFarm "pack/${packageName}/start" "packdir-start" allPlugins; packdirOpt = vimFarm "pack/${packageName}/opt" "packdir-opt" opt; @@ -201,7 +201,7 @@ let ln -s ${python3Env}/${python3Env.sitePackages} $out/pack/${packageName}/start/__python3_dependencies/python3 ''; in - [ packdirStart packdirOpt python3link ]; + [ packdirStart packdirOpt ] ++ lib.optional (allPython3Dependencies python3.pkgs != []) python3link; in buildEnv { name = "vim-pack-dir"; From 22f749ebacd6f0b5af7c2078a5e8feb49ffab41e Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 2 Dec 2022 22:47:22 +0100 Subject: [PATCH 004/204] fox: 1.7.9 -> 1.7.81 --- pkgs/development/libraries/fox/clang.patch | 13 ------------- pkgs/development/libraries/fox/default.nix | 18 +++++++++--------- pkgs/top-level/all-packages.nix | 1 - 3 files changed, 9 insertions(+), 23 deletions(-) delete mode 100644 pkgs/development/libraries/fox/clang.patch diff --git a/pkgs/development/libraries/fox/clang.patch b/pkgs/development/libraries/fox/clang.patch deleted file mode 100644 index 0ca2ebf0d8da..000000000000 --- a/pkgs/development/libraries/fox/clang.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/FXReactor.cpp b/src/FXReactor.cpp -index 1ecdb45..9058a30 100644 ---- a/src/FXReactor.cpp -+++ b/src/FXReactor.cpp -@@ -452,7 +452,7 @@ FXint FXReactor::processActiveHandles(FXTime block,FXuint flags){ - } - - // Normal case -- if(0<=hand){ -+ if(0==hand){ - - // Any handles active? - if(0 Date: Tue, 22 Nov 2022 17:14:51 +0000 Subject: [PATCH 005/204] =?UTF-8?q?amtk:=205.6.0=20=E2=86=92=205.6.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/World/amtk/-/compare/5.6.0...5.6.1 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/amtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix index 0dff90313538..74f83a30a502 100644 --- a/pkgs/development/libraries/amtk/default.nix +++ b/pkgs/development/libraries/amtk/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "amtk"; - version = "5.6.0"; + version = "5.6.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "89uHl0Qqm4UGKs0LPheskSWgtIfhQhbQmwOwiEGCDrk="; + sha256 = "1QEVuFyHKqwpaTS17nJqP6FWxvWtltJ+Dt0Kpa0XMig="; }; nativeBuildInputs = [ From c10edbf4c2652adac5858ecfc39392c2d2cb1983 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 22 Nov 2022 17:15:12 +0000 Subject: [PATCH 006/204] =?UTF-8?q?gnome.gedit:=2043.1=20=E2=86=92=2043.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gedit/-/compare/43.1...43.2 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/apps/gedit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gedit/default.nix b/pkgs/desktops/gnome/apps/gedit/default.nix index 7ab30f8aafea..d7895df784b6 100644 --- a/pkgs/desktops/gnome/apps/gedit/default.nix +++ b/pkgs/desktops/gnome/apps/gedit/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "gedit"; - version = "43.1"; + version = "43.2"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gedit/${lib.versions.major version}/gedit-${version}.tar.xz"; - sha256 = "mDg7Sv0/0eoYzcdP7G4SjneFgvOyP1NgGRQT//jw5qY="; + sha256 = "+VDS01xZS7bI28n1RAytd4jKCoaI4rB4Rvg96aTj/CU="; }; patches = [ From 8398ce6976a546e61940bb0f9789fb7d24d5c004 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 22 Nov 2022 17:15:51 +0000 Subject: [PATCH 007/204] =?UTF-8?q?gnome-builder:=2043.2=20=E2=86=92=2043.?= =?UTF-8?q?3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-builder/-/compare/43.2...43.3 Changelog-Reviewed-By: Jan Tojnar --- pkgs/applications/editors/gnome-builder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 5b6f5d009820..8954e9d5841d 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "43.2"; + version = "43.3"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "dzIhF6ERsnR7zOitYFeKZ5wgIeSGkRz29OY0FjKKuzM="; + sha256 = "rc2d6l0CgRqn70UEVgS24CHJolkwYb5xaDnE71RtPLA="; }; patches = [ From 671b52b22ca54df9ff92080a76fcf458b26ba492 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 22 Nov 2022 17:16:02 +0000 Subject: [PATCH 008/204] =?UTF-8?q?gssdp=5F1=5F6:=201.6.1=20=E2=86=92=201.?= =?UTF-8?q?6.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gssdp/-/compare/gssdp-1.6.1...gssdp-1.6.2 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gssdp/1.6.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gssdp/1.6.nix b/pkgs/development/libraries/gssdp/1.6.nix index 19c46d4776c4..80b518ab27b8 100644 --- a/pkgs/development/libraries/gssdp/1.6.nix +++ b/pkgs/development/libraries/gssdp/1.6.nix @@ -6,6 +6,7 @@ , pkg-config , gobject-introspection , vala +, pandoc , gi-docgen , python3 , libsoup_3 @@ -16,14 +17,14 @@ stdenv.mkDerivation rec { pname = "gssdp"; - version = "1.6.1"; + version = "1.6.2"; outputs = [ "out" "dev" ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gssdp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0r4KbiWREJpuQlhRFhpKU7xUtPBqAhTHlwVmMpvVYzA="; + sha256 = "QQs3be7O2YNrV/SI+ABS/koU+J4HWxzszyjlH0kPn7k="; }; nativeBuildInputs = [ @@ -32,6 +33,7 @@ stdenv.mkDerivation rec { pkg-config gobject-introspection vala + pandoc gi-docgen python3 ]; From b4ecfbde37a04c5b25d2af767a33d3ea3a190e24 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 22 Nov 2022 17:16:10 +0000 Subject: [PATCH 009/204] =?UTF-8?q?gupnp=5F1=5F6:=201.6.1=20=E2=86=92=201.?= =?UTF-8?q?6.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gupnp/-/compare/gupnp-1.6.1...gupnp-1.6.2 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gupnp/1.6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gupnp/1.6.nix b/pkgs/development/libraries/gupnp/1.6.nix index 0e4afedc369f..fc9fc1da08b9 100644 --- a/pkgs/development/libraries/gupnp/1.6.nix +++ b/pkgs/development/libraries/gupnp/1.6.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "gupnp"; - version = "1.6.1"; + version = "1.6.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-hTgUUtKvlbjhSyTUqYljPQ2DzYjRJy8nzLJBbMyDbUc="; + sha256 = "sha256-6QBZzIOAXa2T6DvkflOVjwdHHMRk+UQ5HntcgqpRoY8="; }; depsBuildBuild = [ From dd06e8176b0c45c7103f301c028a287d3a8522c3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 3 Dec 2022 22:57:13 +0000 Subject: [PATCH 010/204] =?UTF-8?q?evolution-data-server:=203.46.1=20?= =?UTF-8?q?=E2=86=92=203.46.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evolution-data-server/-/compare/3.46.1...3.46.2 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/evolution-data-server/default.nix | 4 ++-- .../gnome/core/evolution-data-server/hardcode-gsettings.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix index 726333d1f747..3b0a5caa59f6 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -49,13 +49,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.46.1"; + version = "3.46.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "xV5yz/QZC0LmPdbqvG3OSKGh95BAUx8a9tUcHvpKpus="; + sha256 = "+b1SAIt+U12BaSDPzscKDlViveKK9x+ZbiA/9qhuRuA="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch index 20a94cc70791..1774717affe4 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch +++ b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch @@ -298,10 +298,10 @@ index e61160c..b6553a4 100644 G_CALLBACK (mi_user_headers_settings_changed_cb), NULL); G_UNLOCK (mi_user_headers); diff --git a/src/camel/providers/imapx/camel-imapx-server.c b/src/camel/providers/imapx/camel-imapx-server.c -index e5645e2..96a1ce3 100644 +index 611d5c8..4790fca 100644 --- a/src/camel/providers/imapx/camel-imapx-server.c +++ b/src/camel/providers/imapx/camel-imapx-server.c -@@ -5573,7 +5573,18 @@ camel_imapx_server_skip_old_flags_update (CamelStore *store) +@@ -5593,7 +5593,18 @@ camel_imapx_server_skip_old_flags_update (CamelStore *store) if (!skip_old_flags_update) { GSettings *eds_settings; From 4efd0771043e07a3fdea3afe19b3753394d6a512 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 3 Dec 2022 22:44:15 +0000 Subject: [PATCH 011/204] =?UTF-8?q?evolution:=203.46.1=20=E2=86=92=203.46.?= =?UTF-8?q?2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evolution/-/compare/3.46.1...3.46.2 Changelog-Reviewed-By: Jan Tojnar --- .../networking/mailreaders/evolution/evolution/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index 1e61c5ffc884..0c7f5a417536 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -44,11 +44,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.46.1"; + version = "3.46.2"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "GshFg+0sr4l7B06Z+TVCrRRG//Cs+rhtXmeeAzrgLIY="; + sha256 = "cks7uFOapRxpJsPxfTO7zjWpnBbqY7gJCzRsWr9ol30="; }; nativeBuildInputs = [ From d54b1e0cafbf02bdd0272b4a5b45443ebf6e2c1f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 3 Dec 2022 23:05:21 +0000 Subject: [PATCH 012/204] =?UTF-8?q?evolution-ews:=203.46.1=20=E2=86=92=203?= =?UTF-8?q?.46.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evolution-ews/-/compare/3.46.1...3.46.2 Changelog-Reviewed-By: Jan Tojnar --- .../mailreaders/evolution/evolution-ews/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index 51e1c2e52c87..ba5f5d10226f 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.46.1"; + version = "3.46.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "p5Jp7wnoqAuo8My8ZDMl0rsFc0158G8x8lAehWfLjb0="; + sha256 = "6spQz4oq6sFT2bCmaixVJDbTw1wM3LQFmg3E1trZ30E="; }; patches = [ From 03ba6cdacf4924a413db2216f1bc382f3d3999ad Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 3 Dec 2022 22:44:42 +0000 Subject: [PATCH 013/204] =?UTF-8?q?gnome.gnome-initial-setup:=2043.1=20?= =?UTF-8?q?=E2=86=92=2043.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/compare/43.1...43.2 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-initial-setup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix index f1d63a78df16..0bfa9226e0d4 100644 --- a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix @@ -38,11 +38,11 @@ stdenv.mkDerivation rec { pname = "gnome-initial-setup"; - version = "43.1"; + version = "43.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "gQTnBD75uY4rULKrOP2gX9BDf4xVVp+haDC3vle+DfY="; + sha256 = "I9eWOlTUlZRQTQ6s2FCWyvtfhvHnSljgQGdbbnmK5pg="; }; patches = [ From 0e873690ff4da272f742681fff4df40e54f234b0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 3 Dec 2022 22:46:44 +0000 Subject: [PATCH 014/204] =?UTF-8?q?libshumate:=201.0.2=20=E2=86=92=201.0.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libshumate/-/compare/1.0.2...1.0.3 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/libshumate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libshumate/default.nix b/pkgs/development/libraries/libshumate/default.nix index ef56f936dccf..2d7e6c5fb7a2 100644 --- a/pkgs/development/libraries/libshumate/default.nix +++ b/pkgs/development/libraries/libshumate/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "libshumate"; - version = "1.0.2"; + version = "1.0.3"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libshumate"; rev = version; - sha256 = "zmPsWdTbM+T50X0BsVTn1Aw/5N6sL5hIQiRG5WSG1eg="; + sha256 = "gT6jpFN0mkSdDs+8GQa0qKuL5KLzxanBMGwA4EATW7Y="; }; nativeBuildInputs = [ From 734220a7a783d0deb7dc5eae7f12fc3c12b9e101 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 3 Dec 2022 22:44:47 +0000 Subject: [PATCH 015/204] =?UTF-8?q?gnome.gnome-maps:=2043.1=20=E2=86=92=20?= =?UTF-8?q?43.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-maps/-/compare/v43.1...v43.2 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/apps/gnome-maps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/pkgs/desktops/gnome/apps/gnome-maps/default.nix index 99d4d27ef660..dea63dd14d0b 100644 --- a/pkgs/desktops/gnome/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-maps/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "gnome-maps"; - version = "43.1"; + version = "43.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-H3UaNb1YmteT9bFBNfKT5OxtSywwcz/sdgxofY8UMSY="; + sha256 = "sha256-wCIdJQvkXqNulxrmO/3pcaRhRclnscZZ6WxbBypxVR0="; }; doCheck = true; From 834f5cffdcc8dbc75adaeb48f4b98fa036f09dab Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 3 Dec 2022 22:44:54 +0000 Subject: [PATCH 016/204] =?UTF-8?q?gnome.gnome-remote-desktop:=2043.1=20?= =?UTF-8?q?=E2=86=92=2043.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/compare/43.1...43.2 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix index daf0e8f4fcdc..251d0af37f83 100644 --- a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix +++ b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "gnome-remote-desktop"; - version = "43.1"; + version = "43.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-vYR8PKdzYJlTNEYs1GnkWhJHnxHAxI6WUCjtXLgHpbI="; + hash = "sha256-hKn9Zam62M73NIL9otIKzRIvC4Uhsd6GyUE4ibn6l3E="; }; nativeBuildInputs = [ From 2b67e1c493fae917a19a14ca507d6dadc3cc816b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 3 Dec 2022 22:45:02 +0000 Subject: [PATCH 017/204] =?UTF-8?q?gnome.gnome-software:=2043.1=20?= =?UTF-8?q?=E2=86=92=2043.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-software/-/compare/43.1...43.2 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-software/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix index e971d5ce9293..ee15653d1254 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "43.1"; + version = "43.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "wmdWie53vhHY/waq+kFsTK/EjTgRVTpz7PdkvWr/RHA="; + sha256 = "Iqp/CjF8dw9ouJfp5RKyy+2xgbaV/9sLZY2Zu9ZPNo0="; }; patches = [ From 8db42c7e6e1f034c60defe8e2ba1e7bcea781114 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 3 Dec 2022 22:45:13 +0000 Subject: [PATCH 018/204] =?UTF-8?q?gnome.nautilus:=2043.0=20=E2=86=92=2043?= =?UTF-8?q?.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/nautilus/-/compare/43.0...43.1 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/nautilus/default.nix | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/desktops/gnome/core/nautilus/default.nix b/pkgs/desktops/gnome/core/nautilus/default.nix index 48cc47b5d8e2..2b277f42d491 100644 --- a/pkgs/desktops/gnome/core/nautilus/default.nix +++ b/pkgs/desktops/gnome/core/nautilus/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, fetchpatch , fetchurl , meson , ninja @@ -39,27 +38,16 @@ stdenv.mkDerivation rec { pname = "nautilus"; - version = "43.0"; + version = "43.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "PPVPrAqKvuCQ4VVBf3sW9j6grAwmTvT1RXSvNFgBqRE="; + sha256 = "DaEAPAzaCKwFRqTBQ+06FpfjaCPGD6c/TS9Np3I7zK8="; }; patches = [ - # Switch to GTK 4 settings schema to avoid crash when GTK 3 did not manage to contaminate environment. - # https://gitlab.gnome.org/GNOME/nautilus/-/merge_requests/1013 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/nautilus/-/commit/96d542a0d84da4ad6915a7727642490a5c433d4a.patch"; - sha256 = "BO/0ifRwSTDe7RV+DI3CPZg+UQezk0tbM+UidgoJRQM="; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/nautilus/-/commit/52b4daf4396fd3b21755b3a0d1fbf85c3831c6b1.patch"; - sha256 = "+8KCw2HZUi9UgOEUBNp4kbwqOI1qz6i0Q/wvzqTb8OA="; - }) - # Allow changing extension directory using environment variable. ./extension_dir.patch From 497c2254ee749f70fa989f71d8fc937b8a3529b0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 3 Dec 2022 22:45:57 +0000 Subject: [PATCH 019/204] =?UTF-8?q?gnome-builder:=2043.3=20=E2=86=92=2043.?= =?UTF-8?q?4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-builder/-/compare/43.3...43.4 Changelog-Reviewed-By: Jan Tojnar --- pkgs/applications/editors/gnome-builder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 8954e9d5841d..56b880ee0163 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "43.3"; + version = "43.4"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "rc2d6l0CgRqn70UEVgS24CHJolkwYb5xaDnE71RtPLA="; + sha256 = "Hg1tZ4RcGb7J463VlpX5pTHXKg5UKyA6zJD7OBInwrw="; }; patches = [ From 5ac64b2956e92c2411f14ba77b9e93a81825f5d2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 3 Dec 2022 22:46:39 +0000 Subject: [PATCH 020/204] =?UTF-8?q?libnma:=201.10.2=20=E2=86=92=201.10.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libnma/-/compare/1.10.2...1.10.4 Changelog-Reviewed-By: Jan Tojnar --- pkgs/tools/networking/networkmanager/libnma/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/libnma/default.nix b/pkgs/tools/networking/networkmanager/libnma/default.nix index 5db28c427d1e..3b5f8bba148f 100644 --- a/pkgs/tools/networking/networkmanager/libnma/default.nix +++ b/pkgs/tools/networking/networkmanager/libnma/default.nix @@ -19,7 +19,7 @@ , withGtk4 ? false , gtk4 , withGnome ? true -, gcr +, gcr_4 , glib , substituteAll , lib @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "libnma"; - version = "1.10.2"; + version = "1.10.4"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "T8PZxAS3sTMD2TlPlpYcUpjXGvqfH6evXk8PboQqCUA="; + sha256 = "eecw3aGfmzSIb0BkqhcPGiMmsIMp1lXYC2fpBsf3i3w="; }; patches = [ @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { gtk4 ] ++ lib.optionals withGnome [ # advanced certificate chooser - gcr + gcr_4 ]; mesonFlags = [ From 055749be190c80d0bb480b980b9a53f0c632df3e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 3 Dec 2022 22:46:54 +0000 Subject: [PATCH 021/204] =?UTF-8?q?mm-common:=201.0.4=20=E2=86=92=201.0.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/mm-common/-/compare/1.0.4...1.0.5 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/mm-common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mm-common/default.nix b/pkgs/development/libraries/mm-common/default.nix index e1eaa1d924b7..225ce967080d 100644 --- a/pkgs/development/libraries/mm-common/default.nix +++ b/pkgs/development/libraries/mm-common/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "mm-common"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "6VTAm0MJp++T4TtpJgrNxXOMkHR36zgbeLseQU7m29g="; + sha256 = "cFxtKfQRaim95ONs/BsEbJK274xtrk6uyFAYdH5tpao="; }; nativeBuildInputs = [ From 1011d2a118ebcaa7a974e01820df655d3dedc7d7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 4 Dec 2022 02:29:24 +0100 Subject: [PATCH 022/204] =?UTF-8?q?xdg-desktop-portal-gtk:=201.14.0=20?= =?UTF-8?q?=E2=86=92=201.14.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/flatpak/xdg-desktop-portal-gtk/releases/tag/1.14.1 --- pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index e54f764f9a50..903de4d9a232 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gtk"; - version = "1.14.0"; + version = "1.14.1"; src = fetchFromGitHub { owner = "flatpak"; repo = pname; rev = version; - sha256 = "I9xQgiE3lNb2vRodO5R1y40lqoOKzALskrVePidant4="; + sha256 = "8eyWeoiJ3b/GlqGVfmkf2/uS7FnOpRNgbfxwWjclw8w="; }; nativeBuildInputs = [ From 34100e456b022b66fee882963dfd54cbd1cbff86 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 4 Dec 2022 01:39:33 +0000 Subject: [PATCH 023/204] =?UTF-8?q?vte:=200.70.1=20=E2=86=92=200.70.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/vte/-/compare/0.70.1...0.70.2 --- pkgs/development/libraries/vte/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 07ec683bf05a..f87557ac4623 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "vte"; - version = "0.70.1"; + version = "0.70.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-H0YBy/6lMCuWkCIIyPGF5bGLJZtTWLyTzzkr9ZhxxbY="; + sha256 = "sha256-TRW0OA3j9WTVfqvQBjicQHxwXfWwxwAw/cwklxozTYA="; }; patches = [ From 2fdf1f390340daf5ad815e6110b7ac7710af84f7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 4 Dec 2022 01:39:52 +0000 Subject: [PATCH 024/204] =?UTF-8?q?gnome.gucharmap:=2015.0.1=20=E2=86=92?= =?UTF-8?q?=2015.0.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gucharmap/-/compare/15.0.1...15.0.2 --- pkgs/desktops/gnome/core/gucharmap/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome/core/gucharmap/default.nix b/pkgs/desktops/gnome/core/gucharmap/default.nix index a98d9f2ceea7..c822605cf3e6 100644 --- a/pkgs/desktops/gnome/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome/core/gucharmap/default.nix @@ -45,7 +45,7 @@ let }; in stdenv.mkDerivation rec { pname = "gucharmap"; - version = "15.0.1"; + version = "15.0.2"; outputs = [ "out" "lib" "dev" "devdoc" ]; @@ -54,7 +54,7 @@ in stdenv.mkDerivation rec { owner = "GNOME"; repo = "gucharmap"; rev = version; - sha256 = "sha256-uVXWgnNpPcky9N3FXkDu5oaqaEALECooFnf43Ed+zTY="; + sha256 = "sha256-QoHLMq3U/BvpCFKttxLo0qs2xmZ/pCqPjsgq/MMWNbo="; }; nativeBuildInputs = [ @@ -90,7 +90,9 @@ in stdenv.mkDerivation rec { doCheck = true; postPatch = '' - patchShebangs data/meson_desktopfile.py gucharmap/gen-guch-unicode-tables.pl gucharmap/meson_compileschemas.py + patchShebangs \ + data/meson_desktopfile.py \ + gucharmap/gen-guch-unicode-tables.pl ''; passthru = { From b492a2c6987751b44611feb2d5115dab26df2e7d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 4 Dec 2022 02:46:11 +0100 Subject: [PATCH 025/204] =?UTF-8?q?deja-dup:=2043.4=20=E2=86=92=2044.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/World/deja-dup/-/compare/43.4...44.0 --- pkgs/applications/backup/deja-dup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index 9055b46284c0..afe3cde3a596 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -22,14 +22,14 @@ stdenv.mkDerivation rec { pname = "deja-dup"; - version = "43.4"; + version = "44.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = pname; rev = version; - sha256 = "sha256-8eqrBQrMvS4cta5RP0ibo4Zc3B8hlkftxaRyvb6JuEY="; + sha256 = "sha256-dIH6VPgzJxvXEUtPAYQzpQ8I9R9MwsfeylV25ASfW/k="; }; patches = [ From 34ddff29a498b8167e4e684ca87a4f4801cd0a63 Mon Sep 17 00:00:00 2001 From: Giulio De Pasquale Date: Sun, 4 Dec 2022 14:00:17 +0100 Subject: [PATCH 026/204] libreddit: Add package option --- nixos/modules/services/misc/libreddit.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/libreddit.nix b/nixos/modules/services/misc/libreddit.nix index c961d13da473..fd58928d2821 100644 --- a/nixos/modules/services/misc/libreddit.nix +++ b/nixos/modules/services/misc/libreddit.nix @@ -15,6 +15,13 @@ in services.libreddit = { enable = mkEnableOption (lib.mdDoc "Private front-end for Reddit"); + package = mkOption { + type = types.package; + default = pkgs.libreddit; + defaultText = literalExpression "pkgs.libreddit"; + description = lib.mdDoc "Libreddit package to use."; + }; + address = mkOption { default = "0.0.0.0"; example = "127.0.0.1"; @@ -45,7 +52,7 @@ in after = [ "network.target" ]; serviceConfig = { DynamicUser = true; - ExecStart = "${pkgs.libreddit}/bin/libreddit ${args}"; + ExecStart = "${cfg.package}/bin/libreddit ${args}"; AmbientCapabilities = lib.mkIf (cfg.port < 1024) [ "CAP_NET_BIND_SERVICE" ]; Restart = "on-failure"; RestartSec = "2s"; From 97eaeee775071cb4c63b0134a346bf1c78ace871 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Fri, 2 Dec 2022 09:54:39 +0100 Subject: [PATCH 027/204] github-runner: make `ldd` and `ldconfig` paths absolute on Linux --- .../continuous-integration/github-runner/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 84c9c9268496..9947f12e523e 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -7,6 +7,7 @@ , fetchFromGitHub , fetchurl , git +, glibc , icu , libkrb5 , lib @@ -259,7 +260,12 @@ stdenv.mkDerivation rec { substituteInPlace $out/lib/run.sh --replace '"$DIR"/bin' '"$DIR"/lib' substituteInPlace $out/lib/config.sh --replace './bin' $out'/lib' \ --replace 'source ./env.sh' $out/bin/env.sh - + '' + lib.optionalString stdenv.isLinux '' + # Make binary paths absolute + substituteInPlace $out/lib/config.sh \ + --replace 'ldd' '${glibc}/bin/ldd' \ + --replace '/sbin/ldconfig' '${glibc}/bin/ldconfig' + '' + '' # Remove uneeded copy for run-helper template substituteInPlace $out/lib/run.sh --replace 'cp -f "$DIR"/run-helper.sh.template "$DIR"/run-helper.sh' ' ' substituteInPlace $out/lib/run-helper.sh --replace '"$DIR"/bin/' '"$DIR"/' From 2c0042956018b6b0dbe41195362afacf704b7214 Mon Sep 17 00:00:00 2001 From: Robert Kovacsics Date: Fri, 14 Oct 2022 19:08:38 +0100 Subject: [PATCH 028/204] nixos/dnsmasq: Use attrs instead of plain text config This should make it easier to configure in multiple places, override defaults, etc. --- .../from_md/release-notes/rl-2305.section.xml | 9 ++ .../manual/release-notes/rl-2305.section.md | 5 ++ nixos/modules/services/networking/dnsmasq.nix | 86 +++++++++++++++---- nixos/tests/dnscrypt-proxy2.nix | 2 +- nixos/tests/kubernetes/dns.nix | 2 +- nixos/tests/schleuder.nix | 4 +- 6 files changed, 86 insertions(+), 22 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml index 0fd0382998c2..6605fd1bc982 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml @@ -128,6 +128,15 @@ sudo and sources the environment variables. + + + The dnsmasq service now takes configuration + via the services.dnsmasq.settings attribute + set. The option + services.dnsmasq.extraConfig will be + deprecated when NixOS 22.11 reaches end of life. + + A new virtualisation.rosetta module was diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 39550d44733a..1ff28867b40e 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -43,6 +43,11 @@ In addition to numerous new and upgraded packages, this release has the followin - `services.mastodon` gained a tootctl wrapped named `mastodon-tootctl` similar to `nextcloud-occ` which can be executed from any user and switches to the configured mastodon user with sudo and sources the environment variables. +- The `dnsmasq` service now takes configuration via the + `services.dnsmasq.settings` attribute set. The option + `services.dnsmasq.extraConfig` will be deprecated when NixOS 22.11 reaches + end of life. + - A new `virtualisation.rosetta` module was added to allow running `x86_64` binaries through [Rosetta](https://developer.apple.com/documentation/apple-silicon/about-the-rosetta-translation-environment) inside virtualised NixOS guests on Apple silicon. This feature works by default with the [UTM](https://docs.getutm.app/) virtualisation [package](https://search.nixos.org/packages?channel=unstable&show=utm&from=0&size=1&sort=relevance&type=packages&query=utm). - Resilio sync secret keys can now be provided using a secrets file at runtime, preventing these secrets from ending up in the Nix store. diff --git a/nixos/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix index cfc37b74b9a9..4886654e8c03 100644 --- a/nixos/modules/services/networking/dnsmasq.nix +++ b/nixos/modules/services/networking/dnsmasq.nix @@ -7,15 +7,27 @@ let dnsmasq = pkgs.dnsmasq; stateDir = "/var/lib/dnsmasq"; + # True values are just put as `name` instead of `name=true`, and false values + # are turned to comments (false values are expected to be overrides e.g. + # mkForce) + formatKeyValue = + name: value: + if value == true + then name + else if value == false + then "# setting `${name}` explicitly set to false" + else generators.mkKeyValueDefault { } "=" name value; + + settingsFormat = pkgs.formats.keyValue { + mkKeyValue = formatKeyValue; + listsAsDuplicateKeys = true; + }; + + # Because formats.generate is outputting a file, we use of conf-file. Once + # `extraConfig` is deprecated we can just use + # `dnsmasqConf = format.generate "dnsmasq.conf" cfg.settings` dnsmasqConf = pkgs.writeText "dnsmasq.conf" '' - dhcp-leasefile=${stateDir}/dnsmasq.leases - ${optionalString cfg.resolveLocalQueries '' - conf-file=/etc/dnsmasq-conf.conf - resolv-file=/etc/dnsmasq-resolv.conf - ''} - ${flip concatMapStrings cfg.servers (server: '' - server=${server} - '')} + conf-file=${settingsFormat.generate "dnsmasq.conf" cfg.settings} ${cfg.extraConfig} ''; @@ -23,6 +35,10 @@ in { + imports = [ + (mkRenamedOptionModule [ "services" "dnsmasq" "servers" ] [ "services" "dnsmasq" "settings" "server" ]) + ]; + ###### interface options = { @@ -46,15 +62,6 @@ in ''; }; - servers = mkOption { - type = types.listOf types.str; - default = []; - example = [ "8.8.8.8" "8.8.4.4" ]; - description = lib.mdDoc '' - The DNS servers which dnsmasq should query. - ''; - }; - alwaysKeepRunning = mkOption { type = types.bool; default = false; @@ -63,12 +70,49 @@ in ''; }; + settings = mkOption { + type = types.submodule { + + freeformType = settingsFormat.type; + + options.server = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "8.8.8.8" "8.8.4.4" ]; + description = lib.mdDoc '' + The DNS servers which dnsmasq should query. + ''; + }; + + }; + default = { }; + description = lib.mdDoc '' + Configuration of dnsmasq. Lists get added one value per line (empty + lists and false values don't get added, though false values get + turned to comments). Gets merged with + + { + dhcp-leasefile = "${stateDir}/dnsmasq.leases"; + conf-file = optional cfg.resolveLocalQueries "/etc/dnsmasq-conf.conf"; + resolv-file = optional cfg.resolveLocalQueries "/etc/dnsmasq-resolv.conf"; + } + ''; + example = literalExpression '' + { + domain-needed = true; + dhcp-range = [ "192.168.0.2,192.168.0.254" ]; + } + ''; + }; + extraConfig = mkOption { type = types.lines; default = ""; description = lib.mdDoc '' Extra configuration directives that should be added to `dnsmasq.conf`. + + This option is deprecated, please use {option}`settings` instead. ''; }; @@ -81,6 +125,14 @@ in config = mkIf cfg.enable { + warnings = lib.optional (cfg.extraConfig != "") "Text based config is deprecated, dnsmasq now supports `services.dnsmasq.settings` for an attribute-set based config"; + + services.dnsmasq.settings = { + dhcp-leasefile = mkDefault "${stateDir}/dnsmasq.leases"; + conf-file = mkDefault (optional cfg.resolveLocalQueries "/etc/dnsmasq-conf.conf"); + resolv-file = mkDefault (optional cfg.resolveLocalQueries "/etc/dnsmasq-resolv.conf"); + }; + networking.nameservers = optional cfg.resolveLocalQueries "127.0.0.1"; diff --git a/nixos/tests/dnscrypt-proxy2.nix b/nixos/tests/dnscrypt-proxy2.nix index 4435d77bbf3b..a75a745d3553 100644 --- a/nixos/tests/dnscrypt-proxy2.nix +++ b/nixos/tests/dnscrypt-proxy2.nix @@ -26,7 +26,7 @@ in { }; services.dnsmasq.enable = true; - services.dnsmasq.servers = [ "127.0.0.1#${toString localProxyPort}" ]; + services.dnsmasq.settings.server = [ "127.0.0.1#${toString localProxyPort}" ]; }; }; diff --git a/nixos/tests/kubernetes/dns.nix b/nixos/tests/kubernetes/dns.nix index 6299b7ff988a..1b7145eb5d5e 100644 --- a/nixos/tests/kubernetes/dns.nix +++ b/nixos/tests/kubernetes/dns.nix @@ -69,7 +69,7 @@ let extraConfiguration = { config, pkgs, lib, ... }: { environment.systemPackages = [ pkgs.bind.host ]; services.dnsmasq.enable = true; - services.dnsmasq.servers = [ + services.dnsmasq.settings.server = [ "/cluster.local/${config.services.kubernetes.addons.dns.clusterIp}#53" ]; }; diff --git a/nixos/tests/schleuder.nix b/nixos/tests/schleuder.nix index a9e4cc325bc7..e57ef66bb8f9 100644 --- a/nixos/tests/schleuder.nix +++ b/nixos/tests/schleuder.nix @@ -82,9 +82,7 @@ import ./make-test-python.nix { # Since we don't have internet here, use dnsmasq to provide MX records from /etc/hosts services.dnsmasq = { enable = true; - extraConfig = '' - selfmx - ''; + settings.selfmx = true; }; networking.extraHosts = '' From 59cbf207dffcce7d4a55b54592e0ebd952eae1ae Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 5 Dec 2022 03:02:27 +0100 Subject: [PATCH 029/204] mysocketw: fix build on darwin --- pkgs/development/libraries/mysocketw/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/development/libraries/mysocketw/default.nix b/pkgs/development/libraries/mysocketw/default.nix index 5ee10c854a55..880f5d50a042 100644 --- a/pkgs/development/libraries/mysocketw/default.nix +++ b/pkgs/development/libraries/mysocketw/default.nix @@ -49,15 +49,11 @@ stdenv.mkDerivation rec { printf %s 'https://AnotherFoxGuy.com/CMakeCM::modules/JoinPaths.cmake.1' > JoinPaths.cmake.whence )''; - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace src/Makefile \ - --replace -Wl,-soname, -Wl,-install_name,$out/lib/ - ''; - meta = with lib; { description = "Cross platform (Linux/FreeBSD/Unix/Win32) streaming socket C++"; homepage = "https://github.com/RigsOfRods/socketw"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ ]; + platforms = platforms.unix; }; } From 0d5cfedbe4f572360093ca449ac96517d17c0069 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 5 Dec 2022 14:27:32 +0100 Subject: [PATCH 030/204] pmbootstrap: 1.50.0 -> 1.50.1 --- pkgs/tools/misc/pmbootstrap/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/pmbootstrap/default.nix b/pkgs/tools/misc/pmbootstrap/default.nix index aa6c8ebae2eb..fe2eb882c13e 100644 --- a/pkgs/tools/misc/pmbootstrap/default.nix +++ b/pkgs/tools/misc/pmbootstrap/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "pmbootstrap"; - version = "1.50.0"; + version = "1.50.1"; src = fetchPypi { inherit pname version; - hash = "sha256-UtXUq+B3EMHS3CTqfzbyQK0gHgrFwcwQ6zTzw/EwIuA="; + hash = "sha256-2S3I3J3wmRkVSUshyQCUTuYgHLsDMnXZQHt7KySBzIY="; }; repo = fetchFromGitLab { @@ -15,11 +15,14 @@ buildPythonApplication rec { owner = "postmarketOS"; repo = pname; rev = version; - hash = "sha256-wuNsmc7FBk05VgH+E4uwMJeZRTlqAUe6kLvHqCLAwEY="; + hash = "sha256-UkgCNob4nazFO8xXyosV+11Sj4yveYBfgh7aw+/6Rlg="; }; pmb_test = "${repo}/test"; + # Tests depend on sudo + doCheck = stdenv.isLinux; + checkInputs = [ pytestCheckHook git openssl ps sudo ]; # Add test dependency in PATH @@ -93,7 +96,5 @@ buildPythonApplication rec { homepage = "https://gitlab.com/postmarketOS/pmbootstrap"; license = licenses.gpl3Plus; maintainers = with maintainers; [ onny ]; - # https://github.com/NixOS/nixpkgs/pull/146576#issuecomment-974267651 - broken = stdenv.isDarwin && stdenv.isAarch64; }; } From adc3eb3244c69758317c8af83761efa8b115596f Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 4 Dec 2022 06:09:46 +0100 Subject: [PATCH 031/204] ogre: 1.12.1 -> 13.5.3 --- pkgs/development/libraries/ogre/default.nix | 133 +++++++++++--------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 74 insertions(+), 63 deletions(-) diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index 2017d5435ea4..34cb8d21f839 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -1,29 +1,34 @@ -{ fetchFromGitHub +{ lib , stdenv -, lib +, fetchFromGitHub , cmake -, libGLU -, libGL -, freetype -, freeimage -, zziplib -, xorgproto -, libXrandr -, libXaw -, freeglut -, libXt -, libpng -, boost -, ois -, libX11 -, libXmu -, libSM , pkg-config -, libXxf86vm -, libICE , unzip -, libXrender , SDL2 +, boost +, freeimage +, freetype +, libpng +, ois +, pugixml +, zziplib + # linux +, freeglut +, libGL +, libGLU +, libICE +, libSM +, libX11 +, libXaw +, libXmu +, libXrandr +, libXrender +, libXt +, libXxf86vm +, xorgproto + # darwin +, Cocoa + # optional , withNvidiaCg ? false , nvidia_cg_toolkit , withSamples ? false @@ -31,59 +36,63 @@ stdenv.mkDerivation rec { pname = "ogre"; - version = "1.12.1"; + version = "13.5.3"; src = fetchFromGitHub { owner = "OGRECave"; repo = "ogre"; rev = "v${version}"; - sha256 = "sha256-FHW0+DZhw6MLlhjh4DRYhA+6vBBXMN9K6GEVoR6P5kM="; + sha256 = "sha256-fjgMAuIA7rm3Gt2z//kPkc7LOcfddoFgY38B7bs6zZo="; }; - # fix for ARM. sys/sysctl.h has moved in later glibcs, and - # https://github.com/OGRECave/ogre-next/issues/132 suggests it isn't - # needed anyway. - postPatch = '' - substituteInPlace OgreMain/src/OgrePlatformInformation.cpp \ - --replace '#include ' "" - ''; + nativeBuildInputs = [ + cmake + pkg-config + unzip + ]; - cmakeFlags = [ "-DOGRE_BUILD_DEPENDENCIES=OFF" "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ] - ++ map (x: "-DOGRE_BUILD_PLUGIN_${x}=on") - ([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG") - ++ map (x: "-DOGRE_BUILD_RENDERSYSTEM_${x}=on") [ "GL" ]; + buildInputs = [ + SDL2 + boost + freeimage + freetype + libpng + ois + pugixml + zziplib + ] ++ lib.optionals stdenv.isLinux [ + freeglut + libGL + libGLU + libICE + libSM + libX11 + libXaw + libXmu + libXrandr + libXrender + libXt + libXxf86vm + xorgproto + ] ++ lib.optionals stdenv.isDarwin [ + Cocoa + ] ++ lib.optionals withNvidiaCg [ + nvidia_cg_toolkit + ]; - - nativeBuildInputs = [ cmake unzip pkg-config ]; - buildInputs = - [ - libGLU - libGL - freetype - freeimage - zziplib - xorgproto - libXrandr - libXaw - freeglut - libXt - libpng - boost - ois - libX11 - libXmu - libSM - libXxf86vm - libICE - libXrender - SDL2 - ] ++ lib.optional withNvidiaCg nvidia_cg_toolkit; + cmakeFlags = [ + "-DOGRE_BUILD_COMPONENT_OVERLAY_IMGUI=FALSE" + "-DOGRE_BUILD_DEPENDENCIES=OFF" + "-DOGRE_BUILD_SAMPLES=${toString withSamples}" + ] ++ lib.optionals stdenv.isDarwin [ + "-DOGRE_BUILD_LIBS_AS_FRAMEWORKS=FALSE" + ]; meta = { - description = "A 3D engine"; + description = "3D Object-Oriented Graphics Rendering Engine"; homepage = "https://www.ogre3d.org/"; - maintainers = [ lib.maintainers.raskin ]; - platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ raskin wegank ]; + platforms = lib.platforms.unix; license = lib.licenses.mit; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8d21c8e8cba..c9033f12693c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21792,7 +21792,9 @@ with pkgs; ode = callPackage ../development/libraries/ode { }; - ogre = callPackage ../development/libraries/ogre {}; + ogre = callPackage ../development/libraries/ogre { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; ogre1_9 = callPackage ../development/libraries/ogre/1.9.x.nix {}; ogre1_10 = callPackage ../development/libraries/ogre/1.10.x.nix {}; From ac9af8d268060f355c4c4ab3df44ac14dd65b244 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 5 Dec 2022 14:34:59 +0100 Subject: [PATCH 032/204] ogrepaged: use ogre1_9 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9033f12693c..0db95078cff8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21798,7 +21798,9 @@ with pkgs; ogre1_9 = callPackage ../development/libraries/ogre/1.9.x.nix {}; ogre1_10 = callPackage ../development/libraries/ogre/1.10.x.nix {}; - ogrepaged = callPackage ../development/libraries/ogrepaged { }; + ogrepaged = callPackage ../development/libraries/ogrepaged { + ogre = ogre1_9; + }; olm = callPackage ../development/libraries/olm { }; From 904280a5147e114a0cd17c7a9f8711f99b30330f Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 5 Dec 2022 14:36:17 +0100 Subject: [PATCH 033/204] opendungeons: fix build on aarch64-linux --- pkgs/games/opendungeons/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/games/opendungeons/default.nix b/pkgs/games/opendungeons/default.nix index 9afcbd898785..61f8aad304c8 100644 --- a/pkgs/games/opendungeons/default.nix +++ b/pkgs/games/opendungeons/default.nix @@ -16,6 +16,11 @@ stdenv.mkDerivation rec { ./fix_link_date_time.patch ]; + # source/utils/StackTraceUnix.cpp:122:2: error: #error Unsupported architecture. + postPatch = lib.optionalString (!stdenv.isx86_64) '' + cp source/utils/StackTrace{Stub,Unix}.cpp + ''; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ ogre cegui boost sfml openal ois ]; From d4f0deff85676ce565cd8b8e3f9b51b099b116ed Mon Sep 17 00:00:00 2001 From: nialov Date: Mon, 5 Dec 2022 15:27:42 +0200 Subject: [PATCH 034/204] gitmux: init at 0.7.10 --- .../git-and-tools/gitmux/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/applications/version-management/git-and-tools/gitmux/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/gitmux/default.nix b/pkgs/applications/version-management/git-and-tools/gitmux/default.nix new file mode 100644 index 000000000000..7e66985bb886 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/gitmux/default.nix @@ -0,0 +1,35 @@ +{ fetchFromGitHub, buildGoModule, lib, testers, gitmux }: + +buildGoModule rec { + pname = "gitmux"; + version = "0.7.10"; + + src = fetchFromGitHub { + owner = "arl"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-kBrE3jU7N8+kdT4tqC6gIGPz3soagStzLy5Iz4vNFI0="; + }; + + vendorSha256 = "sha256-V6xe+19NiHYIIN4rgkyzdP4eGnRXo0aW4fVbdlIcvig="; + + # GitHub source does contain a regression test for the module + # but it requires networking as it git clones a repo from github + doCheck = false; + + ldflags = [ "-X main.version=${version}" ]; + + passthru.tests.version = testers.testVersion { + package = gitmux; + command = "gitmux -V"; + }; + + subPackages = [ "." ]; + + meta = with lib; { + description = "Git in your tmux status bar"; + homepage = "https://github.com/arl/gitmux"; + license = licenses.mit; + maintainers = with maintainers; [ nialov ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b721e3997ba..066234861d32 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1827,6 +1827,8 @@ with pkgs; gitls = callPackage ../applications/version-management/git-and-tools/gitls { }; + gitmux = callPackage ../applications/version-management/git-and-tools/gitmux { }; + gitnuro = callPackage ../applications/version-management/git-and-tools/gitnuro { }; gitsign = callPackage ../applications/version-management/git-and-tools/gitsign { }; From a91db52d87517d2314601fe7c11fc8de29704637 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 5 Dec 2022 17:56:36 +0000 Subject: [PATCH 035/204] =?UTF-8?q?gnome.gnome-characters:=2043.0=20?= =?UTF-8?q?=E2=86=92=2043.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-characters/-/compare/43.0...43.1 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/apps/gnome-characters/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-characters/default.nix b/pkgs/desktops/gnome/apps/gnome-characters/default.nix index 9dc7d113571d..5617272acc33 100644 --- a/pkgs/desktops/gnome/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-characters/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gnome-characters"; - version = "43.0"; + version = "43.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "poW5y/k1Re05EWjEHJ2L+DeFq7+0iWdYJ+5zQkcbqsg="; + sha256 = "sj4V2VCXizY8gaRyYe4aO0fbPGaX7haf8hPuplcqeEE="; }; patches = [ From adb82d6119f3753ca42d41b256cb16930d60861e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 5 Dec 2022 17:58:24 +0000 Subject: [PATCH 036/204] =?UTF-8?q?tracker-miners:=203.4.1=20=E2=86=92=203?= =?UTF-8?q?.4.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/tracker-miners/-/compare/3.4.1...3.4.2 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/tracker-miners/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index 55793719dd81..32225a7bb0d8 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -46,11 +46,11 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "3.4.1"; + version = "3.4.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "L84OyF+3YXyLKIfCJ5d0DV3shOwDbbdNbCCLurXFjCQ="; + sha256 = "EB42CPHCi/7YriVSL3pyC1WfiJp24oCvvlCk2LBk+Sw="; }; nativeBuildInputs = [ From 30b36b9874f3ea115c5fec57b39117ea882485ef Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Fri, 2 Dec 2022 01:19:50 -0800 Subject: [PATCH 037/204] mcfly: update description to latest from repo --- pkgs/tools/misc/mcfly/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix index bdefd4a1b2d2..79c9238b9e27 100644 --- a/pkgs/tools/misc/mcfly/default.nix +++ b/pkgs/tools/misc/mcfly/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { homepage = "https://github.com/cantino/mcfly"; - description = "An upgraded ctrl-r for Bash whose history results make sense for what you're working on right now"; + description = "An upgraded ctrl-r where history results make sense for what you're working on right now"; changelog = "https://github.com/cantino/mcfly/raw/v${version}/CHANGELOG.txt"; license = licenses.mit; maintainers = [ maintainers.melkor333 ]; From 5a756162648ace359e00dd924e2389e237b789ef Mon Sep 17 00:00:00 2001 From: Mats Date: Mon, 5 Dec 2022 21:09:43 +0100 Subject: [PATCH 038/204] trilium-{desktop,server}: 0.56.2 -> 0.57.3 --- pkgs/applications/office/trilium/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 0ac2f4eac134..1499e1393435 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -10,13 +10,13 @@ let maintainers = with maintainers; [ fliegendewurst ]; }; - version = "0.56.2"; + version = "0.57.3"; desktopSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - desktopSource.sha256 = "1rqfkbxgcd32kpi6xfd590nivd1ga0d0kf5zvffyypyy28q95pyz"; + desktopSource.sha256 = "0ch2l0raysdzkm131rq3xgsk52f9h2f1nx1zjc0zzlvs4qz657l3"; serverSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - serverSource.sha256 = "1pyi2b649n2rihr4dcz8brfkqrbvssbzhr3dnmyrhrp3qdyxamb6"; + serverSource.sha256 = "0666pm2pzh1srzpdvs36nw1w2yp4k67k3idz6pyargziqh9pkyqf"; in { From 668c2b8246663e5c130e66d242db90304caaacfc Mon Sep 17 00:00:00 2001 From: Mats Date: Mon, 5 Dec 2022 23:11:01 +0100 Subject: [PATCH 039/204] trilium-desktop: stop auto generating desktop item --- pkgs/applications/office/trilium/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 1499e1393435..73d595cf699d 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -49,6 +49,11 @@ in { }) ]; + # Remove trilium-portable.sh, so trilium knows it is packaged making it stop auto generating a desktop item on launch + postPatch = '' + rm ./trilium-portable.sh + ''; + installPhase = '' runHook preInstall mkdir -p $out/bin From bbd7a1511c7c84a59141290bc930dc8b87293b2f Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Mon, 5 Dec 2022 12:04:52 -0800 Subject: [PATCH 040/204] macvim: remove python2 option --- pkgs/applications/editors/vim/macvim.nix | 33 ++++++++++++------------ 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 806e2f9d4fd0..f5b79ecdb01e 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -1,18 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, runCommand, ncurses, gettext -, pkg-config, cscope, ruby, tcl, perl, luajit +{ lib +, stdenv +, fetchFromGitHub +, runCommand +, ncurses +, gettext +, pkg-config +, cscope +, ruby +, tcl +, perl +, luajit , darwin - -, usePython27 ? false -, python27 ? null, python37 ? null +, python37 }: -let - python = if usePython27 - then { pkg = python27; name = "python"; } - else { pkg = python37; name = "python3"; }; -in -assert python.pkg != null; - let # Building requires a few system tools to be in PATH. # Some of these we could patch into the relevant source files (such as xcodebuild and @@ -40,7 +41,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config buildSymlinks ]; buildInputs = [ - gettext ncurses cscope luajit ruby tcl perl python.pkg + gettext ncurses cscope luajit ruby tcl perl python37 ]; patches = [ ./macvim.patch ]; @@ -53,14 +54,14 @@ stdenv.mkDerivation { "--enable-multibyte" "--enable-nls" "--enable-luainterp=dynamic" - "--enable-${python.name}interp=dynamic" + "--enable-python3interp=dynamic" "--enable-perlinterp=dynamic" "--enable-rubyinterp=dynamic" "--enable-tclinterp=yes" "--without-local-dir" "--with-luajit" "--with-lua-prefix=${luajit}" - "--with-${python.name}-command=${python.pkg}/bin/${python.name}" + "--with-python3-command=${python37}/bin/python3" "--with-ruby-command=${ruby}/bin/ruby" "--with-tclsh=${tcl}/bin/tclsh" "--with-tlib=ncurses" @@ -158,7 +159,7 @@ stdenv.mkDerivation { libperl=$(dirname $(find ${perl} -name "libperl.dylib")) install_name_tool -add_rpath ${luajit}/lib $exe install_name_tool -add_rpath ${tcl}/lib $exe - install_name_tool -add_rpath ${python.pkg}/lib $exe + install_name_tool -add_rpath ${python37}/lib $exe install_name_tool -add_rpath $libperl $exe install_name_tool -add_rpath ${ruby}/lib $exe From 6fa853a7fa9a32dc30740183350c65993184c9f4 Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Sun, 6 Nov 2022 18:03:26 +0900 Subject: [PATCH 041/204] libbpf: make libbpf_1 the default keep libbpf_0 around for suricatta --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 16 ++++------------ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 749b9c2ba512..18e965f2194a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -748,6 +748,7 @@ mapAliases ({ libayatana-appindicator-gtk3 = libayatana-appindicator; # Added 2022-10-18 libbencodetools = bencodetools; # Added 2022-07-30 libbluedevil = throw "'libbluedevil' (Qt4) is unmaintained and unused since 'kde4.bluedevil's removal in 2017"; # Added 2022-06-14 + libbpf_1 = libbpf; # Added 2022-12-06 libcanberra_gtk2 = throw "'libcanberra_gtk2' has been renamed to/replaced by 'libcanberra-gtk2'"; # Converted to throw 2022-02-22 libcanberra_gtk3 = throw "'libcanberra_gtk3' has been renamed to/replaced by 'libcanberra-gtk3'"; # Converted to throw 2022-02-22 libcap_manpages = throw "'libcap_manpages' has been renamed to/replaced by 'libcap.doc'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5fd85a37e114..4a9b4a0e560b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11717,6 +11717,7 @@ with pkgs; suricata = callPackage ../applications/networking/ids/suricata { python = python3; + libbpf = libbpf_0; }; sof-firmware = callPackage ../os-specific/linux/firmware/sof-firmware { }; @@ -12339,9 +12340,7 @@ with pkgs; tracebox = callPackage ../tools/networking/tracebox { stdenv = gcc10StdenvCompat; }; - tracee = callPackage ../tools/security/tracee { - libbpf = libbpf_1; # keep inline with their submodule - }; + tracee = callPackage ../tools/security/tracee { }; tracefilegen = callPackage ../development/tools/analysis/garcosim/tracefilegen { }; @@ -16763,10 +16762,8 @@ with pkgs; bump = callPackage ../development/tools/github/bump { }; - libbpf_1 = callPackage ../os-specific/linux/libbpf { }; + libbpf = callPackage ../os-specific/linux/libbpf { }; libbpf_0 = callPackage ../os-specific/linux/libbpf/0.x.nix { }; - # until more issues are fixed default to libbpf 0.x - libbpf = libbpf_0; bundlewrap = with python3.pkgs; toPythonApplication bundlewrap; @@ -16774,12 +16771,10 @@ with pkgs; bcc = callPackage ../os-specific/linux/bcc { python = python3; - libbpf = libbpf_1; llvmPackages = llvmPackages_14; }; bpftrace = callPackage ../os-specific/linux/bpftrace { - libbpf = libbpf_1; llvmPackages = llvmPackages_14; }; @@ -17686,9 +17681,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - pahole = callPackage ../development/tools/misc/pahole { - libbpf = libbpf_1; - }; + pahole = callPackage ../development/tools/misc/pahole { }; panopticon = callPackage ../development/tools/analysis/panopticon {}; @@ -25947,7 +25940,6 @@ with pkgs; enableMinimal = true; guiSupport = false; }; - libbpf = libbpf_1; }; systemdMinimal = systemd.override { pname = "systemd-minimal"; From 07cd1dce60a1afcacb93de9b08b75a091144bf79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 9 Sep 2022 10:04:21 +0200 Subject: [PATCH 042/204] knot-dns: adapt to libbpf 1.0 --- pkgs/servers/dns/knot-dns/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index eaa1d0658581..29a296dcef68 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring , systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2, libmnl -, ngtcp2-gnutls +, ngtcp2-gnutls, xdp-tools , autoreconfHook , nixosTests, knot-resolver, knot-dns, runCommandLocal }: @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { # TODO: add dnstap support? ] ++ lib.optionals stdenv.isLinux [ libcap_ng systemd - libbpf libmnl # XDP support (it's Linux kernel API) + xdp-tools libbpf libmnl # XDP support (it's Linux kernel API) ] ++ lib.optional stdenv.isDarwin zlib; # perhaps due to gnutls enableParallelBuilding = true; @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { deps = runCommandLocal "knot-deps-test" { nativeBuildInputs = [ (lib.getBin stdenv.cc.libc) ]; } '' - for libname in libngtcp2 libbpf; do + for libname in libngtcp2 libxdp libbpf; do echo "Checking for $libname:" ldd '${knot-dns.bin}/bin/knotd' | grep -F "$libname" echo "OK" From c8825268d2a691f1a0d19ebbe7c212bd58bad743 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sat, 29 Oct 2022 10:18:06 -0400 Subject: [PATCH 043/204] google-cloud-cpp: 1.38.0 -> 2.4.0 --- .../libraries/google-cloud-cpp/default.nix | 20 +++++++------------ .../google-cloud-cpp/skipped_tests.toml | 8 +++++++- pkgs/top-level/all-packages.nix | 4 +--- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/google-cloud-cpp/default.nix b/pkgs/development/libraries/google-cloud-cpp/default.nix index fb2929a72f16..f5d741e3fc9d 100644 --- a/pkgs/development/libraries/google-cloud-cpp/default.nix +++ b/pkgs/development/libraries/google-cloud-cpp/default.nix @@ -18,37 +18,31 @@ , staticOnly ? stdenv.hostPlatform.isStatic }: let - googleapisRev = "d4f3468ef85278428005ed555b3a85db91551ee6"; + googleapisRev = "13d5b3f3f9412f38427c8ad48068f04ad1ee9808"; googleapis = fetchFromGitHub { + name = "googleapis-src"; owner = "googleapis"; repo = "googleapis"; rev = googleapisRev; - hash = "sha256-sIQVFQhE3Ae6ia45apzdgtwzglMM4hFZ8efNAhMO5ZY="; + hash = "sha256-SiU7N1EQ/7LWhUwgf4c0CBfUzNGiLe4sSbbJmJF3sao="; }; excludedTests = builtins.fromTOML (builtins.readFile ./skipped_tests.toml); in stdenv.mkDerivation rec { pname = "google-cloud-cpp"; - version = "1.38.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "googleapis"; repo = "google-cloud-cpp"; rev = "v${version}"; - sha256 = "sha256-kobOkohWIDTQaaihhoh/25tZUNv+CjKFwj2xQqO52bA="; + sha256 = "sha256-o8aURM8fvxn0FZjuqJGclq9Brss8LOFZzD0FV2j/lUc="; }; postPatch = '' substituteInPlace external/googleapis/CMakeLists.txt \ - --replace "https://github.com/googleapis/googleapis/archive/\''${GOOGLE_CLOUD_CPP_GOOGLEAPIS_COMMIT_SHA}.tar.gz" "file://${googleapis}" - - # https://github.com/googleapis/google-cloud-cpp/issues/8992 - for file in external/googleapis/config.pc.in google/cloud/{,*/}config.pc.in; do - substituteInPlace "$file" \ - --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ - --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ \ - --replace '$'{prefix}/@CMAKE_INSTALL_BINDIR@ @CMAKE_INSTALL_FULL_BINDIR@ - done + --replace "https://github.com/googleapis/googleapis/archive/\''${_GOOGLE_CLOUD_CPP_GOOGLEAPIS_COMMIT_SHA}.tar.gz" "file://${googleapis}" + sed -i '/https:\/\/storage.googleapis.com\/cloud-cpp-community-archive\/com_google_googleapis/d' external/googleapis/CMakeLists.txt ''; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/google-cloud-cpp/skipped_tests.toml b/pkgs/development/libraries/google-cloud-cpp/skipped_tests.toml index 8cbe766862b2..71529bfb4550 100644 --- a/pkgs/development/libraries/google-cloud-cpp/skipped_tests.toml +++ b/pkgs/development/libraries/google-cloud-cpp/skipped_tests.toml @@ -13,6 +13,7 @@ whole = [ "bigtable_read_sync_vs_async_benchmark", "bigtable_scan_throughput_benchmark", "bigtable_table_sample_rows_integration_test", + "common_grpc_utils_internal_grpc_impersonate_service_account_integration_test", "iam_iam_credentials_integration_test", "iam_iam_integration_test", "logging_quickstart", @@ -48,6 +49,7 @@ whole = [ "storage_curl_request_integration_test", "storage_curl_resumable_upload_session_integration_test", "storage_curl_sign_blob_integration_test", + "storage_decompressive_transcoding_integration_test", "storage_grpc_integration_test", "storage_key_file_integration_test", "storage_minimal_iam_credentials_rest_integration_test", @@ -84,13 +86,13 @@ whole = [ "storage_throughput_experiment_test", "storage_tracing_integration_test", "storage_unified_credentials_integration_test", - "common_grpc_utils_internal_grpc_impersonate_service_account_integration_test" ] cases = [ "BackupExtraIntegrationTest.CreateBackupWithExpiredVersionTime", "BackupExtraIntegrationTest.BackupWithExpiredVersionTime", "BackupExtraIntegrationTest.BackupWithFutureVersionTime", "BackupExtraIntegrationTest.CreateBackupWithFutureVersionTime", + "BlockingPublisherIntegrationTest.Basic", "DatabaseAdminClientTest.CreateWithEncryptionKey", "DatabaseAdminClientTest.CreateWithNonexistentEncryptionKey", "DatabaseAdminClientTest.DatabaseBasicCRUD", @@ -98,12 +100,16 @@ cases = [ "DatabaseAdminClientTest.VersionRetentionPeriodCreateFailure", "DatabaseAdminClientTest.VersionRetentionPeriodUpdate", "DatabaseAdminClientTest.VersionRetentionPeriodUpdateFailure", + "ErrorParsingIntegrationTest.FailureContainsErrorInfo", + "GrpcServiceAccountIntegrationTest.GetServiceAccount", + "GrpcBucketMetadataIntegrationTest.ObjectMetadataCRUD", "InstanceAdminClientTest.InstanceConfig", "InstanceAdminClientTest.InstanceIam", "InstanceAdminClientTest.InstanceReadOperations", "LoggingIntegrationTest.ListMonitoredResourceDescriptors", "LoggingIntegrationTest.WriteLogEntries", "ObjectFileMultiThreadedTest.Download", + "ObjectReadLargeIntegrationTest.LimitedMemoryGrowth", "SubscriberIntegrationTest.FireAndForget", "SubscriberIntegrationTest.PublishOrdered", "SubscriberIntegrationTest.PublishPullAck", diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54de60646995..246ae2201eff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7585,9 +7585,7 @@ with pkgs; google-guest-oslogin = callPackage ../tools/virtualization/google-guest-oslogin { }; - google-cloud-cpp = callPackage ../development/libraries/google-cloud-cpp { - openssl = openssl_1_1; - }; + google-cloud-cpp = callPackage ../development/libraries/google-cloud-cpp { }; google-java-format = callPackage ../development/tools/google-java-format { }; From a05f2f20537e07f6e8f0d7cdef450f0a41e401ae Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Fri, 11 Nov 2022 07:08:39 -0500 Subject: [PATCH 044/204] grpc: build with `CMAKE_CXX_STANDARD=17` --- pkgs/development/libraries/grpc/default.nix | 36 ++++++++++++--------- pkgs/top-level/all-packages.nix | 4 +-- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 56f3cf0e7abd..744f9652378f 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -54,22 +54,26 @@ stdenv.mkDerivation rec { buildInputs = [ openssl protobuf ] ++ lib.optionals stdenv.isLinux [ libnsl ]; - cmakeFlags = [ - "-DgRPC_ZLIB_PROVIDER=package" - "-DgRPC_CARES_PROVIDER=package" - "-DgRPC_RE2_PROVIDER=package" - "-DgRPC_SSL_PROVIDER=package" - "-DgRPC_PROTOBUF_PROVIDER=package" - "-DgRPC_ABSL_PROVIDER=package" - "-DBUILD_SHARED_LIBS=ON" - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "-D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${buildPackages.protobuf}/bin/protoc" - ] ++ lib.optionals ((stdenv.hostPlatform.useLLVM or false) && lib.versionOlder stdenv.cc.cc.version "11.0") [ - # Needs to be compiled with -std=c++11 for clang < 11. Interestingly this is - # only an issue with the useLLVM stdenv, not the darwin stdenv… - # https://github.com/grpc/grpc/issues/26473#issuecomment-860885484 - "-DCMAKE_CXX_STANDARD=11" - ]; + cmakeFlags = + let + # Needs to be compiled with -std=c++11 for clang < 11. Interestingly this is + # only an issue with the useLLVM stdenv, not the darwin stdenv… + # https://github.com/grpc/grpc/issues/26473#issuecomment-860885484 + useLLVMAndOldCC = (stdenv.hostPlatform.useLLVM or false) && lib.versionOlder stdenv.cc.cc.version "11.0"; + cxxStandard = if useLLVMAndOldCC then "11" else "17"; + in + [ + "-DgRPC_ZLIB_PROVIDER=package" + "-DgRPC_CARES_PROVIDER=package" + "-DgRPC_RE2_PROVIDER=package" + "-DgRPC_SSL_PROVIDER=package" + "-DgRPC_PROTOBUF_PROVIDER=package" + "-DgRPC_ABSL_PROVIDER=package" + "-DBUILD_SHARED_LIBS=ON" + "-DCMAKE_CXX_STANDARD=${cxxStandard}" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${buildPackages.protobuf}/bin/protoc" + ]; # CMake creates a build directory by default, this conflicts with the # basel BUILD file on case-insensitive filesystems. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 246ae2201eff..094cd87fa67f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19468,9 +19468,9 @@ with pkgs; grilo-plugins = callPackage ../development/libraries/grilo-plugins { }; grpc = callPackage ../development/libraries/grpc { - # grpc builds with c++14 so abseil must also be built that way + # grpc builds with c++17 so abseil must also be built that way abseil-cpp = abseil-cpp_202206.override { - cxxStandard = "14"; + cxxStandard = "17"; }; }; From a3cb8c87363a09de39bcaca13f14e02271f98afd Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Fri, 11 Nov 2022 07:09:07 -0500 Subject: [PATCH 045/204] google-cloud-cpp: build with `CMAKE_CXX_STANDARD=17` --- pkgs/development/libraries/google-cloud-cpp/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/google-cloud-cpp/default.nix b/pkgs/development/libraries/google-cloud-cpp/default.nix index f5d741e3fc9d..3ffaedb6b729 100644 --- a/pkgs/development/libraries/google-cloud-cpp/default.nix +++ b/pkgs/development/libraries/google-cloud-cpp/default.nix @@ -117,6 +117,7 @@ stdenv.mkDerivation rec { # this adds a good chunk of time to the build "-DBUILD_TESTING:BOOL=ON" "-DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES:BOOL=OFF" + "-DCMAKE_CXX_STANDARD=17" ] ++ lib.optionals (apis != [ "*" ]) [ "-DGOOGLE_CLOUD_CPP_ENABLE=${lib.concatStringsSep ";" apis}" ]; From da1cb54c5b124276f97148424a81035fcf22bc27 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Fri, 11 Nov 2022 07:09:37 -0500 Subject: [PATCH 046/204] arrow-cpp: build with `CMAKE_CXX_STANDARD=17` --- pkgs/development/libraries/arrow-cpp/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 2ce613c78534..81e5763aa3eb 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -205,7 +205,8 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isDarwin [ "-DCMAKE_INSTALL_RPATH=@loader_path/../lib" # needed for tools executables ] ++ lib.optional (!stdenv.isx86_64) "-DARROW_USE_SIMD=OFF" - ++ lib.optional enableS3 "-DAWSSDK_CORE_HEADER_FILE=${aws-sdk-cpp}/include/aws/core/Aws.h"; + ++ lib.optional enableS3 "-DAWSSDK_CORE_HEADER_FILE=${aws-sdk-cpp}/include/aws/core/Aws.h" + ++ lib.optionals enableGcs [ "-DCMAKE_CXX_STANDARD=17" ]; doInstallCheck = true; ARROW_TEST_DATA = lib.optionalString doInstallCheck "${arrow-testing}/data"; From 343503b44c60a5809b51348b688585a64df6ae1b Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 7 Dec 2022 04:35:57 +1000 Subject: [PATCH 047/204] nixVersions.nix_2_12: init at 2.12.0 https://github.com/NixOS/nix/releases/tag/2.12.0 --- pkgs/tools/package-management/nix/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index e6ee3ffe1d87..821944b772e5 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -119,6 +119,14 @@ in lib.makeExtensible (self: { ]; }; + nix_2_12 = common { + version = "2.12.0"; + sha256 = "sha256-sQ9C101CL/eVN5JgH91ozHFWU4+bXr8/Fi/8NQk6xRI="; + patches = [ + ./patches/flaky-tests.patch + ]; + }; + stable = self.nix_2_11; unstable = self.stable; From f24c75171e9890d7b6f97048b2e58d5ad76bac8f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 7 Dec 2022 04:36:50 +1000 Subject: [PATCH 048/204] nixVersions.stable: 2.11 -> 2.12 --- pkgs/tools/package-management/nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 821944b772e5..a6bf0a585fb7 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -127,7 +127,7 @@ in lib.makeExtensible (self: { ]; }; - stable = self.nix_2_11; + stable = self.nix_2_12; unstable = self.stable; }) From 1ec69621ef95a1b82f267c0197d280f2f8e3a056 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 7 Dec 2022 04:40:42 +1000 Subject: [PATCH 049/204] nixos/nix-fallback-paths: 2.11.1 -> 2.12.0 --- nixos/modules/installer/tools/nix-fallback-paths.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 675674cf5b4b..3eca901bdbf7 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,7 +1,7 @@ { - x86_64-linux = "/nix/store/xdlpraypxdimjyfrr4k06narrv8nmfgh-nix-2.11.1"; - i686-linux = "/nix/store/acghbpn3aaj2q64mz3ljipsgf9d9qxlp-nix-2.11.1"; - aarch64-linux = "/nix/store/0lrf6danhdqjsrhala134ak8vn0b9ghj-nix-2.11.1"; - x86_64-darwin = "/nix/store/60sx4c6xflgqk11gvijwzlsczbxgxgwh-nix-2.11.1"; - aarch64-darwin = "/nix/store/dmk5m3nlqp1awaqrp1f06qhhkh3l102n-nix-2.11.1"; + x86_64-linux = "/nix/store/h88w1442c7hzkbw8sgpcsbqp4lhz6l5p-nix-2.12.0"; + i686-linux = "/nix/store/j23527l1c3hfx17nssc0v53sq6c741zs-nix-2.12.0"; + aarch64-linux = "/nix/store/zgzmdymyh934y3r4vqh8z337ba4cwsjb-nix-2.12.0"; + x86_64-darwin = "/nix/store/wnlrzllazdyg1nrw9na497p4w0m7i7mm-nix-2.12.0"; + aarch64-darwin = "/nix/store/7n5yamgzg5dpp5vb6ipdqgfh6cf30wmn-nix-2.12.0"; } From 2145ef28e265cc82bcca798c0a72b749c609de8b Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Mon, 5 Dec 2022 18:55:16 +0100 Subject: [PATCH 050/204] ssm-agent: apply patch for CVE-2022-29527 --- pkgs/applications/networking/cluster/ssm-agent/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/networking/cluster/ssm-agent/default.nix b/pkgs/applications/networking/cluster/ssm-agent/default.nix index 86b48633c253..baf85847875c 100644 --- a/pkgs/applications/networking/cluster/ssm-agent/default.nix +++ b/pkgs/applications/networking/cluster/ssm-agent/default.nix @@ -3,6 +3,7 @@ , buildGoPackage , makeWrapper , fetchFromGitHub +, fetchpatch , coreutils , nettools , dmidecode @@ -47,6 +48,12 @@ buildGoPackage rec { # They used constants from another package that I couldn't figure # out how to resolve, so hardcoded the constants. ./0002-version-gen-don-t-use-unnecessary-constants.patch + + (fetchpatch { + name = "CVE-2022-29527.patch"; + url = "https://github.com/aws/amazon-ssm-agent/commit/0fe8ae99b2ff25649c7b86d3bc05fc037400aca7.patch"; + sha256 = "sha256-5g14CxhsHLIgs1Vkfw8FCKEJ4AebNqZKf3ZzoAN/T9U="; + }) ]; preConfigure = '' From f1311ba90c358ded9eef10f7fcca259666adb372 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 Dec 2022 01:12:27 +0000 Subject: [PATCH 051/204] telegraf: 1.24.3 -> 1.24.4 --- pkgs/servers/monitoring/telegraf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 464e04a29257..715e8da0b753 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.24.3"; + version = "1.24.4"; excludedPackages = "test"; @@ -12,10 +12,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - sha256 = "sha256-3KQJRapgl36+QwWHjh+nri3FcFtXhre7l3XN8Oj9t+0="; + sha256 = "sha256-GlbkCT85gbQehN2SgWY0WNSQ1FbpgZKBpqm6ImlWASk="; }; - vendorSha256 = "sha256-0PQYnJKDR/CtZviy0FXvVja7fvcvY+BH8zQXiGdKqRg="; + vendorSha256 = "sha256-sBCUs9m04bdkeAIRCJ2Esw68JJIsyVNcoZ3W1WrNKJ4="; proxyVendor = true; ldflags = [ From 1d0bfc77f7d8f9e69a256f0dc1e94dcf424cd22e Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 6 Dec 2022 23:05:30 -0500 Subject: [PATCH 052/204] ruff: 0.0.165 -> 0.0.166 Diff: https://github.com/charliermarsh/ruff/compare/v0.0.165...v0.0.166 Changelog: https://github.com/charliermarsh/ruff/releases/tag/v0.0.166 --- pkgs/development/tools/ruff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 5afee4e069ce..51c72ef30cbe 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.165"; + version = "0.0.166"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-McbLVoYujMNFoZg4rOZW1GNzUYymZHEohNEntOnaP1M="; + sha256 = "sha256-APgYvtWw4v8oyir0BrqbJnBMbgBg8N9LBHDT+n/FyDY="; }; - cargoSha256 = "sha256-2YczpduILH3gSXCEG2w2n1yG4bqox4MMViZJcEFNRtw="; + cargoSha256 = "sha256-KkTOs8eGiN3rSzxdoyAr6zMMVcm6pIujrJRoTHfStuI="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices From 6ffb23e00390b69a0a8fa5efdf051db4185480e1 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 6 Dec 2022 23:09:10 -0500 Subject: [PATCH 053/204] selene: 0.22.0 -> 0.23.0 Diff: https://github.com/kampfkarren/selene/compare/0.22.0...0.23.0 Changelog: https://github.com/kampfkarren/selene/blob/0.23.0/CHANGELOG.md --- pkgs/development/tools/selene/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/selene/default.nix b/pkgs/development/tools/selene/default.nix index 27f61f4e7021..ec780ccef057 100644 --- a/pkgs/development/tools/selene/default.nix +++ b/pkgs/development/tools/selene/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "selene"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "kampfkarren"; repo = pname; rev = version; - sha256 = "sha256-6DbWz4u4mbW/aSDpaLxP4bG14gHxMGc4A8zMTVH/vj0="; + sha256 = "sha256-z1jefnWtaV97kq7CpfKsnFOgLHXDBonsmZTfUKJ4VIM="; }; - cargoSha256 = "sha256-6dYXGxDNiLzpyZCmF2OJl2HAFyzJeAeQpEfaIZBBJD8="; + cargoSha256 = "sha256-TjkileWGB7ocBJPGh2Bm1ucigwL4j/uXgIOAonPHjbA="; nativeBuildInputs = lib.optional robloxSupport pkg-config; From a83a469fe9bac13f4ac0d876600552b03932c707 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Tue, 6 Dec 2022 23:22:41 -0500 Subject: [PATCH 054/204] linux_testing: 6.1-rc3 -> 6.1-rc8 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 2e07f957efe1..76db1b11bbd2 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.1-rc3"; + version = "6.1-rc8"; extraMeta.branch = lib.versions.majorMinor version; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - hash = "sha256-qz863wvIe/JJjqSYoxxbt+2xTqgNNZJpAfWr8nG8wKk="; + hash = "sha256-YQYxNWZ7HmF3z5M88S8I8tjOaglNYWFtCGlGbDttx64="; }; # Should the testing kernels ever be built on Hydra? From e686d1226c315c8d3a054eaca3dfd9fb1a4a8bf8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 Dec 2022 07:38:34 +0000 Subject: [PATCH 055/204] vapoursynth: 60 -> 61 --- pkgs/development/libraries/vapoursynth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index 0aa6fc39baad..3a88e3bd04b4 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "vapoursynth"; - version = "60"; + version = "61"; src = fetchFromGitHub { owner = "vapoursynth"; repo = "vapoursynth"; rev = "R${version}"; - sha256 = "sha256-E1uHNcGxBrwg00tNnY3qH6BpvXtBEGkX7QFy0aMLSnA="; + sha256 = "sha256-JJWq706GLywUO5voYKzxcOvMWF4/NXEbqOrj5uG4DWw="; }; patches = [ From 1130d99e67ee95b6b2354473bf52cc6d85d0d9fb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 Dec 2022 09:38:24 +0000 Subject: [PATCH 056/204] python310Packages.greeclimate: 1.3.0 -> 1.4.0 --- pkgs/development/python-modules/greeclimate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/greeclimate/default.nix b/pkgs/development/python-modules/greeclimate/default.nix index c2da89dc6c44..2059d7c092f8 100644 --- a/pkgs/development/python-modules/greeclimate/default.nix +++ b/pkgs/development/python-modules/greeclimate/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "greeclimate"; - version = "1.3.0"; + version = "1.4.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "cmroche"; repo = "greeclimate"; rev = "refs/tags/v${version}"; - hash = "sha256-4kR3Hc5M4FDG/WFtIW20a9d0vwLzmqtrlhd+teMiejA="; + hash = "sha256-UBkfe4d+K+730TbvModZF1ET7uxMpQGxOkq0PF/WiWc="; }; propagatedBuildInputs = [ From 7f396d994c81b8f70954d61329b7db1c59b76727 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Tue, 6 Dec 2022 12:50:17 -0800 Subject: [PATCH 057/204] lighthouse: 3.2.1 -> 3.3.0 --- pkgs/applications/blockchains/lighthouse/default.nix | 9 ++++++--- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/blockchains/lighthouse/default.nix b/pkgs/applications/blockchains/lighthouse/default.nix index 3eebd80cb593..8b54cc093159 100644 --- a/pkgs/applications/blockchains/lighthouse/default.nix +++ b/pkgs/applications/blockchains/lighthouse/default.nix @@ -10,6 +10,7 @@ , protobuf , rustPlatform , Security +, CoreFoundation , stdenv , testers , unzip @@ -17,7 +18,7 @@ rustPlatform.buildRustPackage rec { pname = "lighthouse"; - version = "3.2.1"; + version = "3.3.0"; # lighthouse/common/deposit_contract/build.rs depositContractSpecVersion = "0.12.1"; @@ -27,10 +28,10 @@ rustPlatform.buildRustPackage rec { owner = "sigp"; repo = "lighthouse"; rev = "v${version}"; - sha256 = "sha256-Aqc3kk1rquhLKNZDlEun4bQpKI4Nsk7+Wr7E2IkJQEs="; + hash = "sha256-py64CWY3k5Z2mm9WduJ4Fh7lQ8b3sF6iIFsYYjndU5I="; }; - cargoSha256 = "sha256-wGEk7OfEmyeRW65kq5stvKCdnCjfssyXUmNWGkGq42M="; + cargoHash = "sha256-0gWTniLkhuPpgdUkE6gpF9uHYT6BeWWgH6Mu7KpFx9w="; buildFeatures = [ "modern" "gnosis" ]; @@ -38,6 +39,8 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ Security + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + CoreFoundation ]; depositContractSpec = fetchurl { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 883df35fb01d..544e12504a57 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36787,8 +36787,8 @@ with pkgs; lguf-brightness = callPackage ../misc/lguf-brightness { }; - lighthouse = callPackage ../applications/blockchains/lighthouse { - inherit (darwin.apple_sdk.frameworks) Security; + lighthouse = darwin.apple_sdk_11_0.callPackage ../applications/blockchains/lighthouse { + inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation Security; }; lilypond = callPackage ../misc/lilypond { guile = guile_1_8; }; From 6dcc133aae403994eb5941f0655a0d4f702fb06d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 7 Dec 2022 02:39:36 +0100 Subject: [PATCH 058/204] cpython: Update meta and add changelog url --- .../interpreters/python/cpython/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 8fbcd7027ae9..d6e8f935380c 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -507,7 +507,15 @@ in with passthru; stdenv.mkDerivation { enableParallelBuilding = true; meta = { - homepage = "http://python.org"; + homepage = "https://www.python.org"; + changelog = let + majorMinor = lib.versions.majorMinor version; + dashedVersion = lib.replaceStrings [ "." "a" ] [ "-" "-alpha-" ] version; + in + if sourceVersion.suffix == "" then + "https://docs.python.org/release/${version}/whatsnew/changelog.html" + else + "https://docs.python.org/${majorMinor}/whatsnew/changelog.html#python-${dashedVersion}"; description = "A high-level dynamically-typed programming language"; longDescription = '' Python is a remarkably powerful dynamic programming language that From 42300ecf83a29008fdb97c62db80434e5eb0f37a Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 7 Dec 2022 10:58:37 -0500 Subject: [PATCH 059/204] scaleway-cli: 2.6.2 -> 2.7.0 Diff: https://github.com/scaleway/scaleway-cli/compare/v2.6.2...v2.7.0 --- pkgs/tools/admin/scaleway-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/pkgs/tools/admin/scaleway-cli/default.nix index 6e38400677a3..6169f22eb12b 100644 --- a/pkgs/tools/admin/scaleway-cli/default.nix +++ b/pkgs/tools/admin/scaleway-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "scaleway-cli"; - version = "2.6.2"; + version = "2.7.0"; src = fetchFromGitHub { owner = "scaleway"; repo = "scaleway-cli"; rev = "v${version}"; - sha256 = "sha256-WEEmU0YslQcjleM6jFLXNxogkXlRAUjkj0q+saugPYA="; + sha256 = "sha256-DWr5I6xMESRWhQCgDY/xJsSw0XhlNSJiVsHNvL+xmH4="; }; - vendorSha256 = "sha256-1YXw6b8xUa2yEfMURetImg2TnFTDUsiQi441pX/O57M="; + vendorSha256 = "sha256-1Ke01pc+RyqxCuD1SGypTSKCFnnHazz6IaybL0TylhA="; ldflags = [ "-w" From 3452f94d452275726b533a1991b050e880151ac2 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 7 Dec 2022 11:37:30 -0500 Subject: [PATCH 060/204] stylua: 0.15.2 -> 0.15.3 Diff: https://github.com/johnnymorganz/stylua/compare/v0.15.2...v0.15.3 Changelog: https://github.com/johnnymorganz/stylua/blob/v0.15.3/CHANGELOG.md --- pkgs/development/tools/stylua/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/stylua/default.nix b/pkgs/development/tools/stylua/default.nix index 871fbb64b7fd..f83535a10e47 100644 --- a/pkgs/development/tools/stylua/default.nix +++ b/pkgs/development/tools/stylua/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "stylua"; - version = "0.15.2"; + version = "0.15.3"; src = fetchFromGitHub { owner = "johnnymorganz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cMT6+U9tfucPE5IkHjsWlzcD+nLQC24fqTyOhsTwFqk="; + sha256 = "sha256-EVsgiG16R4wh4Dh10rv7/H+VDONaVPWOfRNStrw8aso="; }; - cargoSha256 = "sha256-H8oD769xdsXIJWqfFCL76MIKrKkHUSTzzciuHJBdjyI="; + cargoSha256 = "sha256-fDh6TchwQO+FvyPJzrso1Ls9ZIKMHDdFBTzf6AuvGqs="; # remove cargo config so it can find the linker on aarch64-unknown-linux-gnu postPatch = '' From 906558d40fa5e45fbf0331c859f20707aa253385 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 7 Dec 2022 12:03:57 -0500 Subject: [PATCH 061/204] ruff: 0.0.166 -> 0.0.167 Diff: https://github.com/charliermarsh/ruff/compare/v0.0.166...v0.0.167 Changelog: https://github.com/charliermarsh/ruff/releases/tag/v0.0.167 --- pkgs/development/tools/ruff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 51c72ef30cbe..a758201f9017 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.166"; + version = "0.0.167"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-APgYvtWw4v8oyir0BrqbJnBMbgBg8N9LBHDT+n/FyDY="; + sha256 = "sha256-3PnqR6ARvUGrw1tv5laBteCLzDZWSZXfAED47vEqQGo="; }; - cargoSha256 = "sha256-KkTOs8eGiN3rSzxdoyAr6zMMVcm6pIujrJRoTHfStuI="; + cargoSha256 = "sha256-ND86qiQqDuiBVoeb6a1hQrBVIf3KXM1ZfBCipQKby3s="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices From bf6fdfc15c8f87e72806619f8f2398bb771f5bf5 Mon Sep 17 00:00:00 2001 From: Gary Holtz Date: Tue, 6 Dec 2022 21:02:11 -0600 Subject: [PATCH 062/204] glab: 1.23.0 -> 1.24.1 Updating glab version to v.1.24.1 https://gitlab.com/gitlab-org/cli/-/releases/v1.24.1 --- .../version-management/git-and-tools/glab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/glab/default.nix b/pkgs/applications/version-management/git-and-tools/glab/default.nix index 6bfc8df1313c..9d6bbbd13f67 100644 --- a/pkgs/applications/version-management/git-and-tools/glab/default.nix +++ b/pkgs/applications/version-management/git-and-tools/glab/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "glab"; - version = "1.23.0"; + version = "1.24.1"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-NHBLaUEWurWnwbLiEsi3/pHqxKcgjjx+oRAGZXxni/Q="; + sha256 = "sha256-CUchYPMBTINkMJg8TC8rKMVkrcj/Gy+ZxV7jbtMFvpg="; }; vendorSha256 = "sha256-NuK63ibb1t+HnSR/gCFS7HWVtfGLazVx2M+qxRNCR1I="; From b337bad73863d7b25c094b09cc1b8977e0e46a4a Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 7 Dec 2022 14:29:55 -0500 Subject: [PATCH 063/204] ruff: 0.0.167 -> 0.0.168 Diff: https://github.com/charliermarsh/ruff/compare/v0.0.167...v0.0.168 Changelog: https://github.com/charliermarsh/ruff/releases/tag/v0.0.168 --- pkgs/development/tools/ruff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index a758201f9017..4b3068e3ec45 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.167"; + version = "0.0.168"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3PnqR6ARvUGrw1tv5laBteCLzDZWSZXfAED47vEqQGo="; + sha256 = "sha256-fQBtFhKngoIl4I2Wa7quFZrmNBhQhSCVp5gw3LTYIio="; }; - cargoSha256 = "sha256-ND86qiQqDuiBVoeb6a1hQrBVIf3KXM1ZfBCipQKby3s="; + cargoSha256 = "sha256-kLdO+b04YfdMex1B5Mx+EzDD3kkx5EktCPwTVbxKZ+c="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices From 4849068fdd2db333023a1f11fe7bec9fe4e7c231 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 7 Dec 2022 20:36:40 +0100 Subject: [PATCH 064/204] mitmproxy: 8.1.1 -> 9.0.1 --- .../python-modules/mitmproxy/default.nix | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix index 4b4cf1315b5f..b85000fe05c5 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch , buildPythonPackage , pythonOlder # Mitmproxy requirements @@ -8,7 +7,6 @@ , blinker , brotli , certifi -, click , cryptography , flask , h11 @@ -16,6 +14,7 @@ , hyperframe , kaitaistruct , ldap3 +, mitmproxy-wireguard , msgpack , passlib , protobuf @@ -42,24 +41,16 @@ buildPythonPackage rec { pname = "mitmproxy"; - version = "8.1.1"; - disabled = pythonOlder "3.8"; + version = "9.0.1"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "mitmproxy"; + repo = "mitmproxy"; rev = "refs/tags/v${version}"; sha256 = "sha256-nW/WfiY6uF67qNa95tvNvSv/alP2WmzTk34LEBma/04="; }; - patches = [ - # Fix onboarding addon tests failing with Flask >= v2.2 - (fetchpatch { - url = "https://github.com/mitmproxy/mitmproxy/commit/bc370276a19c1d1039e7a45ecdc23c362626c81a.patch"; - hash = "sha256-Cp7RnYpZEuRhlWYOk8BOnAKBAUa7Vy296UmQi3/ufes="; - }) - ]; - propagatedBuildInputs = [ setuptools # setup.py @@ -67,7 +58,6 @@ buildPythonPackage rec { blinker brotli certifi - click cryptography flask h11 @@ -75,11 +65,12 @@ buildPythonPackage rec { hyperframe kaitaistruct ldap3 + mitmproxy-wireguard msgpack passlib protobuf - publicsuffix2 pyopenssl + publicsuffix2 pyparsing pyperclip ruamel-yaml @@ -120,6 +111,12 @@ buildPythonPackage rec { # ValueError: Exceeds the limit (4300) for integer string conversion "test_roundtrip_big_integer" ]; + + disabledTestPaths = [ + # teardown of half the tests broken + "test/mitmproxy/addons/test_onboarding.py" + ]; + dontUsePytestXdist = true; pythonImportsCheck = [ "mitmproxy" ]; From 100cad48588f8491afad78e7014791ce88f312b2 Mon Sep 17 00:00:00 2001 From: Raphael Robatsch Date: Sun, 4 Dec 2022 14:53:16 +0000 Subject: [PATCH 065/204] mbedtls_3: init at 3.2.1 mbedtls 3 is incompatible with mbedtls 2, so create a new package for version 3. Remove comment disabling nixpkgs-update, since the version information on repology looks correct now. --- pkgs/development/libraries/mbedtls/2.nix | 6 ++++++ pkgs/development/libraries/mbedtls/3.nix | 6 ++++++ .../mbedtls/{default.nix => generic.nix} | 20 +++++++++---------- pkgs/top-level/all-packages.nix | 3 ++- 4 files changed, 24 insertions(+), 11 deletions(-) create mode 100644 pkgs/development/libraries/mbedtls/2.nix create mode 100644 pkgs/development/libraries/mbedtls/3.nix rename pkgs/development/libraries/mbedtls/{default.nix => generic.nix} (68%) diff --git a/pkgs/development/libraries/mbedtls/2.nix b/pkgs/development/libraries/mbedtls/2.nix new file mode 100644 index 000000000000..ba1f520b08cf --- /dev/null +++ b/pkgs/development/libraries/mbedtls/2.nix @@ -0,0 +1,6 @@ +{ callPackage }: + +callPackage ./generic.nix { + version = "2.28.1"; + hash = "sha256-brbZB3fINDeVWXf50ct4bxYkoBVyD6bBBijZyFQSnyw="; +} diff --git a/pkgs/development/libraries/mbedtls/3.nix b/pkgs/development/libraries/mbedtls/3.nix new file mode 100644 index 000000000000..d6f53feb086b --- /dev/null +++ b/pkgs/development/libraries/mbedtls/3.nix @@ -0,0 +1,6 @@ +{ callPackage }: + +callPackage ./generic.nix { + version = "3.2.1"; + hash = "sha256-+M36NvFe4gw2PRbld/2JV3yBGrqK6soWcmrSEkUNcrc="; +} diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/generic.nix similarity index 68% rename from pkgs/development/libraries/mbedtls/default.nix rename to pkgs/development/libraries/mbedtls/generic.nix index 2bd924d870c7..bb87c6dbc8ad 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/generic.nix @@ -1,4 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv +, version +, hash , fetchFromGitHub , cmake @@ -11,17 +14,13 @@ stdenv.mkDerivation rec { pname = "mbedtls"; - # Auto updates are disabled due to repology listing dev releases as release - # versions. See - # * https://github.com/NixOS/nixpkgs/pull/119838#issuecomment-822100428 - # * https://github.com/NixOS/nixpkgs/commit/0ee02a9d42b5fe1825b0f7cee7a9986bb4ba975d - version = "2.28.1"; # nixpkgs-update: no auto update + inherit version; src = fetchFromGitHub { - owner = "ARMmbed"; + owner = "Mbed-TLS"; repo = "mbedtls"; rev = "${pname}-${version}"; - sha256 = "sha256-brbZB3fINDeVWXf50ct4bxYkoBVyD6bBBijZyFQSnyw="; + inherit hash; }; nativeBuildInputs = [ cmake ninja perl python3 ]; @@ -40,10 +39,11 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://tls.mbed.org/"; + homepage = "https://www.trustedfirmware.org/projects/mbed-tls/"; + changelog = "https://github.com/Mbed-TLS/mbedtls/blob/${pname}-${version}/ChangeLog"; description = "Portable cryptographic and TLS library, formerly known as PolarSSL"; license = licenses.asl20; platforms = platforms.all; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ raphaelr ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 96d9cb14ea13..d650881ce20c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21486,7 +21486,8 @@ with pkgs; maxflow = callPackage ../development/libraries/maxflow { }; - mbedtls = callPackage ../development/libraries/mbedtls { }; + mbedtls = callPackage ../development/libraries/mbedtls/2.nix { }; + mbedtls_3 = callPackage ../development/libraries/mbedtls/3.nix { }; mdctags = callPackage ../development/tools/misc/mdctags { }; From 985c8dbe14eb901dac7abeeeab2df1e321b89f11 Mon Sep 17 00:00:00 2001 From: Raphael Robatsch Date: Mon, 5 Dec 2022 18:16:18 +0100 Subject: [PATCH 066/204] treewide: use mbedtls 3 where possible Co-authored-by: Sandro --- pkgs/applications/emulators/dolphin-emu/default.nix | 4 ++-- pkgs/applications/emulators/dolphin-emu/master.nix | 4 ++-- pkgs/applications/emulators/dolphin-emu/primehack.nix | 4 ++-- pkgs/applications/misc/lutris/fhsenv.nix | 2 +- pkgs/applications/misc/openrgb/default.nix | 4 ++-- pkgs/applications/networking/browsers/dillo/default.nix | 4 ++-- pkgs/applications/networking/browsers/dillong/default.nix | 4 ++-- pkgs/development/compilers/haxe/default.nix | 4 ++-- pkgs/development/compilers/julia/1.8.nix | 4 ++-- pkgs/development/compilers/neko/default.nix | 4 ++-- pkgs/development/interpreters/hashlink/default.nix | 4 ++-- pkgs/development/libraries/bctoolbox/default.nix | 4 ++-- pkgs/development/libraries/belle-sip/default.nix | 4 ++-- pkgs/development/libraries/yojimbo/default.nix | 4 ++-- pkgs/servers/http/hiawatha/default.nix | 4 ++-- pkgs/tools/filesystems/dislocker/default.nix | 4 ++-- pkgs/tools/networking/shadowsocks-libev/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 ++-- 18 files changed, 35 insertions(+), 35 deletions(-) diff --git a/pkgs/applications/emulators/dolphin-emu/default.nix b/pkgs/applications/emulators/dolphin-emu/default.nix index b27937a6b838..ad9c470bf427 100644 --- a/pkgs/applications/emulators/dolphin-emu/default.nix +++ b/pkgs/applications/emulators/dolphin-emu/default.nix @@ -24,7 +24,7 @@ , wxGTK30 , soundtouch , miniupnpc -, mbedtls +, mbedtls_2 , curl , lzo , sfml @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { wxGTK30 soundtouch miniupnpc - mbedtls + mbedtls_2 curl lzo sfml diff --git a/pkgs/applications/emulators/dolphin-emu/master.nix b/pkgs/applications/emulators/dolphin-emu/master.nix index eee0213ea12b..17a3049ea4f0 100644 --- a/pkgs/applications/emulators/dolphin-emu/master.nix +++ b/pkgs/applications/emulators/dolphin-emu/master.nix @@ -20,7 +20,7 @@ , alsa-lib , miniupnpc , enet -, mbedtls +, mbedtls_2 , soundtouch , sfml , xz @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { hidapi miniupnpc enet - mbedtls + mbedtls_2 soundtouch sfml xz diff --git a/pkgs/applications/emulators/dolphin-emu/primehack.nix b/pkgs/applications/emulators/dolphin-emu/primehack.nix index 93ed03097be9..73a4485af260 100644 --- a/pkgs/applications/emulators/dolphin-emu/primehack.nix +++ b/pkgs/applications/emulators/dolphin-emu/primehack.nix @@ -29,7 +29,7 @@ , alsa-lib , miniupnpc , enet -, mbedtls +, mbedtls_2 , soundtouch , sfml , fmt @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { hidapi miniupnpc enet - mbedtls + mbedtls_2 soundtouch sfml fmt diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index 5c39576ac6f3..075755bf217d 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -30,7 +30,7 @@ in buildFHSUserEnv { # DGen // TODO: libarchive is broken # Dolphin - bluez ffmpeg gettext portaudio wxGTK30 miniupnpc mbedtls lzo sfml gsm + bluez ffmpeg gettext portaudio wxGTK30 miniupnpc mbedtls_2 lzo sfml gsm wavpack orc nettle gmp pcre vulkan-loader # DOSBox diff --git a/pkgs/applications/misc/openrgb/default.nix b/pkgs/applications/misc/openrgb/default.nix index 6de5736e9ac8..ab8415a18823 100644 --- a/pkgs/applications/misc/openrgb/default.nix +++ b/pkgs/applications/misc/openrgb/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitLab, qmake, libusb1, hidapi, pkg-config, coreutils, mbedtls }: +{ lib, mkDerivation, fetchFromGitLab, qmake, libusb1, hidapi, pkg-config, coreutils, mbedtls_2 }: mkDerivation rec { pname = "openrgb"; @@ -12,7 +12,7 @@ mkDerivation rec { }; nativeBuildInputs = [ qmake pkg-config ]; - buildInputs = [ libusb1 hidapi mbedtls ]; + buildInputs = [ libusb1 hidapi mbedtls_2 ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/networking/browsers/dillo/default.nix b/pkgs/applications/networking/browsers/dillo/default.nix index 9c409c29818c..aff0042ded30 100644 --- a/pkgs/applications/networking/browsers/dillo/default.nix +++ b/pkgs/applications/networking/browsers/dillo/default.nix @@ -8,7 +8,7 @@ , libXinerama , libjpeg , libpng -, mbedtls +, mbedtls_2 , openssl , perl , pkg-config @@ -38,7 +38,7 @@ stdenv.mkDerivation { libXinerama libjpeg libpng - mbedtls + mbedtls_2 openssl perl ]; diff --git a/pkgs/applications/networking/browsers/dillong/default.nix b/pkgs/applications/networking/browsers/dillong/default.nix index 2d12134caadd..7fc7cc07121d 100644 --- a/pkgs/applications/networking/browsers/dillong/default.nix +++ b/pkgs/applications/networking/browsers/dillong/default.nix @@ -5,7 +5,7 @@ , pkg-config , which , fltk -, mbedtls +, mbedtls_2 }: stdenv.mkDerivation { @@ -27,7 +27,7 @@ stdenv.mkDerivation { buildInputs = [ fltk - mbedtls + mbedtls_2 ]; # The start_page and home settings refer to /usr. diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index 7a6c019c16da..58370c1a15a2 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, coreutils, ocaml-ng, zlib, pcre, neko, mbedtls, Security }: +{ lib, stdenv, fetchFromGitHub, coreutils, ocaml-ng, zlib, pcre, neko, mbedtls_2, Security }: let ocamlDependencies = version: @@ -42,7 +42,7 @@ let inherit version; buildInputs = [ zlib pcre neko ] - ++ lib.optional (lib.versionAtLeast version "4.1") mbedtls + ++ lib.optional (lib.versionAtLeast version "4.1") mbedtls_2 ++ lib.optional (lib.versionAtLeast version "4.1" && stdenv.isDarwin) Security ++ ocamlDependencies version; diff --git a/pkgs/development/compilers/julia/1.8.nix b/pkgs/development/compilers/julia/1.8.nix index 1c614103bdec..f975b39773d5 100644 --- a/pkgs/development/compilers/julia/1.8.nix +++ b/pkgs/development/compilers/julia/1.8.nix @@ -15,7 +15,7 @@ , libgit2 , curl , nghttp2 -, mbedtls +, mbedtls_2 , libssh2 , gmp , mpfr @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { libgit2 curl nghttp2 - mbedtls + mbedtls_2 libssh2 gmp mpfr diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix index 96bf06e41ea0..40e39d411d69 100644 --- a/pkgs/development/compilers/neko/default.nix +++ b/pkgs/development/compilers/neko/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, boehmgc, zlib, sqlite, pcre, cmake, pkg-config -, git, apacheHttpd, apr, aprutil, libmysqlclient, mbedtls, openssl, pkgs, gtk2, libpthreadstubs +, git, apacheHttpd, apr, aprutil, libmysqlclient, mbedtls_2, openssl, pkgs, gtk2, libpthreadstubs }: stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config git ]; buildInputs = [ boehmgc zlib sqlite pcre apacheHttpd apr aprutil - libmysqlclient mbedtls openssl libpthreadstubs ] + libmysqlclient mbedtls_2 openssl libpthreadstubs ] ++ lib.optional stdenv.isLinux gtk2 ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Security pkgs.darwin.apple_sdk.frameworks.Carbon]; diff --git a/pkgs/development/interpreters/hashlink/default.nix b/pkgs/development/interpreters/hashlink/default.nix index 1af48cba55ab..e24742ac136e 100644 --- a/pkgs/development/interpreters/hashlink/default.nix +++ b/pkgs/development/interpreters/hashlink/default.nix @@ -7,7 +7,7 @@ , libjpeg_turbo , libuv , libvorbis -, mbedtls +, mbedtls_2 , openal , pcre , SDL2 @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { libpng libuv libvorbis - mbedtls + mbedtls_2 openal pcre SDL2 diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix index 6c1c2cdefb9c..2bc457cac18e 100644 --- a/pkgs/development/libraries/bctoolbox/default.nix +++ b/pkgs/development/libraries/bctoolbox/default.nix @@ -2,7 +2,7 @@ , cmake , bc-decaf , fetchFromGitLab -, mbedtls +, mbedtls_2 , lib , stdenv }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # Vendored by BC bc-decaf - mbedtls + mbedtls_2 ]; src = fetchFromGitLab { diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix index 22817feadeda..187264caed19 100644 --- a/pkgs/development/libraries/belle-sip/default.nix +++ b/pkgs/development/libraries/belle-sip/default.nix @@ -4,7 +4,7 @@ , fetchFromGitLab , lib , libantlr3c -, mbedtls +, mbedtls_2 , stdenv , zlib }: @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { "-Wno-error=stringop-overflow" ]; - propagatedBuildInputs = [ libantlr3c mbedtls bctoolbox belr ]; + propagatedBuildInputs = [ libantlr3c mbedtls_2 bctoolbox belr ]; meta = with lib; { homepage = "https://linphone.org/technical-corner/belle-sip"; diff --git a/pkgs/development/libraries/yojimbo/default.nix b/pkgs/development/libraries/yojimbo/default.nix index b72820c77a68..d8c29e56aaab 100644 --- a/pkgs/development/libraries/yojimbo/default.nix +++ b/pkgs/development/libraries/yojimbo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, premake5, doxygen, libsodium, mbedtls }: +{ lib, stdenv, fetchFromGitHub, premake5, doxygen, libsodium, mbedtls_2 }: stdenv.mkDerivation { pname = "yojimbo"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ premake5 doxygen ]; - propagatedBuildInputs = [ libsodium mbedtls ]; + propagatedBuildInputs = [ libsodium mbedtls_2 ]; postBuild = '' premake5 docs diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/servers/http/hiawatha/default.nix index 2ab0b12c483f..d92d5d51a4f8 100644 --- a/pkgs/servers/http/hiawatha/default.nix +++ b/pkgs/servers/http/hiawatha/default.nix @@ -3,7 +3,7 @@ , cmake , ninja -, mbedtls +, mbedtls_2 , libxcrypt , enableCache ? true # Internal cache support. @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ninja ]; - buildInputs = [ mbedtls libxcrypt ] ++ lib.optionals enableXslt [ libxslt libxml2 ]; + buildInputs = [ mbedtls_2 libxcrypt ] ++ lib.optionals enableXslt [ libxslt libxml2 ]; prePatch = '' substituteInPlace CMakeLists.txt --replace SETUID "" diff --git a/pkgs/tools/filesystems/dislocker/default.nix b/pkgs/tools/filesystems/dislocker/default.nix index 10559985f867..396f8142ba93 100644 --- a/pkgs/tools/filesystems/dislocker/default.nix +++ b/pkgs/tools/filesystems/dislocker/default.nix @@ -3,7 +3,7 @@ , fetchpatch , cmake , pkg-config -, mbedtls +, mbedtls_2 , fuse }: @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ fuse mbedtls ]; + buildInputs = [ fuse mbedtls_2 ]; meta = with lib; { description = "Read BitLocker encrypted partitions in Linux"; diff --git a/pkgs/tools/networking/shadowsocks-libev/default.nix b/pkgs/tools/networking/shadowsocks-libev/default.nix index 6018e77e5e43..4b268213c94c 100644 --- a/pkgs/tools/networking/shadowsocks-libev/default.nix +++ b/pkgs/tools/networking/shadowsocks-libev/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake -, libsodium, mbedtls, libev, c-ares, pcre +, libsodium, mbedtls_2, libev, c-ares, pcre , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - buildInputs = [ libsodium mbedtls libev c-ares pcre ]; + buildInputs = [ libsodium mbedtls_2 libev c-ares pcre ]; nativeBuildInputs = [ cmake asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d650881ce20c..e5012912fc40 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21486,8 +21486,8 @@ with pkgs; maxflow = callPackage ../development/libraries/maxflow { }; - mbedtls = callPackage ../development/libraries/mbedtls/2.nix { }; - mbedtls_3 = callPackage ../development/libraries/mbedtls/3.nix { }; + mbedtls_2 = callPackage ../development/libraries/mbedtls/2.nix { }; + mbedtls = callPackage ../development/libraries/mbedtls/3.nix { }; mdctags = callPackage ../development/tools/misc/mdctags { }; From b38c5c97a9b4c35820d3cf9e2cdd75afec60d805 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 Dec 2022 20:01:41 +0000 Subject: [PATCH 067/204] python310Packages.knack: 0.10.0 -> 0.10.1 --- pkgs/development/python-modules/knack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/knack/default.nix b/pkgs/development/python-modules/knack/default.nix index 2e3808db8561..9f1e77efac28 100644 --- a/pkgs/development/python-modules/knack/default.nix +++ b/pkgs/development/python-modules/knack/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "knack"; - version = "0.10.0"; + version = "0.10.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ExkPqV1MIbzgS0vuItak4/sZqTtpmbHRBL0CxHZwbCg="; + sha256 = "sha256-xXKBKCl+bSaXkQhc+Wwv/fzvWM+DxjSly5LrA7KSmDg="; }; propagatedBuildInputs = [ From 05eb854be3b5975dd67ab98a78919309b39a881a Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 7 Dec 2022 21:43:50 +0100 Subject: [PATCH 068/204] pulseaudio: mark patches as merged --- pkgs/servers/pulseaudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 056710a588f7..11c56b925412 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -48,9 +48,9 @@ stdenv.mkDerivation rec { # Install sysconfdir files inside of the nix store, # but use a conventional runtime sysconfdir outside the store ./add-option-for-installation-sysconfdir.patch - # https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/654 + # https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/654 (merged) ./0001-Make-gio-2.0-optional-16.patch - # TODO (not sent upstream) + # https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/746 (merged) ./0002-Ignore-SCM_CREDS-on-darwin.patch ./0003-Ignore-HAVE_CPUID_H-on-aarch64-darwin.patch ./0004-Prefer-HAVE_CLOCK_GETTIME-on-darwin.patch From a0ad970782c37c64b197072d5e4ad85e35dbd481 Mon Sep 17 00:00:00 2001 From: Solid Rhino Date: Wed, 7 Dec 2022 21:44:10 +0100 Subject: [PATCH 069/204] _1password: 2.7.3 -> 2.9.1 update 1password-cli to 2.9.1 --- pkgs/applications/misc/1password/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index e744388b8649..5498651cfe80 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -12,12 +12,12 @@ let if extension == "zip" then fetchzip args else fetchurl args; pname = "1password-cli"; - version = "2.7.3"; + version = "2.9.1"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-FxApOWyExyfuRFQhxAVBWZGqQNmarBFBRB4jqsreWL0=" "zip"; - i686-linux = fetch "linux_386" "sha256-Ta6mdmcsKnNRMz9vwEadZ/xXVBran5BIJQngzNz3PUs=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-Lvxnp5KmkIj9jnaWg02a27eRYIx7WTNSLx+RJ04Vt+g=" "zip"; - aarch64-darwin = fetch "apple_universal" "sha256-6qrNgb5ae+qqlNsNDLbKNeWj0o/SRs+2G/4DfK5Wnhg=" "pkg"; + aarch64-linux = fetch "linux_arm64" "sha256-sFh3jIGknR7RA3/pckvBkFvVoxYfXqYuyUJuc/AfecU=" "zip"; + i686-linux = fetch "linux_386" "sha256-JbBjAdGRtpwkk1svoyNw22BGbslwD8ZuNJRihUoFMP4=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-yUo8LhT9iTl1z5+Cs9/E/YPMrnnimhFK9A1b1og0TSA=" "zip"; + aarch64-darwin = fetch "apple_universal" "sha256-IFaLcMXOLc0oZIWVOaDuyUmUxJc+Keeg77RR/SlCGxI=" "pkg"; x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; From c0a72011e367a5846c612c7b56ae4eaf886ca707 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 Dec 2022 20:46:03 +0000 Subject: [PATCH 070/204] buildpack: 0.27.0 -> 0.28.0 --- pkgs/development/tools/buildpack/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/buildpack/default.nix b/pkgs/development/tools/buildpack/default.nix index db5898a6059e..c8a74bd03085 100644 --- a/pkgs/development/tools/buildpack/default.nix +++ b/pkgs/development/tools/buildpack/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pack"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "buildpacks"; repo = pname; rev = "v${version}"; - sha256 = "sha256-b1lqgY6pu4yt3yY2UupG7PQUkgotK0VDffCW/0thxoo="; + sha256 = "sha256-FKnOqK3qmzWEmf+92up8ApeotyQyZpbmLDY72U3+mY8="; }; - vendorSha256 = "sha256-JqSk4w0chtWNYDQXo8oh5spAxor2kixo3fZcpV4LJ+8="; + vendorSha256 = "sha256-dYa6OuC2ingAh2VOzyGR4lK1GbTJ/l9iKXYWqRJmByc="; nativeBuildInputs = [ installShellFiles ]; From 77fe21081906bd5e86d8fda9aaa11f0ff40b4fa3 Mon Sep 17 00:00:00 2001 From: Steven Keuchel Date: Wed, 7 Dec 2022 22:01:20 +0100 Subject: [PATCH 071/204] python310Packages.metakernel: fix build The package switched to hatch as the build backend in 0.29.2. --- pkgs/development/python-modules/metakernel/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/metakernel/default.nix b/pkgs/development/python-modules/metakernel/default.nix index 5cc40f4a6ca6..bb3d4b917f1f 100644 --- a/pkgs/development/python-modules/metakernel/default.nix +++ b/pkgs/development/python-modules/metakernel/default.nix @@ -1,18 +1,24 @@ { lib , buildPythonPackage , fetchPypi +, hatchling , ipykernel }: buildPythonPackage rec { pname = "metakernel"; version = "0.29.2"; + format = "pyproject"; src = fetchPypi { inherit pname version; sha256 = "sha256-A++uLR4hhOQYmA6o9wBTejFju3CpbK0hwIs7XFscddQ="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ ipykernel ]; # Tests hang, so disable From a1f5263a86bc057901208398ae08252c5c974f78 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Wed, 7 Dec 2022 22:14:29 +0100 Subject: [PATCH 072/204] imagemagick6: 6.9.12-26 -> 6.9.12-68 Fixes CVE-2022-1114, CVE-2022-1115, CVE-2022-3213, CVE-2022-32545, CVE-2022-32546 and CVE-2022-32547. https://github.com/ImageMagick/Website6/blob/91af8aa460a43f8a3bb2be22922a8c35efbe8388/ChangeLog.md --- pkgs/applications/graphics/ImageMagick/6.x.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/6.x.nix b/pkgs/applications/graphics/ImageMagick/6.x.nix index d0b76706dc92..e09de1b25023 100644 --- a/pkgs/applications/graphics/ImageMagick/6.x.nix +++ b/pkgs/applications/graphics/ImageMagick/6.x.nix @@ -35,13 +35,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "6.9.12-26"; + version = "6.9.12-68"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick6"; rev = version; - sha256 = "sha256-oNorY/93jk1v5BS1T3wqctXuzV4o8JlyZtHnsNYmO4U="; + sha256 = "sha256-slQcA0cblxtG/1DiJx5swUh7Kfwgz5HG70eqJFLaQJI="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { ++ lib.optional libXtSupport libXt ++ lib.optional libwebpSupport libwebp; - doCheck = false; # fails 6 out of 76 tests + doCheck = false; # fails 2 out of 76 tests postInstall = '' (cd "$dev/include" && ln -s ImageMagick* ImageMagick) From e7e6577895fe4ef2859e4d2e666c0fe5fd7ac761 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 7 Dec 2022 18:26:49 -0300 Subject: [PATCH 073/204] ventoy-bin: fix egregious error on meta attributes --- pkgs/tools/cd-dvd/ventoy-bin/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/cd-dvd/ventoy-bin/default.nix b/pkgs/tools/cd-dvd/ventoy-bin/default.nix index 5f0f7177d9ae..a9f853cc7fe6 100644 --- a/pkgs/tools/cd-dvd/ventoy-bin/default.nix +++ b/pkgs/tools/cd-dvd/ventoy-bin/default.nix @@ -120,11 +120,11 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - # Setup variables. + # Setup variables local VENTOY_PATH="$out"/share/ventoy local ARCH='${arch}' - # Prepare. + # Prepare cd tool/"$ARCH" rm ash* hexdump* mkexfatfs* mount.exfat-fuse* xzcat* for archive in *.xz; do @@ -144,11 +144,11 @@ stdenv.mkDerivation (finalAttrs: { rm README rm tool/"$ARCH"/Ventoy2Disk.gtk2 || true # For aarch64 and mips64el. - # Copy from "$src" to "$out". + # Copy from "$src" to "$out" mkdir -p "$out"/bin "$VENTOY_PATH" cp -r . "$VENTOY_PATH" - # Fill bin dir. + # Fill bin dir for f in Ventoy2Disk.sh_ventoy VentoyWeb.sh_ventoy-web \ CreatePersistentImg.sh_ventoy-persistent \ ExtendPersistentImg.sh_ventoy-extend-persistent \ @@ -184,9 +184,9 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = with lib; { + homepage = "https://www.ventoy.net"; description = "A New Bootable USB Solution"; longDescription = '' - homepage = "https://www.ventoy.net"; Ventoy is an open source tool to create bootable USB drive for ISO/WIM/IMG/VHD(x)/EFI files. With ventoy, you don't need to format the disk over and over, you just need to copy the ISO/WIM/IMG/VHD(x)/EFI files From fd5154905a03286bddc1515f4be1e9882889ce89 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 Dec 2022 21:44:17 +0000 Subject: [PATCH 074/204] circleci-cli: 0.1.22675 -> 0.1.22770 --- pkgs/development/tools/misc/circleci-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index c70569fd7518..c4e0a47257eb 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.22675"; + version = "0.1.22770"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yCjCsUxl2IUIsiHBlqdNLtjbr+wNn6BpssD3+EHsHKA="; + sha256 = "sha256-3IQSI2cG+wEH7IgV8nEWvQRdfsSap8wQCniMWL/khOg="; }; vendorSha256 = "sha256-tTG2i6ZEck0arKfCiFK7pGg9SE4n7FrF16US67Wj1gY="; From b6d3506eea4a07b5c183cb960aea3d448bca8ba2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 Dec 2022 21:53:15 +0000 Subject: [PATCH 075/204] clairvoyance: 2.0.4 -> 2.0.6 --- pkgs/tools/security/clairvoyance/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/clairvoyance/default.nix b/pkgs/tools/security/clairvoyance/default.nix index 6d4fc13ed468..fd7942bdd5d3 100644 --- a/pkgs/tools/security/clairvoyance/default.nix +++ b/pkgs/tools/security/clairvoyance/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "clairvoyance"; - version = "2.0.4"; + version = "2.0.6"; format = "pyproject"; src = fetchFromGitHub { owner = "nikitastupin"; repo = pname; - rev = "v${version}"; - hash = "sha256-b69a3UTRt5axTSjLcEYkqGe7bFlQKCiMzoNtw91HCyI="; + rev = "refs/tags/v${version}"; + hash = "sha256-Jsb/UjqAppAUz9AGgON6AyVgUdOY6aswjQ9EL939Kro="; }; nativeBuildInputs = with python3.pkgs; [ From e79caabd359bce34a037465babc0c884a4b3df1b Mon Sep 17 00:00:00 2001 From: Marcelo Amancio de Lima Santos Date: Wed, 7 Dec 2022 19:11:03 -0300 Subject: [PATCH 076/204] waynergy: 0.0.14 -> 0.0.15 --- pkgs/tools/wayland/waynergy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/wayland/waynergy/default.nix b/pkgs/tools/wayland/waynergy/default.nix index 36ad2fd19b42..c6b10c293bfd 100644 --- a/pkgs/tools/wayland/waynergy/default.nix +++ b/pkgs/tools/wayland/waynergy/default.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation rec { pname = "waynergy"; - version = "0.0.14"; + version = "0.0.15"; src = fetchFromGitHub { owner = "r-c-f"; repo = "waynergy"; rev = "v${version}"; - hash = "sha256-LtLZDYZGoKNPRZeceMf/ndbO1QfMLkfxHeAo1YNjmm4="; + hash = "sha256-pk1U3svy9r7O9ivFjBNXsaOmgc+nv2QTuwwHejB7B4Q="; }; depsBuildBuild = [ pkg-config ]; From 3e1ee6897bb7cf1f5b084dd576bf197070711d16 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 Dec 2022 22:53:44 +0000 Subject: [PATCH 077/204] crowdsec: 1.4.2 -> 1.4.3 --- pkgs/tools/security/crowdsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/crowdsec/default.nix b/pkgs/tools/security/crowdsec/default.nix index ce76c5d9b450..55107d627104 100644 --- a/pkgs/tools/security/crowdsec/default.nix +++ b/pkgs/tools/security/crowdsec/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "crowdsec"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "crowdsecurity"; repo = pname; rev = "v${version}"; - hash = "sha256-hL3+hTOuwcbxiVZeq9oZjfKI1TJJt64g+74NolA3Drc="; + hash = "sha256-joLnKWKJR4XSoGTTx5xIKB8OH3EwSJbjEArYsPaVAOk="; }; vendorHash = "sha256-FPsoufB9UDgBDIE3yUq4doBse3qgjP19ussYnMAxntk="; From ad866e565db95c40ce13bf456a60108f94a5295e Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Wed, 30 Nov 2022 17:15:00 +0100 Subject: [PATCH 078/204] treewide: switch to port type for nixos modules --- nixos/modules/services/audio/icecast.nix | 2 +- nixos/modules/services/audio/mpd.nix | 2 +- nixos/modules/services/cluster/kubernetes/kubelet.nix | 4 ++-- nixos/modules/services/cluster/kubernetes/scheduler.nix | 2 +- .../services/continuous-integration/buildbot/master.nix | 2 +- nixos/modules/services/development/jupyter/default.nix | 2 +- nixos/modules/services/misc/gitlab.nix | 4 ++-- nixos/modules/services/misc/ripple-data-api.nix | 6 +++--- nixos/modules/services/monitoring/graphite.nix | 2 +- nixos/modules/services/monitoring/kapacitor.nix | 2 +- .../modules/services/monitoring/prometheus/alertmanager.nix | 2 +- nixos/modules/services/monitoring/zabbix-proxy.nix | 2 +- nixos/modules/services/network-filesystems/tahoe.nix | 6 +++--- nixos/modules/services/networking/morty.nix | 2 +- nixos/modules/services/networking/nsd.nix | 4 ++-- nixos/modules/services/networking/nylon.nix | 2 +- nixos/modules/services/networking/pdns-recursor.nix | 4 ++-- nixos/modules/services/networking/redsocks.nix | 2 +- nixos/modules/services/networking/znc/options.nix | 4 ++-- nixos/modules/services/search/elasticsearch-curator.nix | 2 +- nixos/modules/services/search/elasticsearch.nix | 2 +- nixos/modules/services/web-apps/hedgedoc.nix | 2 +- nixos/modules/services/web-apps/limesurvey.nix | 2 +- nixos/modules/services/web-apps/moodle.nix | 2 +- nixos/modules/services/web-apps/zabbix.nix | 4 ++-- nixos/modules/services/web-servers/nginx/vhost-options.nix | 2 +- 26 files changed, 36 insertions(+), 36 deletions(-) diff --git a/nixos/modules/services/audio/icecast.nix b/nixos/modules/services/audio/icecast.nix index 759f1ab0db9b..f71a13b9626d 100644 --- a/nixos/modules/services/audio/icecast.nix +++ b/nixos/modules/services/audio/icecast.nix @@ -74,7 +74,7 @@ in { listen = { port = mkOption { - type = types.int; + type = types.port; description = lib.mdDoc "TCP port that will be used to accept client connections."; default = 8000; }; diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index bbfccec98c4a..ba1e4716c9b9 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -142,7 +142,7 @@ in { }; port = mkOption { - type = types.int; + type = types.port; default = 6600; description = lib.mdDoc '' This setting is the TCP port that is desired for the daemon to get assigned diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix index 0898fee9bdb7..3ede1cb80e85 100644 --- a/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -171,7 +171,7 @@ in port = mkOption { description = lib.mdDoc "Kubernetes kubelet healthz port."; default = 10248; - type = int; + type = port; }; }; @@ -204,7 +204,7 @@ in port = mkOption { description = lib.mdDoc "Kubernetes kubelet info server listening port."; default = 10250; - type = int; + type = port; }; seedDockerImages = mkOption { diff --git a/nixos/modules/services/cluster/kubernetes/scheduler.nix b/nixos/modules/services/cluster/kubernetes/scheduler.nix index 2eada43eb4ec..f31a92f36840 100644 --- a/nixos/modules/services/cluster/kubernetes/scheduler.nix +++ b/nixos/modules/services/cluster/kubernetes/scheduler.nix @@ -43,7 +43,7 @@ in port = mkOption { description = lib.mdDoc "Kubernetes scheduler listening port."; default = 10251; - type = int; + type = port; }; verbosity = mkOption { diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix index d00e0ba39565..680b21dbf21b 100644 --- a/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -206,7 +206,7 @@ in { port = mkOption { default = 8010; - type = types.int; + type = types.port; description = lib.mdDoc "Specifies port number on which the buildbot HTTP interface listens."; }; diff --git a/nixos/modules/services/development/jupyter/default.nix b/nixos/modules/services/development/jupyter/default.nix index c3ef040ebe65..9f7910844468 100644 --- a/nixos/modules/services/development/jupyter/default.nix +++ b/nixos/modules/services/development/jupyter/default.nix @@ -57,7 +57,7 @@ in { }; port = mkOption { - type = types.int; + type = types.port; default = 8888; description = lib.mdDoc '' Port number Jupyter will be listening on. diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index e206d5bb7c6d..e7c707228f1b 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -560,7 +560,7 @@ in { description = lib.mdDoc "GitLab container registry host name."; }; port = mkOption { - type = types.int; + type = types.port; default = 4567; description = lib.mdDoc "GitLab container registry port."; }; @@ -613,7 +613,7 @@ in { }; port = mkOption { - type = types.int; + type = types.port; default = 25; description = lib.mdDoc "Port of the SMTP server for GitLab."; }; diff --git a/nixos/modules/services/misc/ripple-data-api.nix b/nixos/modules/services/misc/ripple-data-api.nix index 2663d734980f..30623a321338 100644 --- a/nixos/modules/services/misc/ripple-data-api.nix +++ b/nixos/modules/services/misc/ripple-data-api.nix @@ -40,7 +40,7 @@ in { port = mkOption { description = lib.mdDoc "Ripple data api port"; default = 5993; - type = types.int; + type = types.port; }; importMode = mkOption { @@ -77,7 +77,7 @@ in { port = mkOption { description = lib.mdDoc "Ripple data api redis port."; default = 5984; - type = types.int; + type = types.port; }; }; @@ -91,7 +91,7 @@ in { port = mkOption { description = lib.mdDoc "Ripple data api couchdb port."; default = 5984; - type = types.int; + type = types.port; }; db = mkOption { diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 017e8a1ba47c..8d92e60d3bad 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -225,7 +225,7 @@ in { port = mkOption { description = lib.mdDoc "Seyren listening port."; default = 8081; - type = types.int; + type = types.port; }; seyrenUrl = mkOption { diff --git a/nixos/modules/services/monitoring/kapacitor.nix b/nixos/modules/services/monitoring/kapacitor.nix index 61529c2e4526..727b694047b4 100644 --- a/nixos/modules/services/monitoring/kapacitor.nix +++ b/nixos/modules/services/monitoring/kapacitor.nix @@ -66,7 +66,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 9092; description = lib.mdDoc "Port of Kapacitor"; }; diff --git a/nixos/modules/services/monitoring/prometheus/alertmanager.nix b/nixos/modules/services/monitoring/prometheus/alertmanager.nix index ee2533ef1213..8706a18a184d 100644 --- a/nixos/modules/services/monitoring/prometheus/alertmanager.nix +++ b/nixos/modules/services/monitoring/prometheus/alertmanager.nix @@ -107,7 +107,7 @@ in { }; port = mkOption { - type = types.int; + type = types.port; default = 9093; description = lib.mdDoc '' Port to listen on for the web interface and API. diff --git a/nixos/modules/services/monitoring/zabbix-proxy.nix b/nixos/modules/services/monitoring/zabbix-proxy.nix index e7e353f36604..85da416ba6c3 100644 --- a/nixos/modules/services/monitoring/zabbix-proxy.nix +++ b/nixos/modules/services/monitoring/zabbix-proxy.nix @@ -102,7 +102,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = if cfg.database.type == "mysql" then mysql.port else pgsql.port; defaultText = literalExpression '' if config.${opt.database.type} == "mysql" diff --git a/nixos/modules/services/network-filesystems/tahoe.nix b/nixos/modules/services/network-filesystems/tahoe.nix index 4213f437f4b2..14c0a3d4725f 100644 --- a/nixos/modules/services/network-filesystems/tahoe.nix +++ b/nixos/modules/services/network-filesystems/tahoe.nix @@ -18,7 +18,7 @@ in }; tub.port = mkOption { default = 3458; - type = types.int; + type = types.port; description = lib.mdDoc '' The port on which the introducer will listen. ''; @@ -58,7 +58,7 @@ in }; tub.port = mkOption { default = 3457; - type = types.int; + type = types.port; description = lib.mdDoc '' The port on which the tub will listen. @@ -80,7 +80,7 @@ in }; web.port = mkOption { default = 3456; - type = types.int; + type = types.port; description = lib.mdDoc '' The port on which the Web server will listen. diff --git a/nixos/modules/services/networking/morty.nix b/nixos/modules/services/networking/morty.nix index 4b20c34cfc9b..72514764a7c6 100644 --- a/nixos/modules/services/networking/morty.nix +++ b/nixos/modules/services/networking/morty.nix @@ -50,7 +50,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 3000; description = lib.mdDoc "Listing port"; }; diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index 57da208bd7af..0ded92652093 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -588,7 +588,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 53; description = lib.mdDoc '' Port the service should bind do. @@ -825,7 +825,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 8952; description = lib.mdDoc '' Port number for remote control operations (uses TLS over TCP). diff --git a/nixos/modules/services/networking/nylon.nix b/nixos/modules/services/networking/nylon.nix index 6ed832b6fa1b..401dbe97c52d 100644 --- a/nixos/modules/services/networking/nylon.nix +++ b/nixos/modules/services/networking/nylon.nix @@ -81,7 +81,7 @@ let }; port = mkOption { - type = types.int; + type = types.port; default = 1080; description = lib.mdDoc '' What port to listen for client requests, default is 1080. diff --git a/nixos/modules/services/networking/pdns-recursor.nix b/nixos/modules/services/networking/pdns-recursor.nix index 473c2a1f1fba..2f07cefc736e 100644 --- a/nixos/modules/services/networking/pdns-recursor.nix +++ b/nixos/modules/services/networking/pdns-recursor.nix @@ -38,7 +38,7 @@ in { }; dns.port = mkOption { - type = types.int; + type = types.port; default = 53; description = lib.mdDoc '' Port number Recursor DNS server will bind to. @@ -67,7 +67,7 @@ in { }; api.port = mkOption { - type = types.int; + type = types.port; default = 8082; description = lib.mdDoc '' Port number Recursor REST API server will bind to. diff --git a/nixos/modules/services/networking/redsocks.nix b/nixos/modules/services/networking/redsocks.nix index 85ae3125ded8..45feb1313c92 100644 --- a/nixos/modules/services/networking/redsocks.nix +++ b/nixos/modules/services/networking/redsocks.nix @@ -81,7 +81,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 12345; description = lib.mdDoc "Port on which redsocks should listen."; }; diff --git a/nixos/modules/services/networking/znc/options.nix b/nixos/modules/services/networking/znc/options.nix index ce8e7a89a4df..bd67ec86d513 100644 --- a/nixos/modules/services/networking/znc/options.nix +++ b/nixos/modules/services/networking/znc/options.nix @@ -18,7 +18,7 @@ let }; port = mkOption { - type = types.ints.u16; + type = types.port; default = 6697; description = lib.mdDoc '' IRC server port. @@ -188,7 +188,7 @@ in port = mkOption { default = 5000; - type = types.int; + type = types.port; description = lib.mdDoc '' Specifies the port on which to listen. ''; diff --git a/nixos/modules/services/search/elasticsearch-curator.nix b/nixos/modules/services/search/elasticsearch-curator.nix index f073ec7cf2bd..0a21d705ef87 100644 --- a/nixos/modules/services/search/elasticsearch-curator.nix +++ b/nixos/modules/services/search/elasticsearch-curator.nix @@ -50,7 +50,7 @@ in { }; port = mkOption { description = lib.mdDoc "the port that elasticsearch is listening on"; - type = types.int; + type = types.port; default = 9200; }; actionYAML = mkOption { diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index 4a9dd50310e2..fa1627566ebe 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -66,7 +66,7 @@ in port = mkOption { description = lib.mdDoc "Elasticsearch port to listen for HTTP traffic."; default = 9200; - type = types.int; + type = types.port; }; tcp_port = mkOption { diff --git a/nixos/modules/services/web-apps/hedgedoc.nix b/nixos/modules/services/web-apps/hedgedoc.nix index ea27eb7ba390..a623e45691df 100644 --- a/nixos/modules/services/web-apps/hedgedoc.nix +++ b/nixos/modules/services/web-apps/hedgedoc.nix @@ -449,7 +449,7 @@ in ''; }; port = mkOption { - type = types.int; + type = types.port; default = 9000; description = lib.mdDoc '' Minio listen port. diff --git a/nixos/modules/services/web-apps/limesurvey.nix b/nixos/modules/services/web-apps/limesurvey.nix index f6a1b5595243..7093d1de0dac 100644 --- a/nixos/modules/services/web-apps/limesurvey.nix +++ b/nixos/modules/services/web-apps/limesurvey.nix @@ -49,7 +49,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = if cfg.database.type == "pgsql" then 5442 else 3306; defaultText = literalExpression "3306"; description = lib.mdDoc "Database host port."; diff --git a/nixos/modules/services/web-apps/moodle.nix b/nixos/modules/services/web-apps/moodle.nix index dc434d0fc803..5f8d9c5b15f4 100644 --- a/nixos/modules/services/web-apps/moodle.nix +++ b/nixos/modules/services/web-apps/moodle.nix @@ -96,7 +96,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; description = lib.mdDoc "Database host port."; default = { mysql = 3306; diff --git a/nixos/modules/services/web-apps/zabbix.nix b/nixos/modules/services/web-apps/zabbix.nix index 0e43922f35de..2cea7e7cea72 100644 --- a/nixos/modules/services/web-apps/zabbix.nix +++ b/nixos/modules/services/web-apps/zabbix.nix @@ -51,7 +51,7 @@ in server = { port = mkOption { - type = types.int; + type = types.port; description = lib.mdDoc "The port of the Zabbix server to connect to."; default = 10051; }; @@ -78,7 +78,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = if cfg.database.type == "mysql" then config.services.mysql.port else if cfg.database.type == "pgsql" then config.services.postgresql.port diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix index e3d4afc074cf..2bdc046c0d8f 100644 --- a/nixos/modules/services/web-servers/nginx/vhost-options.nix +++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix @@ -29,7 +29,7 @@ with lib; listen = mkOption { type = with types; listOf (submodule { options = { addr = mkOption { type = str; description = lib.mdDoc "IP address."; }; - port = mkOption { type = int; description = lib.mdDoc "Port number."; default = 80; }; + port = mkOption { type = port; description = lib.mdDoc "Port number."; default = 80; }; ssl = mkOption { type = bool; description = lib.mdDoc "Enable SSL."; default = false; }; extraParameters = mkOption { type = listOf str; description = lib.mdDoc "Extra parameters of this listen directive."; default = []; example = [ "backlog=1024" "deferred" ]; }; }; }); From 0713d3a8cc1107aa8d933b3a5b1c29017c554d67 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 8 Dec 2022 00:49:51 +0100 Subject: [PATCH 079/204] python310Packages.ruuvitag-ble: init at 0.1.1 --- .../python-modules/ruuvitag-ble/default.nix | 57 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/development/python-modules/ruuvitag-ble/default.nix diff --git a/pkgs/development/python-modules/ruuvitag-ble/default.nix b/pkgs/development/python-modules/ruuvitag-ble/default.nix new file mode 100644 index 000000000000..dd8c338fd314 --- /dev/null +++ b/pkgs/development/python-modules/ruuvitag-ble/default.nix @@ -0,0 +1,57 @@ +{ lib +, bluetooth-data-tools +, bluetooth-sensor-state-data +, buildPythonPackage +, fetchFromGitHub +, hatchling +, home-assistant-bluetooth +, pytestCheckHook +, pythonOlder +, sensor-state-data +}: + +buildPythonPackage rec { + pname = "ruuvitag-ble"; + version = "0.1.1"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "Bluetooth-Devices"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-WkPYlEkUH1xvGjBVr6JkLx5CfIPvAa9vX50OjCOmTME="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + bluetooth-data-tools + bluetooth-sensor-state-data + home-assistant-bluetooth + sensor-state-data + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=ruuvitag_ble --cov-report=term-missing:skip-covered" "" + ''; + + pythonImportsCheck = [ + "ruuvitag_ble" + ]; + + meta = with lib; { + description = "Library for Ruuvitag BLE devices"; + homepage = "https://github.com/Bluetooth-Devices/ruuvitag-ble"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1ccfa77283c6..489ffcb84fb6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9963,6 +9963,8 @@ self: super: with self; { runway-python = callPackage ../development/python-modules/runway-python { }; + ruuvitag-ble = callPackage ../development/python-modules/ruuvitag-ble { }; + ruyaml = callPackage ../development/python-modules/ruyaml { }; rx = callPackage ../development/python-modules/rx { }; From 3807ffe101e2c40b75b4e64079dbc81f6ebf52c5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 8 Dec 2022 00:53:37 +0100 Subject: [PATCH 080/204] python310Packages.knack: add changelog to meta --- pkgs/development/python-modules/knack/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/knack/default.nix b/pkgs/development/python-modules/knack/default.nix index 9f1e77efac28..a5fa8a644ce8 100644 --- a/pkgs/development/python-modules/knack/default.nix +++ b/pkgs/development/python-modules/knack/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-xXKBKCl+bSaXkQhc+Wwv/fzvWM+DxjSly5LrA7KSmDg="; + hash = "sha256-xXKBKCl+bSaXkQhc+Wwv/fzvWM+DxjSly5LrA7KSmDg="; }; propagatedBuildInputs = [ @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/microsoft/knack"; description = "A Command-Line Interface framework"; + changelog = "https://github.com/microsoft/knack/blob/v${version}/HISTORY.rst"; platforms = platforms.all; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; From c9fa130d03d1ae0c382e1bee92df5968c5e4ede4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 8 Dec 2022 00:54:52 +0100 Subject: [PATCH 081/204] python310Packages.knack: add pythonImportsCheck --- pkgs/development/python-modules/knack/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/knack/default.nix b/pkgs/development/python-modules/knack/default.nix index a5fa8a644ce8..c858dcde6619 100644 --- a/pkgs/development/python-modules/knack/default.nix +++ b/pkgs/development/python-modules/knack/default.nix @@ -11,11 +11,15 @@ , mock , vcrpy , pytest +, pythonOlder }: buildPythonPackage rec { pname = "knack"; version = "0.10.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; @@ -42,6 +46,10 @@ buildPythonPackage rec { HOME=$TMPDIR pytest . ''; + pythonImportsCheck = [ + "knack" + ]; + meta = with lib; { homepage = "https://github.com/microsoft/knack"; description = "A Command-Line Interface framework"; From 9878818a2ae8bc78b7d0d0599232481564467bc8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 8 Dec 2022 01:05:51 +0100 Subject: [PATCH 082/204] nuclei: add changelog to meta --- pkgs/tools/security/nuclei/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 3d2d909a399e..0fd684f2ef82 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -11,10 +11,10 @@ buildGoModule rec { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cAXIb8C14cpBKLpvQfJT2JbSy7Jf3SL4XyXVISoI8vE="; + hash = "sha256-cAXIb8C14cpBKLpvQfJT2JbSy7Jf3SL4XyXVISoI8vE="; }; - vendorSha256 = "sha256-qIEKGnFURtfh8CdHSbAtEaQRrsjfpvwyK+uPmYNXpiA="; + vendorHash = "sha256-qIEKGnFURtfh8CdHSbAtEaQRrsjfpvwyK+uPmYNXpiA="; modRoot = "./v2"; subPackages = [ @@ -34,6 +34,7 @@ buildGoModule rec { CVEs across targets that are known and easily detectable. ''; homepage = "https://github.com/projectdiscovery/nuclei"; + changelog = "https://github.com/projectdiscovery/nuclei/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From 7d897e855f9e0f52cb26e3f488ec28a759605a6e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 8 Dec 2022 01:07:29 +0100 Subject: [PATCH 083/204] nuclei: 2.7.9 -> 2.8.1 Diff: https://github.com/projectdiscovery/nuclei/compare/v2.7.9...v2.8.1 Changelog: https://github.com/projectdiscovery/nuclei/releases/tag/v2.8.1 --- pkgs/tools/security/nuclei/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 0fd684f2ef82..b8ffc2f6ba6e 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "2.7.9"; + version = "2.8.1"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - hash = "sha256-cAXIb8C14cpBKLpvQfJT2JbSy7Jf3SL4XyXVISoI8vE="; + hash = "sha256-4qymEc2uYLi+6YDMbW6aUbe3RgOMaj6DT+6EfK3JaKk="; }; - vendorHash = "sha256-qIEKGnFURtfh8CdHSbAtEaQRrsjfpvwyK+uPmYNXpiA="; + vendorHash = "sha256-BW3IaF8etjUklX7RpxVWQoTIXSmu+qT7xyQrPKjTbD4="; modRoot = "./v2"; subPackages = [ From 6481e1f8b08a633f4be4e948213bf6b5cceb2396 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Thu, 8 Dec 2022 01:13:51 +0100 Subject: [PATCH 084/204] awscli2: expand cryptography version pin --- pkgs/tools/admin/awscli2/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index 2b82570431e1..4431283f40d5 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -78,7 +78,8 @@ with py.pkgs; buildPythonApplication rec { --replace "colorama>=0.2.5,<0.4.4" "colorama" \ --replace "distro>=1.5.0,<1.6.0" "distro" \ --replace "docutils>=0.10,<0.16" "docutils" \ - --replace "wcwidth<0.2.0" "wcwidth" + --replace "wcwidth<0.2.0" "wcwidth" \ + --replace "cryptography>=3.3.2,<=38.0.1" "cryptography>=3.3.2,<=38.0.3" ''; postInstall = '' From 0b293963f547e87e9b30b0bda41a8b802f0e592f Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 7 Dec 2022 19:19:32 -0500 Subject: [PATCH 085/204] ruff: 0.0.168 -> 0.0.169 Diff: https://github.com/charliermarsh/ruff/compare/v0.0.168...v0.0.169 Changelog: https://github.com/charliermarsh/ruff/releases/tag/v0.0.169 --- pkgs/development/tools/ruff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 4b3068e3ec45..6bff31436ac9 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.168"; + version = "0.0.169"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fQBtFhKngoIl4I2Wa7quFZrmNBhQhSCVp5gw3LTYIio="; + sha256 = "sha256-YPVI1SaaLSqrpTu/uFTSyWbPVSDeADNVv2OfgR9K4qI="; }; - cargoSha256 = "sha256-kLdO+b04YfdMex1B5Mx+EzDD3kkx5EktCPwTVbxKZ+c="; + cargoSha256 = "sha256-bP6gn/UIv1reytd8atNdoXZxsFFJCt+axl3UiCayERo="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices From 4ee8631e032cbefadf2d7395918f38b37d607ae0 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 7 Dec 2022 19:52:21 -0500 Subject: [PATCH 086/204] hexyl: 0.11.0 -> 0.12.0, add figsoda to maintainers Diff: https://github.com/sharkdp/hexyl/compare/v0.11.0...v0.12.0 Changelog: https://github.com/sharkdp/hexyl/blob/v0.12.0/CHANGELOG.md --- pkgs/tools/misc/hexyl/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/hexyl/default.nix b/pkgs/tools/misc/hexyl/default.nix index 07c3d54d3108..c1832acb11ca 100644 --- a/pkgs/tools/misc/hexyl/default.nix +++ b/pkgs/tools/misc/hexyl/default.nix @@ -1,20 +1,19 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "hexyl"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - hash = "sha256-Y/zEJx+tUYCA/Clvwvnsy7L3whIXT7e5bgluhrOOPjM="; + hash = "sha256-vh3U4JhjlqA8i6vlOF4dhhinhD/rMWLYRx5wx5bdrGw="; }; - cargoHash = "sha256-NpEwuVz0tFkbUZQ4W+ojeD3omEXZ7YRqDmy/zLe5Z1o="; + cargoHash = "sha256-lsRwzD+4p9ijTjMLvoFxFEkvUhioUab5oVe+EZJCEwc="; meta = with lib; { - changelog = "https://github.com/sharkdp/hexyl/releases/tag/v${version}"; description = "A command-line hex viewer"; longDescription = '' `hexyl` is a simple hex viewer for the terminal. It uses a colored @@ -23,7 +22,8 @@ rustPlatform.buildRustPackage rec { characters and non-ASCII). ''; homepage = "https://github.com/sharkdp/hexyl"; + changelog = "https://github.com/sharkdp/hexyl/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ dywedir SuperSandro2000 ]; + maintainers = with maintainers; [ dywedir figsoda SuperSandro2000 ]; }; } From 876425dbed373b5b563ef01c42167d964871ede9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 5 Dec 2022 23:18:52 +0000 Subject: [PATCH 087/204] python310Packages.aiohomekit: 2.3.5 -> 2.4.1 --- pkgs/development/python-modules/aiohomekit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index a4e39cb98aa3..40d9003a7ba7 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "2.3.5"; + version = "2.4.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-rZagtP0DwYr6+eQOEaLXRnZUnhKXcWbn6wOJPAA6WVM="; + hash = "sha256-xgk42/g5mRQiTjYuUnXCfLnQm6DNIJsvMbBOhr2NncQ="; }; nativeBuildInputs = [ From 870af71b88c0ed9fa2550439eff8886cd8343f23 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 7 Dec 2022 21:35:49 +0100 Subject: [PATCH 088/204] python3Packages.aioshelly: 4.1.2 -> 5.1.0 https://github.com/home-assistant-libs/aioshelly/releases/tag/5.1.0 https://github.com/home-assistant-libs/aioshelly/releases/tag/5.0.0 https://github.com/home-assistant-libs/aioshelly/releases/tag/4.2.0 --- pkgs/development/python-modules/aioshelly/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index c4881dcdd56f..b3cb92b95fe6 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -1,14 +1,15 @@ { lib , aiohttp +, bluetooth-data-tools , buildPythonPackage , fetchFromGitHub -, netifaces +, orjson , pythonOlder }: buildPythonPackage rec { pname = "aioshelly"; - version = "4.1.2"; + version = "5.1.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -17,12 +18,13 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-0BxbcWA2Kdk1xTSKN/dH9LJc3yI60kmyMCrK77tqyNE="; + hash = "sha256-jhoPgwydB/DZx7hC16XgM0UBhmByVZRT5b7BDETA+FY="; }; propagatedBuildInputs = [ aiohttp - netifaces + bluetooth-data-tools + orjson ]; # Project has no test From 4fe16e565512fc3b00542f89f51bdba7a0d0b49e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Dec 2022 02:03:21 +0000 Subject: [PATCH 089/204] python310Packages.aioswitcher: 3.2.0 -> 3.2.1 --- pkgs/development/python-modules/aioswitcher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix index 5a671bce26ce..f38a20e8956a 100644 --- a/pkgs/development/python-modules/aioswitcher/default.nix +++ b/pkgs/development/python-modules/aioswitcher/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aioswitcher"; - version = "3.2.0"; + version = "3.2.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "TomerFi"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Vob5p0+SlZR2eHj5Br2pWp3FCxW+zgY6crh8jrkreT0="; + hash = "sha256-k3xmW8aMBz6dbWuLnd6tw2BFoTuD80fpY7q2NfYqMlw="; }; nativeBuildInputs = [ From 46b2278ecb10ef2f4cf6aabb4131fa1760272dd8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 3 Dec 2022 09:41:50 +0100 Subject: [PATCH 090/204] python310Packages.aioswitcher: add changelog to meta --- pkgs/development/python-modules/aioswitcher/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix index f38a20e8956a..4106049be0b7 100644 --- a/pkgs/development/python-modules/aioswitcher/default.nix +++ b/pkgs/development/python-modules/aioswitcher/default.nix @@ -60,6 +60,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to interact with Switcher water heater"; homepage = "https://github.com/TomerFi/aioswitcher"; + changelog = "https://github.com/TomerFi/aioswitcher/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From df151942674387affffbf34ad45c9fa894b5c506 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Dec 2022 02:04:35 +0000 Subject: [PATCH 091/204] python310Packages.aiounifi: 41 -> 42 --- pkgs/development/python-modules/aiounifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index b75b9ac31810..2ac587ddff3a 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "41"; + version = "42"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-rBluo4080m9jFnquXaQY/Cntp7wHToY16aNFhzrQJs8="; + hash = "sha256-vScAWEjdzXSy1gktz+Tfhx13S6OeXZbwZgoS6D1BBtk="; }; propagatedBuildInputs = [ From 83c479ed52e0f032d16f0e3f308fbf158873a1aa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 7 Dec 2022 21:42:05 +0100 Subject: [PATCH 092/204] python3Packages.zigpy: 0.51.6 -> 0.52.3 Diff: https://github.com/zigpy/zigpy/compare/refs/tags/0.51.6...0.52.3 Changelog: https://github.com/zigpy/zigpy/releases/tag/0.52.3 --- pkgs/development/python-modules/zigpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 9b5bd33f85e7..5fd59516d492 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.51.6"; + version = "0.52.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-keQFFWPl2SCy1cyvbqDrA9/Yude8bf0qNiyEbFjFv/o="; + hash = "sha256-axk6C8RLuoKWUdJ3sOklWqnlYTWKTaQh51eWZm2Dy+0="; }; propagatedBuildInputs = [ From c45eeaca9a776917d1c4df722d47ceb13911ed0c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 7 Dec 2022 21:42:43 +0100 Subject: [PATCH 093/204] python3Packages.zigpy-deconz: 0.19.1 -> 0.19.2 Diff: https://github.com/zigpy/zigpy-deconz/compare/refs/tags/0.19.1...0.19.2 Changelog: https://github.com/zigpy/zigpy-deconz/releases/tag/0.19.2 --- pkgs/development/python-modules/zigpy-deconz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-deconz/default.nix b/pkgs/development/python-modules/zigpy-deconz/default.nix index babfcf54c04e..5671a7c12256 100644 --- a/pkgs/development/python-modules/zigpy-deconz/default.nix +++ b/pkgs/development/python-modules/zigpy-deconz/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zigpy-deconz"; - version = "0.19.1"; + version = "0.19.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-qbzHG6qoTAm773HAoAjmmanqVtuIDR72ECQH+N+iw3o="; + hash = "sha256-Eu+6I904vwPewQesYtn8cWXoo36fQpa1Bw660tnV+Lw="; }; propagatedBuildInputs = [ From 977807cf472705d44e9273cdccbcbd1aeb0e914a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 7 Dec 2022 21:51:38 +0100 Subject: [PATCH 094/204] python3Packages.zigpy-znp: 0.9.1 -> 0.9.2 Diff: https://github.com/zigpy/zigpy-znp/compare/refs/tags/v0.9.1...v0.9.2 --- pkgs/development/python-modules/zigpy-znp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index 083805f8e7ee..b545752b4ef5 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "zigpy-znp"; - version = "0.9.1"; + version = "0.9.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-32QSFBzYg+E++5euCWKgbF3/uLEn1uObenmR/Wv9XZc="; + sha256 = "sha256-orJDOnkZH9siDg8H8M8C0UTxJfWPTB+gBNtUM6s4F94="; }; propagatedBuildInputs = [ From 2707868f59e4de0b3f2f1eec280c1d255585abda Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 7 Dec 2022 23:38:57 +0100 Subject: [PATCH 095/204] python3Packages.zha-quirks: 0.0.87 -> 0.0.88 Diff: https://github.com/zigpy/zha-device-handlers/compare/refs/tags/0.0.87...0.0.88 Changelog: https://github.com/zigpy/zha-device-handlers/releases/tag/0.0.88 --- pkgs/development/python-modules/zha-quirks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 86059d60b0cb..73ed507444b6 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.87"; + version = "0.0.88"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-MX+UWS1h2HMIhyrhtn/tzti2w9RBHptVE3klATIXvAM="; + hash = "sha256-GjKYa8wgNugGC4IZJfMLVJnlPAgBmTLd8Wwy6e4g/+U="; }; propagatedBuildInputs = [ From 3f5230c22b92041ec0f96a4c80f22c2ceef180d2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 7 Dec 2022 23:39:28 +0100 Subject: [PATCH 096/204] python3Packages.bellows: 0.34.4 -> 0.34.5 Diff: https://github.com/zigpy/bellows/compare/refs/tags/0.34.4...0.34.5 Changelog: https://github.com/zigpy/bellows/releases/tag/0.34.5 --- pkgs/development/python-modules/bellows/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index 1125e45e6282..041af30ddfd9 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.34.4"; + version = "0.34.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - hash = "sha256-JUI2jUUc2i+/6mRYNhmuAOmAS4nCzMZwyM8ug0pOFfc="; + hash = "sha256-GJG3rmJoBxDrqzsNY2r1cEywRfB4tlLn2DDsaDEI3Bo="; }; propagatedBuildInputs = [ From 6a395166ac5224a3d3b75f092b179dbf38bbd147 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 7 Dec 2022 23:47:34 +0100 Subject: [PATCH 097/204] python3Packages.mac-vendor-lookup: pick correct src version The previous commit was missing the version bump. --- pkgs/development/python-modules/mac-vendor-lookup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mac-vendor-lookup/default.nix b/pkgs/development/python-modules/mac-vendor-lookup/default.nix index 2c0a7d4f7240..d4a1be562f9e 100644 --- a/pkgs/development/python-modules/mac-vendor-lookup/default.nix +++ b/pkgs/development/python-modules/mac-vendor-lookup/default.nix @@ -13,8 +13,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bauerj"; repo = "mac_vendor_lookup"; - rev = "5b57faac0c5a701a7e18085e331853397b68c07c"; - hash = "sha256-F/aiMs+J4bAesr6mKy+tYVjAjZ3l9vyHxV7zaaB6KbA="; + rev = "90dbea48f8a9d567b5f9039ebd151ddfe7d12a19"; + hash = "sha256-mPPJDrWdyvkTdb4WfeTNYwuC+Ek9vH7ORKRTREg+vK8="; }; postPatch = '' From 9c57e0b5b3978edd7152d35b3b3f5a800422fbe9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 7 Dec 2022 23:48:57 +0100 Subject: [PATCH 098/204] python3Package.bluetooth-adapters: 0.8.0 -> 0.12.0 https://github.com/Bluetooth-Devices/bluetooth-adapters/releases/tag/v0.12.0 https://github.com/Bluetooth-Devices/bluetooth-adapters/releases/tag/v0.11.0 https://github.com/Bluetooth-Devices/bluetooth-adapters/releases/tag/v0.10.1 https://github.com/Bluetooth-Devices/bluetooth-adapters/releases/tag/v0.10.0 https://github.com/Bluetooth-Devices/bluetooth-adapters/releases/tag/v0.9.0 --- .../python-modules/bluetooth-adapters/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bluetooth-adapters/default.nix b/pkgs/development/python-modules/bluetooth-adapters/default.nix index b696b6b9369e..6e750422120f 100644 --- a/pkgs/development/python-modules/bluetooth-adapters/default.nix +++ b/pkgs/development/python-modules/bluetooth-adapters/default.nix @@ -3,18 +3,21 @@ , pythonOlder , fetchFromGitHub , poetry-core +, aiohttp , async-timeout , bleak , dbus-fast +, mac-vendor-lookup , myst-parser , pytestCheckHook , sphinxHook , sphinx-rtd-theme +, usb-devices }: buildPythonPackage rec { pname = "bluetooth-adapters"; - version = "0.8.0"; + version = "0.12.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +26,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-K5EeDcGcjrZYQTbuYAzT7XhcAqpYW1w/jP5T0cOPsVU="; + hash = "sha256-meBCjWKAIN6sNrBp/Riptu9igvVwIPf0G2x+Z3Kqkts="; }; postPatch = '' @@ -44,9 +47,12 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + aiohttp async-timeout bleak dbus-fast + mac-vendor-lookup + usb-devices ]; pythonImportsCheck = [ From 64a7798f23c60ed6a97ec5bb89f26b814693ce4f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 7 Dec 2022 23:52:57 +0100 Subject: [PATCH 099/204] python3Packages.bluetooth-auto-recovery: 0.5.1 -> 0.5.4 Diff: https://github.com/Bluetooth-Devices/bluetooth-auto-recovery/compare/refs/tags/v0.5.1...v0.5.4 Changelog: https://github.com/Bluetooth-Devices/bluetooth-auto-recovery/blob/v0.5.4/CHANGELOG.md --- .../python-modules/bluetooth-auto-recovery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix index a4353a19204f..3a673c9c264b 100644 --- a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix +++ b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "bluetooth-auto-recovery"; - version = "0.5.1"; + version = "0.5.4"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-LvLav3OCud1EZe3JXvjbuuKU9xtd6ywrx6pZLLP0N/A="; + hash = "sha256-C3CO4nqKVTjD07QturJNeg0GLx2N9cbsBatXcehJLRs="; }; nativeBuildInputs = [ From fa4f8b6b8736fd5aff318729b82b23f127424ff7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 7 Dec 2022 23:53:38 +0100 Subject: [PATCH 100/204] python3Packages.hass-nabucasa: 0.56.0 -> 0.61.0 Diff: https://github.com/nabucasa/hass-nabucasa/compare/0.56.0...0.61.0 --- pkgs/development/python-modules/hass-nabucasa/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index a1c07368c0de..375e975d969a 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -15,19 +15,18 @@ buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.56.0"; + version = "0.61.0"; src = fetchFromGitHub { owner = "nabucasa"; repo = pname; rev = version; - sha256 = "sha256-IgDOugHr4fCD9o3QQY5w/ibjak/d56R31KgQAbjUkkI="; + sha256 = "sha256-KG2eCwGZWVtepJQdsSwFziWsT1AbV6rYWRIO/I/CR8g="; }; postPatch = '' substituteInPlace setup.py \ --replace "acme==" "acme>=" \ - --replace "cryptography>=2.8,<38.0" "cryptography" \ --replace "pycognito==" "pycognito>=" \ --replace "snitun==" "snitun>=" \ ''; From 294b532b4435434171d3ba3010272e2bae640e56 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 7 Dec 2022 23:55:21 +0100 Subject: [PATCH 101/204] python3Packages.nettigo-air-monitor: 1.4.2 -> 1.5.0 https://github.com/bieniu/nettigo-air-monitor/releases/tag/1.5.0 --- .../python-modules/nettigo-air-monitor/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix index 3ae81a4afed6..de424d8afdf9 100644 --- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -5,6 +5,7 @@ , dacite , fetchFromGitHub , aqipy-atmotech +, orjson , pytest-asyncio , pytest-error-for-skips , pytestCheckHook @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "nettigo-air-monitor"; - version = "1.4.2"; + version = "1.5.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,13 +23,14 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = version; - hash = "sha256-UbknJ+dX+4kzfe6/gg/Nj1Ay8YXtIRj203B6NkhGVys="; + hash = "sha256-84cd869k+JZZpjBBoHH2AyIo8ixJzVgpLLRBV4cMNKA="; }; propagatedBuildInputs = [ aiohttp - dacite aqipy-atmotech + dacite + orjson ]; checkInputs = [ From 56d645ed24cfd1727e000d7450c4347db39fae7e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 7 Dec 2022 23:56:20 +0100 Subject: [PATCH 102/204] python3Packages.nextdns: 1.1.1 -> 1.2.2 https://github.com/bieniu/nextdns/releases/tag/1.2.2 https://github.com/bieniu/nextdns/releases/tag/1.2.1 https://github.com/bieniu/nextdns/releases/tag/1.2.0 --- pkgs/development/python-modules/nextdns/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nextdns/default.nix b/pkgs/development/python-modules/nextdns/default.nix index a0aac69df9e1..41b22ee21703 100644 --- a/pkgs/development/python-modules/nextdns/default.nix +++ b/pkgs/development/python-modules/nextdns/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "nextdns"; - version = "1.1.1"; + version = "1.2.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-hMTafmG3mk6jyrqxI7L/rQxKGpgNgEZ+b6d6/yISCng="; + hash = "sha256-F6vTOwE8WdcELH+W7VuRbGDLD+7+a09iai/TDMBfv4s="; }; propagatedBuildInputs = [ @@ -41,6 +41,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/bieniu/nextdns/releases/tag/${version}"; description = "Module for the NextDNS API"; homepage = "https://github.com/bieniu/nextdns"; license = licenses.asl20; From adffebab3298b80230f4ba34203562616bb6e17b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Dec 2022 00:04:04 +0100 Subject: [PATCH 103/204] python3Packages.pyrainbird: 0.6.2 -> 0.6.3 Diff: https://github.com/jbarrancos/pyrainbird/compare/0.6.2...0.6.3 --- pkgs/development/python-modules/pyrainbird/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyrainbird/default.nix b/pkgs/development/python-modules/pyrainbird/default.nix index 5035f7c1a369..5461dc44523a 100644 --- a/pkgs/development/python-modules/pyrainbird/default.nix +++ b/pkgs/development/python-modules/pyrainbird/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyrainbird"; - version = "0.6.2"; + version = "0.6.3"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -22,12 +22,15 @@ buildPythonPackage rec { owner = "jbarrancos"; repo = pname; rev = version; - hash = "sha256-MikJDW5Fo2DNpn9/Hyc1ecIIMEwE8GD5LKpka2t7aCk="; + hash = "sha256-yGUBCs1IxbGKBo21gExFIqDawM2EHlO+jiRqonEUnPk="; }; postPatch = '' substituteInPlace pytest.ini \ --replace "--cov=pyrainbird --cov-report=term-missing" "" + + substituteInPlace setup.cfg \ + --replace "pycryptodome>=3.16.0" "pycryptodome" ''; propagatedBuildInputs = [ From f8f4b61b67fab19c6a40f9733ba7487f7b246f1a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Dec 2022 00:04:22 +0100 Subject: [PATCH 104/204] python3Packages.pytibber: 0.26.3 -> 0.26.4 Diff: https://github.com/Danielhiversen/pyTibber/compare/refs/tags/0.26.3...0.26.4 Changelog: https://github.com/Danielhiversen/pyTibber/releases/tag/0.26.4 --- pkgs/development/python-modules/pytibber/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix index 2f7614e5bb57..a4047483eb63 100644 --- a/pkgs/development/python-modules/pytibber/default.nix +++ b/pkgs/development/python-modules/pytibber/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pytibber"; - version = "0.26.3"; + version = "0.26.4"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyTibber"; rev = "refs/tags/${version}"; - hash = "sha256-4yDV6tH1XSWZfcjCJ/3r4hl1n4Sbgc3x7YPE6GOfA3Y="; + hash = "sha256-R++vsJ2CJwPxG/32qam/LRj7GUj3obh9z20xXNMAnQ4="; }; propagatedBuildInputs = [ From 2d93eec21b1a0593eb282e17dc8c094b8793e6ee Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Dec 2022 00:05:38 +0100 Subject: [PATCH 105/204] python3Packages.pyunifiprotect: 4.5.1 -> 4.5.2 Diff: https://github.com/briis/pyunifiprotect/compare/refs/tags/v4.5.1...v4.5.2 Changelog: https://github.com/AngellusMortis/pyunifiprotect/releases/tag/v4.5.2 --- pkgs/development/python-modules/pyunifiprotect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix index af7c4b1cc52a..9cf53fb9e210 100644 --- a/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "pyunifiprotect"; - version = "4.5.1"; + version = "4.5.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "briis"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7LgAK0AzQ7uoVW7fXwoU512iI5LG0BL8N0R9f7AjFN4="; + hash = "sha256-xYDt/vvzI7qIK/8XE6mhcI5GPDKyHRj73Lagn0QOOz0="; }; postPatch = '' From 0843740e4e69d42b5ae731bb92fed096e66f9d27 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Dec 2022 00:05:52 +0100 Subject: [PATCH 106/204] python3Packages.pyvesync: 2.0.4 -> 2.1.1 --- pkgs/development/python-modules/pyvesync/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvesync/default.nix b/pkgs/development/python-modules/pyvesync/default.nix index 19d8fee57ef4..58cb26d1e9bb 100644 --- a/pkgs/development/python-modules/pyvesync/default.nix +++ b/pkgs/development/python-modules/pyvesync/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyvesync"; - version = "2.0.4"; + version = "2.1.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1Svz/9ZS5ynr88/We1fa+H1IGdC5ljUa4M5O8X+muX4="; + sha256 = "sha256-ulYOzCIpHkL/2nQExomoV4mLkU6e0ns4MHxEbjCPGrQ="; }; propagatedBuildInputs = [ From f34cfe42a3fb510d6fc966947806c39bd35ee2b5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Dec 2022 00:08:06 +0100 Subject: [PATCH 107/204] python3Packages.sense-energy: 0.10.4 -> 0.11.0 https://github.com/scottbonline/sense/releases/tag/0.11.0 --- pkgs/development/python-modules/sense-energy/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sense-energy/default.nix b/pkgs/development/python-modules/sense-energy/default.nix index b3f2d6955709..22e7b4897e0a 100644 --- a/pkgs/development/python-modules/sense-energy/default.nix +++ b/pkgs/development/python-modules/sense-energy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sense-energy"; - version = "0.10.4"; + version = "0.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,9 +19,13 @@ buildPythonPackage rec { owner = "scottbonline"; repo = "sense"; rev = version; - hash = "sha256-yflI17lLZMXXB0ye+jz3VWWMdZtcBTwbg8deA4ENmWw="; + hash = "sha256-QX8CPf3o0IaAhjWYeUjDoAgktNrh/sSRjFhOweAxxco="; }; + postPatch = '' + sed -i '/download_url/d' setup.py + ''; + propagatedBuildInputs = [ aiohttp requests From ca02a0e26546665f2e58b9a2c0b64f5b197d3bc3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Dec 2022 00:10:18 +0100 Subject: [PATCH 108/204] python3Packages.subarulink: 0.6.1 -> 0.7.0 https://github.com/G-Two/subarulink/releases/tag/v0.7.0 --- pkgs/development/python-modules/subarulink/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix index bf975f5e8483..9da63e59a4bf 100644 --- a/pkgs/development/python-modules/subarulink/default.nix +++ b/pkgs/development/python-modules/subarulink/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "subarulink"; - version = "0.6.1"; + version = "0.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "G-Two"; repo = pname; - rev = "v${version}"; - hash = "sha256-esZ+nIHIXKfilb8dBFbAbQQFI6fFRUcoFVCPdnqGXYw="; + rev = "refs/tags/v${version}"; + hash = "sha256-BxnpdZwbnZF1oWcu3jRDeXvcaweOuVk1R79KpMLB02c="; }; propagatedBuildInputs = [ From 470cadf538ba7863cd28cde502bb600f1624f56c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Dec 2022 00:15:32 +0100 Subject: [PATCH 109/204] python3Packages.xiaomi-ble: 0.11.0 -> 0.12.2 Diff: https://github.com/Bluetooth-Devices/xiaomi-ble/compare/v0.11.0...v0.12.2 --- pkgs/development/python-modules/xiaomi-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xiaomi-ble/default.nix b/pkgs/development/python-modules/xiaomi-ble/default.nix index 676afd2a44dd..ff2e61c1a01d 100644 --- a/pkgs/development/python-modules/xiaomi-ble/default.nix +++ b/pkgs/development/python-modules/xiaomi-ble/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "xiaomi-ble"; - version = "0.11.0"; + version = "0.12.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-qAqXg+skA7FfAjRXljt1UpyOcC3KYghc+5wjiRzlyyg="; + hash = "sha256-MwKhoerfloFT5/x1darfMP/qF5sEy6LiKEogINIUq0c="; }; nativeBuildInputs = [ From f960451ba901fe5842b177f27776070481645e88 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Dec 2022 00:16:25 +0100 Subject: [PATCH 110/204] python3Packages.xknx: 1.2.1 -> 2.1.0 Diff: https://github.com/XKNX/xknx/compare/refs/tags/1.2.1...2.1.0 Changelog: https://github.com/XKNX/xknx/releases/tag/2.1.0 --- pkgs/development/python-modules/xknx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index 7b22508e2a20..2f3a3768331f 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xknx"; - version = "1.2.1"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-5uRPMu9qZ0ofMdgk8d1IpKjHjnEP+zhWs+EDQx9wk6U="; + hash = "sha256-a8hC63G+FZBe6yePgrmzRsRTzpHWS+tBQmVUS/uHfzI="; }; propagatedBuildInputs = [ From 8e7a408d6df218df2f710afd4cfe527153973aca Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Dec 2022 00:16:56 +0100 Subject: [PATCH 111/204] python3Packages.zwave-js-server-python: 0.43.0 -> 0.43.1 Diff: https://github.com/home-assistant-libs/zwave-js-server-python/compare/refs/tags/0.43.0...0.43.1 --- .../python-modules/zwave-js-server-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix index dcbeca33f827..42aaaa4d13e1 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.43.0"; + version = "0.43.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-qzAM3vcVySJB6OfOHKXYYXDR+xOSbGpyH7b9TaYkOLM="; + hash = "sha256-qnGMUY7c2jqLQbVybVdu9vWcPMFoxCnCCTBhWP+AXE0="; }; propagatedBuildInputs = [ From e6bbed1cc5d88fd26566dcd82e319bcee236e65b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Dec 2022 00:19:11 +0100 Subject: [PATCH 112/204] python3Packages.bleak-retry-connector: 2.9.0 -> 2.10.1 Diff: https://github.com/Bluetooth-Devices/bleak-retry-connector/compare/refs/tags/v2.9.0...v2.10.1 --- .../python-modules/bleak-retry-connector/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bleak-retry-connector/default.nix b/pkgs/development/python-modules/bleak-retry-connector/default.nix index b040ef83d9d9..6961a9c93221 100644 --- a/pkgs/development/python-modules/bleak-retry-connector/default.nix +++ b/pkgs/development/python-modules/bleak-retry-connector/default.nix @@ -1,6 +1,7 @@ { lib , async-timeout , bleak +, bluetooth-adapters , dbus-fast , buildPythonPackage , fetchFromGitHub @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "bleak-retry-connector"; - version = "2.9.0"; + version = "2.10.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-U9Urxu7BdTTecONcb2d6jg9oE6fmdNMEVSayLNQiyvY="; + hash = "sha256-QAQQ53T3MTNNaK0rzsBb2F1/qMvMHtr6/+3k1CAKXi0="; }; postPatch = '' @@ -36,6 +37,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ async-timeout bleak + bluetooth-adapters dbus-fast ]; From 211d1a964ec278f6f4bf25ac2268fdcb528184f4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Dec 2022 00:22:41 +0100 Subject: [PATCH 113/204] home-assistant: 2022.11.5 -> 2022.12.0 https://www.home-assistant.io/blog/2022/12/07/release-202212/ --- .../home-assistant/component-packages.nix | 369 ++++++++++++++++-- pkgs/servers/home-assistant/default.nix | 80 +--- pkgs/servers/home-assistant/frontend.nix | 4 +- pkgs/servers/home-assistant/tests.nix | 8 +- 4 files changed, 357 insertions(+), 104 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index a4b2f5c14cdd..8f635e6d0666 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.11.5"; + version = "2022.12.0"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -50,6 +50,9 @@ "airnow" = ps: with ps; [ pyairnow ]; + "airq" = ps: with ps; [ + aioairq + ]; "airthings" = ps: with ps; [ airthings-cloud ]; @@ -60,9 +63,11 @@ bleak bluetooth-adapters bluetooth-auto-recovery + bluetooth-data-tools dbus-fast fnvhash home-assistant-frontend + janus pillow pyserial pyudev @@ -151,12 +156,16 @@ ]; "apple_tv" = ps: with ps; [ aiohttp-cors + fnvhash ifaddr pyatv + sqlalchemy zeroconf ]; "application_credentials" = ps: with ps; [ aiohttp-cors + fnvhash + sqlalchemy ]; "apprise" = ps: with ps; [ apprise @@ -170,6 +179,22 @@ ]; "aquostv" = ps: with ps; [ ]; # missing inputs: sharp_aquos_rc + "aranet" = ps: with ps; [ + aiohttp-cors + bleak-retry-connector + bleak + bluetooth-adapters + bluetooth-auto-recovery + bluetooth-data-tools + dbus-fast + fnvhash + home-assistant-frontend + janus + pillow + pyserial + pyudev + sqlalchemy + ]; # missing inputs: aranet4 "arcam_fmj" = ps: with ps; [ arcam-fmj ]; @@ -183,6 +208,7 @@ ]; "arwn" = ps: with ps; [ aiohttp-cors + janus paho-mqtt ]; "aseko_pool_live" = ps: with ps; [ @@ -207,20 +233,8 @@ pyatome ]; "august" = ps: with ps; [ - aiohttp-cors - bleak-retry-connector - bleak - bluetooth-adapters - bluetooth-auto-recovery - dbus-fast - fnvhash - home-assistant-frontend - pillow - pyserial - pyudev - sqlalchemy - yalexs-ble yalexs + yalexs-ble ]; "august_ble" = ps: with ps; [ ]; @@ -254,6 +268,7 @@ "axis" = ps: with ps; [ aiohttp-cors axis + janus paho-mqtt ]; "azure_devops" = ps: with ps; [ @@ -267,7 +282,9 @@ ]; "backup" = ps: with ps; [ aiohttp-cors + fnvhash securetar + sqlalchemy ]; "baf" = ps: with ps; [ ]; # missing inputs: aiobafi6 @@ -317,9 +334,11 @@ bluemaestro-ble bluetooth-adapters bluetooth-auto-recovery + bluetooth-data-tools dbus-fast fnvhash home-assistant-frontend + janus pillow pyserial pyudev @@ -336,9 +355,11 @@ bleak bluetooth-adapters bluetooth-auto-recovery + bluetooth-data-tools dbus-fast fnvhash home-assistant-frontend + janus pillow pyserial pyudev @@ -350,9 +371,11 @@ bleak bluetooth-adapters bluetooth-auto-recovery + bluetooth-data-tools dbus-fast fnvhash home-assistant-frontend + janus pillow pyserial pyudev @@ -371,9 +394,13 @@ "bosch_shc" = ps: with ps; [ aiohttp-cors boschshcpy + fnvhash ifaddr + sqlalchemy zeroconf ]; + "brandt" = ps: with ps; [ + ]; "braviatv" = ps: with ps; [ pybravia ]; @@ -408,10 +435,12 @@ bleak bluetooth-adapters bluetooth-auto-recovery + bluetooth-data-tools bthome-ble dbus-fast fnvhash home-assistant-frontend + janus pillow pyserial pyudev @@ -443,6 +472,7 @@ "cast" = ps: with ps; [ pyturbojpeg aiohttp-cors + fnvhash hass-nabucasa ifaddr mutagen @@ -450,6 +480,7 @@ plexauth plexwebsocket PyChromecast + sqlalchemy zeroconf ]; "cert_expiry" = ps: with ps; [ @@ -544,8 +575,10 @@ crownstone-cloud crownstone-sse crownstone-uart + fnvhash pyserial pyudev + sqlalchemy ]; "cups" = ps: with ps; [ pycups @@ -589,11 +622,13 @@ bleak bluetooth-adapters bluetooth-auto-recovery + bluetooth-data-tools dbus-fast fnvhash hass-nabucasa home-assistant-frontend ifaddr + janus pillow psutil-home-assistant pyserial @@ -634,7 +669,9 @@ "devolo_home_control" = ps: with ps; [ aiohttp-cors devolo-home-control-api + fnvhash ifaddr + sqlalchemy zeroconf ]; "devolo_home_network" = ps: with ps; [ @@ -671,8 +708,10 @@ ]; "discovery" = ps: with ps; [ aiohttp-cors + fnvhash ifaddr netdisco + sqlalchemy zeroconf ]; "dlib_face_detect" = ps: with ps; [ @@ -686,13 +725,17 @@ "dlna_dmr" = ps: with ps; [ aiohttp-cors async-upnp-client + fnvhash ifaddr + sqlalchemy zeroconf ]; "dlna_dms" = ps: with ps; [ aiohttp-cors async-upnp-client + fnvhash ifaddr + sqlalchemy zeroconf ]; "dnsip" = ps: with ps; [ @@ -720,6 +763,7 @@ ]; "dsmr_reader" = ps: with ps; [ aiohttp-cors + janus paho-mqtt ]; "dte_energy_bridge" = ps: with ps; [ @@ -788,7 +832,9 @@ "elkm1" = ps: with ps; [ aiohttp-cors elkm1-lib + fnvhash ifaddr + sqlalchemy ]; "elmax" = ps: with ps; [ elmax-api @@ -808,7 +854,9 @@ ]; "emulated_hue" = ps: with ps; [ aiohttp-cors + fnvhash ifaddr + sqlalchemy ]; "emulated_kasa" = ps: with ps; [ sense-energy @@ -816,7 +864,9 @@ "emulated_roku" = ps: with ps; [ aiohttp-cors emulated-roku + fnvhash ifaddr + sqlalchemy ]; "energy" = ps: with ps; [ aiohttp-cors @@ -855,10 +905,12 @@ bleak bluetooth-adapters bluetooth-auto-recovery + bluetooth-data-tools construct dbus-fast fnvhash home-assistant-frontend + janus pillow pyserial pyudev @@ -874,10 +926,12 @@ bleak bluetooth-adapters bluetooth-auto-recovery + bluetooth-data-tools dbus-fast fnvhash home-assistant-frontend ifaddr + janus pillow pyserial pyudev @@ -940,6 +994,7 @@ ]; "file_upload" = ps: with ps; [ aiohttp-cors + janus ]; "filesize" = ps: with ps; [ ]; @@ -972,10 +1027,12 @@ bleak bluetooth-adapters bluetooth-auto-recovery + bluetooth-data-tools dbus-fast fjaraskupan fnvhash home-assistant-frontend + janus pillow pyserial pyudev @@ -1011,7 +1068,9 @@ "flux_led" = ps: with ps; [ aiohttp-cors flux-led + fnvhash ifaddr + sqlalchemy ]; "folder" = ps: with ps; [ ]; @@ -1026,7 +1085,9 @@ ]; "forked_daapd" = ps: with ps; [ aiohttp-cors + fnvhash spotipy + sqlalchemy ]; # missing inputs: pyforked-daapd pylibrespot-java "fortios" = ps: with ps; [ fortiosapi @@ -1049,8 +1110,10 @@ ]; "fritz" = ps: with ps; [ aiohttp-cors + fnvhash fritzconnection ifaddr + sqlalchemy xmltodict ]; "fritzbox" = ps: with ps; [ @@ -1066,6 +1129,7 @@ aiohttp-cors fnvhash home-assistant-frontend + janus pillow sqlalchemy ]; @@ -1114,7 +1178,9 @@ ]; "geocaching" = ps: with ps; [ aiohttp-cors + fnvhash geocachingapi + sqlalchemy ]; "geofency" = ps: with ps; [ aiohttp-cors @@ -1152,8 +1218,10 @@ ]; "google" = ps: with ps; [ aiohttp-cors + fnvhash gcal-sync oauth2client + sqlalchemy ]; "google_assistant" = ps: with ps; [ pyturbojpeg @@ -1172,7 +1240,9 @@ ]; "google_sheets" = ps: with ps; [ aiohttp-cors + fnvhash gspread + sqlalchemy ]; "google_translate" = ps: with ps; [ gtts @@ -1188,10 +1258,12 @@ bleak bluetooth-adapters bluetooth-auto-recovery + bluetooth-data-tools dbus-fast fnvhash govee-ble home-assistant-frontend + janus pillow pyserial pyudev @@ -1207,8 +1279,10 @@ ]; "gree" = ps: with ps; [ aiohttp-cors + fnvhash greeclimate ifaddr + sqlalchemy ]; "greeneye_monitor" = ps: with ps; [ greeneye-monitor @@ -1231,13 +1305,11 @@ "habitica" = ps: with ps; [ habitipy ]; - "hangouts" = ps: with ps; [ - hangups - ]; "hardkernel" = ps: with ps; [ aiohttp-cors fnvhash home-assistant-frontend + janus pillow psutil-home-assistant sqlalchemy @@ -1255,6 +1327,7 @@ aiohttp-cors fnvhash home-assistant-frontend + janus pillow sqlalchemy ]; @@ -1275,7 +1348,8 @@ pyheos ]; "here_travel_time" = ps: with ps; [ - herepy + ]; # missing inputs: here_routing here_transit + "hexaom" = ps: with ps; [ ]; "hi_kumo" = ps: with ps; [ ]; @@ -1306,7 +1380,9 @@ ]; "home_connect" = ps: with ps; [ aiohttp-cors + fnvhash homeconnect + sqlalchemy ]; "home_plus_control" = ps: with ps; [ aiohttp-cors @@ -1316,19 +1392,67 @@ ]; "homeassistant_alerts" = ps: with ps; [ ]; - "homeassistant_sky_connect" = ps: with ps; [ + "homeassistant_hardware" = ps: with ps; [ aiohttp-cors - psutil-home-assistant + bellows + fnvhash + home-assistant-frontend + ifaddr + janus + pillow + pyserial-asyncio pyserial pyudev + sqlalchemy + zeroconf + zha-quirks + zigpy-deconz + zigpy-xbee + zigpy-zigate + zigpy-znp + zigpy + ]; + "homeassistant_sky_connect" = ps: with ps; [ + aiohttp-cors + bellows + fnvhash + home-assistant-frontend + ifaddr + janus + pillow + psutil-home-assistant + pyserial-asyncio + pyserial + pyudev + sqlalchemy + zeroconf + zha-quirks + zigpy-deconz + zigpy-xbee + zigpy-zigate + zigpy-znp + zigpy ]; "homeassistant_yellow" = ps: with ps; [ aiohttp-cors + bellows fnvhash home-assistant-frontend + ifaddr + janus pillow psutil-home-assistant + pyserial-asyncio + pyserial + pyudev sqlalchemy + zeroconf + zha-quirks + zigpy-deconz + zigpy-xbee + zigpy-zigate + zigpy-znp + zigpy ]; "homekit" = ps: with ps; [ pyqrcode @@ -1339,6 +1463,7 @@ hap-python ha-ffmpeg ifaddr + sqlalchemy zeroconf ]; "homekit_controller" = ps: with ps; [ @@ -1348,10 +1473,12 @@ bleak bluetooth-adapters bluetooth-auto-recovery + bluetooth-data-tools dbus-fast fnvhash home-assistant-frontend ifaddr + janus pillow pyserial pyudev @@ -1427,10 +1554,12 @@ bleak bluetooth-adapters bluetooth-auto-recovery + bluetooth-data-tools dbus-fast fnvhash home-assistant-frontend ibeacon-ble + janus pillow pyserial pyudev @@ -1479,10 +1608,12 @@ bleak bluetooth-adapters bluetooth-auto-recovery + bluetooth-data-tools dbus-fast fnvhash home-assistant-frontend inkbird-ble + janus pillow pyserial pyudev @@ -1507,6 +1638,7 @@ fnvhash home-assistant-frontend insteon-frontend-home-assistant + janus pillow pyinsteon pyserial @@ -1528,7 +1660,9 @@ ]; "ios" = ps: with ps; [ aiohttp-cors + fnvhash ifaddr + sqlalchemy zeroconf ]; "iotawatt" = ps: with ps; [ @@ -1600,9 +1734,11 @@ bleak bluetooth-adapters bluetooth-auto-recovery + bluetooth-data-tools dbus-fast fnvhash home-assistant-frontend + janus kegtron-ble pillow pyserial @@ -1622,9 +1758,11 @@ bleak bluetooth-adapters bluetooth-auto-recovery + bluetooth-data-tools dbus-fast fnvhash home-assistant-frontend + janus pillow pyserial pyudev @@ -1669,8 +1807,15 @@ "lametric" = ps: with ps; [ aiohttp-cors demetriek + fnvhash + sqlalchemy ]; "landisgyr_heat_meter" = ps: with ps; [ + aiohttp-cors + fnvhash + pyserial + pyudev + sqlalchemy ultraheat-api ]; "lannouncer" = ps: with ps; [ @@ -1693,9 +1838,11 @@ bleak bluetooth-adapters bluetooth-auto-recovery + bluetooth-data-tools dbus-fast fnvhash home-assistant-frontend + janus led-ble pillow pyserial @@ -1721,7 +1868,9 @@ aiolifx aiolifx-effects aiolifx-themes + fnvhash ifaddr + sqlalchemy ]; "lifx_cloud" = ps: with ps; [ ]; @@ -1748,13 +1897,20 @@ "litterrobot" = ps: with ps; [ pylitterbot ]; + "livisi" = ps: with ps; [ + ]; # missing inputs: aiolivisi "llamalab_automate" = ps: with ps; [ ]; + "local_calendar" = ps: with ps; [ + ical + ]; "local_file" = ps: with ps; [ ]; "local_ip" = ps: with ps; [ aiohttp-cors + fnvhash ifaddr + sqlalchemy ]; "locative" = ps: with ps; [ aiohttp-cors @@ -1765,6 +1921,7 @@ aiohttp-cors fnvhash home-assistant-frontend + janus pillow sqlalchemy ]; @@ -1808,6 +1965,8 @@ "lyric" = ps: with ps; [ aiohttp-cors aiolyric + fnvhash + sqlalchemy ]; "magicseaweed" = ps: with ps; [ ]; # missing inputs: magicseaweed @@ -1822,12 +1981,14 @@ ]; "manual_mqtt" = ps: with ps; [ aiohttp-cors + janus paho-mqtt ]; "map" = ps: with ps; [ aiohttp-cors fnvhash home-assistant-frontend + janus pillow sqlalchemy ]; @@ -1843,6 +2004,11 @@ "matrix" = ps: with ps; [ matrix-client ]; + "matter" = ps: with ps; [ + aiohttp-cors + fnvhash + sqlalchemy + ]; # missing inputs: python-matter-server "maxcube" = ps: with ps; [ maxcube-api ]; @@ -1876,9 +2042,11 @@ bleak bluetooth-adapters bluetooth-auto-recovery + bluetooth-data-tools dbus-fast fnvhash home-assistant-frontend + janus pillow pyserial pyudev @@ -1953,9 +2121,11 @@ bleak bluetooth-adapters bluetooth-auto-recovery + bluetooth-data-tools dbus-fast fnvhash home-assistant-frontend + janus moat-ble pillow pyserial @@ -1966,8 +2136,10 @@ pynacl pyturbojpeg aiohttp-cors + fnvhash hass-nabucasa pillow + sqlalchemy ]; "mochad" = ps: with ps; [ ]; # missing inputs: pymochad @@ -1976,9 +2148,11 @@ ]; "modem_callerid" = ps: with ps; [ aiohttp-cors + fnvhash phone-modem pyserial pyudev + sqlalchemy ]; "modern_forms" = ps: with ps; [ aiomodernforms @@ -1993,8 +2167,10 @@ ]; "motion_blinds" = ps: with ps; [ aiohttp-cors + fnvhash ifaddr motionblinds + sqlalchemy ]; "motioneye" = ps: with ps; [ aiohttp-cors @@ -2005,22 +2181,27 @@ ]; "mqtt" = ps: with ps; [ aiohttp-cors + janus paho-mqtt ]; "mqtt_eventstream" = ps: with ps; [ aiohttp-cors + janus paho-mqtt ]; "mqtt_json" = ps: with ps; [ aiohttp-cors + janus paho-mqtt ]; "mqtt_room" = ps: with ps; [ aiohttp-cors + janus paho-mqtt ]; "mqtt_statestream" = ps: with ps; [ aiohttp-cors + janus paho-mqtt ]; "msteams" = ps: with ps; [ @@ -2039,6 +2220,7 @@ aiohttp-cors fnvhash home-assistant-frontend + janus pillow sqlalchemy ]; @@ -2049,6 +2231,7 @@ ]; "mysensors" = ps: with ps; [ aiohttp-cors + janus paho-mqtt pymysensors ]; @@ -2073,7 +2256,9 @@ ]; "neato" = ps: with ps; [ aiohttp-cors + fnvhash pybotvac + sqlalchemy ]; "nederlandse_spoorwegen" = ps: with ps; [ nsapi @@ -2083,15 +2268,19 @@ ]; "nest" = ps: with ps; [ aiohttp-cors + fnvhash google-nest-sdm ha-ffmpeg python-nest + sqlalchemy ]; "netatmo" = ps: with ps; [ pyturbojpeg aiohttp-cors + fnvhash hass-nabucasa pyatmo + sqlalchemy ]; "netdata" = ps: with ps; [ netdata @@ -2107,7 +2296,9 @@ ]; # missing inputs: pynetio "network" = ps: with ps; [ aiohttp-cors + fnvhash ifaddr + sqlalchemy ]; "neurio_energy" = ps: with ps; [ ]; # missing inputs: neurio @@ -2129,7 +2320,6 @@ ]; # missing inputs: notifications-android-tv "nibe_heatpump" = ps: with ps; [ nibe - tenacity ]; "nightscout" = ps: with ps; [ py-nightscout @@ -2148,10 +2338,12 @@ ]; "nmap_tracker" = ps: with ps; [ aiohttp-cors + fnvhash getmac ifaddr mac-vendor-lookup netmap + sqlalchemy ]; "nmbs" = ps: with ps; [ ]; # missing inputs: pyrail @@ -2225,6 +2417,7 @@ aiohttp-cors fnvhash home-assistant-frontend + janus pillow sqlalchemy ]; @@ -2299,9 +2492,11 @@ bleak bluetooth-adapters bluetooth-auto-recovery + bluetooth-data-tools dbus-fast fnvhash home-assistant-frontend + janus oralb-ble pillow pyserial @@ -2329,6 +2524,7 @@ pyturbojpeg aiohttp-cors hass-nabucasa + janus paho-mqtt ]; "p1_monitor" = ps: with ps; [ @@ -2347,6 +2543,7 @@ aiohttp-cors fnvhash home-assistant-frontend + janus pillow sqlalchemy ]; @@ -2354,6 +2551,7 @@ aiohttp-cors fnvhash home-assistant-frontend + janus pillow sqlalchemy ]; @@ -2492,9 +2690,11 @@ bleak bluetooth-adapters bluetooth-auto-recovery + bluetooth-data-tools dbus-fast fnvhash home-assistant-frontend + janus pillow pyserial pyudev @@ -2556,6 +2756,7 @@ aiohttp-cors fnvhash home-assistant-frontend + janus pillow psutil-home-assistant sqlalchemy @@ -2674,6 +2875,22 @@ ]; # missing inputs: russound_rio "russound_rnet" = ps: with ps; [ ]; # missing inputs: russound + "ruuvitag_ble" = ps: with ps; [ + aiohttp-cors + bleak-retry-connector + bleak + bluetooth-adapters + bluetooth-auto-recovery + bluetooth-data-tools + dbus-fast + fnvhash + home-assistant-frontend + janus + pillow + pyserial + pyudev + sqlalchemy + ]; # missing inputs: ruuvitag-ble "sabnzbd" = ps: with ps; [ pysabnzbd ]; @@ -2683,6 +2900,7 @@ fnvhash hass-nabucasa home-assistant-frontend + janus pillow sqlalchemy ]; @@ -2692,10 +2910,12 @@ "samsungtv" = ps: with ps; [ aiohttp-cors async-upnp-client + fnvhash getmac ifaddr samsungctl samsungtvws + sqlalchemy wakeonlan zeroconf ] @@ -2727,6 +2947,8 @@ ]; # missing inputs: scsgate "search" = ps: with ps; [ aiohttp-cors + fnvhash + sqlalchemy ]; "season" = ps: with ps; [ ephem @@ -2745,6 +2967,22 @@ "sensibo" = ps: with ps; [ pysensibo ]; + "sensirion_ble" = ps: with ps; [ + aiohttp-cors + bleak-retry-connector + bleak + bluetooth-adapters + bluetooth-auto-recovery + bluetooth-data-tools + dbus-fast + fnvhash + home-assistant-frontend + janus + pillow + pyserial + pyudev + sqlalchemy + ]; # missing inputs: sensirion-ble "sensor" = ps: with ps; [ fnvhash sqlalchemy @@ -2757,9 +2995,11 @@ bleak bluetooth-adapters bluetooth-auto-recovery + bluetooth-data-tools dbus-fast fnvhash home-assistant-frontend + janus pillow pyserial pyudev @@ -2772,9 +3012,11 @@ bleak bluetooth-adapters bluetooth-auto-recovery + bluetooth-data-tools dbus-fast fnvhash home-assistant-frontend + janus pillow pyserial pyudev @@ -2787,6 +3029,8 @@ "senz" = ps: with ps; [ aiohttp-cors aiosenz + fnvhash + sqlalchemy ]; "serial" = ps: with ps; [ pyserial-asyncio @@ -2810,6 +3054,19 @@ "shelly" = ps: with ps; [ aiohttp-cors aioshelly + bleak-retry-connector + bleak + bluetooth-adapters + bluetooth-auto-recovery + bluetooth-data-tools + dbus-fast + fnvhash + home-assistant-frontend + janus + pillow + pyserial + pyudev + sqlalchemy ]; "shiftr" = ps: with ps; [ paho-mqtt @@ -2839,6 +3096,8 @@ ]; "simply_automated" = ps: with ps; [ ]; + "simu" = ps: with ps; [ + ]; "simulated" = ps: with ps; [ ]; "sinch" = ps: with ps; [ @@ -2911,6 +3170,7 @@ ]; "snips" = ps: with ps; [ aiohttp-cors + janus paho-mqtt ]; "snmp" = ps: with ps; [ @@ -2922,9 +3182,11 @@ bleak bluetooth-adapters bluetooth-auto-recovery + bluetooth-data-tools dbus-fast fnvhash home-assistant-frontend + janus pillow pyserial pysnooz @@ -2960,12 +3222,14 @@ "sonos" = ps: with ps; [ aiohttp-cors async-upnp-client + fnvhash ifaddr plexapi plexauth plexwebsocket soco spotipy + sqlalchemy zeroconf ]; "sony_projector" = ps: with ps; [ @@ -2990,7 +3254,9 @@ ]; # missing inputs: hass_splunk "spotify" = ps: with ps; [ aiohttp-cors + fnvhash spotipy + sqlalchemy ]; "sql" = ps: with ps; [ sqlalchemy @@ -3004,7 +3270,9 @@ "ssdp" = ps: with ps; [ aiohttp-cors async-upnp-client + fnvhash ifaddr + sqlalchemy zeroconf ]; "starline" = ps: with ps; [ @@ -3029,7 +3297,9 @@ aiohttp-cors aiosteamist discovery30303 + fnvhash ifaddr + sqlalchemy ]; "stiebel_eltron" = ps: with ps; [ pymodbus @@ -3041,6 +3311,7 @@ pyturbojpeg aiohttp-cors av + numpy ]; "streamlabswater" = ps: with ps; [ streamlabswater @@ -3084,9 +3355,11 @@ bleak bluetooth-adapters bluetooth-auto-recovery + bluetooth-data-tools dbus-fast fnvhash home-assistant-frontend + janus pillow pyserial pyudev @@ -3117,7 +3390,9 @@ ]; "system_bridge" = ps: with ps; [ aiohttp-cors + fnvhash ifaddr + sqlalchemy zeroconf ]; # missing inputs: systembridgeconnector "system_health" = ps: with ps; [ @@ -3147,6 +3422,7 @@ "tasmota" = ps: with ps; [ aiohttp-cors hatasmota + janus paho-mqtt ]; "tautulli" = ps: with ps; [ @@ -3188,6 +3464,8 @@ "tesla_wall_connector" = ps: with ps; [ tesla-wall-connector ]; + "text" = ps: with ps; [ + ]; "tfiac" = ps: with ps; [ ]; # missing inputs: pytfiac "thermobeacon" = ps: with ps; [ @@ -3196,9 +3474,11 @@ bleak bluetooth-adapters bluetooth-auto-recovery + bluetooth-data-tools dbus-fast fnvhash home-assistant-frontend + janus pillow pyserial pyudev @@ -3213,9 +3493,11 @@ bleak bluetooth-adapters bluetooth-auto-recovery + bluetooth-data-tools dbus-fast fnvhash home-assistant-frontend + janus pillow pyserial pyudev @@ -3251,9 +3533,11 @@ bleak bluetooth-adapters bluetooth-auto-recovery + bluetooth-data-tools dbus-fast fnvhash home-assistant-frontend + janus pillow pyserial pyudev @@ -3296,8 +3580,10 @@ ]; # missing inputs: pytouchline "tplink" = ps: with ps; [ aiohttp-cors + fnvhash ifaddr python-kasa + sqlalchemy ]; "tplink_lte" = ps: with ps; [ ]; # missing inputs: tp-connected @@ -3367,6 +3653,8 @@ "twitter" = ps: with ps; [ twitterapi ]; + "ubiwizz" = ps: with ps; [ + ]; "ubus" = ps: with ps; [ openwrt-ubus-rpc ]; @@ -3409,8 +3697,10 @@ "upnp" = ps: with ps; [ aiohttp-cors async-upnp-client + fnvhash getmac ifaddr + sqlalchemy zeroconf ]; "uprise_smart_shades" = ps: with ps; [ @@ -3422,8 +3712,10 @@ ]; "usb" = ps: with ps; [ aiohttp-cors + fnvhash pyserial pyudev + sqlalchemy ]; "usgs_earthquakes_feed" = ps: with ps; [ aio-geojson-usgs-earthquakes @@ -3443,8 +3735,10 @@ ]; # missing inputs: vtjp "velbus" = ps: with ps; [ aiohttp-cors + fnvhash pyserial pyudev + sqlalchemy velbus-aio ]; "velux" = ps: with ps; [ @@ -3542,6 +3836,8 @@ ]; "websocket_api" = ps: with ps; [ aiohttp-cors + fnvhash + sqlalchemy ]; "wemo" = ps: with ps; [ pywemo @@ -3562,12 +3858,16 @@ ]; # missing inputs: wirelesstagpy "withings" = ps: with ps; [ aiohttp-cors + fnvhash + sqlalchemy withings-api ]; "wiz" = ps: with ps; [ aiohttp-cors + fnvhash ifaddr pywizlight + sqlalchemy ]; "wled" = ps: with ps; [ wled @@ -3592,6 +3892,8 @@ ]; "xbox" = ps: with ps; [ aiohttp-cors + fnvhash + sqlalchemy xbox-webapi ]; "xbox_live" = ps: with ps; [ @@ -3606,8 +3908,10 @@ "xiaomi_aqara" = ps: with ps; [ pyxiaomigateway aiohttp-cors + fnvhash ifaddr netdisco + sqlalchemy zeroconf ]; "xiaomi_ble" = ps: with ps; [ @@ -3616,9 +3920,11 @@ bleak bluetooth-adapters bluetooth-auto-recovery + bluetooth-data-tools dbus-fast fnvhash home-assistant-frontend + janus pillow pyserial pyudev @@ -3647,9 +3953,11 @@ bleak bluetooth-adapters bluetooth-auto-recovery + bluetooth-data-tools dbus-fast fnvhash home-assistant-frontend + janus pillow pyserial pyudev @@ -3663,7 +3971,9 @@ aiohttp-cors aiomusiccast async-upnp-client + fnvhash ifaddr + sqlalchemy zeroconf ]; "yandex_transport" = ps: with ps; [ @@ -3674,7 +3984,9 @@ "yeelight" = ps: with ps; [ aiohttp-cors async-upnp-client + fnvhash ifaddr + sqlalchemy yeelight zeroconf ]; @@ -3686,6 +3998,8 @@ ]; "yolink" = ps: with ps; [ aiohttp-cors + fnvhash + sqlalchemy yolink-api ]; "youless" = ps: with ps; [ @@ -3702,7 +4016,9 @@ ]; # missing inputs: zengge "zeroconf" = ps: with ps; [ aiohttp-cors + fnvhash ifaddr + sqlalchemy zeroconf ]; "zerproc" = ps: with ps; [ @@ -3717,6 +4033,7 @@ fnvhash home-assistant-frontend ifaddr + janus pillow pyserial-asyncio pyserial @@ -3743,13 +4060,17 @@ ]; "zwave_js" = ps: with ps; [ aiohttp-cors + fnvhash pyserial pyudev + sqlalchemy zwave-js-server-python ]; "zwave_me" = ps: with ps; [ aiohttp-cors + fnvhash ifaddr + sqlalchemy url-normalize zeroconf zwave-me-ws @@ -3768,6 +4089,7 @@ "air_quality" "airly" "airnow" + "airq" "airthings" "airthings_ble" "airtouch4" @@ -3982,7 +4304,6 @@ "growatt_server" "guardian" "habitica" - "hangouts" "hardkernel" "hardware" "harmony" @@ -3990,7 +4311,6 @@ "hddtemp" "hdmi_cec" "heos" - "here_travel_time" "hisense_aehw4a1" "history" "history_stats" @@ -4000,6 +4320,7 @@ "home_plus_control" "homeassistant" "homeassistant_alerts" + "homeassistant_hardware" "homeassistant_sky_connect" "homeassistant_yellow" "homekit" @@ -4074,6 +4395,7 @@ "lifx" "light" "litterrobot" + "local_calendar" "local_file" "local_ip" "locative" @@ -4343,6 +4665,7 @@ "tellduslive" "template" "tesla_wall_connector" + "text" "thermobeacon" "thermopro" "threshold" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index d2cdd24d4f27..9ef566004144 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -41,16 +41,6 @@ let }; }); - arcam-fmj = super.arcam-fmj.overridePythonAttrs (old: rec { - disabledTestPaths = [ - # incompatible with pytest-aiohttp 0.3.0 - # see https://github.com/elupus/arcam_fmj/pull/12 - "tests/test_fake.py" - "tests/test_standard.py" - "tests/test_utils.py" - ]; - }); - caldav = super.caldav.overridePythonAttrs (old: rec { version = "0.9.1"; src = fetchFromGitHub { @@ -88,62 +78,6 @@ let }; }); - nibe = super.nibe.overridePythonAttrs (oldAttrs: rec { - version = "0.5.0"; - src = fetchFromGitHub { - owner = "yozik04"; - repo = "nibe"; - rev = "refs/tags/${version}"; - hash = "sha256-DguGWNJfc5DfbcKMX2eMM2U1WyVPcdtv2BmpVloOFSU="; - }; - }); - - # pytest-aiohttp>0.3.0 breaks home-assistant tests - pytest-aiohttp = super.pytest-aiohttp.overridePythonAttrs (oldAttrs: rec { - version = "0.3.0"; - src = self.fetchPypi { - inherit version; - pname = "pytest-aiohttp"; - hash = "sha256-ySmFQzljeXc3WDhwO2L+9jUoWYvAqdRRY566lfSqpE8="; - }; - propagatedBuildInputs = with self; [ aiohttp pytest ]; - doCheck = false; - patches = []; - }); - aioecowitt = super.aioecowitt.overridePythonAttrs (oldAttrs: { - doCheck = false; # requires aiohttp>=1.0.0 - }); - aiohomekit = super.aiohomekit.overridePythonAttrs (oldAttrs: { - doCheck = false; # requires aiohttp>=1.0.0 - }); - aioopenexchangerates = super.aioopenexchangerates.overridePythonAttrs (oldAttrs: { - doCheck = false; # requires aiohttp>=1.0.0 - }); - gcal-sync = super.gcal-sync.overridePythonAttrs (oldAttrs: { - doCheck = false; # requires aiohttp>=1.0.0 - }); - hass-nabucasa = super.hass-nabucasa.overridePythonAttrs (oldAttrs: { - doCheck = false; # requires aiohttp>=1.0.0 - }); - pylitterbot = super.pylitterbot.overridePythonAttrs (oldAttrs: { - doCheck = false; # requires pytest-aiohttp>=1.0.0 - }); - pynws = super.pynws.overridePythonAttrs (oldAttrs: { - doCheck = false; # requires pytest-aiohttp>=1.0.0 - }); - pytomorrowio = super.pytomorrowio.overridePythonAttrs (oldAttrs: { - doCheck = false; # requires pytest-aiohttp>=1.0.0 - }); - rtsp-to-webrtc = super.rtsp-to-webrtc.overridePythonAttrs (oldAttrs: { - doCheck = false; # requires pytest-aiohttp>=1.0.0 - }); - snitun = super.snitun.overridePythonAttrs (oldAttrs: { - doCheck = false; # requires aiohttp>=1.0.0 - }); - zwave-js-server-python = super.zwave-js-server-python.overridePythonAttrs (oldAttrs: { - doCheck = false; # requires aiohttp>=1.0.0 - }); - # Pinned due to API changes in 0.1.0 poolsense = super.poolsense.overridePythonAttrs (oldAttrs: rec { version = "0.0.8"; @@ -165,16 +99,6 @@ let }; }); - pydaikin = super.pydaikin.overridePythonAttrs (oldAttrs: rec { - disabledTests = [ - "test_power_sensors" - ]; - }); - - pydeconz = super.pydeconz.overridePythonAttrs (oldAttrs: rec { - doCheck = false; # requires pytest-aiohttp>=1.0.0 - }); - python-slugify = super.python-slugify.overridePythonAttrs (oldAttrs: rec { pname = "python-slugify"; version = "4.0.1"; @@ -264,7 +188,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.11.5"; + hassVersion = "2022.12.0"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -282,7 +206,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-5QV9k3aMMhkB5ZVNOzkwAcA2qTLT7HBays8BoRyshVo="; + hash = "sha256-EucTvr/XISdRIpbNkLZjSAHubIbEE3VvMf2y5XE7/n8="; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index dd6831b196fc..b8bdb7e84dae 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20221108.0"; + version = "20221207.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - sha256 = "sha256-jwDKWDI5fhrQNtEqMMWQZJFjjJYSqjNZFOVRsQvI9pY="; + hash = "sha256-8sLk9cWbsEkPf3sL0UWhrlxLOUABXKqDrKZfE0HVDjw="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index 1651e3026644..cbcd0847b790 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -14,12 +14,14 @@ let generic = [ av ]; google_translate = [ mutagen ]; google_sheets = [ oauth2client ]; - homeassistant_sky_connect = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp ]; + hassio = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp ]; + homeassistant_sky_connect = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp zwave-js-server-python ]; homeassistant_yellow = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp ]; lovelace = [ PyChromecast ]; nest = [ av ]; onboarding = [ pymetno radios rpi-bad-power ]; raspberry_pi = [ rpi-bad-power ]; + shelly = [ pyswitchbot ]; tilt_ble = [ govee-ble ibeacon-ble ]; tomorrowio = [ pyclimacell ]; version = [ aioaseko ]; @@ -70,6 +72,10 @@ let # aioserial mock produces wrong state "--deselect tests/components/modem_callerid/test_init.py::test_setup_entry" ]; + unifiprotect = [ + # "TypeError: object Mock can't be used in 'await' expression + "--deselect tests/components/unifiprotect/test_repairs.py::test_ea_warning_fix" + ]; skybell = [ # Sandbox network limitations: Cannot connect to host cloud.myskybell.com:443 "--deselect tests/components/skybell/test_config_flow.py::test_flow_user_unknown_error" From 87c22c79097edab8f80b0b649e4bef5b276a6ced Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Dec 2022 00:23:16 +0100 Subject: [PATCH 114/204] nixos/home-assistant: update bluetooth components --- nixos/modules/services/home-automation/home-assistant.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix index 2962e52c08bb..fa06e5391bbf 100644 --- a/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -435,6 +435,7 @@ in { "august" "august_ble" "airthings_ble" + "aranet" "bluemaestro" "bluetooth" "bluetooth_le_tracker" @@ -453,8 +454,11 @@ in { "moat" "oralb" "qingping" + "ruuvitag_ble" + "sensirion_ble" "sensorpro" "sensorpush" + "shelly" "snooz" "switchbot" "thermobeacon" From 6569998d23a65aa67952715aaa577d777aa0638d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Dec 2022 01:49:06 +0100 Subject: [PATCH 115/204] python3Packages.home-assistant-bluetooth: 1.6.0 -> 1.8.1 https://github.com/home-assistant-libs/home-assistant-bluetooth/releases/tag/v1.8.1 https://github.com/home-assistant-libs/home-assistant-bluetooth/releases/tag/v1.8.0 https://github.com/home-assistant-libs/home-assistant-bluetooth/releases/tag/v1.7.0 --- .../python-modules/home-assistant-bluetooth/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix index 4b0a9b660cfb..68261007b7c5 100644 --- a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix +++ b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix @@ -2,14 +2,16 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, cython , poetry-core +, setuptools , bleak , pytestCheckHook }: buildPythonPackage rec { pname = "home-assistant-bluetooth"; - version = "1.6.0"; + version = "1.8.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -17,7 +19,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-6w940Yn0WgVC0Rn9OX40+6hO4maPSC7VrT3ARD8CIjQ="; + hash = "sha256-oOrsZmAXLYsJ19DrQ70O0RpeSz8Jn8oD41Tsc5DVUng="; }; postPatch = '' @@ -26,7 +28,9 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ + cython poetry-core + setuptools ]; propagatedBuildInputs = [ From 166db6ef4bc7515903579dd19993263fb4ce5cf3 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 8 Dec 2022 03:01:45 +0100 Subject: [PATCH 116/204] erlang: don't relink escript on darwin --- pkgs/development/interpreters/erlang/generic-builder.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index e716f809de8b..de904ba58d5f 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -137,7 +137,9 @@ stdenv.mkDerivation ({ postInstall = '' ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call + '' + (lib.optionalString stdenv.isLinux '' ln -s $out/lib/erlang/bin/escript $out/bin/escript + '') + '' ${postInstall} ''; From 4e9abf3af4e9cd5850027bd66b88abfc89a36d2f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 Dec 2022 02:53:20 +0000 Subject: [PATCH 117/204] cve: 1.1.0 -> 1.2.0 --- pkgs/development/python-modules/cvelib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cvelib/default.nix b/pkgs/development/python-modules/cvelib/default.nix index 49b5c7590691..8bdcb400b96f 100644 --- a/pkgs/development/python-modules/cvelib/default.nix +++ b/pkgs/development/python-modules/cvelib/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "cvelib"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "RedHatProductSecurity"; repo = "cvelib"; rev = "tags/${version}"; - hash = "sha256-MZzCTUleEddIlZBRhxD8ZgaWAOFcpa5hvNuIjrBJRzk="; + hash = "sha256-8qlXwEbgLRZ1qYtBJ1c0nv6qfIOW5zAK9eOS+n+afWQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}"; From 90b7662d0ec3eb13c4111bf3d1ce3368b9aa2725 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 8 Dec 2022 11:20:32 +0800 Subject: [PATCH 118/204] pantheon.elementary-calculator: 2.0.0 -> 2.0.1 --- pkgs/desktops/pantheon/apps/elementary-calculator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix index 17b241e7a9cb..ac133fa54d3c 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "elementary-calculator"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = "calculator"; rev = version; - sha256 = "sha256-NE7x5vSfwakwJJe2VGRFiYc7GCB1M6xU5945EC6Em34="; + sha256 = "sha256-7aKJDlpODIysrHtqtD5wfd+dULFpD+LfWsjzg3OAxkY="; }; nativeBuildInputs = [ From 3193b7c81035524c851db099e202300151370001 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 8 Dec 2022 04:25:54 +0100 Subject: [PATCH 119/204] btanks: python2 -> python3 --- pkgs/games/btanks/default.nix | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/pkgs/games/btanks/default.nix b/pkgs/games/btanks/default.nix index 202bab0df667..cec88ab51bdc 100644 --- a/pkgs/games/btanks/default.nix +++ b/pkgs/games/btanks/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, sconsPackages, pkg-config, SDL, libGL, zlib, smpeg +{ lib, stdenv, fetchurl, fetchpatch, scons, pkg-config, SDL, libGL, zlib, smpeg , SDL_image, libvorbis, expat, zip, lua }: stdenv.mkDerivation rec { @@ -7,10 +7,10 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "0ha35kxc8xlbg74wsrbapfgxvcrwy6psjkqi7c6adxs55dmcxliz"; + hash = "sha256-P9LOaitF96YMOxFPqa/xPLPdn7tqZc3JeYt2xPosQ0E="; }; - nativeBuildInputs = [ sconsPackages.scons_3_0_1 pkg-config ]; + nativeBuildInputs = [ scons pkg-config ]; buildInputs = [ SDL libGL zlib smpeg SDL_image libvorbis expat zip lua ]; @@ -20,17 +20,25 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = "https://aur.archlinux.org/cgit/aur.git/plain/lua52.patch?h=btanks"; - sha256 = "0ip563kz6lhwiims5djrxq3mvb7jx9yzkpsqxxhbi9n6qzz7y2az"; name = "lua52.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/lua52.patch?h=btanks&id=cd0e016963238f16209baa2da658aa3fad36e33d"; + hash = "sha256-Xwl//sfGprhg71jf+X3q8qxdB+5ZtqJrjBxS8+cw5UY="; }) (fetchpatch { - url = "https://salsa.debian.org/games-team/btanks/raw/master/debian/patches/gcc-4.7.patch"; - sha256 = "1dxlk1xh69gj10sqcsyckiakb8an3h41206wby4z44mpmvxc7pi4"; + url = "https://salsa.debian.org/games-team/btanks/-/raw/debian/0.9.8083-9/debian/patches/gcc-4.7.patch"; + hash = "sha256-JN7D+q63EvKJX9wAEQgcVqE1VZzMa4Y1CPIlA3uYtLc="; }) (fetchpatch { - url = "https://salsa.debian.org/games-team/btanks/raw/master/debian/patches/pow10f.patch"; - sha256 = "1h45790v2dpdbccfn6lwfgl8782q54i14cz9gpipkaghcka4y0g9"; + url = "https://salsa.debian.org/games-team/btanks/-/raw/debian/0.9.8083-9/debian/patches/pow10f.patch"; + hash = "sha256-6QFP1GTwqXnjfekzEiIpWKCD6HOcGusYW+02sUE6hcA="; + }) + (fetchpatch { + url = "https://salsa.debian.org/games-team/btanks/-/raw/debian/0.9.8083-9/debian/patches/python3.patch"; + hash = "sha256-JpK409Myi8mxQaunmLFKKh1NKvKLXpNHHsDvRee8OoQ="; + }) + (fetchpatch { + url = "https://salsa.debian.org/games-team/btanks/-/raw/debian/0.9.8083-9/debian/patches/scons.patch"; + hash = "sha256-JCvBY2fOV8Sc/mpvEsJQv1wKcS1dHqYxvRk6I9p7ZKc="; }) ]; From e653bf7a337046571835d2666a66c3c236a00024 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 Dec 2022 03:35:48 +0000 Subject: [PATCH 120/204] ddosify: 0.9.0 -> 0.9.1 --- pkgs/development/tools/ddosify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ddosify/default.nix b/pkgs/development/tools/ddosify/default.nix index 0cefbfc9281f..b13b396cbf37 100644 --- a/pkgs/development/tools/ddosify/default.nix +++ b/pkgs/development/tools/ddosify/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ddosify"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-8sqOhhuneLFxhmZjoMYYfWw9wv55zWzw3QQEZW+hxBU="; + sha256 = "sha256-CUCIY3tDkmNPnHFgfjWa5wVFvaSWV9DAyPFx3+dHxZQ="; }; vendorSha256 = "sha256-mq82KNa01gHvW+RUREra+ysaJ1YWIwX0v/uYMxmFN4M="; From fa19b16e9393b1db67d06c3c1cbc411402721474 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 8 Dec 2022 04:35:53 +0100 Subject: [PATCH 121/204] ecopcr: 0.8.0 -> 1.0.1 --- .../science/biology/ecopcr/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/biology/ecopcr/default.nix b/pkgs/applications/science/biology/ecopcr/default.nix index 4a6b093e1d0b..c5ab32a68838 100644 --- a/pkgs/applications/science/biology/ecopcr/default.nix +++ b/pkgs/applications/science/biology/ecopcr/default.nix @@ -1,17 +1,19 @@ -{ lib, stdenv, fetchurl, gcc, zlib, python27 }: +{ lib, stdenv, fetchurl, gcc, zlib, python3 }: stdenv.mkDerivation rec { pname = "ecopcr"; - version = "0.8.0"; + version = "1.0.1"; src = fetchurl { - url = "https://git.metabarcoding.org/obitools/ecopcr/uploads/6f37991b325c8c171df7e79e6ae8d080/ecopcr-${version}.tar.gz"; - sha256 = "10c58hj25z78jh0g3zcbx4890yd2qrvaaanyx8mn9p49mmyf5pk6"; + url = "https://git.metabarcoding.org/obitools/ecopcr/-/archive/ecopcr_v${version}/ecopcr-ecopcr_v${version}.tar.gz"; + hash = "sha256-ssvWpi7HuuRRAkpqqrX3ijLuBqM3QsrmrG+t7/m6fZA="; }; - sourceRoot = "ecoPCR/src"; + buildInputs = [ gcc python3 zlib ]; - buildInputs = [ gcc python27 zlib ]; + preConfigure = '' + cd src + ''; installPhase = '' mkdir -p $out/bin From 2e77af64e99fd00a7d21f45cd7e3bbe3bde89baa Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 8 Dec 2022 04:38:04 +0100 Subject: [PATCH 122/204] chirp: 20220823 -> unstable-2022-12-07 --- pkgs/applications/radio/chirp/default.nix | 37 ++++++++++++++++------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix index 95d33d6f1eec..e73f438f76b8 100644 --- a/pkgs/applications/radio/chirp/default.nix +++ b/pkgs/applications/radio/chirp/default.nix @@ -1,24 +1,39 @@ { lib -, fetchurl -, python2 +, fetchFromGitHub +, python3 +, unstableGitUpdater }: -python2.pkgs.buildPythonApplication rec { - pname = "chirp-daily"; - version = "20220823"; - src = fetchurl { - url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-V+8HQAYU2XjOYeku0XEHqkY4m0XjiUBxM61QcupnlVM="; +python3.pkgs.buildPythonApplication rec { + pname = "chirp"; + version = "unstable-2022-12-07"; + + src = fetchFromGitHub { + owner = "kk7ds"; + repo = "chirp"; + rev = "dc0c98d22423b496faf0a86296a6ec0bb3b3e11a"; + hash = "sha256-z0xD11CB7Vt8k0dPXE+E5ZD9XAFwWNxjnUs25/Gd7zI="; }; - propagatedBuildInputs = with python2.pkgs; [ - pygtk pyserial libxml2 future + propagatedBuildInputs = with python3.pkgs; [ + future + pyserial + requests + six + wxPython_4_2 ]; + # "running build_ext" fails with no output + doCheck = false; + + passthru.updateScript = unstableGitUpdater { + branch = "py3"; + }; + meta = with lib; { description = "A free, open-source tool for programming your amateur radio"; homepage = "https://chirp.danplanet.com/"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; }; } From 660b60e9d3e380185c25287db13eaf571d62c60f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 8 Dec 2022 03:08:48 +0000 Subject: [PATCH 123/204] =?UTF-8?q?terraform-providers.cloudamqp:=201.20.0?= =?UTF-8?q?=20=E2=86=92=201.20.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index fddb9cc57ed0..ae48be788671 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -213,13 +213,13 @@ "vendorHash": null }, "cloudamqp": { - "hash": "sha256-EtFGqYNfyDbS4f1tjRTKcrQNFqEZmmILeuEOpwkx6/4=", + "hash": "sha256-ocwPi39Wn+nHtkRshqFKkCknFCKgmrxSMy1SJFd7ni8=", "homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp", "owner": "cloudamqp", "repo": "terraform-provider-cloudamqp", - "rev": "v1.20.0", + "rev": "v1.20.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-fDYkeUOW9wuypAJR1YFEQp8KhtTfMr8NZeT7TMYXEmU=" + "vendorHash": "sha256-pnQHWSXI3rqYv0EeG9rGINtInSgQ/NSMMYiPrXRMUuM=" }, "cloudflare": { "hash": "sha256-1Ak5NPaOSqF0mJU2/CnssQjz7ekyVE/kqDOS5rYSN10=", From cb66e74ad5964572cbbdd1375f579c06612b43e2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 8 Dec 2022 03:08:53 +0000 Subject: [PATCH 124/204] =?UTF-8?q?terraform-providers.fastly:=203.0.2=20?= =?UTF-8?q?=E2=86=92=203.0.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index ae48be788671..cbf1c961be5f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -386,11 +386,11 @@ "vendorHash": "sha256-0t+2ixMSsgDK9zzst3s0YWdnS6p7jO0stHnaKio5lvY=" }, "fastly": { - "hash": "sha256-X2T/t3uDY1jDPhx7IZOwVLx1o4pse5/0T+nrJtRB1Lk=", + "hash": "sha256-AlEO9isKHdOxhI7M7Egxv7lmrQ066s2zcIz9fm5dobM=", "homepage": "https://registry.terraform.io/providers/fastly/fastly", "owner": "fastly", "repo": "terraform-provider-fastly", - "rev": "v3.0.2", + "rev": "v3.0.3", "spdx": "MPL-2.0", "vendorHash": null }, From 7adc65c821099c8bf87635767a17114af392d3c2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 8 Dec 2022 03:10:18 +0000 Subject: [PATCH 125/204] =?UTF-8?q?terraform-providers.heroku:=205.1.7=20?= =?UTF-8?q?=E2=86=92=205.1.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index cbf1c961be5f..1c96c0fcc635 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -507,11 +507,11 @@ "vendorHash": null }, "heroku": { - "hash": "sha256-TdL0m83sIS8BuNE6j6mSsEnXq7KuaYJEhuDHkXyNAMc=", + "hash": "sha256-GmrzvE1Wc1dQSlEL4mLYHIkAVxKwElx2fCWkrnZra18=", "homepage": "https://registry.terraform.io/providers/heroku/heroku", "owner": "heroku", "repo": "terraform-provider-heroku", - "rev": "v5.1.7", + "rev": "v5.1.8", "spdx": "MPL-2.0", "vendorHash": null }, From 9b2c42115141e518ff0a3789e533362dc6a4dc5e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 8 Dec 2022 03:10:33 +0000 Subject: [PATCH 126/204] =?UTF-8?q?terraform-providers.infoblox:=202.1.0?= =?UTF-8?q?=20=E2=86=92=202.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 1c96c0fcc635..2975307eeca4 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -589,11 +589,11 @@ "vendorHash": null }, "infoblox": { - "hash": "sha256-VquTyQxbVFPImZCwthwf8hJPlUxAxhmed/r1V+qm/ak=", + "hash": "sha256-bLZK2lZqnpiE5vsJAAiGw4BrBzVWGyg5VZq/Ngr8VlA=", "homepage": "https://registry.terraform.io/providers/infobloxopen/infoblox", "owner": "infobloxopen", "repo": "terraform-provider-infoblox", - "rev": "v2.1.0", + "rev": "v2.2.0", "spdx": "MPL-2.0", "vendorHash": null }, From c33749e142e9b0d1806a19770c8079d24aad43b6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 8 Dec 2022 03:14:22 +0000 Subject: [PATCH 127/204] =?UTF-8?q?terraform-providers.snowflake:=200.52.0?= =?UTF-8?q?=20=E2=86=92=200.53.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 2975307eeca4..aa60c6e61578 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1032,13 +1032,13 @@ "vendorHash": null }, "snowflake": { - "hash": "sha256-V2N9Lq425fdjlJ+lCVQzMAYfEiS2/Oqevz1dIve//FA=", + "hash": "sha256-folCDzwXDfWGVxqX+wMBtRqUXdecYL0Rj7XYzb5QBvA=", "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake", "owner": "Snowflake-Labs", "repo": "terraform-provider-snowflake", - "rev": "v0.52.0", + "rev": "v0.53.0", "spdx": "MIT", - "vendorHash": "sha256-n6ov9eTlNF/jNDTDOZuuqyFfuv8lDZHKP/5jhFauwY8=" + "vendorHash": "sha256-5sqPDUNg1uH3LAMnvQ4YAm5LDdcywQHp1DVKYLFZG7Q=" }, "sops": { "hash": "sha256-6FuThi6iuuUGcMhswAk3Z6Lxth/2nuI57A02Xu2s+/U=", From 909ec73ed6822b257f4cb40db104429e1adfbfd0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 8 Dec 2022 03:19:23 +0000 Subject: [PATCH 128/204] =?UTF-8?q?terraform-providers.oci:=204.100.0=20?= =?UTF-8?q?=E2=86=92=204.101.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index aa60c6e61578..563dc7e7f025 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -816,11 +816,11 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-t8GrhKnKredpbRmx/MAA4tx0kV0yZoFNnacKsp0Htro=", + "hash": "sha256-DGkjk9siXkknuNxWcUnDfR56xPYFS111J8QcAgj0cPU=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v4.100.0", + "rev": "v4.101.0", "spdx": "MPL-2.0", "vendorHash": null }, From 9c1d86410ff79c3de9c86528153c7a7c9d660f59 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 8 Dec 2022 03:19:41 +0000 Subject: [PATCH 129/204] =?UTF-8?q?terraform-providers.tencentcloud:=201.7?= =?UTF-8?q?9.0=20=E2=86=92=201.79.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 563dc7e7f025..e155dac034e7 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1095,11 +1095,11 @@ "vendorHash": "sha256-2wPmLpjhG6QgG+BUCO0oIzHjBOWIOYuptgdtSIm9TZw=" }, "tencentcloud": { - "hash": "sha256-beoS4io1KffsMCvYHwpWzo6NNwdi7JyPBBi/BwGFU9Y=", + "hash": "sha256-jel9zn2i/xt7Up4o8Tf5S5Z63zRbQszt9IY5xjcQhLo=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.79.0", + "rev": "v1.79.1", "spdx": "MPL-2.0", "vendorHash": null }, From be5ff49e538a2bb8f5c308b947386fb0903be859 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 Dec 2022 03:49:56 +0000 Subject: [PATCH 130/204] do-agent: 3.15.1 -> 3.15.2 --- pkgs/servers/monitoring/do-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/do-agent/default.nix b/pkgs/servers/monitoring/do-agent/default.nix index 2508e135431f..1aa130803913 100644 --- a/pkgs/servers/monitoring/do-agent/default.nix +++ b/pkgs/servers/monitoring/do-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "do-agent"; - version = "3.15.1"; + version = "3.15.2"; src = fetchFromGitHub { owner = "digitalocean"; repo = "do-agent"; rev = version; - sha256 = "sha256-a3/zwBxxTdcDQkvKb/Fj1M2U1qhKRXg7dtRzEgkKCu0="; + sha256 = "sha256-YK4k2iSKrRVraUjbUCYxNjH+CGn6eASsEKIU5QsfcNM="; }; ldflags = [ From 38e4ad81634bbdfda69fbf10dbea604d05c350c4 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 8 Dec 2022 04:54:01 +0100 Subject: [PATCH 131/204] opentsdb: python2 -> python3 --- pkgs/tools/misc/opentsdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix index 18ba5f4b5fc5..0429e854338b 100644 --- a/pkgs/tools/misc/opentsdb/default.nix +++ b/pkgs/tools/misc/opentsdb/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, autoconf, automake, curl, fetchurl, fetchpatch, jdk8, makeWrapper, nettools -, python2, git +, python3, git }: let jdk = jdk8; jre = jdk8.jre; in @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ makeWrapper autoconf automake ]; - buildInputs = [ curl jdk nettools python2 git ]; + buildInputs = [ curl jdk nettools python3 git ]; preConfigure = '' patchShebangs ./build-aux/ From 7c78928ad6fb6c872c92a84e4e0dec8324178ca5 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 8 Dec 2022 05:10:23 +0100 Subject: [PATCH 132/204] tailor: 0.9.35 -> 0.9.37 --- .../version-management/tailor/default.nix | 40 ++++++++++++++----- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/version-management/tailor/default.nix b/pkgs/applications/version-management/tailor/default.nix index e3b5891720fb..bd824a71633c 100644 --- a/pkgs/applications/version-management/tailor/default.nix +++ b/pkgs/applications/version-management/tailor/default.nix @@ -1,19 +1,37 @@ -{ fetchurl, pypy2Packages }: +{ lib +, python3 +, fetchurl +}: -pypy2Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "tailor"; - version = "0.9.35"; + version = "0.9.37"; src = fetchurl { - urls = [ - "http://darcs.arstecnica.it/tailor/tailor-${version}.tar.gz" - "https://src.fedoraproject.org/repo/pkgs/tailor/tailor-${version}.tar.gz/58a6bc1c1d922b0b1e4579c6440448d1/tailor-${version}.tar.gz" - ]; - sha256 = "061acapxxn5ab3ipb5nd3nm8pk2xj67bi83jrfd6lqq3273fmdjh"; + url = "https://gitlab.com/ports1/tailor/-/archive/0.937/tailor-0.937.tar.gz"; + hash = "sha256-Bdf8ZCRsbCsFz1GRxyQxxndXSsm8oOL2738m9UxOTVc="; }; - meta = { - description = "Version control tools integration tool"; + propagatedBuildInputs = with python3.pkgs; [ + future + ]; + + # AssertionError: Tailor Darcs repository not found! + doCheck = false; + + meta = with lib; { + description = "A tool to migrate changesets between various kinds of version control system."; + longDescription = '' + With its ability to "translate the history" from one VCS kind to another, + this tool makes it easier to keep the upstream changes merged in + a own branch of a product. + + Tailor is able to fetch the history from Arch, Bazaar, CVS, Darcs, Monotone, + Perforce or Subversion and rewrite it over Aegis, Bazaar, CVS, Darcs, Git, + Mercurial, Monotone and Subversion. + ''; + homepage = "https://gitlab.com/ports1/tailor"; + license = licenses.gpl1Plus; + platforms = platforms.unix; }; } - From 2341d8f1504cbaf90e16c898f51ebfec31e4ab83 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Thu, 8 Dec 2022 15:44:56 +1300 Subject: [PATCH 133/204] python3Packages.mypy-boto3-s3: fix package metadata As per . --- pkgs/development/python-modules/mypy-boto3-s3/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index eb36da387f60..6825978f19f3 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { version = "1.26.0.post1"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; @@ -31,9 +31,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Type annotations for boto3"; - homepage = "https://vemel.github.io/boto3_stubs_docs/mypy_boto3_s3/"; - license = with licenses; [ bsd3 ]; + description = "Type annotations for boto3.s3"; + homepage = "https://github.com/youtype/mypy_boto3_builder"; + license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; } From b012b226225528c6ac3aaae424463244d749943f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Wed, 7 Dec 2022 21:47:45 +0300 Subject: [PATCH 134/204] teams-for-linux: init at 1.0.45 --- .../teams-for-linux/default.nix | 91 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 93 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix new file mode 100644 index 000000000000..3a6c97073ab6 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix @@ -0,0 +1,91 @@ +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, makeDesktopItem +, copyDesktopItems +, fixup_yarn_lock +, yarn +, nodejs +, fetchYarnDeps +, electron +}: + +stdenv.mkDerivation rec { + pname = "teams-for-linux"; + version = "1.0.45"; + + src = fetchFromGitHub { + owner = "IsmaelMartinez"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Q6DFegFrLUW/YiRyYJI4ITVVyMC5IkazlzhdR8203cY="; + }; + + offlineCache = fetchYarnDeps { + yarnLock = src + "/yarn.lock"; + sha256 = "sha256-jaAieO5q+tNfWN7Rp6ueasl45cfp9W1QxPdqIeCnVkE="; + }; + + nativeBuildInputs = [ yarn fixup_yarn_lock nodejs copyDesktopItems makeWrapper ]; + + configurePhase = '' + runHook preConfigure + + export HOME=$(mktemp -d) + yarn config --offline set yarn-offline-mirror $offlineCache + fixup_yarn_lock yarn.lock + yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive + patchShebangs node_modules/ + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + yarn --offline electron-builder \ + --dir --linux ${if stdenv.hostPlatform.isAarch64 then "--arm64" else "--x64"} \ + -c.electronDist=${electron}/lib/electron \ + -c.electronVersion=${electron.version} + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/{applications,teams-for-linux} + cp dist/linux-${lib.optionalString stdenv.hostPlatform.isAarch64 "arm64-"}unpacked/resources/app.asar $out/share/teams-for-linux/ + + pushd build/icons + for image in *png; do + mkdir -p $out/share/icons/hicolor/''${image%.png}/apps + cp -r $image $out/share/icons/hicolor/''${image%.png}/apps/teams-for-linux.png + done + popd + + makeWrapper '${electron}/bin/electron' "$out/bin/teams-for-linux" \ + --add-flags "$out/share/teams-for-linux/app.asar" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + + runHook postInstall + ''; + + desktopItems = [(makeDesktopItem { + name = pname; + exec = pname; + icon = pname; + desktopName = "Microsoft Teams for Linux"; + comment = meta.description; + categories = [ "Network" "InstantMessaging" "Chat" ]; + })]; + + meta = with lib; { + description = "Unofficial Microsoft Teams client for Linux"; + homepage = "https://github.com/IsmaelMartinez/teams-for-linux"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ muscaln ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dcae27e1a6cb..c10e30ab58d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32241,6 +32241,8 @@ with pkgs; teams = callPackage ../applications/networking/instant-messengers/teams { }; + teams-for-linux = callPackage ../applications/networking/instant-messengers/teams-for-linux { }; + teamspeak_client = libsForQt5.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; teamspeak5_client = callPackage ../applications/networking/instant-messengers/teamspeak/client5.nix { }; teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { }; From 9fa6008c890f83c19a1a8ae71f21e7a727b0dc9d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 Dec 2022 05:53:53 +0000 Subject: [PATCH 135/204] python310Packages.pyvesync: 2.0.4 -> 2.1.1 --- pkgs/development/python-modules/pyvesync/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvesync/default.nix b/pkgs/development/python-modules/pyvesync/default.nix index 19d8fee57ef4..58cb26d1e9bb 100644 --- a/pkgs/development/python-modules/pyvesync/default.nix +++ b/pkgs/development/python-modules/pyvesync/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyvesync"; - version = "2.0.4"; + version = "2.1.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1Svz/9ZS5ynr88/We1fa+H1IGdC5ljUa4M5O8X+muX4="; + sha256 = "sha256-ulYOzCIpHkL/2nQExomoV4mLkU6e0ns4MHxEbjCPGrQ="; }; propagatedBuildInputs = [ From d5338a356afb26eff72cc764fbd4faf80ae9e64d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 1 Dec 2022 06:23:29 +0100 Subject: [PATCH 136/204] =?UTF-8?q?ocamlPackages.sexp=5Fpretty:=200.15.0?= =?UTF-8?q?=20=E2=86=92=200.15.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/janestreet/0.15.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/janestreet/0.15.nix b/pkgs/development/ocaml-modules/janestreet/0.15.nix index 019afdbe09c3..5d79b458dddc 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.15.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.15.nix @@ -904,7 +904,8 @@ with self; sexp_pretty = janePackage { pname = "sexp_pretty"; - hash = "1p1jspwjvrhm8li22xl0n8wngs12d9g7nc1svk6xc32jralnxblg"; + version = "0.15.1"; + hash = "sha256-UJEO2P4C7ZaD110MEfkG4FXfGDVAAW2TAK489faV6SM="; minimumOCamlVersion = "4.07"; meta.description = "S-expression pretty-printer"; propagatedBuildInputs = [ ppx_base re sexplib ]; From 4d63564ae582b2a04da348a1b6518aa4406abd69 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 1 Dec 2022 08:06:14 +0100 Subject: [PATCH 137/204] =?UTF-8?q?ocamlPackages.csvfields:=200.15.0=20?= =?UTF-8?q?=E2=86=92=200.15.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/janestreet/0.15.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/janestreet/0.15.nix b/pkgs/development/ocaml-modules/janestreet/0.15.nix index 5d79b458dddc..897b24e6940e 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.15.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.15.nix @@ -294,7 +294,8 @@ with self; csvfields = janePackage { pname = "csvfields"; - hash = "0z47pq17bw776hzvk48ypbd92ps9vlvl86mnhw3j6cqx4ahbjik3"; + version = "0.15.1"; + hash = "sha256-bBupsarwjte2NCncNDFSkrrmMR3EYPn+D7xI9zQOhFA="; propagatedBuildInputs = [ core num ]; meta.description = "Runtime support for ppx_xml_conv and ppx_csv_conv"; }; From c24b7eab34936d7d67ffea8fde5ee1096ae4ddda Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 1 Dec 2022 08:17:21 +0100 Subject: [PATCH 138/204] =?UTF-8?q?ocamlPackages.core=5Funix:=200.15.0=20?= =?UTF-8?q?=E2=86=92=200.15.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/janestreet/0.15.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/janestreet/0.15.nix b/pkgs/development/ocaml-modules/janestreet/0.15.nix index 897b24e6940e..676bea0e47fe 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.15.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.15.nix @@ -283,7 +283,8 @@ with self; core_unix = janePackage { pname = "core_unix"; - hash = "1xzxqzg23in5ivz0v3qshzpr4w92laayscqj9im7jylh2ar1xi0a"; + version = "0.15.2"; + hash = "sha256-9f2PiLo+4Bjnfvh3scvIiPHj0wPZozmMMiCTe7vC1EA="; meta.description = "Unix-specific portions of Core"; buildInputs = [ jst-config ]; propagatedBuildInputs = [ core_kernel expect_test_helpers_core ocaml_intrinsics ppx_jane timezone spawn ]; From 92b4f173803f65531e066321934e7d1ee7eb5090 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 8 Dec 2022 07:56:44 +0100 Subject: [PATCH 139/204] tennix: avoid URL literal It's not allowed anymore: https://hydra.nixos.org/build/201125718 This amends PR #204859 --- pkgs/games/tennix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/tennix/default.nix b/pkgs/games/tennix/default.nix index bfcdb9c4c55d..e5b2b358f329 100644 --- a/pkgs/games/tennix/default.nix +++ b/pkgs/games/tennix/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.3.1"; src = fetchgit { - url = git://repo.or.cz/tennix.git; + url = "git://repo.or.cz/tennix.git"; rev = "refs/tags/tennix-${version}"; sha256 = "sha256-U5+S1jEeg+7gdM1++dln6ePTqxZu2Zt0oUrH3DIlkgk="; }; From 3f7c8b2b9699b6d4be1f29d32feab9d01455e573 Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Thu, 8 Dec 2022 09:20:21 +0100 Subject: [PATCH 140/204] ungoogled-chromium: 108.0.5359.95 -> 108.0.5359.99 --- .../networking/browsers/chromium/upstream-info.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index d4a0484641cb..72dd05fdc1d3 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -45,8 +45,8 @@ } }, "ungoogled-chromium": { - "version": "108.0.5359.95", - "sha256": "1b3r2yl8qkp8k0kq5yi0a1xsmglniqn3v318fhx0k12cagrgbd5b", + "version": "108.0.5359.99", + "sha256": "0v5ynal3s28s4f9s4s95hblnjxiy6498qmk04s0vf2ixqwi7rivn", "sha256bin64": null, "deps": { "gn": { @@ -56,8 +56,8 @@ "sha256": "1rhadb6qk867jafr85x2m3asis3jv7x06blhmad2d296p26d5w6x" }, "ungoogled-patches": { - "rev": "108.0.5359.95-1", - "sha256": "0fl95hw6ll0g4lrccfxhhnkz3plqm003z09dz8dr6ycx5x3vqk0b" + "rev": "108.0.5359.99-1", + "sha256": "0qibibgi54mdwmmcmz613qk9mgjczspvq09bz5m0wpkxbx7hla0i" } } } From a445c5f6ea7f59f9d6707b9b66e712ebaeab4da1 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 8 Dec 2022 11:46:10 +0300 Subject: [PATCH 141/204] supergfxd: fix config format --- nixos/modules/services/hardware/supergfxd.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/hardware/supergfxd.nix b/nixos/modules/services/hardware/supergfxd.nix index abb6bedb98ff..5cc07e02f317 100644 --- a/nixos/modules/services/hardware/supergfxd.nix +++ b/nixos/modules/services/hardware/supergfxd.nix @@ -2,7 +2,7 @@ let cfg = config.services.supergfxd; - ini = pkgs.formats.ini { }; + json = pkgs.formats.json { }; in { options = { @@ -10,7 +10,7 @@ in enable = lib.mkEnableOption (lib.mdDoc "Enable the supergfxd service"); settings = lib.mkOption { - type = lib.types.nullOr ini.type; + type = lib.types.nullOr json.type; default = null; description = lib.mdDoc '' The content of /etc/supergfxd.conf. @@ -23,7 +23,7 @@ in config = lib.mkIf cfg.enable { environment.systemPackages = [ pkgs.supergfxctl ]; - environment.etc."supergfxd.conf" = lib.mkIf (cfg.settings != null) (ini.generate "supergfxd.conf" cfg.settings); + environment.etc."supergfxd.conf".source = lib.mkIf (cfg.settings != null) (json.generate "supergfxd.conf" cfg.settings); services.dbus.enable = true; From 2f80026cd28af33c949a3644c82342b5e71191ff Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 8 Dec 2022 09:08:48 +1000 Subject: [PATCH 142/204] aardvark-dns: 1.3.0 -> 1.4.0 https://github.com/containers/aardvark-dns/releases/tag/v1.4.0 --- pkgs/tools/networking/aardvark-dns/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/aardvark-dns/default.nix b/pkgs/tools/networking/aardvark-dns/default.nix index 546d22fe46a9..fdf76d459a29 100644 --- a/pkgs/tools/networking/aardvark-dns/default.nix +++ b/pkgs/tools/networking/aardvark-dns/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "aardvark-dns"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wlaOgWptD4qdaSRg6NNkQNARHMZe3z3QVoXjp133guQ="; + sha256 = "sha256-tQTa/iIo7kpcQq1p2romoOG2qNOiSDH7DHx3iZYLY8w="; }; - cargoHash = "sha256-BnIGoLIuV/uDaskMA8CeVX2McAHJPT+gchZsS0bQxjI="; + cargoHash = "sha256-naWkSXQHfImd6R+RHKkmTe8UiqxknZEFYoJ0g/URCVY="; meta = with lib; { description = "Authoritative dns server for A/AAAA container records"; From 4d7177b500c11da896e60192982d62a6d63191aa Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 8 Dec 2022 09:10:04 +1000 Subject: [PATCH 143/204] netavark: 1.3.0 -> 1.4.0 https://github.com/containers/netavark/releases/tag/v1.4.0 --- pkgs/tools/networking/netavark/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/netavark/default.nix b/pkgs/tools/networking/netavark/default.nix index 0bfe7f974e8d..fbd0a8119c51 100644 --- a/pkgs/tools/networking/netavark/default.nix +++ b/pkgs/tools/networking/netavark/default.nix @@ -7,22 +7,22 @@ rustPlatform.buildRustPackage rec { pname = "netavark"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5LczayUgIJ2mcSiHKadegzTM8PvejAD0lhUlXO4Js30="; + sha256 = "sha256-nG+HTwF3v8FUK2SE+I312Ec5y6YPShS9si9Pc2SG1jc="; }; - cargoHash = "sha256-gBdhdJD5EkkYNdpTNq+spySaoWnWViy9+bXTL7ps4PE="; + cargoHash = "sha256-szIG1udBCZj18sN3IiQtOuR8qw/xWhTMgb/n4lyTwvs="; nativeBuildInputs = [ installShellFiles mandown ]; postBuild = '' - make -C docs - installManPage docs/*.1 + make -C docs netavark.1 + installManPage docs/netavark.1 ''; meta = with lib; { From 1b501f52e6ef5b94630aa3372d1bf61ca098069e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 8 Dec 2022 10:40:47 +0100 Subject: [PATCH 144/204] python310Packages.pyvesync: add changelog to meta --- pkgs/development/python-modules/pyvesync/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pyvesync/default.nix b/pkgs/development/python-modules/pyvesync/default.nix index 58cb26d1e9bb..25e075b31806 100644 --- a/pkgs/development/python-modules/pyvesync/default.nix +++ b/pkgs/development/python-modules/pyvesync/default.nix @@ -31,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to manage Etekcity Devices and Levoit Air Purifier"; homepage = "https://github.com/webdjoe/pyvesync"; + changelog = "https://github.com/webdjoe/pyvesync/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 513871da5c2dd00b1abe90085afb74b6ee759275 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 Dec 2022 09:47:14 +0000 Subject: [PATCH 145/204] python310Packages.mypy-boto3-builder: 7.11.11 -> 7.12.0 --- .../development/python-modules/mypy-boto3-builder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix index 00be47cf8207..9ae495cf55e2 100644 --- a/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "7.11.11"; + version = "7.12.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "youtype"; repo = "mypy_boto3_builder"; rev = "refs/tags/${version}"; - hash = "sha256-4iyh/oXuYsdtqEf1Dh4Z3y8AHWiS1TmimO5HUwsHrHA="; + hash = "sha256-YmWQZvSABE0IKvISJWeB0rYryZ9FNTCgS7/lE2/sO04="; }; nativeBuildInputs = [ From 349d73f0cf2e9cfeef01b2eb2f8dba0a97969d62 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Nov 2022 15:19:51 +0000 Subject: [PATCH 146/204] nmrpflash: 0.9.18.2 -> 0.9.19 --- pkgs/development/embedded/nmrpflash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/embedded/nmrpflash/default.nix b/pkgs/development/embedded/nmrpflash/default.nix index a05170b1bd80..76c8902f590a 100644 --- a/pkgs/development/embedded/nmrpflash/default.nix +++ b/pkgs/development/embedded/nmrpflash/default.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation rec { pname = "nmrpflash"; - version = "0.9.18.2"; + version = "0.9.19"; src = fetchFromGitHub { owner = "jclehner"; repo = "nmrpflash"; rev = "v${version}"; - sha256 = "sha256-hKE9FEBkbN39zBRSoy3Ntq/fziizskJXNBcwQZX9igE="; + sha256 = "sha256-bXxJiIbMk8JG0nbWOgINUAb8zaGBN3XUdA3JZev4Igs="; }; nativeBuildInputs = [ pkg-config ]; From dd48617171568317977452600e097aebe52f30c2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Nov 2022 08:03:59 +0000 Subject: [PATCH 147/204] clash: 1.11.4 -> 1.12.0 --- pkgs/tools/networking/clash/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix index 5013ad60caff..e5594d2e0c43 100644 --- a/pkgs/tools/networking/clash/default.nix +++ b/pkgs/tools/networking/clash/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clash"; - version = "1.11.4"; + version = "1.12.0"; src = fetchFromGitHub { owner = "Dreamacro"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NLGX72eZCfyh6y3mud/btMh15rNXnss7S0P7ujCX1ms="; + sha256 = "sha256-SE+nZIatvwyc6JubMb7YUlNiJv+LYtJjFMlKEoJzEn8="; }; - vendorSha256 = "sha256-zaWN/zI4WhHnEK12k1tWZ/qjLGvaZbJ4WfEvCZJ0+ms="; + vendorSha256 = "sha256-ikcGZ1Gfxb4zBkav8MDi3+xNbvhqHIk6NhLfI2ne3ns="; # Do not build testing suit excludedPackages = [ "./test" ]; From cc8df97489838843d8e2547e2a5c20cd8a7ba4fe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 6 Dec 2022 16:22:04 +0000 Subject: [PATCH 148/204] page: 4.1.0 -> 4.3.0 --- pkgs/tools/misc/page/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/page/default.nix b/pkgs/tools/misc/page/default.nix index c096d96d17ae..61edaef5f2b7 100644 --- a/pkgs/tools/misc/page/default.nix +++ b/pkgs/tools/misc/page/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "page"; - version = "4.1.0"; + version = "4.3.0"; src = fetchFromGitHub { owner = "I60R"; repo = pname; rev = "v${version}"; - sha256 = "sha256-w/6uCzBRXsmq7Khe+8ysfgBoxnWBLyRMyb43sCxNYMA="; + sha256 = "sha256-ywOT/R6YYK5MOfiCxJDw7grQqUj7NvOv7ulNp6EdK/E="; }; nativeBuildInputs = [ installShellFiles ]; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { installShellCompletion --zsh $completions_dir/_page ''; - cargoSha256 = "sha256-xHGlJxUpmqR+WoKURpRAJAhmmKXIO0SWg9VLFiinKfo="; + cargoSha256 = "sha256-UGPgqmoCqyeqCZS3YlwNAXrJl42nR/Cz+83Jkz5rSrw="; meta = with lib; { description = "Use neovim as pager"; From b3404063ed5b7c5789af0ef52c657eaee75133e9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 Dec 2022 18:45:59 +0000 Subject: [PATCH 149/204] automatic-timezoned: 1.0.45 -> 1.0.49 --- pkgs/tools/system/automatic-timezoned/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/tools/system/automatic-timezoned/default.nix index ee235fe695a6..cc32210b3dda 100644 --- a/pkgs/tools/system/automatic-timezoned/default.nix +++ b/pkgs/tools/system/automatic-timezoned/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "1.0.45"; + version = "1.0.49"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Q/FekjyEgeZAhX4Ni8XcBPSto/UwXU4TD9b3yrBNIZ4="; + sha256 = "sha256-Y4QKTO85f8RHJp0tn4+/EF7uL0j2UPprDUhNaNhTfM4="; }; - cargoSha256 = "sha256-gvJRN9YGaY1mfBn8gopTW8p+7AE7JI/A/1rixWVX2tU="; + cargoSha256 = "sha256-JJcmQBK39ld0pDDnrpJVJzn5fHmR5A7+NLDB+h3JHlo="; meta = with lib; { description = "Automatically update system timezone based on location"; From 4d4b965b40840f40b4aa9a1a42aaa6ba91dd6b69 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 Dec 2022 08:23:05 +0000 Subject: [PATCH 150/204] vkquake: 1.20.3 -> 1.22.1 --- pkgs/games/quakespasm/vulkan.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix index bfd9691fe148..cc6793d2c058 100644 --- a/pkgs/games/quakespasm/vulkan.nix +++ b/pkgs/games/quakespasm/vulkan.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "vkquake"; - version = "1.20.3"; + version = "1.22.1"; src = fetchFromGitHub { owner = "Novum"; repo = "vkQuake"; rev = version; - sha256 = "sha256-ocxXkayWujqAFV5N67VfmzJOUbjCPBZut9zmwNRYDeI="; + sha256 = "sha256-v0KLYAI9X1JYN7v8vpoAMWEHVMXytX72lOnJl2gJako="; }; sourceRoot = "source/Quake"; From 1ec1413384a84541f853fb48571f55596fa350d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 6 Dec 2022 16:51:20 +0000 Subject: [PATCH 151/204] pocketbase: 0.8.0 -> 0.9.0 --- pkgs/servers/pocketbase/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/servers/pocketbase/default.nix index a96431cc3126..4cc6369b7eb5 100644 --- a/pkgs/servers/pocketbase/default.nix +++ b/pkgs/servers/pocketbase/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "pocketbase"; repo = pname; rev = "v${version}"; - sha256 = "sha256-z7Vs+Z34r5g62X9DnEVkqTrr+V2bWwkfMXitNz+pVN8="; + sha256 = "sha256-eWYx45k18HDcXkgfKl9G4Q1h/BcCy+NDVhh5ndoW+Fk="; }; - vendorSha256 = "sha256-Ya+D15eAJ7qgEQoM2LcN2VEmmyp4cuS6/wCOEGdrgA8="; + vendorSha256 = "sha256-+wPcCF5AZ1HzNH1egCiK4eUQ0UmPPJzKB45lk7SOuCI="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; From f4edf91c8f9e691f035e69034c8bacb0558cb36f Mon Sep 17 00:00:00 2001 From: toastal <561087+toastal@users.noreply.github.com> Date: Thu, 8 Dec 2022 11:38:56 +0000 Subject: [PATCH 152/204] =?UTF-8?q?senpai:=20unstable-2022-11-15=20?= =?UTF-8?q?=E2=86=92=20unstable-2022-12-02?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://git.sr.ht/~taiite/senpai/commit/870e2e51feb2186bcb4c719e17967eb1311678a3 --- pkgs/applications/networking/irc/senpai/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/irc/senpai/default.nix b/pkgs/applications/networking/irc/senpai/default.nix index 0721d720cc7c..28d51650b263 100644 --- a/pkgs/applications/networking/irc/senpai/default.nix +++ b/pkgs/applications/networking/irc/senpai/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "senpai"; - version = "unstable-2022-11-15"; + version = "unstable-2022-12-02"; src = fetchFromSourcehut { owner = "~taiite"; repo = "senpai"; - rev = "cb0ba0669522ecf8ab0b0c3ccd0f14827eb65832"; - sha256 = "sha256-Ny7TAKdh7RFGlrMRVIyCFFLqOanNWK+qGBbh+dVngMs="; + rev = "870e2e51feb2186bcb4c719e17967eb1311678a3"; + sha256 = "sha256-YWEgA1KAa1cj2YaqOXVVBw70gSxK7WEMNDyGJOFq4DQ="; }; - vendorSha256 = "sha256-dCADJ+k2vWLpgN251/gEyAg6WhPGK2DEWRaAHSHp1aM="; + vendorSha256 = "sha256-+78Ln8179MfDKSfT/jnN9Y5CIbpdq28XMDHsIu+4f4c="; subPackages = [ "cmd/senpai" From e968b8b88d04064764520ed4127265103b2b8785 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 6 Dec 2022 17:04:47 +0000 Subject: [PATCH 153/204] praat: 6.3.01 -> 6.3.02 --- pkgs/applications/audio/praat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index b41913c4b91e..9ef53b980b93 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "praat"; - version = "6.3.01"; + version = "6.3.02"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${version}"; - sha256 = "sha256-BgfVbD/xQ3IaTMJhac6eSnbZQdBTDdqboruxSbKvbyE="; + sha256 = "sha256-sn/GWCw1bxtFjUUKkrPZVOe5qRQ5ATyII52CPHmlB3g="; }; configurePhase = '' From ee89367a3d9f21a46be9132f22e19ecb3c80260c Mon Sep 17 00:00:00 2001 From: Yureka Date: Thu, 8 Dec 2022 13:25:52 +0100 Subject: [PATCH 154/204] pkgsMusl.systemd: fix build (#204221) --- pkgs/os-specific/linux/systemd/default.nix | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 7c57d9edf601..0178cd7d6d45 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -6,6 +6,7 @@ , fetchFromGitHub , fetchpatch , fetchzip +, applyPatches , buildPackages , makeBinaryWrapper , ninja @@ -79,7 +80,7 @@ , withCoredump ? true , withCryptsetup ? true , withDocumentation ? true -, withEfi ? stdenv.hostPlatform.isEfi +, withEfi ? stdenv.hostPlatform.isEfi && !stdenv.hostPlatform.isMusl , withFido2 ? true , withHomed ? false , withHostnamed ? true @@ -169,10 +170,20 @@ stdenv.mkDerivation { ] ++ lib.optional stdenv.hostPlatform.isMusl ( let oe-core = fetchzip { - url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-86a33f98a7c0d6f2c2b51d02ba9e01b63062cf98.tar.bz2"; - sha256 = "081j01sw21hl405l7g9z4bavvq0q0k4g80365677m0ykhiqlx3am"; + url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-d43ec090ceb2bf0016a065103a4c34d0c43cb906.tar.gz"; + sha256 = "sha256-e5rHmz0uyNgJwrAj96VGWWu9YHhZtJXoDpCtj17eC5w="; }; - musl-patches = oe-core + "/meta/recipes-core/systemd/systemd"; + oe-core-patched = applyPatches { + src = oe-core; + patches = [ + (fetchpatch { + url = "https://lore.kernel.org/all/20221109002306.853567-1-raj.khem@gmail.com/raw"; + includes = [ "meta/recipes-core/systemd/systemd/*" ]; + sha256 = "sha256-aPJjN4vesZwFzgY4Nb6uaIuHz/quH1HccSVEof32IOU="; + }) + ]; + }; + musl-patches = oe-core-patched + "/meta/recipes-core/systemd/systemd"; in [ (musl-patches + "/0003-missing_type.h-add-comparison_fn_t.patch") @@ -194,6 +205,8 @@ stdenv.mkDerivation { (musl-patches + "/0001-pass-correct-parameters-to-getdents64.patch") (musl-patches + "/0002-Add-sys-stat.h-for-S_IFDIR.patch") (musl-patches + "/0001-Adjust-for-musl-headers.patch") + (musl-patches + "/0001-networkd-ipv4acd.c-Use-net-if.h-for-getting-IFF_LOOP.patch") + (musl-patches + "/0001-test-compile-test-utmp.c-only-if-UTMP-is-enabled.patch") ] ); From 49a8c118b252339d383d7dba90b707161db00ec2 Mon Sep 17 00:00:00 2001 From: tars0x9752 <46079709+tars0x9752@users.noreply.github.com> Date: Wed, 10 Aug 2022 14:58:15 +0900 Subject: [PATCH 155/204] blesh: unstable-2022-07-24 -> unstable-2022-07-29, refactor --- nixos/modules/programs/bash/blesh.nix | 2 +- pkgs/shells/bash/blesh/default.nix | 51 ++++++++++++++------------- 2 files changed, 28 insertions(+), 25 deletions(-) diff --git a/nixos/modules/programs/bash/blesh.nix b/nixos/modules/programs/bash/blesh.nix index 0a9aa6242425..8fa51bef7744 100644 --- a/nixos/modules/programs/bash/blesh.nix +++ b/nixos/modules/programs/bash/blesh.nix @@ -9,7 +9,7 @@ in { config = mkIf cfg.enable { programs.bash.interactiveShellInit = mkBefore '' - source ${pkgs.blesh}/share/ble.sh + source ${pkgs.blesh}/share/blesh/ble.sh ''; }; meta.maintainers = with maintainers; [ laalsaas ]; diff --git a/pkgs/shells/bash/blesh/default.nix b/pkgs/shells/bash/blesh/default.nix index f342f408540f..26ff975dae33 100644 --- a/pkgs/shells/bash/blesh/default.nix +++ b/pkgs/shells/bash/blesh/default.nix @@ -1,51 +1,54 @@ { lib , stdenvNoCC -, fetchFromGitHub -, git +, fetchzip +, runtimeShell , bashInteractive , glibcLocales -, runtimeShell }: stdenvNoCC.mkDerivation rec { name = "blesh"; - version = "unstable-2022-07-24"; + version = "unstable-2022-07-29"; - src = fetchFromGitHub { - owner = "akinomyoga"; - repo = "ble.sh"; - rev = "0b95d5d900b79a63e7f0834da5aa7276b8332a44"; - hash = "sha256-s/RQKcAFcCUB3Xd/4uOsIgigOE0lCCeVC9K3dfnP/EQ="; - fetchSubmodules = true; - leaveDotGit = true; + src = fetchzip { + url = "https://github.com/akinomyoga/ble.sh/releases/download/nightly/ble-nightly-20220729+a22e145.tar.xz"; + sha256 = "088jv02y40pjcfzgrbx8n6aksznfh6zl0j5siwfw3pmwn3i16njw"; }; - nativeBuildInputs = [ git ]; + dontBuild = true; doCheck = true; checkInputs = [ bashInteractive glibcLocales ]; preCheck = "export LC_ALL=en_US.UTF-8"; - installFlags = [ "INSDIR=$(out)/share" ]; + installPhase = '' + runHook preInstall + + mkdir -p "$out/share/blesh/lib" + + cat <"$out/share/blesh/lib/_package.sh" + _ble_base_package_type=nix + + function ble/base/package:nix/update { + echo "Ble.sh is installed by Nix. You can update it there." >&2 + return 1 + } + EOF + + cp -rv $src/* $out/share/blesh + + runHook postInstall + ''; + postInstall = '' mkdir -p "$out/bin" cat <"$out/bin/blesh-share" #!${runtimeShell} # Run this script to find the ble.sh shared folder # where all the shell scripts are living. - echo "$out/share/ble.sh" + echo "$out/share/blesh" EOF chmod +x "$out/bin/blesh-share" - - mkdir -p "$out/share/lib" - cat <"$out/share/lib/_package.sh" - _ble_base_package_type=nix - - function ble/base/package:nix/update { - echo "Ble.sh is installed by Nix. You can update it there." >/dev/stderr - return 1 - } - EOF ''; meta = with lib; { From 275f079066904c41e9191093510acfa0c16bc872 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 8 Dec 2022 13:47:11 +0100 Subject: [PATCH 156/204] unifi-protect-backup: 0.7.3 -> 0.8.3 https://github.com/ep1cman/unifi-protect-backup/blob/main/CHANGELOG.md#083---2022-12-08 https://github.com/ep1cman/unifi-protect-backup/blob/main/CHANGELOG.md#082---2022-12-05 https://github.com/ep1cman/unifi-protect-backup/blob/main/CHANGELOG.md#081---2022-12-04 https://github.com/ep1cman/unifi-protect-backup/blob/main/CHANGELOG.md#080---2022-12-03 https://github.com/ep1cman/unifi-protect-backup/blob/main/CHANGELOG.md#074---2022-08-21 --- pkgs/applications/backup/unifi-protect-backup/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/backup/unifi-protect-backup/default.nix b/pkgs/applications/backup/unifi-protect-backup/default.nix index dbfff51d8fde..b3d5acb85625 100644 --- a/pkgs/applications/backup/unifi-protect-backup/default.nix +++ b/pkgs/applications/backup/unifi-protect-backup/default.nix @@ -2,7 +2,7 @@ python3.pkgs.buildPythonApplication rec { pname = "unifi-protect-backup"; - version = "0.7.4"; + version = "0.8.3"; format = "pyproject"; @@ -10,12 +10,14 @@ python3.pkgs.buildPythonApplication rec { owner = "ep1cman"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-4Kpz89yqKmxHmnaPYpvJ2hx46yfcaCYjOioyya+38vE="; + hash = "sha256-3iOaJZAvkhjiWLKI1m2hmVkWLaNtq74nQZYIm/XCgeA="; }; preBuild = '' sed -i 's_click = "8.0.1"_click = "^8"_' pyproject.toml sed -i 's_pyunifiprotect = .*_pyunifiprotect = "*"_' pyproject.toml + sed -i 's_aiorun = .*_aiorun = "*"_' pyproject.toml + sed -i '/pylint/d' pyproject.toml ''; nativeBuildInputs = with python3.pkgs; [ @@ -24,6 +26,8 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ aiocron + aiorun + aiosqlite click pyunifiprotect ]; From 3933114462c6a979ce62acf3f7e2d20c3bc52f29 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 7 Dec 2022 19:50:53 +0000 Subject: [PATCH 157/204] =?UTF-8?q?gnome.mutter:=2043.1=20=E2=86=92=2043.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/mutter/-/compare/43.1...43.2 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/mutter/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index 3cba6b652cce..48320f7100b6 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -49,13 +49,13 @@ let self = stdenv.mkDerivation rec { pname = "mutter"; - version = "43.1"; + version = "43.2"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "8vCLJSeDlIpezILwDp6TWmHrv4VkhEvdkniKtEqngmQ="; + sha256 = "/S63B63DM8wnevhoXlzzkTXhxNeYofnQXojkU9w+u4Q="; }; patches = [ @@ -75,13 +75,6 @@ let self = stdenv.mkDerivation rec { sha256 = "NYoKCRh5o1Q15c11a79Hk5tGKq/jOa+e6GpgBjPEepo="; revert = true; }) - - # Backport edge resistance fix (should be part of 43.2) - # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2687 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/accf532a29ea9a1d70880dfaa1834050aa3ae7be.patch"; - sha256 = "XAHcPGQFWfZujlqO/cvUryojPCMBBSxeIG06BesDQQw="; - }) ]; mesonFlags = [ From 05bff5055bb48780fa1830746ecf8dfd3dcafb7f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 7 Dec 2022 19:50:42 +0000 Subject: [PATCH 158/204] =?UTF-8?q?gnome.gnome-shell:=2043.1=20=E2=86=92?= =?UTF-8?q?=2043.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-shell/-/compare/43.1...43.2 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-shell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index b71b9c02d909..c13ed844c28d 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -68,13 +68,13 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "43.1"; + version = "43.2"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "3wREdl3vG9Cv7pYX0rWRm8ebTbhufnV6wOH3N0jsG9w="; + sha256 = "52/UvpNCQQ7p+9zday2Bxv8GDnyMxaDxyuanq6JdGGA="; }; patches = [ From 2ea6e158443692e100c7260a726a18d1f0a1ca9b Mon Sep 17 00:00:00 2001 From: kilianar Date: Thu, 8 Dec 2022 14:17:50 +0100 Subject: [PATCH 159/204] vscode-extensions.james-yu.latex-workshop: 9.1.0 -> 9.1.1 https://github.com/James-Yu/LaTeX-Workshop/releases/tag/v9.1.1 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 6bb6db618ad0..834386997e3c 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1468,8 +1468,8 @@ let mktplcRef = { name = "latex-workshop"; publisher = "James-Yu"; - version = "9.1.0"; - sha256 = "sha256-a/v8/5ztB9DXqYpGWMYSRIwZIj1D+iebG35fO0yDjQQ="; + version = "9.1.1"; + sha256 = "sha256-Xt/z5r9R090Z9nP1v7k+jYm9EOcjy0GfYiYpc7jNid4="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog"; From 79a7bab6306716bd244af47e00b3bf5acc85cc29 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 8 Dec 2022 14:19:42 +0100 Subject: [PATCH 160/204] cmdstan: unbreak on aarch64-linux --- .../development/compilers/cmdstan/default.nix | 33 +++++++++++++------ 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix index 6aa30a584a8e..c82fc654b47a 100644 --- a/pkgs/development/compilers/cmdstan/default.nix +++ b/pkgs/development/compilers/cmdstan/default.nix @@ -1,14 +1,25 @@ { lib, stdenv, fetchurl, python3, runtimeShell }: +let + # FIXME: remove conditional on future release + version = if stdenv.isx86_64 then "2.31.0" else "2.30.1"; + # includes stanc binaries needed to build cmdstand + srcs = rec { + aarch64-linux = fetchurl { + url = "https://github.com/stan-dev/cmdstan/releases/download/v${version}/cmdstan-${version}-linux-arm64.tar.gz"; + sha256 = "sha256-oj/7JHT4LZcRAHiA2KbM6pZbOe6C98Ff//cNsG9DIm8="; + }; + x86_64-darwin = fetchurl { + url = "https://github.com/stan-dev/cmdstan/releases/download/v${version}/cmdstan-${version}.tar.gz"; + sha256 = "sha256-BMqRRWIC/Z7It2qkESJd9L3ycyxvA6NHiWbAvzVMzIQ="; + }; + x86_64-linux = x86_64-darwin; + }; + src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); +in stdenv.mkDerivation rec { pname = "cmdstan"; - version = "2.31.0"; - - # includes stanc binaries needed to build cmdstand - src = fetchurl { - url = "https://github.com/stan-dev/cmdstan/releases/download/v${version}/cmdstan-${version}.tar.gz"; - sha256 = "sha256-BMqRRWIC/Z7It2qkESJd9L3ycyxvA6NHiWbAvzVMzIQ="; - }; + inherit version src; buildFlags = [ "build" ]; enableParallelBuilding = true; @@ -22,6 +33,9 @@ stdenv.mkDerivation rec { substituteInPlace stan/lib/stan_math/make/libraries \ --replace "/usr/bin/env bash" "bash" patchShebangs . + '' + lib.optionalString stdenv.isAarch64 '' + sed -z -i "s/TEST(CommandStansummary, check_console_output).*TEST(CommandStansummary, check_csv_output)/TEST(CommandStansummary, check_csv_output)/" \ + src/test/interface/stansummary_test.cpp ''; checkPhase = '' @@ -41,10 +55,9 @@ stdenv.mkDerivation rec { ''; # Hack to ensure that patchelf --shrink-rpath get rids of a $TMPDIR reference. - preFixup = "rm -rf $(pwd)"; + preFixup = "rm -rf stan"; meta = { - broken = stdenv.isLinux && stdenv.isAarch64; description = "Command-line interface to Stan"; longDescription = '' Stan is a probabilistic programming language implementing full Bayesian @@ -54,6 +67,6 @@ stdenv.mkDerivation rec { ''; homepage = "https://mc-stan.org/interfaces/cmdstan.html"; license = lib.licenses.bsd3; - platforms = lib.platforms.all; + platforms = [ "aarch64-linux" "x86_64-darwin" "x86_64-linux" ]; }; } From 2787fc7d1e51404678614bf0fe92fc296746eec0 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 8 Dec 2022 09:44:17 -0300 Subject: [PATCH 161/204] erlang: fix build --- pkgs/development/interpreters/erlang/generic-builder.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index de904ba58d5f..bdfca31d7f7f 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -137,9 +137,6 @@ stdenv.mkDerivation ({ postInstall = '' ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call - '' + (lib.optionalString stdenv.isLinux '' - ln -s $out/lib/erlang/bin/escript $out/bin/escript - '') + '' ${postInstall} ''; From c06ff08579c10a18674a70da9bb159cd402101fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 Dec 2022 15:27:25 +0000 Subject: [PATCH 162/204] python310Packages.pontos: 22.11.0 -> 22.12.0 --- pkgs/development/python-modules/pontos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix index 4d207628cf8e..59980857560f 100644 --- a/pkgs/development/python-modules/pontos/default.nix +++ b/pkgs/development/python-modules/pontos/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "22.11.0"; + version = "22.12.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-WGtHMQ+8hACt8SMyO0zO80ASlfykJfHQOtNwyk1fsFE="; + hash = "sha256-8enSKOVEkYPI/2d2nzDkf1GO15kpMI6xDktroK9Ti2s="; }; nativeBuildInputs = [ From ee6c50751ca1cb9f99a410b1a49da66fca8994af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 Dec 2022 16:18:12 +0000 Subject: [PATCH 163/204] esbuild: 0.15.18 -> 0.16.1 --- pkgs/development/tools/esbuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index df4729eeb816..afb3b1c17e07 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.15.18"; + version = "0.16.1"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-b9R1ML+pgRg9j2yrkQmBulPuLHYLUQvW+WTyR/Cq6zE="; + sha256 = "sha256-5b9uJfIGWDQi5exPVCgK/9wrozptX1FebPMrWJ0v4TM="; }; vendorSha256 = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; From 11340cca867ea0e449782c6da7dd593a87f7391f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 Dec 2022 16:48:31 +0000 Subject: [PATCH 164/204] evcc: 0.108.3 -> 0.109.2 --- pkgs/servers/home-automation/evcc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index bd611627908e..70af6e4530e3 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -16,20 +16,20 @@ buildGoModule rec { pname = "evcc"; - version = "0.108.3"; + version = "0.109.2"; src = fetchFromGitHub { owner = "evcc-io"; repo = pname; rev = version; - hash = "sha256-jBUKMsSpcMoW4v9S5pCpojoYzFASj8hmWPzUcqL3doQ="; + hash = "sha256-/Mklf+F9OHq56Qj/kn8JpRAgWwCZqwsH9EwrBFdi/mQ="; }; - vendorHash = "sha256-10W1BNHcdP77m7lJ/mc+jQeUigoUid3K0wI4bUm5y+s="; + vendorHash = "sha256-H3ACmang+DPOCnccHLG6YzKvi7Rf5k8RkJDD1CgGBrw="; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-+l5LuxJAjrTvOL5XEQ4OIktdupSpn6IqrNX5x4MRmNw="; + hash = "sha256-oxoENlZNThW1PrwcGwiNP5Q7BZyhhtuCwXFey0t3Kz8="; }; nativeBuildInputs = [ From ee48569ebfa4e383d54fc7b7dfd74954c213a1a9 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 8 Dec 2022 13:49:19 -0300 Subject: [PATCH 165/204] linux: 4.14.300 -> 4.14.301 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 676302eb1e05..31f2e25c8f65 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.300"; + version = "4.14.301"; # 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 = "047vmh09icm45g7mnmdvyj9cam7747bcpah1s7n9dm5i2j2f906y"; + sha256 = "16zrpfadsnznpl37crbq5g1hz1ch0zfp2a75yzlqy2fs0f7fxlmc"; }; } // (args.argsOverride or {})) From 1a3bd52a0bc83190ab3359b8fe73748a0661368e Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 8 Dec 2022 13:49:32 -0300 Subject: [PATCH 166/204] linux: 4.19.267 -> 4.19.268 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 734fa93fa207..167f7cd84792 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.267"; + version = "4.19.268"; # 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 = "035yxx13jz5f5ig2r6ybzgivm8vjafgnvjws0jfzha4w6klf7r9l"; + sha256 = "0kr0di4gr6p57c8h6ybcli01kazq235npbh6qrpx0hpmqcdcx6r1"; }; } // (args.argsOverride or {})) From 1c008e6a66043e42a64a304dfd5d88868d5a04a4 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 8 Dec 2022 13:49:42 -0300 Subject: [PATCH 167/204] linux: 5.10.157 -> 5.10.158 --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 8be0db43fb0d..3b56aa0c8e1a 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.157"; + version = "5.10.158"; # 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/v5.x/linux-${version}.tar.xz"; - sha256 = "0zrjdmaj3sx0w7397glaiq6w9wwdj7lpff77a09kzmbyfz0dfk7w"; + sha256 = "1rq7lyp41fydybs53rcdjhiy271arh95xch16s5s3jhhanxj82hy"; }; } // (args.argsOverride or {})) From 6b0253df6a8c4d93b20e5d98a55d17b2de573976 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 8 Dec 2022 13:49:48 -0300 Subject: [PATCH 168/204] linux: 5.15.81 -> 5.15.82 --- pkgs/os-specific/linux/kernel/linux-5.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index f0e341f540a2..5892aead9007 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.81"; + version = "5.15.82"; # 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/v5.x/linux-${version}.tar.xz"; - sha256 = "1awny3lgfkh5n2gdksajbyzips8kawz6rkr0p5inwkbmppg5r24g"; + sha256 = "0r8v7113favmch2x6br7jk6idihza99l9qyd7ik99i5sg6xzdvpw"; }; } // (args.argsOverride or { })) From 2d1651b612050ac860aa701d74f07c6927bba46f Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 8 Dec 2022 13:49:57 -0300 Subject: [PATCH 169/204] linux: 5.4.225 -> 5.4.226 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index d4f06b7b2f83..8d874fc72694 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.225"; + version = "5.4.226"; # 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/v5.x/linux-${version}.tar.xz"; - sha256 = "1ak0qlxzfylgvkldh2whq4mzynh1rymhnnc1yif9a5s3f7v9dxar"; + sha256 = "0i4s1hl5q0ax55z7m5krzyw1zj9v03q8jcfksknb6qrg3lm5a7qc"; }; } // (args.argsOverride or {})) From 02a7f67cf02cc093e8e7c36e71a84e7974643565 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 8 Dec 2022 13:50:09 -0300 Subject: [PATCH 170/204] linux: 6.0.11 -> 6.0.12 --- pkgs/os-specific/linux/kernel/linux-6.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.0.nix b/pkgs/os-specific/linux/kernel/linux-6.0.nix index 0815279fb4fa..e882de626a15 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.0.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.0.11"; + version = "6.0.12"; # 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/v6.x/linux-${version}.tar.xz"; - sha256 = "0qn7m74wfixqk832j2yvgf2lq4vi55agm5gk9ziy2wa9wqqn3bib"; + sha256 = "00ag63lnxw2gijw3b6v29lhrlv480m12954q5zh4jawlz3nk1dw9"; }; } // (args.argsOverride or { })) From 0ff3b35356b5a57f93b4a7c27ed9ca4c71d388ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Thu, 3 Nov 2022 15:52:19 +0100 Subject: [PATCH 171/204] nixos/doc: fix some options --- nixos/modules/programs/htop.nix | 2 +- nixos/modules/programs/weylus.nix | 2 +- nixos/modules/services/audio/liquidsoap.nix | 12 +++++---- .../modules/services/databases/clickhouse.nix | 2 +- nixos/modules/services/databases/mysql.nix | 10 ++++--- nixos/modules/services/databases/openldap.nix | 2 +- nixos/modules/services/games/asf.nix | 8 +++--- nixos/modules/services/games/terraria.nix | 2 +- nixos/modules/services/hardware/argonone.nix | 2 +- nixos/modules/services/hardware/joycond.nix | 2 +- nixos/modules/services/matrix/conduit.nix | 3 +-- nixos/modules/services/matrix/synapse.nix | 1 + nixos/modules/services/misc/autorandr.nix | 4 +-- nixos/modules/services/misc/heisenbridge.nix | 3 +-- nixos/modules/services/misc/portunus.nix | 4 +-- .../services/misc/sourcehut/default.nix | 2 +- .../services/monitoring/grafana-agent.nix | 26 ++++++++++--------- .../services/monitoring/uptime-kuma.nix | 3 +-- .../modules/services/networking/ddclient.nix | 2 +- .../modules/services/networking/ergochat.nix | 4 +-- .../modules/services/networking/multipath.nix | 2 +- nixos/modules/services/networking/nomad.nix | 2 +- nixos/modules/services/networking/sabnzbd.nix | 2 +- nixos/modules/services/search/meilisearch.nix | 2 +- .../modules/services/security/opensnitch.nix | 2 +- .../modules/services/web-apps/code-server.nix | 2 +- nixos/modules/services/web-apps/invidious.nix | 2 +- .../modules/services/web-apps/mattermost.nix | 4 +-- .../modules/services/web-apps/onlyoffice.nix | 2 +- .../services/web-servers/lighttpd/default.nix | 2 +- nixos/modules/virtualisation/qemu-vm.nix | 9 ++++--- 31 files changed, 67 insertions(+), 60 deletions(-) diff --git a/nixos/modules/programs/htop.nix b/nixos/modules/programs/htop.nix index 521287f9352d..2682ced490ca 100644 --- a/nixos/modules/programs/htop.nix +++ b/nixos/modules/programs/htop.nix @@ -20,7 +20,7 @@ in package = mkOption { type = types.package; default = pkgs.htop; - defaultText = "pkgs.htop"; + defaultText = lib.literalExpression "pkgs.htop"; description = lib.mdDoc '' The htop package that should be used. ''; diff --git a/nixos/modules/programs/weylus.nix b/nixos/modules/programs/weylus.nix index eab8afdf2cc8..a5775f3b981c 100644 --- a/nixos/modules/programs/weylus.nix +++ b/nixos/modules/programs/weylus.nix @@ -29,7 +29,7 @@ in package = mkOption { type = package; default = pkgs.weylus; - defaultText = "pkgs.weylus"; + defaultText = lib.literalExpression "pkgs.weylus"; description = lib.mdDoc "Weylus package to install."; }; }; diff --git a/nixos/modules/services/audio/liquidsoap.nix b/nixos/modules/services/audio/liquidsoap.nix index c313104c4609..5c10d13af5fd 100644 --- a/nixos/modules/services/audio/liquidsoap.nix +++ b/nixos/modules/services/audio/liquidsoap.nix @@ -38,11 +38,13 @@ in default = {}; - example = { - myStream1 = "/etc/liquidsoap/myStream1.liq"; - myStream2 = literalExpression "./myStream2.liq"; - myStream3 = "out(playlist(\"/srv/music/\"))"; - }; + example = literalExpression '' + { + myStream1 = "/etc/liquidsoap/myStream1.liq"; + myStream2 = ./myStream2.liq; + myStream3 = "out(playlist(\"/srv/music/\"))"; + } + ''; type = types.attrsOf (types.either types.path types.str); }; diff --git a/nixos/modules/services/databases/clickhouse.nix b/nixos/modules/services/databases/clickhouse.nix index 96607d9a783c..04dd20b5f14d 100644 --- a/nixos/modules/services/databases/clickhouse.nix +++ b/nixos/modules/services/databases/clickhouse.nix @@ -16,7 +16,7 @@ with lib; package = mkOption { type = types.package; default = pkgs.clickhouse; - defaultText = "pkgs.clickhouse"; + defaultText = lib.literalExpression "pkgs.clickhouse"; description = lib.mdDoc '' ClickHouse package to use. ''; diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index ec4524e9061d..128bb0862175 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -160,10 +160,12 @@ in List of database names and their initial schemas that should be used to create databases on the first startup of MySQL. The schema attribute is optional: If not specified, an empty database is created. ''; - example = [ - { name = "foodatabase"; schema = literalExpression "./foodatabase.sql"; } - { name = "bardatabase"; } - ]; + example = literalExpression '' + [ + { name = "foodatabase"; schema = ./foodatabase.sql; } + { name = "bardatabase"; } + ] + ''; }; initialScript = mkOption { diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index 7a59de372f24..cba3442023cb 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -16,7 +16,7 @@ let # systemd/systemd#19604 description = '' LDAP value - either a string, or an attrset containing - path or base64 for included + `path` or `base64` for included values or base-64 encoded values respectively. ''; check = x: lib.isString x || (lib.isAttrs x && (x ? path || x ? base64)); diff --git a/nixos/modules/services/games/asf.nix b/nixos/modules/services/games/asf.nix index 10847e8f11f3..d3f7883421ce 100644 --- a/nixos/modules/services/games/asf.nix +++ b/nixos/modules/services/games/asf.nix @@ -43,12 +43,14 @@ in web-ui = mkOption { type = types.submodule { options = { - enable = mkEnableOption - (lib.mdDoc "Wheter to start the web-ui. This is the preferred way of configuring things such as the steam guard token"); + enable = mkEnableOption "" // { + description = lib.mdDoc "Whether to start the web-ui. This is the preferred way of configuring things such as the steam guard token."; + }; package = mkOption { type = types.package; default = pkgs.ArchiSteamFarm.ui; + defaultText = lib.literalExpression "pkgs.ArchiSteamFarm.ui"; description = lib.mdDoc "Web-UI package to use. Contents must be in lib/dist."; }; @@ -56,7 +58,6 @@ in }; default = { enable = true; - package = pkgs.ArchiSteamFarm.ui; }; example = { enable = false; @@ -67,6 +68,7 @@ in package = mkOption { type = types.package; default = pkgs.ArchiSteamFarm; + defaultText = lib.literalExpression "pkgs.ArchiSteamFarm"; description = lib.mdDoc "Package to use. Should always be the latest version, for security reasons, since this module uses very new features and to not get out of sync with the Steam API."; }; diff --git a/nixos/modules/services/games/terraria.nix b/nixos/modules/services/games/terraria.nix index 571bcde2c5b2..ccdd779165b8 100644 --- a/nixos/modules/services/games/terraria.nix +++ b/nixos/modules/services/games/terraria.nix @@ -116,7 +116,7 @@ in openFirewall = mkOption { type = types.bool; default = false; - description = lib.mdDoc "Wheter to open ports in the firewall"; + description = lib.mdDoc "Whether to open ports in the firewall"; }; dataDir = mkOption { diff --git a/nixos/modules/services/hardware/argonone.nix b/nixos/modules/services/hardware/argonone.nix index dc90e09e985b..e67c2625062e 100644 --- a/nixos/modules/services/hardware/argonone.nix +++ b/nixos/modules/services/hardware/argonone.nix @@ -9,7 +9,7 @@ in package = lib.mkOption { type = lib.types.package; default = pkgs.argononed; - defaultText = "pkgs.argononed"; + defaultText = lib.literalExpression "pkgs.argononed"; description = lib.mdDoc '' The package implementing the Argon One driver ''; diff --git a/nixos/modules/services/hardware/joycond.nix b/nixos/modules/services/hardware/joycond.nix index f4da00762a43..1af18b3b63d3 100644 --- a/nixos/modules/services/hardware/joycond.nix +++ b/nixos/modules/services/hardware/joycond.nix @@ -14,7 +14,7 @@ with lib; package = mkOption { type = types.package; default = pkgs.joycond; - defaultText = "pkgs.joycond"; + defaultText = lib.literalExpression "pkgs.joycond"; description = lib.mdDoc '' The joycond package to use. ''; diff --git a/nixos/modules/services/matrix/conduit.nix b/nixos/modules/services/matrix/conduit.nix index 812d463e9e86..c8d89ed33f51 100644 --- a/nixos/modules/services/matrix/conduit.nix +++ b/nixos/modules/services/matrix/conduit.nix @@ -23,8 +23,7 @@ in package = mkOption { type = types.package; default = pkgs.matrix-conduit; - defaultText = "pkgs.matrix-conduit"; - example = "pkgs.matrix-conduit"; + defaultText = lib.literalExpression "pkgs.matrix-conduit"; description = lib.mdDoc '' Package of the conduit matrix server to use. ''; diff --git a/nixos/modules/services/matrix/synapse.nix b/nixos/modules/services/matrix/synapse.nix index 86662055222a..a80d4cabfec0 100644 --- a/nixos/modules/services/matrix/synapse.nix +++ b/nixos/modules/services/matrix/synapse.nix @@ -286,6 +286,7 @@ in { log_config = mkOption { type = types.path; default = ./synapse-log_config.yaml; + defaultText = lib.literalExpression "nixos/modules/services/matrix/synapse-log_config.yaml"; description = lib.mdDoc '' The file that holds the logging configuration. ''; diff --git a/nixos/modules/services/misc/autorandr.nix b/nixos/modules/services/misc/autorandr.nix index 365fdd5fcc39..072064143dbd 100644 --- a/nixos/modules/services/misc/autorandr.nix +++ b/nixos/modules/services/misc/autorandr.nix @@ -258,7 +258,7 @@ in { type = hooksModule; description = lib.mdDoc "Global hook scripts"; default = { }; - example = '' + example = literalExpression '' { postswitch = { "notify-i3" = "''${pkgs.i3}/bin/i3-msg restart"; @@ -279,7 +279,7 @@ in { exit 1 esac echo "Xft.dpi: $DPI" | ''${pkgs.xorg.xrdb}/bin/xrdb -merge - ''' + '''; }; } ''; diff --git a/nixos/modules/services/misc/heisenbridge.nix b/nixos/modules/services/misc/heisenbridge.nix index 13ba362b33db..d07e0e420462 100644 --- a/nixos/modules/services/misc/heisenbridge.nix +++ b/nixos/modules/services/misc/heisenbridge.nix @@ -28,8 +28,7 @@ in package = mkOption { type = types.package; default = pkgs.heisenbridge; - defaultText = "pkgs.heisenbridge"; - example = "pkgs.heisenbridge.override { … = …; }"; + defaultText = lib.literalExpression "pkgs.heisenbridge"; description = lib.mdDoc '' Package of the application to run, exposed for overriding purposes. ''; diff --git a/nixos/modules/services/misc/portunus.nix b/nixos/modules/services/misc/portunus.nix index 0b283ea27d82..1dae605e46f2 100644 --- a/nixos/modules/services/misc/portunus.nix +++ b/nixos/modules/services/misc/portunus.nix @@ -29,7 +29,7 @@ in package = mkOption { type = types.package; default = pkgs.portunus; - defaultText = "pkgs.portunus"; + defaultText = lib.literalExpression "pkgs.portunus"; description = lib.mdDoc "The Portunus package to use."; }; @@ -108,7 +108,7 @@ in package = mkOption { type = types.package; default = pkgs.openldap; - defaultText = "pkgs.openldap"; + defaultText = lib.literalExpression "pkgs.openldap"; description = lib.mdDoc "The OpenLDAP package to use."; }; diff --git a/nixos/modules/services/misc/sourcehut/default.nix b/nixos/modules/services/misc/sourcehut/default.nix index aaa7bb057546..7dd254e34920 100644 --- a/nixos/modules/services/misc/sourcehut/default.nix +++ b/nixos/modules/services/misc/sourcehut/default.nix @@ -505,7 +505,7 @@ in description = lib.mdDoc "Origin URL for API, 100 more than web."; type = types.str; default = "http://${cfg.listenAddress}:${toString (cfg.meta.port + 100)}"; - defaultText = ''http://:''${toString ( + 100)}''; + defaultText = lib.literalMD ''`"http://''${`[](#opt-services.sourcehut.listenAddress)`}:''${toString (`[](#opt-services.sourcehut.meta.port)` + 100)}"`''; }; webhooks = mkOption { description = lib.mdDoc "The Redis connection used for the webhooks worker."; diff --git a/nixos/modules/services/monitoring/grafana-agent.nix b/nixos/modules/services/monitoring/grafana-agent.nix index ecb39a924f58..270d888afb78 100644 --- a/nixos/modules/services/monitoring/grafana-agent.nix +++ b/nixos/modules/services/monitoring/grafana-agent.nix @@ -16,7 +16,7 @@ in package = mkOption { type = types.package; default = pkgs.grafana-agent; - defaultText = "pkgs.grafana-agent"; + defaultText = lib.literalExpression "pkgs.grafana-agent"; description = lib.mdDoc "The grafana-agent package to use."; }; @@ -49,17 +49,19 @@ in }; default = { }; - defaultText = '' - metrics = { - wal_directory = "\''${STATE_DIRECTORY}"; - global.scrape_interval = "5s"; - }; - integrations = { - agent.enabled = true; - agent.scrape_integration = true; - node_exporter.enabled = true; - replace_instance_label = true; - }; + defaultText = lib.literalExpression '' + { + metrics = { + wal_directory = "\''${STATE_DIRECTORY}"; + global.scrape_interval = "5s"; + }; + integrations = { + agent.enabled = true; + agent.scrape_integration = true; + node_exporter.enabled = true; + replace_instance_label = true; + }; + } ''; example = { metrics.global.remote_write = [{ diff --git a/nixos/modules/services/monitoring/uptime-kuma.nix b/nixos/modules/services/monitoring/uptime-kuma.nix index 3a6091de679d..b6dc993e6a05 100644 --- a/nixos/modules/services/monitoring/uptime-kuma.nix +++ b/nixos/modules/services/monitoring/uptime-kuma.nix @@ -13,9 +13,8 @@ in package = mkOption { type = types.package; - example = literalExpression "pkgs.uptime-kuma"; default = pkgs.uptime-kuma; - defaultText = "pkgs.uptime-kuma"; + defaultText = literalExpression "pkgs.uptime-kuma"; description = lib.mdDoc "Uptime Kuma package to use."; }; diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix index 5c32817979af..4d843641f58a 100644 --- a/nixos/modules/services/networking/ddclient.nix +++ b/nixos/modules/services/networking/ddclient.nix @@ -71,7 +71,7 @@ with lib; package = mkOption { type = package; default = pkgs.ddclient; - defaultText = "pkgs.ddclient"; + defaultText = lib.literalExpression "pkgs.ddclient"; description = lib.mdDoc '' The ddclient executable package run by the service. ''; diff --git a/nixos/modules/services/networking/ergochat.nix b/nixos/modules/services/networking/ergochat.nix index 1a70b1f8613e..a003512677eb 100644 --- a/nixos/modules/services/networking/ergochat.nix +++ b/nixos/modules/services/networking/ergochat.nix @@ -17,10 +17,10 @@ in { configFile = lib.mkOption { type = lib.types.path; default = (pkgs.formats.yaml {}).generate "ergo.conf" cfg.settings; - defaultText = "generated config file from .settings"; + defaultText = lib.literalMD "generated config file from `settings`"; description = lib.mdDoc '' Path to configuration file. - Setting this will skip any configuration done via `.settings` + Setting this will skip any configuration done via `settings` ''; }; diff --git a/nixos/modules/services/networking/multipath.nix b/nixos/modules/services/networking/multipath.nix index cb6b6db272c2..54ee2a015687 100644 --- a/nixos/modules/services/networking/multipath.nix +++ b/nixos/modules/services/networking/multipath.nix @@ -28,7 +28,7 @@ in { type = package; description = lib.mdDoc "multipath-tools package to use"; default = pkgs.multipath-tools; - defaultText = "pkgs.multipath-tools"; + defaultText = lib.literalExpression "pkgs.multipath-tools"; }; devices = mkOption { diff --git a/nixos/modules/services/networking/nomad.nix b/nixos/modules/services/networking/nomad.nix index 5e5d9469efc7..890ee0b7d8d1 100644 --- a/nixos/modules/services/networking/nomad.nix +++ b/nixos/modules/services/networking/nomad.nix @@ -67,7 +67,7 @@ in Additional plugins dir used to configure nomad. ''; example = literalExpression '' - [ "" "pkgs."] + [ "" pkgs. ] ''; }; diff --git a/nixos/modules/services/networking/sabnzbd.nix b/nixos/modules/services/networking/sabnzbd.nix index 8486be1bc66c..8f3545df8995 100644 --- a/nixos/modules/services/networking/sabnzbd.nix +++ b/nixos/modules/services/networking/sabnzbd.nix @@ -20,7 +20,7 @@ in package = mkOption { type = types.package; default = pkgs.sabnzbd; - defaultText = "pkgs.sabnzbd"; + defaultText = lib.literalExpression "pkgs.sabnzbd"; description = lib.mdDoc "The sabnzbd executable package run by the service."; }; diff --git a/nixos/modules/services/search/meilisearch.nix b/nixos/modules/services/search/meilisearch.nix index 9262b927cba4..3983b1b2c92c 100644 --- a/nixos/modules/services/search/meilisearch.nix +++ b/nixos/modules/services/search/meilisearch.nix @@ -21,7 +21,7 @@ in package = mkOption { description = lib.mdDoc "The package to use for meilisearch. Use this if you require specific features to be enabled. The default package has no features."; default = pkgs.meilisearch; - defaultText = "pkgs.meilisearch"; + defaultText = lib.literalExpression "pkgs.meilisearch"; type = types.package; }; diff --git a/nixos/modules/services/security/opensnitch.nix b/nixos/modules/services/security/opensnitch.nix index 8f1407b555fb..98695b1ef060 100644 --- a/nixos/modules/services/security/opensnitch.nix +++ b/nixos/modules/services/security/opensnitch.nix @@ -91,7 +91,7 @@ in { InterceptUnknown = mkOption { type = types.bool; description = mdDoc '' - Wheter to intercept spare connections. + Whether to intercept spare connections. ''; }; diff --git a/nixos/modules/services/web-apps/code-server.nix b/nixos/modules/services/web-apps/code-server.nix index 0d6b6c529b6d..24e34e0c5833 100644 --- a/nixos/modules/services/web-apps/code-server.nix +++ b/nixos/modules/services/web-apps/code-server.nix @@ -15,7 +15,7 @@ in { package = mkOption { default = pkgs.code-server; - defaultText = "pkgs.code-server"; + defaultText = lib.literalExpression "pkgs.code-server"; description = lib.mdDoc "Which code-server derivation to use."; type = types.package; }; diff --git a/nixos/modules/services/web-apps/invidious.nix b/nixos/modules/services/web-apps/invidious.nix index e106478628f5..a153aa3fb0c3 100644 --- a/nixos/modules/services/web-apps/invidious.nix +++ b/nixos/modules/services/web-apps/invidious.nix @@ -151,7 +151,7 @@ in package = lib.mkOption { type = types.package; default = pkgs.invidious; - defaultText = "pkgs.invidious"; + defaultText = lib.literalExpression "pkgs.invidious"; description = lib.mdDoc "The Invidious package to use."; }; diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix index 71292c47d63a..99042821f5eb 100644 --- a/nixos/modules/services/web-apps/mattermost.nix +++ b/nixos/modules/services/web-apps/mattermost.nix @@ -106,7 +106,7 @@ in package = mkOption { type = types.package; default = pkgs.mattermost; - defaultText = "pkgs.mattermost"; + defaultText = lib.literalExpression "pkgs.mattermost"; description = lib.mdDoc "Mattermost derivation to use."; }; @@ -238,7 +238,7 @@ in package = mkOption { type = types.package; default = pkgs.matterircd; - defaultText = "pkgs.matterircd"; + defaultText = lib.literalExpression "pkgs.matterircd"; description = lib.mdDoc "matterircd derivation to use."; }; parameters = mkOption { diff --git a/nixos/modules/services/web-apps/onlyoffice.nix b/nixos/modules/services/web-apps/onlyoffice.nix index db4a9582794e..1478e8da87a1 100644 --- a/nixos/modules/services/web-apps/onlyoffice.nix +++ b/nixos/modules/services/web-apps/onlyoffice.nix @@ -29,7 +29,7 @@ in package = mkOption { type = types.package; default = pkgs.onlyoffice-documentserver; - defaultText = "pkgs.onlyoffice-documentserver"; + defaultText = lib.literalExpression "pkgs.onlyoffice-documentserver"; description = lib.mdDoc "Which package to use for the OnlyOffice instance."; }; diff --git a/nixos/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix index ec847495d741..811afe8e0af6 100644 --- a/nixos/modules/services/web-servers/lighttpd/default.nix +++ b/nixos/modules/services/web-servers/lighttpd/default.nix @@ -137,7 +137,7 @@ in package = mkOption { default = pkgs.lighttpd; - defaultText = "pkgs.lighttpd"; + defaultText = lib.literalExpression "pkgs.lighttpd"; type = types.package; description = lib.mdDoc '' lighttpd package to use. diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index eae898a08a69..1b3c0e23f97d 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -580,7 +580,7 @@ in virtualisation.host.pkgs = mkOption { type = options.nixpkgs.pkgs.type; default = pkgs; - defaultText = "pkgs"; + defaultText = literalExpression "pkgs"; example = literalExpression '' import pkgs.path { system = "x86_64-darwin"; } ''; @@ -595,7 +595,8 @@ in mkOption { type = types.package; default = cfg.host.pkgs.qemu_kvm; - example = "pkgs.qemu_test"; + defaultText = literalExpression "config.virtualisation.host.pkgs.qemu_kvm"; + example = literalExpression "pkgs.qemu_test"; description = lib.mdDoc "QEMU package to use."; }; @@ -721,7 +722,7 @@ in firmware = mkOption { type = types.path; default = pkgs.OVMF.firmware; - defaultText = "pkgs.OVMF.firmware"; + defaultText = literalExpression "pkgs.OVMF.firmware"; description = lib.mdDoc '' Firmware binary for EFI implementation, defaults to OVMF. @@ -731,7 +732,7 @@ in variables = mkOption { type = types.path; default = pkgs.OVMF.variables; - defaultText = "pkgs.OVMF.variables"; + defaultText = literalExpression "pkgs.OVMF.variables"; description = lib.mdDoc '' Platform-specific flash binary for EFI variables, implementation-dependent to the EFI firmware. From 0fa7b1b004788881733dc117edd7699f77384166 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Fri, 4 Nov 2022 17:31:41 +0100 Subject: [PATCH 172/204] lib/generators.toPretty: don't evaluate derivations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With the goal of making `toPretty` suitable for rendering option values, render derivations as `` instead of ``. This is to avoid causing sudden evaluation errors for out-of-tree projects that have options with `default = pkgs.someUnfreePackage;` and no `defaultText`. --- lib/generators.nix | 2 +- lib/tests/misc.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/generators.nix b/lib/generators.nix index b77cca75010f..9620b8b27b9b 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -330,7 +330,7 @@ rec { then v.__pretty v.val else if v == {} then "{ }" else if v ? type && v.type == "derivation" then - "" + "" else "{" + introSpace + libStr.concatStringsSep introSpace (libAttr.mapAttrsToList (name: value: diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index b73da4f1010d..9267e1f57694 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -754,7 +754,7 @@ runTests { emptylist = "[ ]"; attrs = "{ foo = null; \"foo bar\" = \"baz\"; }"; emptyattrs = "{ }"; - drv = ""; + drv = ""; }; }; From 0b661ce32af9baa07da56b3f48fcd3ef5611b66c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Mon, 7 Nov 2022 13:01:13 +0100 Subject: [PATCH 173/204] lib/generators.toPretty: escape strings properly --- lib/generators.nix | 24 +++++++++++++----------- lib/tests/misc.nix | 16 ++++++++-------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/lib/generators.nix b/lib/generators.nix index 9620b8b27b9b..06823d215e36 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -297,17 +297,19 @@ rec { else if isFloat v then "~${toString v}" else if isString v then let - # Separate a string into its lines - newlineSplits = filter (v: ! isList v) (builtins.split "\n" v); - # For a '' string terminated by a \n, which happens when the closing '' is on a new line - multilineResult = "''" + introSpace + concatStringsSep introSpace (lib.init newlineSplits) + outroSpace + "''"; - # For a '' string not terminated by a \n, which happens when the closing '' is not on a new line - multilineResult' = "''" + introSpace + concatStringsSep introSpace newlineSplits + "''"; - # For single lines, replace all newlines with their escaped representation - singlelineResult = "\"" + libStr.escape [ "\"" ] (concatStringsSep "\\n" newlineSplits) + "\""; - in if multiline && length newlineSplits > 1 then - if lib.last newlineSplits == "" then multilineResult else multilineResult' - else singlelineResult + lines = filter (v: ! isList v) (builtins.split "\n" v); + escapeSingleline = libStr.escape [ "\\" "\"" "\${" ]; + escapeMultiline = libStr.replaceStrings [ "\${" "''" ] [ "''\${" "'''" ]; + singlelineResult = "\"" + concatStringsSep "\\n" (map escapeSingleline lines) + "\""; + multilineResult = let + escapedLines = map escapeMultiline lines; + # The last line gets a special treatment: if it's empty, '' is on its own line at the "outer" + # indentation level. Otherwise, '' is appended to the last line. + lastLine = lib.last escapedLines; + in "''" + introSpace + concatStringsSep introSpace (lib.init escapedLines) + + (if lastLine == "" then outroSpace else introSpace + lastLine) + "''"; + in + if multiline && length lines > 1 then multilineResult else singlelineResult else if true == v then "true" else if false == v then "false" else if null == v then "null" diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 9267e1f57694..cfad5a3cd92a 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -727,7 +727,7 @@ runTests { float = 0.1337; bool = true; emptystring = ""; - string = ''fno"rd''; + string = "fn\${o}\"r\\d"; newlinestring = "\n"; path = /. + "/foo"; null_ = null; @@ -735,7 +735,7 @@ runTests { functionArgs = { arg ? 4, foo }: arg; list = [ 3 4 function [ false ] ]; emptylist = []; - attrs = { foo = null; "foo bar" = "baz"; }; + attrs = { foo = null; "foo b/ar" = "baz"; }; emptyattrs = {}; drv = deriv; }; @@ -744,7 +744,7 @@ runTests { float = "~0.133700"; bool = "true"; emptystring = ''""''; - string = ''"fno\"rd"''; + string = ''"fn\''${o}\"r\\d"''; newlinestring = "\"\\n\""; path = "/foo"; null_ = "null"; @@ -752,7 +752,7 @@ runTests { functionArgs = ""; list = "[ 3 4 ${function} [ false ] ]"; emptylist = "[ ]"; - attrs = "{ foo = null; \"foo bar\" = \"baz\"; }"; + attrs = "{ foo = null; \"foo b/ar\" = \"baz\"; }"; emptyattrs = "{ }"; drv = ""; }; @@ -799,8 +799,8 @@ runTests { newlinestring = "\n"; multilinestring = '' hello - there - test + ''${there} + te'''st ''; multilinestring' = '' hello @@ -827,8 +827,8 @@ runTests { multilinestring = '' ''' hello - there - test + '''''${there} + te''''st '''''; multilinestring' = '' ''' From 6a117e2759b84b9508f1d69cb5be54ca331bff98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Thu, 3 Nov 2022 15:56:27 +0100 Subject: [PATCH 174/204] nixos/doc: render option values using `lib.generators.toPretty` Render un`_type`d defaults and examples as `literalExpression`s using `lib.generators.toPretty` so that consumers don't have to reinvent Nix pretty-printing. `renderOptionValue` is kept internal for now intentionally. Make `toPretty` print floats as valid Nix values (without a tilde). Get rid of the now-obsolete `substSpecial` function. Move towards disallowing evaluation of packages in the manual by raising a warning on `pkgs.foo.{outPath,drvPath}`; later, this should throw an error. Instead, module authors should use `literalExpression` and `mkPackageOption`. --- lib/generators.nix | 14 ++++++++++---- lib/options.nix | 21 +++++++++++++++++---- lib/tests/misc.nix | 2 +- nixos/lib/make-options-doc/default.nix | 19 +------------------ nixos/modules/misc/documentation.nix | 11 ++++++++--- 5 files changed, 37 insertions(+), 30 deletions(-) diff --git a/lib/generators.nix b/lib/generators.nix index 06823d215e36..c0fe69389e00 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -278,8 +278,11 @@ rec { mapAny 0; /* Pretty print a value, akin to `builtins.trace`. - * Should probably be a builtin as well. - */ + * Should probably be a builtin as well. + * The pretty-printed string should be suitable for rendering default values + * in the NixOS manual. In particular, it should be as close to a valid Nix expression + * as possible. + */ toPretty = { /* If this option is true, attrsets like { __pretty = fn; val = …; } will use fn to convert val to a pretty printed representation. @@ -294,7 +297,10 @@ rec { introSpace = if multiline then "\n${indent} " else " "; outroSpace = if multiline then "\n${indent}" else " "; in if isInt v then toString v - else if isFloat v then "~${toString v}" + # toString loses precision on floats, so we use toJSON instead. This isn't perfect + # as the resulting string may not parse back as a float (e.g. 42, 1e-06), but for + # pretty-printing purposes this is acceptable. + else if isFloat v then builtins.toJSON v else if isString v then let lines = filter (v: ! isList v) (builtins.split "\n" v); @@ -328,7 +334,7 @@ rec { else "" else if isAttrs v then # apply pretty values if allowed - if attrNames v == [ "__pretty" "val" ] && allowPrettyValues + if allowPrettyValues && v ? __pretty && v ? val then v.__pretty v.val else if v == {} then "{ }" else if v ? type && v.type == "derivation" then diff --git a/lib/options.nix b/lib/options.nix index c80256c0e653..b13687576e81 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -218,7 +218,7 @@ rec { # the set generated with filterOptionSets. optionAttrSetToDocList = optionAttrSetToDocList' []; - optionAttrSetToDocList' = prefix: options: + optionAttrSetToDocList' = _: options: concatMap (opt: let docOption = rec { @@ -234,9 +234,8 @@ rec { readOnly = opt.readOnly or false; type = opt.type.description or "unspecified"; } - // optionalAttrs (opt ? example) { example = scrubOptionValue opt.example; } - // optionalAttrs (opt ? default) { default = scrubOptionValue opt.default; } - // optionalAttrs (opt ? defaultText) { default = opt.defaultText; } + // optionalAttrs (opt ? example) { example = renderOptionValue opt.example; } + // optionalAttrs (opt ? default) { default = renderOptionValue (opt.defaultText or opt.default); } // optionalAttrs (opt ? relatedPackages && opt.relatedPackages != null) { inherit (opt) relatedPackages; }; subOptions = @@ -256,6 +255,9 @@ rec { efficient: the XML representation of derivations is very large (on the order of megabytes) and is not actually used by the manual generator. + + This function was made obsolete by renderOptionValue and is kept for + compatibility with out-of-tree code. */ scrubOptionValue = x: if isDerivation x then @@ -265,6 +267,17 @@ rec { else x; + /* Ensures that the given option value (default or example) is a `_type`d string + by rendering Nix values to `literalExpression`s. + */ + renderOptionValue = v: + if v ? _type && v ? text then v + else literalExpression (lib.generators.toPretty { + multiline = true; + allowPrettyValues = true; + } v); + + /* For use in the `defaultText` and `example` option attributes. Causes the given string to be rendered verbatim in the documentation as Nix code. This is necessary for complex values, e.g. functions, or values that depend on diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index cfad5a3cd92a..648c05ab3572 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -741,7 +741,7 @@ runTests { }; expected = rec { int = "42"; - float = "~0.133700"; + float = "0.1337"; bool = "true"; emptystring = ''""''; string = ''"fn\''${o}\"r\\d"''; diff --git a/nixos/lib/make-options-doc/default.nix b/nixos/lib/make-options-doc/default.nix index 694512115d40..dea3eec5bd6d 100644 --- a/nixos/lib/make-options-doc/default.nix +++ b/nixos/lib/make-options-doc/default.nix @@ -26,7 +26,7 @@ # If you include more than one option list into a document, you need to # provide different ids. , variablelistId ? "configuration-variable-list" - # Strig to prefix to the option XML/HTML id attributes. + # String to prefix to the option XML/HTML id attributes. , optionIdPrefix ? "opt-" , revision ? "" # Specify revision for the options # a set of options the docs we are generating will be merged into, as if by recursiveUpdate. @@ -45,28 +45,11 @@ }: let - # Make a value safe for JSON. Functions are replaced by the string "", - # derivations are replaced with an attrset - # { _type = "derivation"; name = ; }. - # We need to handle derivations specially because consumers want to know about them, - # but we can't easily use the type,name subset of keys (since type is often used as - # a module option and might cause confusion). Use _type,name instead to the same - # effect, since _type is already used by the module system. - substSpecial = x: - if lib.isDerivation x then { _type = "derivation"; name = x.name; } - else if builtins.isAttrs x then lib.mapAttrs (name: substSpecial) x - else if builtins.isList x then map substSpecial x - else if lib.isFunction x then "" - else x; - rawOpts = lib.optionAttrSetToDocList options; transformedOpts = map transformOptions rawOpts; filteredOpts = lib.filter (opt: opt.visible && !opt.internal) transformedOpts; optionsList = lib.flip map filteredOpts (opt: opt - // lib.optionalAttrs (opt ? example) { example = substSpecial opt.example; } - // lib.optionalAttrs (opt ? default) { default = substSpecial opt.default; } - // lib.optionalAttrs (opt ? type) { type = substSpecial opt.type; } // lib.optionalAttrs (opt ? relatedPackages && opt.relatedPackages != []) { relatedPackages = genRelatedPackages opt.relatedPackages opt.name; } ); diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index aa6e40f43705..64a8f7846b46 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -48,10 +48,15 @@ let }; scrubDerivations = namePrefix: pkgSet: mapAttrs (name: value: - let wholeName = "${namePrefix}.${name}"; in - if isAttrs value then + let + wholeName = "${namePrefix}.${name}"; + guard = lib.warn "Attempt to evaluate package ${wholeName} in option documentation; this is not supported and will eventually be an error. Use `mkPackageOption` or `literalExpression` instead."; + in if isAttrs value then scrubDerivations wholeName value - // (optionalAttrs (isDerivation value) { outPath = "\${${wholeName}}"; }) + // optionalAttrs (isDerivation value) { + outPath = guard "\${${wholeName}}"; + drvPath = guard drvPath; + } else value ) pkgSet; From 109f8b46575c5cc5e3208e4709d89f39f3a83dd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Fri, 2 Dec 2022 09:15:03 +0100 Subject: [PATCH 175/204] nixos/make-options-doc: remove dead code The logic for pretty-printing Nix values isn't needed any more because `optionAttrSetToDocList` returns already rendered values. --- .../make-options-doc/options-to-docbook.xsl | 82 ------------------- 1 file changed, 82 deletions(-) diff --git a/nixos/lib/make-options-doc/options-to-docbook.xsl b/nixos/lib/make-options-doc/options-to-docbook.xsl index 0fe14a6d2d16..ac49659c681f 100644 --- a/nixos/lib/make-options-doc/options-to-docbook.xsl +++ b/nixos/lib/make-options-doc/options-to-docbook.xsl @@ -138,82 +138,6 @@ - - - '' - - '' - - - - - - - - - - - null - - - - - - - '''' - - - "" - - - - - - - - - - - - true - - - - - false - - - - - [ - - - - - ] - - - - - - - - - - { - - - = - ; - - } - - - - - (build of ) - -