From 78708cb7b220ae191083305e0528afb60c3fa506 Mon Sep 17 00:00:00 2001 From: archer-65 Date: Wed, 23 Nov 2022 23:53:01 +0100 Subject: [PATCH 01/37] mongoc: 1.8.0 -> 1.23.1 --- maintainers/maintainer-list.nix | 6 ++++ pkgs/development/libraries/mongoc/default.nix | 32 +++++++++++++++---- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 30c1a1332e13..65c4f3f5cffe 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1071,6 +1071,12 @@ githubId = 56009; name = "Arcadio Rubio García"; }; + archer-65 = { + email = "mario.liguori.056@gmail.com"; + github = "archer-65"; + githubId = 76066109; + name = "Mario Liguori"; + }; archseer = { email = "blaz@mxxn.io"; github = "archseer"; diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index 8b5753b3aca9..ecb247de0ba4 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/development/libraries/mongoc/default.nix @@ -1,19 +1,36 @@ -{ lib, stdenv, fetchzip, perl, pkg-config, libbson -, openssl, which, zlib, snappy +{ + lib, + stdenv, + fetchzip, + cmake, + pkg-config, + perl, + openssl, + zlib, + cyrus_sasl, + libbson, + snappy, }: - stdenv.mkDerivation rec { pname = "mongoc"; - version = "1.8.0"; + version = "1.23.1"; src = fetchzip { url = "https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"; sha256 = "1vnnk3pwbcmwva1010bl111kdcdx3yb2w7j7a78hhvrm1k9r1wp8"; }; - nativeBuildInputs = [ pkg-config which perl ]; - buildInputs = [ openssl zlib ]; - propagatedBuildInputs = [ libbson snappy ]; + # https://github.com/NixOS/nixpkgs/issues/25585 + preFixup = ''rm -rf "$(pwd)" ''; + + nativeBuildInputs = [cmake pkg-config perl]; + buildInputs = [openssl zlib cyrus_sasl]; + propagatedBuildInputs = [libbson snappy]; + + # -DMONGOC_TEST_USE_CRYPT_SHARED=OFF + # The `mongodl.py` script is causing issues, and you also need to disabled sandboxing for it. However, it is used only to run some tests. + # https://www.mongodb.com/community/forums/t/problem-downloading-crypt-shared-when-installing-the-mongodb-c-driver/189370 + cmakeFlags = ["-DCMAKE_BUILD_TYPE=Release" "-DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF" "-DMONGOC_TEST_USE_CRYPT_SHARED=OFF"]; enableParallelBuilding = true; @@ -22,6 +39,7 @@ stdenv.mkDerivation rec { homepage = "http://mongoc.org"; license = licenses.asl20; mainProgram = "mongoc-stat"; + maintainers = with maintainers; [archer-65]; platforms = platforms.all; }; } From 18e8f906f31778fb84010a615d6dba2c40962e9f Mon Sep 17 00:00:00 2001 From: firefly-cpp Date: Thu, 24 Nov 2022 16:56:26 +0100 Subject: [PATCH 02/37] python310Packages.opytimark: init at 1.0.8 --- .../python-modules/opytimark/default.nix | 58 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/development/python-modules/opytimark/default.nix diff --git a/pkgs/development/python-modules/opytimark/default.nix b/pkgs/development/python-modules/opytimark/default.nix new file mode 100644 index 000000000000..059c5555b997 --- /dev/null +++ b/pkgs/development/python-modules/opytimark/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, numpy +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "opytimizer"; + version = "1.0.8"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "gugarosa"; + repo = "opytimark"; + rev = "v${version}"; + hash = "sha256-T3OFm10gvGrUXAAHOnO0Zv1nWrXPBXSmEWnbJxrWYU0="; + }; + + patches = [ + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/gugarosa/opytimark/pull/2.patch"; + hash = "sha256-r/oCKI9Q1nuCZDGHx7UW8j523sFe4EFmguMOJTs/LOU="; + }) + ]; + + propagatedBuildInputs = [ + numpy + ]; + + checkInputs = [ + pytestCheckHook + ]; + + # several tests are failing + disabledTests = [ + "test_year" + "test_decorator" + "test_loader" + "cec_benchmark" + ]; + + pythonImportsCheck = [ + "opytimark" + ]; + + meta = with lib; { + description = "Library consisting of optimization benchmarking functions"; + homepage = "https://github.com/gugarosa/opytimark"; + changelog = "https://github.com/gugarosa/opytimark/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ firefly-cpp ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6935f3efff29..5906d50aea4d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6528,6 +6528,8 @@ self: super: with self; { opuslib = callPackage ../development/python-modules/opuslib { }; + opytimark = callPackage ../development/python-modules/opytimark { }; + oralb-ble = callPackage ../development/python-modules/oralb-ble { }; orderedmultidict = callPackage ../development/python-modules/orderedmultidict { }; From 2db377afd15d6bfc564fa6df9b7ae3b0c54479f0 Mon Sep 17 00:00:00 2001 From: Moritz 'e1mo' Fromm Date: Sat, 26 Nov 2022 21:52:43 +0100 Subject: [PATCH 03/37] checkSSLCert: Add missing runtime dependencies Not all of the required or optional dependencies listed under were present, causing the program to fail due to the lack of the bc binary. --- .../servers/monitoring/nagios/plugins/check_ssl_cert.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index 9ca3ebaf0e89..3caaf8ce4e6d 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -6,6 +6,13 @@ , makeWrapper , which , curl +, bc +, coreutils # date and timeout binary +, bind # host and dig binary +, nmap +, iproute2 +, netcat-gnu +, python3 }: stdenv.mkDerivation rec { @@ -30,7 +37,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/check_ssl_cert \ - --prefix PATH : "${lib.makeBinPath [ openssl file which curl ]}" + --prefix PATH : "${lib.makeBinPath [ openssl file which curl bc coreutils bind nmap iproute2 netcat-gnu python3 ]}" ''; meta = with lib; { From 7c51c518c95b3e612ad41d5ee0cdcb4ea2a4f3b7 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sun, 27 Nov 2022 12:47:40 -0800 Subject: [PATCH 04/37] python310Packages.angrop: patch to work with newer angr version --- pkgs/development/python-modules/angrop/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index ea47444d47ce..eb8c6706b5d5 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -2,6 +2,7 @@ , angr , buildPythonPackage , fetchFromGitHub +, fetchpatch , progressbar , pythonOlder , pythonRelaxDepsHook @@ -22,6 +23,14 @@ buildPythonPackage rec { hash = "sha256-wIPk7Cz7FSPviPFBSLrBjLr9M0o3pyoJM7wiAhHrg9Q="; }; + patches = [ + (fetchpatch { + name = "compatibility-with-newer-angr.patch"; + url = "https://github.com/angr/angrop/commit/23194ee4ecdcb7a7390ec04eb133786ec3f807b1.patch"; + hash = "sha256-n9/oPUblUHSk81qwU129rnNOjsNViaegp6454CaDo+8="; + }) + ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; From 7a6755b91ac392a7cc8d1afb9163da77a8fb986b Mon Sep 17 00:00:00 2001 From: Mats Date: Thu, 17 Nov 2022 20:05:42 +0100 Subject: [PATCH 05/37] pythonPackages.weakrefmethod: init at 1.0.3 --- .../python-modules/weakrefmethod/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/weakrefmethod/default.nix diff --git a/pkgs/development/python-modules/weakrefmethod/default.nix b/pkgs/development/python-modules/weakrefmethod/default.nix new file mode 100644 index 000000000000..66c0aef2eb9f --- /dev/null +++ b/pkgs/development/python-modules/weakrefmethod/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, buildPythonPackage, fetchPypi, unittest2 }: + +buildPythonPackage rec { + pname = "weakrefmethod"; + version = "1.0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-N7wfu1V1rPghctTre2/EQS131aHXDf8sH4pFdDAc2mY="; + }; + + checkInputs = [ + unittest2 + ]; + + pythonImportsCheck = [ "weakrefmethod" ]; + + meta = with lib; { + description = "A WeakMethod class for storing bound methods using weak references"; + homepage = "https://github.com/twang817/weakrefmethod"; + license = licenses.psfl; + maintainers = with maintainers; [ myaats ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8f23c6a7fa03..d7c7afc756f8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11857,6 +11857,8 @@ self: super: with self; { wcwidth = callPackage ../development/python-modules/wcwidth { }; + weakrefmethod = callPackage ../development/python-modules/weakrefmethod { }; + weasyprint = callPackage ../development/python-modules/weasyprint { }; web3 = callPackage ../development/python-modules/web3 { }; From c7094d2c9c0a33782f6e7aa9abed6ea9fbb11bde Mon Sep 17 00:00:00 2001 From: Mats Date: Thu, 17 Nov 2022 20:11:11 +0100 Subject: [PATCH 06/37] pythonPackages.signalslot: init at 0.1.2 --- .../python-modules/signalslot/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/signalslot/default.nix diff --git a/pkgs/development/python-modules/signalslot/default.nix b/pkgs/development/python-modules/signalslot/default.nix new file mode 100644 index 000000000000..44f1c91fc435 --- /dev/null +++ b/pkgs/development/python-modules/signalslot/default.nix @@ -0,0 +1,48 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, contexter +, eventlet +, mock +, pytestCheckHook +, six +, weakrefmethod +}: + +buildPythonPackage rec { + pname = "signalslot"; + version = "0.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-Z26RPNau+4719e82jMhb2LyIR6EvsANI8r3+eKuw494="; + }; + + propagatedBuildInputs = [ + contexter + six + weakrefmethod + ]; + + checkInputs = [ + eventlet + mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "signalslot" ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--pep8 --cov" "" \ + --replace "--cov-report html" "" + ''; + + meta = with lib; { + description = "Simple Signal/Slot implementation"; + homepage = "https://github.com/numergy/signalslot"; + license = licenses.mit; + maintainers = with maintainers; [ myaats ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d7c7afc756f8..457b686c1699 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10225,6 +10225,8 @@ self: super: with self; { sievelib = callPackage ../development/python-modules/sievelib { }; + signalslot = callPackage ../development/python-modules/signalslot { }; + signedjson = callPackage ../development/python-modules/signedjson { }; sigrok = callPackage ../development/python-modules/sigrok { }; From 1dbbfb411ece9c61fad23025448ee14778ea8e83 Mon Sep 17 00:00:00 2001 From: Mats Date: Thu, 17 Nov 2022 20:17:21 +0100 Subject: [PATCH 07/37] maintainers: add myaats --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ee2014d6525b..090a4df67ebf 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9629,6 +9629,12 @@ githubId = 43796009; name = "Max Wilson"; }; + myaats = { + email = "mats@mats.sh"; + github = "Myaats"; + githubId = 6295090; + name = "Mats"; + }; myrl = { email = "myrl.0xf@gmail.com"; github = "Myrl"; From b33cc1ecc684daf124d4d34499b112a8f7339653 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Nov 2022 16:28:40 +0000 Subject: [PATCH 08/37] checkSSLCert: 2.54.0 -> 2.55.0 --- pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index 9ca3ebaf0e89..19acf3cec2de 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "check_ssl_cert"; - version = "2.54.0"; + version = "2.55.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "v${version}"; - hash = "sha256-rRzO5MYpQrDuMyQlOCupV6IR7ZZgpU2lhPpgqoEXiaY="; + hash = "sha256-7eMK1WYazxfqkwxAJyE4SyKukegkYOUd3AC7Y8A7EFA="; }; nativeBuildInputs = [ From 0b4ef3e8ea7001dd2ee69ebf22c6d0d692d94447 Mon Sep 17 00:00:00 2001 From: wuyoli Date: Mon, 28 Nov 2022 17:19:15 +0100 Subject: [PATCH 09/37] river: install session file --- pkgs/applications/window-managers/river/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/applications/window-managers/river/default.nix index b1f80d102d2a..3231882a4fba 100644 --- a/pkgs/applications/window-managers/river/default.nix +++ b/pkgs/applications/window-managers/river/default.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall zig build -Drelease-safe -Dcpu=baseline ${lib.optionalString xwaylandSupport "-Dxwayland"} -Dman-pages --prefix $out install + install contrib/river.desktop -Dt $out/share/wayland-sessions runHook postInstall ''; @@ -61,6 +62,8 @@ stdenv.mkDerivation rec { */ installFlags = [ "DESTDIR=$(out)" ]; + passthru.providedSessions = ["river"]; + meta = with lib; { homepage = "https://github.com/ifreund/river"; description = "A dynamic tiling wayland compositor"; From 00ec1e3578a7f6a87b9bdc76f13095b9a33597b4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Nov 2022 03:07:06 +0000 Subject: [PATCH 10/37] python310Packages.adafruit-platformdetect: 3.35.0 -> 3.36.0 --- .../python-modules/adafruit-platformdetect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index a87ec356dc06..64aca1ab3eed 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.35.0"; + version = "3.36.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - hash = "sha256-B0WxkloPTjILXfLl2FgoE9/7OkVdxU05mKAYcoPqCxM="; + hash = "sha256-c5AJsTR6qfBtxlTkjRpVoxDGO6TxJ6BvD9HX+Icf1ig="; }; nativeBuildInputs = [ From bcb5f0decca13c2bd666ee0a2b306b162117bd71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Tue, 29 Nov 2022 14:09:41 +0100 Subject: [PATCH 11/37] nixos/nix-daemon: allow registry paths to be... paths Currently paths are handled by `types.package`, whose semantics are a bit of a mess. In particular, it converts path values to derivations using `toDerivation`, which will lead to problems when flake `outPath`s become paths in https://github.com/NixOS/nix/pull/6530. This change makes the "incompatible changes" section in the above PR obsolete: `nix.registry.nixpkgs.flake = nixpkgs;` works as expected (the flake is copied to the store). --- nixos/modules/services/misc/nix-daemon.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 26e7cbfca733..8eb1ed53d0c7 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -414,6 +414,7 @@ in str int bool + path package ]); in From 86fa72c8b7b55819f9b2ed3182de39c31e506dce Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Nov 2022 21:45:13 +0100 Subject: [PATCH 12/37] python310Packages.archinfo: 9.2.26 -> 9.2.27 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 47dc3c22a799..7081f426c66f 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.26"; + version = "9.2.27"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-aiOJxdQnpNa4zCHRysyw9JsW9GQTHha8lup8VErgiDA="; + hash = "sha256-dzD73jmbeQQY/IjF6XRdOcDIhR2lzeA2XQdipssiT00="; }; nativeBuildInputs = [ From 7e078bb6ef62aaa240720f2ea0ebf15bca48e647 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Nov 2022 21:45:17 +0100 Subject: [PATCH 13/37] python310Packages.ailment: 9.2.26 -> 9.2.27 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 6ad9cd017ed9..6253c43d60c6 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.26"; + version = "9.2.27"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-/M0D252/YaJhmyJv51sOoAUCDbcxbIndF8mw9ATtYMQ="; + hash = "sha256-siODqRqji2u+EJag/wTXCZG4LATNxggpMtqMHZAfQ9o="; }; nativeBuildInputs = [ From 58d0519cfa3d640e83f762ba9cfe3cb5916e7549 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Nov 2022 21:45:21 +0100 Subject: [PATCH 14/37] python310Packages.pyvex: 9.2.26 -> 9.2.27 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 0224ffeb43a0..88670ec9f7a5 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.26"; + version = "9.2.27"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-stxFT4oM4qLHXFJ2+kTNVgcjQ77239Gg0rp6T76wVBU="; + hash = "sha256-r46rTS9MOMUUWRwGF3pohV+1bPL03VmoILEjEKfr04o="; }; nativeBuildInputs = [ From d0e9b1e85a4dec5a998ffef124f8141bb7917a23 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Nov 2022 21:45:25 +0100 Subject: [PATCH 15/37] python310Packages.claripy: 9.2.26 -> 9.2.27 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 7c3296cbd720..9afd28132e15 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.26"; + version = "9.2.27"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-niJaHsvIX7NFA+pWufTA6j+Jvj6LcGlC+RaLNFn7yBo="; + hash = "sha256-7tn/OdPNUnbF2T0wASCBfuTZ0zI1j8GY5kh0QwbzS+8="; }; nativeBuildInputs = [ From 7385d8aa705f0c3809f23fa26f01bb1550dac0f5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Nov 2022 21:45:29 +0100 Subject: [PATCH 16/37] python310Packages.cle: 9.2.26 -> 9.2.27 --- pkgs/development/python-modules/cle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 038062982f85..88d472a9de7a 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -16,7 +16,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.26"; + version = "9.2.27"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-o6JGxEiG4HD4leAf1+NOEDQ5gkmRaDXl2SZtcVtH6f0="; + hash = "sha256-PP8TdAiyqdcgJNz5jYjAFcuv42ca0zfLwL289XKDqk4="; }; nativeBuildInputs = [ From 60ad56db7b5ed55e6a0d1016efcd286df65d03f9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Nov 2022 21:45:34 +0100 Subject: [PATCH 17/37] python310Packages.angr: 9.2.26 -> 9.2.27 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 91d4ff4211f8..f592ba98e390 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.26"; + version = "9.2.27"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-6NqxJETKBDUmOOM+RjD3gdvqfsXFqoHhhaL55D+Ajz8="; + hash = "sha256-ttq9V+Bhmbeit3OBUquIlLW7HQeCe2+KE/QkuvLJMjE="; }; propagatedBuildInputs = [ From 9c02c436c6f5d0fb51c98de4d59c82df1d107370 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Nov 2022 22:36:02 +0000 Subject: [PATCH 18/37] python310Packages.fakeredis: 2.0.0 -> 2.1.0 --- pkgs/development/python-modules/fakeredis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index 317f3d406759..821794b4b349 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "2.0.0"; + version = "2.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "dsoftwareinc"; repo = "fakeredis-py"; rev = "refs/tags/v${version}"; - hash = "sha256-y9fuVg5Mu0ZT8hoja9V5mEfOz/hPH66Zbk5Rr/luPSc="; + hash = "sha256-d+colAAESTt2YME8URX3e/l6GsC1l0vzg3wY/NQPkDk="; }; nativeBuildInputs = [ From 232ffa264c688806d9bc25349f3bf11d3fcb3fbe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 30 Nov 2022 06:17:15 +0000 Subject: [PATCH 19/37] python310Packages.growattserver: 1.2.4 -> 1.3.0 --- pkgs/development/python-modules/growattserver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/growattserver/default.nix b/pkgs/development/python-modules/growattserver/default.nix index 03a43a92eecf..35994bff2f3c 100644 --- a/pkgs/development/python-modules/growattserver/default.nix +++ b/pkgs/development/python-modules/growattserver/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "growattserver"; - version = "1.2.4"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "indykoning"; repo = "PyPi_GrowattServer"; rev = "refs/tags/${version}"; - hash = "sha256-HZsgha7CAjJYDDBlh2Ib24glUiMAXpNR8KsSdm78BA8="; + hash = "sha256-xriI4VFLTTeYkfIu7kb/k1OcgnHhCdvl5Ic/JF4Pf6s="; }; propagatedBuildInputs = [ From f1b9cc23aa8b1549dd7cb53dbe9fc950efc97646 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 30 Nov 2022 02:57:32 +0100 Subject: [PATCH 20/37] Release NixOS 22.11 --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- CONTRIBUTING.md | 16 ++++++++-------- README.md | 4 ++-- .../from_md/installation/upgrading.chapter.xml | 16 ++++++++-------- .../from_md/release-notes/rl-2211.section.xml | 2 +- .../doc/manual/installation/upgrading.chapter.md | 16 ++++++++-------- .../doc/manual/release-notes/rl-2211.section.md | 2 +- 7 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 47857a8ca4c3..3d4bb049991f 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -22,7 +22,7 @@ For new packages please briefly describe the package or provide a link to its ho - made sure NixOS tests are [linked](https://nixos.org/manual/nixpkgs/unstable/#ssec-nixos-tests-linking) to the relevant packages - [ ] Tested compilation of all packages that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"`. Note: all changes have to be committed, also see [nixpkgs-review usage](https://github.com/Mic92/nixpkgs-review#usage) - [ ] Tested basic functionality of all binary files (usually in `./result/bin/`) -- [22.11 Release Notes (or backporting 22.05 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2211-release-notes) +- [23.05 Release Notes (or backporting 22.11 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2305-release-notes) - [ ] (Package updates) Added a release notes entry if the change is major or breaking - [ ] (Module updates) Added a release notes entry if the change is significant - [ ] (Module addition) Added a release notes entry if adding a new NixOS module diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d8540782b91b..2d83222ee3a8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -98,17 +98,17 @@ git push origin feature --force-with-lease Follow these steps to backport a change into a release branch in compliance with the [commit policy](https://nixos.org/nixpkgs/manual/#submitting-changes-stable-release-branches). -You can add a label such as `backport release-22.05` to a PR, so that merging it will +You can add a label such as `backport release-22.11` to a PR, so that merging it will automatically create a backport (via [a GitHub Action](.github/workflows/backport.yml)). This also works for PR's that have already been merged, and might take a couple of minutes to trigger. You can also create the backport manually: 1. Take note of the commits in which the change was introduced into `master` branch. -2. Check out the target _release branch_, e.g. `release-22.05`. Do not use a _channel branch_ like `nixos-22.05` or `nixpkgs-22.05-darwin`. +2. Check out the target _release branch_, e.g. `release-22.11`. Do not use a _channel branch_ like `nixos-22.11` or `nixpkgs-22.11-darwin`. 3. Create a branch for your change, e.g. `git checkout -b backport`. 4. When the reason to backport is not obvious from the original commit message, use `git cherry-pick -xe ` and add a reason. Otherwise use `git cherry-pick -x `. That's fine for minor version updates that only include security and bug fixes, commits that fixes an otherwise broken package or similar. Please also ensure the commits exists on the master branch; in the case of squashed or rebased merges, the commit hash will change and the new commits can be found in the merge message at the bottom of the master pull request. -5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-22.05`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[22.05]`. +5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-22.11`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[22.11]`. 6. When the backport pull request is merged and you have the necessary privileges you can also replace the label `9.needs: port to stable` with `8.has: port to stable` on the original pull request. This way maintainers can keep track of missing backports easier. ## Criteria for Backporting changes @@ -120,15 +120,15 @@ Anything that does not cause user or downstream dependency regressions can be ba - Services which require a client to be up-to-date regardless. (E.g. `spotify`, `steam`, or `discord`) - Security critical applications (E.g. `firefox`) -## Generating 22.11 Release Notes +## Generating 23.05 Release Notes Documentation in nixpkgs is transitioning to a markdown-centric workflow. Release notes now require a translation step to convert from markdown to a compatible docbook document. -Steps for updating 22.11 Release notes: +Steps for updating 23.05 Release notes: -1. Edit `nixos/doc/manual/release-notes/rl-2211.section.md` with the desired changes -2. Run `./nixos/doc/manual/md-to-db.sh` to render `nixos/doc/manual/from_md/release-notes/rl-2211.section.xml` -3. Include changes to `rl-2211.section.md` and `rl-2211.section.xml` in the same commit. +1. Edit `nixos/doc/manual/release-notes/rl-2305.section.md` with the desired changes +2. Run `./nixos/doc/manual/md-to-db.sh` to render `nixos/doc/manual/from_md/release-notes/rl-2305.section.xml` +3. Include changes to `rl-2305.section.md` and `rl-2305.section.xml` in the same commit. ## Reviewing contributions diff --git a/README.md b/README.md index c7e14f693495..4c6ad635164b 100644 --- a/README.md +++ b/README.md @@ -51,9 +51,9 @@ Nixpkgs and NixOS are built and tested by our continuous integration system, [Hydra](https://hydra.nixos.org/). * [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined) -* [Continuous package builds for the NixOS 22.05 release](https://hydra.nixos.org/jobset/nixos/release-22.05) +* [Continuous package builds for the NixOS 22.11 release](https://hydra.nixos.org/jobset/nixos/release-22.11) * [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents) -* [Tests for the NixOS 22.05 release](https://hydra.nixos.org/job/nixos/release-22.05/tested#tabs-constituents) +* [Tests for the NixOS 22.11 release](https://hydra.nixos.org/job/nixos/release-22.11/tested#tabs-constituents) Artifacts successfully built with Hydra are published to cache at https://cache.nixos.org/. When successful build and test criteria are diff --git a/nixos/doc/manual/from_md/installation/upgrading.chapter.xml b/nixos/doc/manual/from_md/installation/upgrading.chapter.xml index 11fe1d317ccd..f6aedc800aca 100644 --- a/nixos/doc/manual/from_md/installation/upgrading.chapter.xml +++ b/nixos/doc/manual/from_md/installation/upgrading.chapter.xml @@ -12,7 +12,7 @@ Stable channels, such as - nixos-22.05. + nixos-22.11. These only get conservative bug fixes and package upgrades. For instance, a channel update may cause the Linux kernel on your system to be upgraded from 4.19.34 to 4.19.38 (a minor bug fix), @@ -33,7 +33,7 @@ Small channels, such as - nixos-22.05-small + nixos-22.11-small or nixos-unstable-small. These are identical to the stable and unstable channels @@ -60,8 +60,8 @@ When you first install NixOS, you’re automatically subscribed to the NixOS channel that corresponds to your installation source. For - instance, if you installed from a 22.05 ISO, you will be subscribed - to the nixos-22.05 channel. To see which NixOS + instance, if you installed from a 22.11 ISO, you will be subscribed + to the nixos-22.11 channel. To see which NixOS channel you’re subscribed to, run the following as root: @@ -76,17 +76,17 @@ nixos https://nixos.org/channels/nixos-unstable (Be sure to include the nixos parameter at the - end.) For instance, to use the NixOS 22.05 stable channel: + end.) For instance, to use the NixOS 22.11 stable channel: -# nix-channel --add https://nixos.org/channels/nixos-22.05 nixos +# nix-channel --add https://nixos.org/channels/nixos-22.11 nixos If you have a server, you may want to use the small channel instead: -# nix-channel --add https://nixos.org/channels/nixos-22.05-small nixos +# nix-channel --add https://nixos.org/channels/nixos-22.11-small nixos And if you want to live on the bleeding edge: @@ -146,7 +146,7 @@ system.autoUpgrade.allowReboot = true; also specify a channel explicitly, e.g. -system.autoUpgrade.channel = https://nixos.org/channels/nixos-22.05; +system.autoUpgrade.channel = https://nixos.org/channels/nixos-22.11; diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 8b79b09a8b38..6b12cf8a57d6 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -1,5 +1,5 @@
- Release 22.11 (“Raccoon”, 2022.11/??) + Release 22.11 (“Raccoon”, 2022.11/30) Support is planned until the end of June 2023, handing over to 23.05. diff --git a/nixos/doc/manual/installation/upgrading.chapter.md b/nixos/doc/manual/installation/upgrading.chapter.md index 2644979bc9db..249bcd97cec8 100644 --- a/nixos/doc/manual/installation/upgrading.chapter.md +++ b/nixos/doc/manual/installation/upgrading.chapter.md @@ -6,7 +6,7 @@ expressions and associated binaries. The NixOS channels are updated automatically from NixOS's Git repository after certain tests have passed and all packages have been built. These channels are: -- *Stable channels*, such as [`nixos-22.05`](https://nixos.org/channels/nixos-22.05). +- *Stable channels*, such as [`nixos-22.11`](https://nixos.org/channels/nixos-22.05). These only get conservative bug fixes and package upgrades. For instance, a channel update may cause the Linux kernel on your system to be upgraded from 4.19.34 to 4.19.38 (a minor bug fix), but not @@ -19,7 +19,7 @@ passed and all packages have been built. These channels are: radical changes between channel updates. It's not recommended for production systems. -- *Small channels*, such as [`nixos-22.05-small`](https://nixos.org/channels/nixos-22.05-small) +- *Small channels*, such as [`nixos-22.11-small`](https://nixos.org/channels/nixos-22.05-small) or [`nixos-unstable-small`](https://nixos.org/channels/nixos-unstable-small). These are identical to the stable and unstable channels described above, except that they contain fewer binary packages. This means they get updated @@ -38,8 +38,8 @@ newest supported stable release. When you first install NixOS, you're automatically subscribed to the NixOS channel that corresponds to your installation source. For -instance, if you installed from a 22.05 ISO, you will be subscribed to -the `nixos-22.05` channel. To see which NixOS channel you're subscribed +instance, if you installed from a 22.11 ISO, you will be subscribed to +the `nixos-22.11` channel. To see which NixOS channel you're subscribed to, run the following as root: ```ShellSession @@ -54,16 +54,16 @@ To switch to a different NixOS channel, do ``` (Be sure to include the `nixos` parameter at the end.) For instance, to -use the NixOS 22.05 stable channel: +use the NixOS 22.11 stable channel: ```ShellSession -# nix-channel --add https://nixos.org/channels/nixos-22.05 nixos +# nix-channel --add https://nixos.org/channels/nixos-22.11 nixos ``` If you have a server, you may want to use the "small" channel instead: ```ShellSession -# nix-channel --add https://nixos.org/channels/nixos-22.05-small nixos +# nix-channel --add https://nixos.org/channels/nixos-22.11-small nixos ``` And if you want to live on the bleeding edge: @@ -114,5 +114,5 @@ the new generation contains a different kernel, initrd or kernel modules. You can also specify a channel explicitly, e.g. ```nix -system.autoUpgrade.channel = https://nixos.org/channels/nixos-22.05; +system.autoUpgrade.channel = https://nixos.org/channels/nixos-22.11; ``` diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 6d0bc1197768..771b089e5d06 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -1,4 +1,4 @@ -# Release 22.11 (“Raccoon”, 2022.11/??) {#sec-release-22.11} +# Release 22.11 (“Raccoon”, 2022.11/30) {#sec-release-22.11} Support is planned until the end of June 2023, handing over to 23.05. From 96a8f390198819373696618af07de2b63aa15681 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 30 Nov 2022 15:08:22 +0000 Subject: [PATCH 21/37] python310Packages.manimpango: 0.4.2 -> 0.4.3 --- pkgs/development/python-modules/manimpango/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/manimpango/default.nix b/pkgs/development/python-modules/manimpango/default.nix index 48487af1bc47..6a5668260549 100644 --- a/pkgs/development/python-modules/manimpango/default.nix +++ b/pkgs/development/python-modules/manimpango/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "manimpango"; - version = "0.4.2"; + version = "0.4.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "ManimCommunity"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ftoESXUMc+jnKmEzhmwZc/R7vVX9idsezPFHRUzPbaU="; + hash = "sha256-FT3X6TmGfwd8kRPtuqy78ZCGeEGGg6IJEeEpB7ZbIsA="; }; nativeBuildInputs = [ From ecf7441d25f82544f2f091f2fb734cf260a3667d Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Tue, 29 Nov 2022 09:16:28 -0500 Subject: [PATCH 22/37] nixos/lxc: apply recommendations from distrobuilder --- .../modules/virtualisation/lxc-container.nix | 41 ++++++++++++++++--- 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/nixos/modules/virtualisation/lxc-container.nix b/nixos/modules/virtualisation/lxc-container.nix index f05f04baa35d..a71b69341051 100644 --- a/nixos/modules/virtualisation/lxc-container.nix +++ b/nixos/modules/virtualisation/lxc-container.nix @@ -88,6 +88,16 @@ in }; ''; }; + + privilegedContainer = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Whether this LXC container will be running as a privileged container or not. If set to `true` then + additional configuration will be applied to the `systemd` instance running within the container as + recommended by [distrobuilder](https://linuxcontainers.org/distrobuilder/introduction/). + ''; + }; }; }; @@ -146,12 +156,31 @@ in }; # Add the overrides from lxd distrobuilder - systemd.extraConfig = '' - [Service] - ProtectProc=default - ProtectControlGroups=no - ProtectKernelTunables=no - ''; + # https://github.com/lxc/distrobuilder/blob/05978d0d5a72718154f1525c7d043e090ba7c3e0/distrobuilder/main.go#L630 + systemd.packages = [ + (pkgs.writeTextFile { + name = "systemd-lxc-service-overrides"; + destination = "/etc/systemd/system/service.d/zzz-lxc-service.conf"; + text = '' + [Service] + ProcSubset=all + ProtectProc=default + ProtectControlGroups=no + ProtectKernelTunables=no + NoNewPrivileges=no + LoadCredential= + '' + optionalString cfg.privilegedContainer '' + # Additional settings for privileged containers + ProtectHome=no + ProtectSystem=no + PrivateDevices=no + PrivateTmp=no + ProtectKernelLogs=no + ProtectKernelModules=no + ReadWritePaths= + ''; + }) + ]; # Allow the user to login as root without password. users.users.root.initialHashedPassword = mkOverride 150 ""; From b0f767da93e4f813fe25c4b876d013a3decda744 Mon Sep 17 00:00:00 2001 From: David Morgan Date: Wed, 30 Nov 2022 16:09:35 +0000 Subject: [PATCH 23/37] vimpc: Support more platforms --- pkgs/applications/audio/vimpc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/vimpc/default.nix b/pkgs/applications/audio/vimpc/default.nix index 5cc3c1099995..7e834efb9524 100644 --- a/pkgs/applications/audio/vimpc/default.nix +++ b/pkgs/applications/audio/vimpc/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { description = "A vi/vim inspired client for the Music Player Daemon (mpd)"; homepage = "https://github.com/boysetsfrog/vimpc"; license = licenses.gpl3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; }; } From 53b811ea51b0575cc4cb55ea6f35584cf5ec3a21 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 30 Nov 2022 17:11:25 +0000 Subject: [PATCH 24/37] appthreat-depscan: 3.2.1 -> 3.2.3 --- pkgs/development/tools/appthreat-depscan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/appthreat-depscan/default.nix b/pkgs/development/tools/appthreat-depscan/default.nix index e6d107b39356..81096c44ac44 100644 --- a/pkgs/development/tools/appthreat-depscan/default.nix +++ b/pkgs/development/tools/appthreat-depscan/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "appthreat-depscan"; - version = "3.2.1"; + version = "3.2.3"; src = fetchFromGitHub { owner = "AppThreat"; repo = "dep-scan"; rev = "refs/tags/v${version}"; - hash = "sha256-tBhsH5ZlEsrboOCSJLcwY9kYv0aK9IrLCU+ZjY0y648="; + hash = "sha256-VWFYgRIpEmOpOonazoRF0wPUfAiOu90gxm22M6Wkvgo="; }; propagatedBuildInputs = with python3.pkgs; [ From 7690adfd1699b799339ebab17496dc0a3c29003a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 30 Nov 2022 17:40:24 +0000 Subject: [PATCH 25/37] python310Packages.meshtastic: 2.0.4 -> 2.0.5 --- pkgs/development/python-modules/meshtastic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index dc545b48874a..3857ea2971d0 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.0.4"; + version = "2.0.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-WPmoK/5pTVv9ueRnR6Gxtj86LM8ChB0dMfEvo+lLmy0="; + hash = "sha256-wzDi4C/XUykoTxgoDneQzWplTlo0bGUODM38Eza4fUY="; }; propagatedBuildInputs = [ From 068f7348db86a08b108bcce5cb8320685534de17 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 30 Nov 2022 18:34:29 +0100 Subject: [PATCH 26/37] nixos/doc/rl-2211: more cleanup --- .../from_md/release-notes/rl-2211.section.xml | 352 +++++++++--------- .../manual/release-notes/rl-2211.section.md | 121 +++--- 2 files changed, 236 insertions(+), 237 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 6689d2389eb2..2c64ea535c7e 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -2,7 +2,7 @@ Release 22.11 (“Raccoon”, 2022.11/??) The NixOS release team is happy to announce a new version of NixOS - 22.11. NixOS is both a linux distribution, and a set of packages + 22.11. NixOS is both a Linux distribution, and a set of packages usable on other Linux systems and macOS. @@ -190,9 +190,10 @@ For cross-compilation targets that can also run on the - building machine, we also enabled running tests now. This is - for example the case for the pkgsStatic and pkgsLLVm package - sets or i686 packages on x86_64 machine. + building machine, we now run tests. This, for example, is the + case for the pkgsStatic and + pkgsLLVM package sets or i686 packages on + x86_64 machines. @@ -242,9 +243,12 @@ - Nix has been upgraded from - v2.8.1 - to v2.11.0 + Nix has been upgraded from v2.8.1 to v2.11.0. For more + information, please see the release notes for + 2.9, + 2.10 + and + 2.11. @@ -254,9 +258,9 @@ - GNOME has been upgraded to version 43. Please take a look at - their Release - Notes for details. + GNOME has been upgraded to version 43. Please see the + release + notes for details. @@ -290,7 +294,7 @@ - Python now defalts to 3.10, updated from 3.9. + Python now defaults to 3.10, updated from 3.9. @@ -393,7 +397,7 @@ checkouts via the sparseCheckout option. This used to accept a multi-line string with directories/patterns to check out, but now requires a list of - strings + strings. @@ -403,7 +407,7 @@ ssh-keygen -A as they are insecure. Also, SetEnv directives in ssh_config and - sshd_config are now first-match-wins + sshd_config are now first-match-wins. @@ -511,7 +515,7 @@ kanidm has been updated to 1.1.0-alpha.10 and now requires a TLS certificate and key. It will always start https and-–-if enabled-–-an LDAPS - server and no HTTP and LDAP server anymore + server and no HTTP and LDAP server anymore. @@ -1527,6 +1531,13 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [
New Services + + + alps, + a simple and extensible webmail. Available as + services.alps. + + appvm, @@ -1534,6 +1545,14 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ virtualisation.appvm. + + + AusweisApp2, + the authentication software for the German ID card. Available + as + programs.ausweisapp. + + automatic-timezoned. @@ -1544,18 +1563,10 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ - [xray] (https://github.com/XTLS/Xray-core), a fully compatible - v2ray-core replacement. Features XTLS, which when enabled on - server and client, brings UDP FullCone NAT to proxy setups. - Available as - services.xray. - - - - - syncstorage-rs, - a self-hostable sync server for Firefox. Available as - services.firefox-syncserver. + Dolibarr, + an enterprise resource planning and customer relationship + manager. Enable using + services.dolibarr. @@ -1567,39 +1578,16 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ - Komga, a free and - open source comics/mangas media server. Available as - services.komga. + endlessh-go, + an SSH tarpit that exposes Prometheus metrics. Available as + services.endlessh-go. - Tandoor Recipes, - a self-hosted multi-tenant recipe collection. Available as - services.tandoor-recipes. - - - - - HBase - cluster, a distributed, scalable, big data store. - Available as - services.hadoop.hbase. - - - - - Please, - a Sudo clone written in Rust. Available as - security.please - - - - - Sachet, - an SMS alerting tool for the Prometheus Alertmanager. - Available as - services.prometheus.sachet. + endlessh, + an SSH tarpit. Available as + services.endlessh. @@ -1614,17 +1602,53 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ - infnoise, - a hardware True Random Number Generator dongle. Available as - services.infnoise. + expressvpn, + the CLI client for ExpressVPN. Available as + services.expressvpn. - kthxbye, - an alert acknowledgement management daemon for Prometheus - Alertmanager. Available as - services.kthxbye + FreshRSS, a + free, self-hostable RSS feed aggregator. Available as + services.freshrss. + + + + + Garage, + a simple object storage server for geodistributed deployments, + alternative to MinIO. Available as + services.garage. + + + + + go-autoconfig, + IMAP/SMTP autodiscover server. Available as + services.go-autoconfig. + + + + + Grafana + Tempo, a distributed tracing store. Available as + services.tempo. + + + + + HBase + cluster, a distributed, scalable, big data store. + Available as + services.hadoop.hbase. + + + + + infnoise, + a hardware True Random Number Generator dongle. Available as + services.infnoise. @@ -1642,6 +1666,21 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ services.karma + + + Komga, a free and + open source comics/mangas media server. Available as + services.komga. + + + + + kthxbye, + an alert acknowledgement management daemon for Prometheus + Alertmanager. Available as + services.kthxbye + + languagetool, @@ -1649,6 +1688,42 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ services.languagetool. + + + Listmonk, a + self-hosted newsletter manager. Enable using + services.listmonk. + + + + + Mepo, a + fast, simple, hackable OSM map viewer for mobile and desktop + Linux. Available as + programs.mepo.enable. + + + + + merecat, + a small and easy HTTP server based on thttpd. Available as + services.merecat + + + + + netbird, a zero + configuration VPN. Available as + services.netbird. + + + + + ntfy.sh, a push + notification service. Available as + services.ntfy-sh + + OpenRGB, @@ -1665,45 +1740,10 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ - ntfy.sh, a push - notification service. Available as - services.ntfy-sh - - - - - alps, - a simple and extensible webmail. Available as - services.alps. - - - - - endlessh, - an SSH tarpit. Available as - services.endlessh. - - - - - endlessh-go, - an SSH tarpit that exposes Prometheus metrics. Available as - services.endlessh-go. - - - - - Garage, - a simple object storage server for geodistributed deployments, - alternative to MinIO. Available as - services.garage. - - - - - netbird, a zero - configuration VPN. Available as - services.netbird. + Patroni, + a template for PostgreSQL HA with ZooKeeper, etcd or Consul. + Available as + services.patroni. @@ -1715,6 +1755,29 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ services.persistent-evdev. + + + Please, + a Sudo clone written in Rust. Available as + security.please. + + + + + Prometheus + IPMI exporter, an IPMI exporter for Prometheus. + Available as + services.prometheus.exporters.ipmi. + + + + + Sachet, + an SMS alerting tool for the Prometheus Alertmanager. + Available as + services.prometheus.sachet. + + schleuder, a @@ -1724,38 +1787,16 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ - Dolibarr, - an enterprise resource planning and customer relationship - manager. Enable using - services.dolibarr. + syncstorage-rs, + a self-hostable sync server for Firefox. Available as + services.firefox-syncserver. - FreshRSS, a - free, self-hostable RSS feed aggregator. Available as - services.freshrss. - - - - - expressvpn, - the CLI client for ExpressVPN. Available as - services.expressvpn. - - - - - merecat, - a small and easy HTTP server based on thttpd. Available as - services.merecat - - - - - go-autoconfig, - IMAP/SMTP autodiscover server. Available as - services.go-autoconfig. + Tandoor Recipes, + a self-hosted multi-tenant recipe collection. Available as + services.tandoor-recipes. @@ -1769,33 +1810,9 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ - Grafana - Tempo, a distributed tracing store. Available as - services.tempo. - - - - - AusweisApp2, - the authentication software for the German ID card. Available - as - programs.ausweisapp. - - - - - Patroni, - a template for PostgreSQL HA with ZooKeeper, etcd or Consul. - Available as - services.patroni. - - - - - Prometheus - IPMI exporter, an IPMI exporter for Prometheus. - Available as - services.prometheus.exporters.ipmi. + Uptime + Kuma, a fancy self-hosted monitoring tool. Available as + services.uptime-kuma. @@ -1808,24 +1825,11 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ - Listmonk, a - self-hosted newsletter manager. Enable using - services.listmonk. - - - - - Uptime - Kuma, a fancy self-hosted monitoring tool. Available as - services.uptime-kuma. - - - - - Mepo, a - fast, simple, hackable OSM map viewer for mobile and desktop - Linux. Available as - programs.mepo.enable. + [xray] (https://github.com/XTLS/Xray-core), a fully compatible + v2ray-core replacement. Features XTLS, which when enabled on + server and client, brings UDP FullCone NAT to proxy setups. + Available as + services.xray. diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 00e815fa66ac..b93235dd4dec 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -1,6 +1,6 @@ # Release 22.11 (“Raccoon”, 2022.11/??) {#sec-release-22.11} -The NixOS release team is happy to announce a new version of NixOS 22.11. NixOS is both a linux distribution, and a set of packages usable on other Linux systems and macOS. +The NixOS release team is happy to announce a new version of NixOS 22.11. NixOS is both a Linux distribution, and a set of packages usable on other Linux systems and macOS. This release is supported until the end of June 2023, handing over to NixOS 23.05. @@ -26,9 +26,9 @@ In addition to numerous new and upgraded packages, this release includes the fol - `nsncd` is now available as a replacement of `nscd`. `nscd` is responsible for resolving hostnames, users and more in NixOS and has been a long standing source of bugs, such as sporadic network freezes. - + More context in this [issue](https://github.com/NixOS/nixpkgs/issues/135888). - + Help us test the new implementation by setting `services.nscd.enableNsncd` to `true`. We plan to use `nsncd` by default in NixOS 23.05. @@ -45,7 +45,7 @@ In addition to numerous new and upgraded packages, this release includes the fol - Haskell `ghcWithPackages` is now up to 15 times faster to evaluate, thanks to changing `lib.closePropagation` from a quadratic to linear complexity. Please see backward incompatibilities notes below. -- For cross-compilation targets that can also run on the building machine, we also enabled running tests now. This is for example the case for the pkgsStatic and pkgsLLVm package sets or i686 packages on `x86_64` machine. +- For cross-compilation targets that can also run on the building machine, we now run tests. This, for example, is the case for the `pkgsStatic` and `pkgsLLVM` package sets or i686 packages on `x86_64` machines. - To simplify cross-compilation in NixOS, this release introduces the `nixpkgs.hostPlatform` and `nixpkgs.buildPlatform` options. These cover and override the `nixpkgs.{system,localSystem,crossSystem}` options. @@ -66,11 +66,11 @@ In addition to numerous new and upgraded packages, this release includes the fol ## Notable version updates {#sec-release-22.11-version-updates} -- Nix has been upgraded from [v2.8.1 to v2.11.0](https://github.com/NixOS/nix/compare/2.8.1...2.11.0) +- Nix has been upgraded from v2.8.1 to v2.11.0. For more information, please see the release notes for [2.9](https://nixos.org/manual/nix/stable/release-notes/rl-2.9.html), [2.10](https://nixos.org/manual/nix/stable/release-notes/rl-2.10.html) and [2.11](https://nixos.org/manual/nix/stable/release-notes/rl-2.11.html). - OpenSSL now defaults to OpenSSL 3, updated from 1.1.1. -- GNOME has been upgraded to version 43. Please take a look at their [Release Notes](https://release.gnome.org/43/) for details. +- GNOME has been upgraded to version 43. Please see the [release notes](https://release.gnome.org/43/) for details. - KDE Plasma has been upgraded from v5.24 to v5.26. Please see the release notes for [v5.25](https://kde.org/announcements/plasma/5/5.25.0/) and [v5.26](https://kde.org/announcements/plasma/5/5.26.0/) for more details on the included changes. @@ -81,7 +81,7 @@ In addition to numerous new and upgraded packages, this release includes the fol - Perl has been updated to 5.36, and its core module `HTTP::Tiny` was patched to verify SSL/TLS certificates by default. -- Python now defalts to 3.10, updated from 3.9. +- Python now defaults to 3.10, updated from 3.9. ## Backward Incompatibilities {#sec-release-22.11-incompatibilities} @@ -111,9 +111,9 @@ In addition to numerous new and upgraded packages, this release includes the fol - The `fetchgit` fetcher now uses [cone mode](https://www.git-scm.com/docs/git-sparse-checkout/2.37.0#_internalscone_mode_handling) by default for sparse checkouts. [Non-cone mode](https://www.git-scm.com/docs/git-sparse-checkout/2.37.0#_internalsnon_cone_problems) can be enabled by passing `nonConeMode = true`, but note that non-cone mode is deprecated and this option may be removed alongside a future Git update without notice. -- The `fetchgit` fetcher supports sparse checkouts via the `sparseCheckout` option. This used to accept a multi-line string with directories/patterns to check out, but now requires a list of strings +- The `fetchgit` fetcher supports sparse checkouts via the `sparseCheckout` option. This used to accept a multi-line string with directories/patterns to check out, but now requires a list of strings. -- `openssh` was updated to version 9.1, disabling the generation of DSA keys when using `ssh-keygen -A` as they are insecure. Also, `SetEnv` directives in `ssh_config` and `sshd_config` are now first-match-wins +- `openssh` was updated to version 9.1, disabling the generation of DSA keys when using `ssh-keygen -A` as they are insecure. Also, `SetEnv` directives in `ssh_config` and `sshd_config` are now first-match-wins. - `bsp-layout` no longer uses the command `cycle` to switch to other window layouts, as it got replaced by the commands `previous` and `next`. @@ -149,7 +149,7 @@ In addition to numerous new and upgraded packages, this release includes the fol - Emacs now uses the Lucid toolkit by default instead of GTK because of stability and compatibility issues. Users who still wish to remain using GTK can do so by using `emacs-gtk`. -- `kanidm` has been updated to 1.1.0-alpha.10 and now requires a TLS certificate and key. It will always start `https` and-–-if enabled-–-an LDAPS server and no HTTP and LDAP server anymore +- `kanidm` has been updated to 1.1.0-alpha.10 and now requires a TLS certificate and key. It will always start `https` and-–-if enabled-–-an LDAPS server and no HTTP and LDAP server anymore. - riak package removed along with `services.riak` module, due to lack of maintainer to update the package. @@ -452,89 +452,84 @@ In addition to numerous new and upgraded packages, this release includes the fol ## New Services {#sec-release-22.11-new-services} +- [alps](https://git.sr.ht/~migadu/alps), a simple and extensible webmail. Available as [services.alps](#opt-services.alps.enable). + - [appvm](https://github.com/jollheef/appvm), Nix based app VMs. Available as [virtualisation.appvm](options.html#opt-virtualisation.appvm.enable). +- [AusweisApp2](https://www.ausweisapp.bund.de/), the authentication software for the German ID card. Available as [programs.ausweisapp](#opt-programs.ausweisapp.enable). + - [automatic-timezoned](https://github.com/maxbrunet/automatic-timezoned). a Linux daemon to automatically update the system timezone based on location. Available as [services.automatic-timezoned](#opt-services.automatic-timezoned.enable). -- [xray] (https://github.com/XTLS/Xray-core), a fully compatible v2ray-core replacement. Features XTLS, which when enabled on server and client, brings UDP FullCone NAT to proxy setups. Available as [services.xray](options.html#opt-services.xray.enable). - -- [syncstorage-rs](https://github.com/mozilla-services/syncstorage-rs), a self-hostable sync server for Firefox. Available as [services.firefox-syncserver](options.html#opt-services.firefox-syncserver.enable). +- [Dolibarr](https://www.dolibarr.org/), an enterprise resource planning and customer relationship manager. Enable using [services.dolibarr](#opt-services.dolibarr.enable). - [dragonflydb](https://dragonflydb.io/), a modern replacement for Redis and Memcached. Available as [services.dragonflydb](#opt-services.dragonflydb.enable). -- [Komga](https://komga.org/), a free and open source comics/mangas media server. Available as [services.komga](#opt-services.komga.enable). +- [endlessh-go](https://github.com/shizunge/endlessh-go), an SSH tarpit that exposes Prometheus metrics. Available as [services.endlessh-go](#opt-services.endlessh-go.enable). -- [Tandoor Recipes](https://tandoor.dev), a self-hosted multi-tenant recipe collection. Available as [services.tandoor-recipes](options.html#opt-services.tandoor-recipes.enable). - -- [HBase cluster](https://hbase.apache.org/), a distributed, scalable, big data store. Available as [services.hadoop.hbase](options.html#opt-services.hadoop.hbase.enable). - -- [Please](https://github.com/edneville/please), a Sudo clone written in Rust. Available as [security.please](#opt-security.please.enable) - -- [Sachet](https://github.com/messagebird/sachet/), an SMS alerting tool for the Prometheus Alertmanager. Available as [services.prometheus.sachet](#opt-services.prometheus.sachet.enable). +- [endlessh](https://github.com/skeeto/endlessh), an SSH tarpit. Available as [services.endlessh](#opt-services.endlessh.enable). - [EVCC](https://evcc.io) is an EV charge controller with PV integration. It supports a multitude of chargers, meters, vehicle APIs and more and ties that together with a well-tested backend and a lightweight web frontend. Available as [services.evcc](#opt-services.evcc.enable). -- [infnoise](https://github.com/leetronics/infnoise), a hardware True Random Number Generator dongle. - Available as [services.infnoise](options.html#opt-services.infnoise.enable). +- [expressvpn](https://www.expressvpn.com), the CLI client for ExpressVPN. Available as [services.expressvpn](#opt-services.expressvpn.enable). -- [kthxbye](https://github.com/prymitive/kthxbye), an alert acknowledgement management daemon for Prometheus Alertmanager. Available as [services.kthxbye](options.html#opt-services.kthxbye.enable) +- [FreshRSS](https://freshrss.org/), a free, self-hostable RSS feed aggregator. Available as [services.freshrss](#opt-services.freshrss.enable). -- [kanata](https://github.com/jtroo/kanata), a tool to improve keyboard comfort and usability with advanced customization. - Available as [services.kanata](options.html#opt-services.kanata.enable). +- [Garage](https://garagehq.deuxfleurs.fr/), a simple object storage server for geodistributed deployments, alternative to MinIO. Available as [services.garage](#opt-services.garage.enable). + +- [go-autoconfig](https://github.com/L11R/go-autoconfig), IMAP/SMTP autodiscover server. Available as [services.go-autoconfig](#opt-services.go-autoconfig.enable). + +- [Grafana Tempo](https://www.grafana.com/oss/tempo/), a distributed tracing store. Available as [services.tempo](#opt-services.tempo.enable). + +- [HBase cluster](https://hbase.apache.org/), a distributed, scalable, big data store. Available as [services.hadoop.hbase](options.html#opt-services.hadoop.hbase.enable). + +- [infnoise](https://github.com/leetronics/infnoise), a hardware True Random Number Generator dongle. Available as [services.infnoise](options.html#opt-services.infnoise.enable). + +- [kanata](https://github.com/jtroo/kanata), a tool to improve keyboard comfort and usability with advanced customization. Available as [services.kanata](options.html#opt-services.kanata.enable). - [karma](https://github.com/prymitive/karma), an alert dashboard for Prometheus Alertmanager. Available as [services.karma](options.html#opt-services.karma.enable) -- [languagetool](https://languagetool.org/), a multilingual grammar, style, and spell checker. - Available as [services.languagetool](options.html#opt-services.languagetool.enable). +- [Komga](https://komga.org/), a free and open source comics/mangas media server. Available as [services.komga](#opt-services.komga.enable). + +- [kthxbye](https://github.com/prymitive/kthxbye), an alert acknowledgement management daemon for Prometheus Alertmanager. Available as [services.kthxbye](options.html#opt-services.kthxbye.enable) + +- [languagetool](https://languagetool.org/), a multilingual grammar, style, and spell checker. Available as [services.languagetool](options.html#opt-services.languagetool.enable). + +- [Listmonk](https://listmonk.app), a self-hosted newsletter manager. Enable using [services.listmonk](options.html#opt-services.listmonk.enable). + +- [Mepo](https://mepo.milesalan.com), a fast, simple, hackable OSM map viewer for mobile and desktop Linux. Available as [programs.mepo.enable](#opt-programs.mepo.enable). + +- [merecat](https://troglobit.com/projects/merecat/), a small and easy HTTP server based on thttpd. Available as [services.merecat](#opt-services.merecat.enable) + +- [netbird](https://netbird.io), a zero configuration VPN. Available as [services.netbird](options.html#opt-services.netbird.enable). + +- [ntfy.sh](https://ntfy.sh), a push notification service. Available as [services.ntfy-sh](#opt-services.ntfy-sh.enable) - [OpenRGB](https://gitlab.com/CalcProgrammer1/OpenRGB/-/tree/master), a FOSS tool for controlling RGB lighting. Available as [services.hardware.openrgb.enable](options.html#opt-services.hardware.openrgb.enable). - [Outline](https://www.getoutline.com/), a wiki and knowledge base similar to Notion. Available as [services.outline](#opt-services.outline.enable). -- [ntfy.sh](https://ntfy.sh), a push notification service. Available as [services.ntfy-sh](#opt-services.ntfy-sh.enable) - -- [alps](https://git.sr.ht/~migadu/alps), a simple and extensible webmail. Available as [services.alps](#opt-services.alps.enable). - -- [endlessh](https://github.com/skeeto/endlessh), an SSH tarpit. Available as [services.endlessh](#opt-services.endlessh.enable). - -- [endlessh-go](https://github.com/shizunge/endlessh-go), an SSH tarpit that exposes Prometheus metrics. Available as [services.endlessh-go](#opt-services.endlessh-go.enable). - -- [Garage](https://garagehq.deuxfleurs.fr/), a simple object storage server for geodistributed deployments, alternative to MinIO. Available as [services.garage](#opt-services.garage.enable). - -- [netbird](https://netbird.io), a zero configuration VPN. - Available as [services.netbird](options.html#opt-services.netbird.enable). +- [Patroni](https://github.com/zalando/patroni), a template for PostgreSQL HA with ZooKeeper, etcd or Consul. Available as [services.patroni](options.html#opt-services.patroni.enable). - [persistent-evdev](https://github.com/aiberia/persistent-evdev), a daemon to add virtual proxy devices that mirror a physical input device but persist even if the underlying hardware is hot-plugged. Available as [services.persistent-evdev](#opt-services.persistent-evdev.enable). -- [schleuder](https://schleuder.org/), a mailing list manager with PGP support. Enable using [services.schleuder](#opt-services.schleuder.enable). - -- [Dolibarr](https://www.dolibarr.org/), an enterprise resource planning and customer relationship manager. Enable using [services.dolibarr](#opt-services.dolibarr.enable). - -- [FreshRSS](https://freshrss.org/), a free, self-hostable RSS feed aggregator. Available as [services.freshrss](#opt-services.freshrss.enable). - -- [expressvpn](https://www.expressvpn.com), the CLI client for ExpressVPN. Available as [services.expressvpn](#opt-services.expressvpn.enable). - -- [merecat](https://troglobit.com/projects/merecat/), a small and easy HTTP server based on thttpd. Available as [services.merecat](#opt-services.merecat.enable) - -- [go-autoconfig](https://github.com/L11R/go-autoconfig), IMAP/SMTP autodiscover server. Available as [services.go-autoconfig](#opt-services.go-autoconfig.enable). - -- [tmate-ssh-server](https://github.com/tmate-io/tmate-ssh-server), server side part of [tmate](https://tmate.io/). Available as [services.tmate-ssh-server](#opt-services.tmate-ssh-server.enable). - -- [Grafana Tempo](https://www.grafana.com/oss/tempo/), a distributed tracing store. Available as [services.tempo](#opt-services.tempo.enable). - -- [AusweisApp2](https://www.ausweisapp.bund.de/), the authentication software for the German ID card. Available as [programs.ausweisapp](#opt-programs.ausweisapp.enable). - -- [Patroni](https://github.com/zalando/patroni), a template for PostgreSQL HA with ZooKeeper, etcd or Consul. -Available as [services.patroni](options.html#opt-services.patroni.enable). +- [Please](https://github.com/edneville/please), a Sudo clone written in Rust. Available as [security.please](#opt-security.please.enable). - [Prometheus IPMI exporter](https://github.com/prometheus-community/ipmi_exporter), an IPMI exporter for Prometheus. Available as [services.prometheus.exporters.ipmi](#opt-services.prometheus.exporters.ipmi.enable). -- [WriteFreely](https://writefreely.org), a simple blogging platform with ActivityPub support. Available as [services.writefreely](options.html#opt-services.writefreely.enable). +- [Sachet](https://github.com/messagebird/sachet/), an SMS alerting tool for the Prometheus Alertmanager. Available as [services.prometheus.sachet](#opt-services.prometheus.sachet.enable). -- [Listmonk](https://listmonk.app), a self-hosted newsletter manager. Enable using [services.listmonk](options.html#opt-services.listmonk.enable). +- [schleuder](https://schleuder.org/), a mailing list manager with PGP support. Enable using [services.schleuder](#opt-services.schleuder.enable). + +- [syncstorage-rs](https://github.com/mozilla-services/syncstorage-rs), a self-hostable sync server for Firefox. Available as [services.firefox-syncserver](options.html#opt-services.firefox-syncserver.enable). + +- [Tandoor Recipes](https://tandoor.dev), a self-hosted multi-tenant recipe collection. Available as [services.tandoor-recipes](options.html#opt-services.tandoor-recipes.enable). + +- [tmate-ssh-server](https://github.com/tmate-io/tmate-ssh-server), server side part of [tmate](https://tmate.io/). Available as [services.tmate-ssh-server](#opt-services.tmate-ssh-server.enable). - [Uptime Kuma](https://uptime.kuma.pet/), a fancy self-hosted monitoring tool. Available as [services.uptime-kuma](#opt-services.uptime-kuma.enable). -- [Mepo](https://mepo.milesalan.com), a fast, simple, hackable OSM map viewer for mobile and desktop Linux. Available as [programs.mepo.enable](#opt-programs.mepo.enable). +- [WriteFreely](https://writefreely.org), a simple blogging platform with ActivityPub support. Available as [services.writefreely](options.html#opt-services.writefreely.enable). + +- [xray] (https://github.com/XTLS/Xray-core), a fully compatible v2ray-core replacement. Features XTLS, which when enabled on server and client, brings UDP FullCone NAT to proxy setups. Available as [services.xray](options.html#opt-services.xray.enable). From 6184f635b3c3d2794821bb31c04a4e7a99ee0fdb Mon Sep 17 00:00:00 2001 From: maralorn Date: Wed, 30 Nov 2022 19:03:28 +0100 Subject: [PATCH 27/37] nixos/doc: Fix typo in 22.11 release manual --- nixos/doc/manual/release-notes/rl-2211.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 00e815fa66ac..3ba03a3fd5e0 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -444,7 +444,7 @@ In addition to numerous new and upgraded packages, this release includes the fol - The option `services.picom.experimentalBackends` was removed since it is now the default and the option will cause `picom` to quit instead. -- `haskellPackage.callHackage` is not always invalidated if `all-cabal-hashes` changes, leading to less rebuilds of haskell dependencies. +- `haskellPackages.callHackage` is not always invalidated if `all-cabal-hashes` changes, leading to less rebuilds of haskell dependencies. - `haskellPackages.callHackage` and `haskellPackages.callCabal2nix` (and related functions) no longer keep a reference to the `cabal2nix` call used to generate them. As a result, they will be garbage collected more often. From 29450f5d80c775d7f8b7a41b8f3e5edda5c97c18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 30 Nov 2022 19:19:22 +0100 Subject: [PATCH 28/37] nixos/release-notes: fix link formatting --- .../manual/from_md/release-notes/rl-2211.section.xml | 10 +++++----- nixos/doc/manual/release-notes/rl-2211.section.md | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 2c64ea535c7e..3345ac134427 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -1512,7 +1512,7 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ - haskellPackage.callHackage is not always + haskellPackages.callHackage is not always invalidated if all-cabal-hashes changes, leading to less rebuilds of haskell dependencies. @@ -1825,10 +1825,10 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ - [xray] (https://github.com/XTLS/Xray-core), a fully compatible - v2ray-core replacement. Features XTLS, which when enabled on - server and client, brings UDP FullCone NAT to proxy setups. - Available as + xray, + a fully compatible v2ray-core replacement. Features XTLS, + which when enabled on server and client, brings UDP FullCone + NAT to proxy setups. Available as services.xray. diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index d52b27c1a840..6675d9c0c68c 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -530,6 +530,6 @@ In addition to numerous new and upgraded packages, this release includes the fol - [WriteFreely](https://writefreely.org), a simple blogging platform with ActivityPub support. Available as [services.writefreely](options.html#opt-services.writefreely.enable). -- [xray] (https://github.com/XTLS/Xray-core), a fully compatible v2ray-core replacement. Features XTLS, which when enabled on server and client, brings UDP FullCone NAT to proxy setups. Available as [services.xray](options.html#opt-services.xray.enable). +- [xray](https://github.com/XTLS/Xray-core), a fully compatible v2ray-core replacement. Features XTLS, which when enabled on server and client, brings UDP FullCone NAT to proxy setups. Available as [services.xray](options.html#opt-services.xray.enable). From c4e46d958cff0124c8d6626d6d5d20fae54a94d3 Mon Sep 17 00:00:00 2001 From: Mats Date: Thu, 17 Nov 2022 20:44:15 +0100 Subject: [PATCH 29/37] steamos-devkit: init at 0.20221101 --- .../tools/steamos-devkit/default.nix | 135 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 137 insertions(+) create mode 100644 pkgs/development/tools/steamos-devkit/default.nix diff --git a/pkgs/development/tools/steamos-devkit/default.nix b/pkgs/development/tools/steamos-devkit/default.nix new file mode 100644 index 000000000000..8451f7f9898e --- /dev/null +++ b/pkgs/development/tools/steamos-devkit/default.nix @@ -0,0 +1,135 @@ +{ lib +, fetchFromGitHub +, fetchFromGitLab +, writeScript +, python3 +, copyDesktopItems +, makeDesktopItem +, pkg-config +, SDL2 +}: +let + # steamos-devkit requires a build of the unreleased pyimgui 2.0 branch, move to pythonPackages when 2.0 is released. + pyimgui = python3.pkgs.buildPythonPackage { + pname = "pyimgui"; + version = "unstable-2022-03-06"; + + src = fetchFromGitHub { + owner = "pyimgui"; + repo = "pyimgui"; + rev = "1f095af5886f424ee12f26fa93b108b6420fafa4"; # dev/version-2.0 branch + fetchSubmodules = true; + sha256 = "sha256-k070ue132m8H1Zm8bo7J7spCS5dSTGOj689ci7vJ+aw="; + }; + + nativeBuildInputs = with python3.pkgs; [ + cython + pkg-config + SDL2 + ]; + + propagatedBuildInputs = with python3.pkgs; [ + click + pyopengl + pysdl2 + ]; + + # Requires OpenGL acceleration + doCheck = false; + pythonImportsCheck = [ "imgui" ]; + }; + steamos-devkit-script = '' + #!${python3.interpreter} + import os + + # Change the cwd to avoid imgui using cwd which often is ~ to store the state, use the same location as the settings + path = os.path.expanduser(os.path.join("~", ".devkit-client-gui")) + os.makedirs(path, exist_ok=True) + os.chdir(path) + + # Workaround to get pysdl to work on wayland, remove when https://gitlab.steamos.cloud/devkit/steamos-devkit/-/issues/1 is solved. + if os.environ.get("XDG_SESSION_TYPE") == "wayland": + os.environ["SDL_VIDEODRIVER"] = "wayland" + + import devkit_client.gui2 + devkit_client.gui2.main() + ''; +in +python3.pkgs.buildPythonPackage rec { + pname = "steamos-devkit"; + version = "0.20221101"; + + src = fetchFromGitLab { + domain = "gitlab.steamos.cloud"; + owner = "devkit"; + repo = "steamos-devkit"; + rev = "v${version}"; + sha256 = "sha256-VKnfcMF3WxkvqxlhJF+5j4Hso/TZpSS4dMOmSrWagRU="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + appdirs + bcrypt + cffi + cryptography + idna + ifaddr + netifaces + numpy + paramiko + pycparser + pyimgui + pynacl + pysdl2 + signalslot + six + ]; + + nativeBuildInputs = [ + copyDesktopItems + ]; + + postUnpack = '' + # Find the absolute source root to link correctly to the previous root + prevRoot=$(realpath $sourceRoot) + + # Update the source root to the devkit_client package + sourceRoot="$sourceRoot/client" + + # Link the setup script into the new source root + ln -s $prevRoot/setup/shiv-linux-setup.py $sourceRoot/setup.py + ''; + + postInstall = '' + mkdir -p $out/bin + + # These are various assets like scripts that steamos-devkit will copy to the remote device + cp -R ./devkit-utils $out/${python3.sitePackages}/devkit-utils + + # writeScript + symlink will be ignored by wrapPythonPrograms + # Copying it is undesirable too, just write it directly to a script instead + cat << EOF > $out/bin/steamos-devkit + ${steamos-devkit-script} + EOF + chmod +x $out/bin/steamos-devkit + ''; + + # There are no checks for steamos-devkit + doCheck = false; + pythonImportsCheck = [ "devkit_client" ]; + + desktopItems = [ + (makeDesktopItem { + name = "SteamOS-Devkit"; + exec = "steamos-devkit"; + desktopName = "SteamOS Devkit Client"; + }) + ]; + + meta = with lib; { + description = "SteamOS Devkit Client"; + homepage = "https://gitlab.steamos.cloud/devkit/steamos-devkit"; + license = licenses.mit; + maintainers = with maintainers; [ myaats ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47fee83a9ae5..a8e4ffcb2744 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25798,6 +25798,8 @@ with pkgs; statifier = callPackage ../os-specific/linux/statifier { }; + steamos-devkit = callPackage ../development/tools/steamos-devkit { }; + swiftdefaultapps = callPackage ../os-specific/darwin/swiftdefaultapps { }; sysdig = callPackage ../os-specific/linux/sysdig { From 8ede52a7c16645c5299ae0349bb770c437050d26 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Mon, 17 Oct 2022 05:17:55 -0700 Subject: [PATCH 30/37] emacs: change substituteInPlace invocation to an aligning patch Commit 97b928ce09d6034ebcb541fb548e5d4862302add in Emacs messed up the substituteInPlace. Use a patch instead to prevent silent failures. https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=97b928ce09d6034ebcb541fb548e5d4862302add --- pkgs/applications/editors/emacs/generic.nix | 41 +++++++++---------- .../emacs/native-comp-driver-options-28.patch | 16 ++++++++ .../emacs/native-comp-driver-options.patch | 19 +++++++++ 3 files changed, 55 insertions(+), 21 deletions(-) create mode 100644 pkgs/applications/editors/emacs/native-comp-driver-options-28.patch create mode 100644 pkgs/applications/editors/emacs/native-comp-driver-options.patch diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 486435cc86b4..3e195fdec6a9 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -7,7 +7,7 @@ , patches ? _: [ ] , macportVersion ? null }: -{ stdenv, llvmPackages_6, lib, fetchurl, fetchpatch, ncurses, xlibsWrapper, libXaw, libXpm +{ stdenv, llvmPackages_6, lib, fetchurl, fetchpatch, substituteAll, ncurses, xlibsWrapper, libXaw, libXpm , Xaw3d, libXcursor, pkg-config, gettext, libXft, dbus, libpng, libjpeg, giflib , libtiff, librsvg, libwebp, gconf, libxml2, imagemagick, gnutls, libselinux , alsa-lib, cairo, acl, gpm, m17n_lib, libotf @@ -67,7 +67,25 @@ let emacs = (if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation pname = pname + lib.optionalString ( !withX && !withNS && !withMacport && !withGTK2 && !withGTK3 ) "-nox"; inherit version; - patches = patches fetchpatch; + patches = patches fetchpatch ++ lib.optionals nativeComp [ + (substituteAll { + src = if lib.versionOlder version "29" + then ./native-comp-driver-options-28.patch + else ./native-comp-driver-options.patch; + backendPath = (lib.concatStringsSep " " + (builtins.map (x: ''"-B${x}"'') [ + # Paths necessary so the JIT compiler finds its libraries: + "${lib.getLib libgccjit}/lib" + "${lib.getLib libgccjit}/lib/gcc" + "${lib.getLib stdenv.cc.libc}/lib" + + # Executable paths necessary for compilation (ld, as): + "${lib.getBin stdenv.cc.cc}/bin" + "${lib.getBin stdenv.cc.bintools}/bin" + "${lib.getBin stdenv.cc.bintools.bintools}/bin" + ])); + }) + ]; src = if macportVersion != null then fetchFromBitbucket { owner = "mituharu"; @@ -112,25 +130,6 @@ let emacs = (if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation done '' - # Make native compilation work both inside and outside of nix build - (lib.optionalString nativeComp (let - backendPath = (lib.concatStringsSep " " - (builtins.map (x: ''\"-B${x}\"'') [ - # Paths necessary so the JIT compiler finds its libraries: - "${lib.getLib libgccjit}/lib" - "${lib.getLib libgccjit}/lib/gcc" - "${lib.getLib stdenv.cc.libc}/lib" - - # Executable paths necessary for compilation (ld, as): - "${lib.getBin stdenv.cc.cc}/bin" - "${lib.getBin stdenv.cc.bintools}/bin" - "${lib.getBin stdenv.cc.bintools.bintools}/bin" - ])); - in '' - substituteInPlace lisp/emacs-lisp/comp.el --replace \ - "(defcustom native-comp-driver-options nil" \ - "(defcustom native-comp-driver-options '(${backendPath})" - '')) "" ]; diff --git a/pkgs/applications/editors/emacs/native-comp-driver-options-28.patch b/pkgs/applications/editors/emacs/native-comp-driver-options-28.patch new file mode 100644 index 000000000000..98c6da305145 --- /dev/null +++ b/pkgs/applications/editors/emacs/native-comp-driver-options-28.patch @@ -0,0 +1,16 @@ +diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el +index a5ab12ae38..e33e71cb55 100644 +--- a/lisp/emacs-lisp/comp.el ++++ b/lisp/emacs-lisp/comp.el +@@ -178,7 +178,7 @@ native-comp-compiler-options + :type '(repeat string) + :version "28.1") + +-(defcustom native-comp-driver-options nil ++(defcustom native-comp-driver-options '(@backendPath@) + "Options passed verbatim to the native compiler's back-end driver. + Note that not all options are meaningful; typically only the options + affecting the assembler and linker are likely to be useful. +-- +2.37.3 + diff --git a/pkgs/applications/editors/emacs/native-comp-driver-options.patch b/pkgs/applications/editors/emacs/native-comp-driver-options.patch new file mode 100644 index 000000000000..58eee35aed0a --- /dev/null +++ b/pkgs/applications/editors/emacs/native-comp-driver-options.patch @@ -0,0 +1,19 @@ +diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el +index 2c9b79334b..50c6b5ac85 100644 +--- a/lisp/emacs-lisp/comp.el ++++ b/lisp/emacs-lisp/comp.el +@@ -178,8 +178,9 @@ native-comp-compiler-options + :type '(repeat string) + :version "28.1") + +-(defcustom native-comp-driver-options (when (eq system-type 'darwin) +- '("-Wl,-w")) ++(defcustom native-comp-driver-options (append (when (eq system-type 'darwin) ++ '("-Wl,-w")) ++ '(@backendPath@)) + "Options passed verbatim to the native compiler's back-end driver. + Note that not all options are meaningful; typically only the options + affecting the assembler and linker are likely to be useful. +-- +2.37.3 + From 263371e1689e5634c2fdeb5f7d8e6d9190ba1dba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 30 Nov 2022 20:02:55 +0000 Subject: [PATCH 31/37] hachoir: 3.1.3 -> 3.2.0 --- pkgs/development/python-modules/hachoir/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hachoir/default.nix b/pkgs/development/python-modules/hachoir/default.nix index c7d4178e3bf9..07d02454faeb 100644 --- a/pkgs/development/python-modules/hachoir/default.nix +++ b/pkgs/development/python-modules/hachoir/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "hachoir"; - version = "3.1.3"; + version = "3.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "vstinner"; repo = pname; rev = version; - hash = "sha256-HlxDwkU0GccO+IUzbtVpLbsAo+Mcacm4/WrXWCsmpBg="; + hash = "sha256-BRrb6bnPSDVjZF1cOA9NlUYd2HrtqZEAVhHgkjmE0Xg="; }; propagatedBuildInputs = [ From 3b5b92f388db665ea113c211e5fb92cad8a43c18 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 30 Nov 2022 21:12:28 +0100 Subject: [PATCH 32/37] python310Packages.hachoir: add changelog to meta --- pkgs/development/python-modules/hachoir/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/hachoir/default.nix b/pkgs/development/python-modules/hachoir/default.nix index 07d02454faeb..3a1a34f8340b 100644 --- a/pkgs/development/python-modules/hachoir/default.nix +++ b/pkgs/development/python-modules/hachoir/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "vstinner"; repo = pname; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-BRrb6bnPSDVjZF1cOA9NlUYd2HrtqZEAVhHgkjmE0Xg="; }; @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to view and edit a binary stream"; homepage = "https://hachoir.readthedocs.io/"; + changelog = "https://github.com/vstinner/hachoir/blob/${version}/doc/changelog.rst"; license = with licenses; [ gpl2Only ]; maintainers = with maintainers; [ fab ]; }; From bf00facf84b962615ee90f53d075caa681684644 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 30 Nov 2022 21:14:25 +0100 Subject: [PATCH 33/37] python310Packages.fakeredis: add changelog to meta --- pkgs/development/python-modules/fakeredis/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index 821794b4b349..cc45b86ab626 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -61,6 +61,7 @@ buildPythonPackage rec { meta = with lib; { description = "Fake implementation of Redis API"; homepage = "https://github.com/dsoftwareinc/fakeredis-py"; + changelog = "https://github.com/cunla/fakeredis-py/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 2f075e8a197166216d69ee4318e39976c31848a2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 30 Nov 2022 21:29:31 +0100 Subject: [PATCH 34/37] checkSSLCert: add changelog to meta --- pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index 19acf3cec2de..b591aae26ee7 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Nagios plugin to check the CA and validity of an X.509 certificate"; homepage = "https://github.com/matteocorti/check_ssl_cert"; + changelog = "https://github.com/matteocorti/check_ssl_cert/releases/tag/v${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ fab ]; platforms = platforms.all; From bb1819d7396a3def129aeacf00c9f288c2850361 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 30 Nov 2022 21:33:34 +0100 Subject: [PATCH 35/37] python310Packages.growattserver: add changelog to meta --- pkgs/development/python-modules/growattserver/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/growattserver/default.nix b/pkgs/development/python-modules/growattserver/default.nix index 35994bff2f3c..f8fb0996e29f 100644 --- a/pkgs/development/python-modules/growattserver/default.nix +++ b/pkgs/development/python-modules/growattserver/default.nix @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python package to retrieve information from Growatt units"; homepage = "https://github.com/indykoning/PyPi_GrowattServer"; + changelog = "https://github.com/indykoning/PyPi_GrowattServer/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From e371f83543c611b119ce9bdc2edf3922e7512442 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 1 Dec 2022 08:04:44 +1000 Subject: [PATCH 36/37] terraform: 1.3.5 -> 1.3.6 https://github.com/hashicorp/terraform/releases/tag/v1.3.6 --- pkgs/applications/networking/cluster/terraform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index b6601bb91bfe..fe105fa3b71a 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -168,8 +168,8 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.3.5"; - sha256 = "sha256-+jmZcIF9+vvjoA/PXWCc3F4l3YnlpZgxs0eGxchiIBE="; + version = "1.3.6"; + sha256 = "sha256-aETsvcHoHSwqWCAdn9JPJLcX1Wi1umUghSjkq37OYDU="; vendorSha256 = "sha256-fviukVGBkbxFs2fJpEp/tFMymXex7NRQdcGIIA9W88k="; patches = [ ./provider-path-0_15.patch ]; passthru = { From 3e52056bb39e815757f16042c961c64efc4cf76b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 29 Nov 2022 00:52:46 +0100 Subject: [PATCH 37/37] docker: fix darwin build --- pkgs/applications/virtualization/docker/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 90a17ae87f48..35416a898f06 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -15,10 +15,10 @@ rec { , iptables, e2fsprogs, xz, util-linux, xfsprogs, git , procps, rootlesskit, slirp4netns, fuse-overlayfs, nixosTests , clientOnly ? !stdenv.isLinux, symlinkJoin - , withSystemd ? true, systemd - , withBtrfs ? true, btrfs-progs - , withLvm ? true, lvm2 - , withSeccomp ? true, libseccomp + , withSystemd ? stdenv.isLinux, systemd + , withBtrfs ? stdenv.isLinux, btrfs-progs + , withLvm ? stdenv.isLinux, lvm2 + , withSeccomp ? stdenv.isLinux, libseccomp }: let docker-runc = runc.overrideAttrs (oldAttrs: {