From d7ea3d708bf0a430ac7e23b4f5cbff7160d4b8d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Ga=C5=82kowski?= Date: Sun, 9 Oct 2022 19:34:49 +0200 Subject: [PATCH 001/117] smokegen: init at v4.14.3 --- maintainers/maintainer-list.nix | 6 ++++++ .../libraries/smokegen/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/smokegen/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 33b6269fcbd9..4ff473168759 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13980,6 +13980,12 @@ githubId = 928084; name = "Utku Demir"; }; + uthar = { + email = "galkowskikasper@gmail.com"; + github = "uthar"; + githubId = 15697697; + name = "Kasper Gałkowski"; + }; uvnikita = { email = "uv.nikita@gmail.com"; github = "uvNikita"; diff --git a/pkgs/development/libraries/smokegen/default.nix b/pkgs/development/libraries/smokegen/default.nix new file mode 100644 index 000000000000..643ae1064db7 --- /dev/null +++ b/pkgs/development/libraries/smokegen/default.nix @@ -0,0 +1,21 @@ +{ pkgs, lib, ... }: + +pkgs.stdenv.mkDerivation rec { + pname = "smokegen"; + version = "v4.14.3"; + src = pkgs.fetchzip { + url = "https://invent.kde.org/unmaintained/${pname}/-/archive/${version}/${pname}-${version}.tar.gz"; + hash = "sha256-finsoruPeJZLawIjNUJ25Pq54eaCByfALVraNQJPk7c="; + }; + buildInputs = [ pkgs.cmake pkgs.qt4 ]; + buildPhase = '' + cmake . + ''; + meta = with lib; { + description = "A general purpose C++ parser with a plugin infrastructure"; + homepage = "https://invent.kde.org/unmaintained/smokegen"; + license = licenses.gpl2Only; + platforms = platforms.unix; + maintainers = with maintainers; [ uthar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0586a6575fd1..3e40a0b4cecc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4733,6 +4733,8 @@ with pkgs; simg2img = callPackage ../tools/filesystems/simg2img { }; + smokegen = callPackage ../development/libraries/smokegen {}; + snazy = callPackage ../development/tools/snazy { }; snippetpixie = callPackage ../tools/text/snippetpixie { }; From fd3646f5177ec74430218f1f24c1bc40be4990a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Ga=C5=82kowski?= Date: Sun, 9 Oct 2022 19:36:54 +0200 Subject: [PATCH 002/117] smokeqt: init at v4.14.3 --- .../development/libraries/smokeqt/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/libraries/smokeqt/default.nix diff --git a/pkgs/development/libraries/smokeqt/default.nix b/pkgs/development/libraries/smokeqt/default.nix new file mode 100644 index 000000000000..145a9f243bb3 --- /dev/null +++ b/pkgs/development/libraries/smokeqt/default.nix @@ -0,0 +1,21 @@ +{ pkgs, lib, ... }: + +pkgs.stdenv.mkDerivation rec { + pname = "smokeqt"; + version = "v4.14.3"; + src = pkgs.fetchzip { + url = "https://invent.kde.org/unmaintained/${pname}/-/archive/${version}/${pname}-${version}.tar.gz"; + hash = "sha256-8FiEGF8gduVw5I/bi2wExGUWmjIjYEhWpjpXKJGBNMg="; + }; + cmakeFlags = [ + "-DCMAKE_CXX_STANDARD=98" + ]; + buildInputs = [ pkgs.cmake pkgs.qt4 pkgs.smokegen ]; + meta = with lib; { + description = "Bindings for the Qt libraries"; + homepage = "https://invent.kde.org/unmaintained/smokeqt"; + license = licenses.gpl2Only; + platforms = platforms.unix; + maintainers = with maintainers; [ uthar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e40a0b4cecc..6362b923c379 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4735,6 +4735,8 @@ with pkgs; smokegen = callPackage ../development/libraries/smokegen {}; + smokeqt = callPackage ../development/libraries/smokeqt {}; + snazy = callPackage ../development/tools/snazy { }; snippetpixie = callPackage ../tools/text/snippetpixie { }; From 422f1c24bd9ebb0c413d74bf11f28eb82441e525 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Ga=C5=82kowski?= Date: Sun, 9 Oct 2022 19:38:32 +0200 Subject: [PATCH 003/117] sbclPackages: fix build of qt, qt-libs and qtools --- .../development/lisp-modules-new/packages.nix | 91 +++++++++++++++++++ .../patches/qt-libs-dont-download.patch | 36 ++++++++ .../patches/qtools-use-nix-libs.patch | 19 ++++ 3 files changed, 146 insertions(+) create mode 100644 pkgs/development/lisp-modules-new/patches/qt-libs-dont-download.patch create mode 100644 pkgs/development/lisp-modules-new/patches/qtools-use-nix-libs.patch diff --git a/pkgs/development/lisp-modules-new/packages.nix b/pkgs/development/lisp-modules-new/packages.nix index 97c1cf0fca5b..1ad06f615b56 100644 --- a/pkgs/development/lisp-modules-new/packages.nix +++ b/pkgs/development/lisp-modules-new/packages.nix @@ -11,6 +11,9 @@ let optionals hasSuffix splitString + remove + optionalString + stringLength ; # Used by builds that would otherwise attempt to write into storeDir. @@ -42,6 +45,11 @@ let # Patches are already applied in `build` patches = []; src = build; + # TODO(kasper): handle this with a setup hook + LD_LIBRARY_PATH = + build.LD_LIBRARY_PATH + + (optionalString (stringLength build.LD_LIBRARY_PATH != 0) ":") + + "${build}"; }); # A little hacky @@ -332,6 +340,89 @@ let version = "f19162e76"; }); + qt = let + rev = "dffff3ee3dbd0686c85c323f579b8bbf4881e60e"; + in build-with-compile-into-pwd rec { + pname = "commonqt"; + version = builtins.substring 0 7 rev; + + src = pkgs.fetchFromGitHub { + inherit rev; + owner = pname; + repo = pname; + hash = "sha256-GAgwT0D9mIkYPTHfCH/KxxIv7b6QGwcxwZE7ehH5xug="; + }; + + buildInputs = [ pkgs.qt4 ]; + nativeBuildInputs = [ pkgs.smokegen pkgs.smokeqt ]; + nativeLibs = [ pkgs.qt4 pkgs.smokegen pkgs.smokeqt ]; + + systems = [ "qt" ]; + + lispLibs = with ql; [ + cffi named-readtables cl-ppcre alexandria + closer-mop iterate trivial-garbage bordeaux-threads + ]; + }; + + qt-libs = build-with-compile-into-pwd { + inherit (ql.qt-libs) pname version src; + patches = [ ./patches/qt-libs-dont-download.patch ]; + prePatch = '' + substituteInPlace systems/*.asd --replace ":qt+libs" ":qt" + echo "LD Path: $LD_LIBRARY_PATH" + ''; + lispLibs = ql.qt-libs.lispLibs ++ [ qt ]; + systems = [ + "qt-libs" + "commonqt" + # "phonon" + # "qimageblitz" + # "qsci" + "qt3support" + "qtcore" + "qtdbus" + "qtdeclarative" + "qtgui" + "qthelp" + "qtnetwork" + "qtopengl" + "qtscript" + "qtsql" + "qtsvg" + "qttest" + "qtuitools" + # "qtwebkit" + "qtxml" + "qtxmlpatterns" + # "qwt" + "smokebase" + ]; + }; + commonqt = qt-libs; + qt3support = qt-libs; + qtcore = qt-libs; + qtdbus = qt-libs; + qtdeclarative = qt-libs; + qtgui = qt-libs; + qthelp = qt-libs; + qtnetwork = qt-libs; + qtopengl = qt-libs; + qtscript = qt-libs; + qtsql = qt-libs; + qtsvg = qt-libs; + qttest = qt-libs; + qtuitools = qt-libs; + qtxml = qt-libs; + qtxmlpatterns = qt-libs; + smokebase = qt-libs; + + qtools = build-with-compile-into-pwd { + inherit (ql.qtools) pname version src nativeLibs; + lispLibs = [ qt ] ++ remove ql.qt_plus_libs ql.qtools.lispLibs ++ [ qt-libs ]; + patches = [ ./patches/qtools-use-nix-libs.patch ]; + }; + }; in packages diff --git a/pkgs/development/lisp-modules-new/patches/qt-libs-dont-download.patch b/pkgs/development/lisp-modules-new/patches/qt-libs-dont-download.patch new file mode 100644 index 000000000000..e21a44c2a17d --- /dev/null +++ b/pkgs/development/lisp-modules-new/patches/qt-libs-dont-download.patch @@ -0,0 +1,36 @@ +--- a/qt-libs.asd ++++ b/qt-libs.asd +@@ -17,5 +17,4 @@ + :components ((:file "qt-libs")) + :depends-on (:qt-lib-generator + :cl-ppcre +- :cffi) +- :perform (asdf:load-op :after (op c) (uiop:symbol-call :qt-libs :ensure-standalone-libs))) ++ :cffi)) +--- a/qt-libs.lisp ++++ b/qt-libs.lisp +@@ -94,16 +94,14 @@ + standalone-dir) + + (defun %ensure-lib-loaded (file) +- (let ((file (etypecase file +- (pathname file) +- (string (installed-library-file file)))) +- (name (intern (string-upcase (pathname-name file)))) +- #+sbcl(sb-ext:*muffled-warnings* 'style-warning)) +- (cffi::register-foreign-library +- name `((T ,file)) +- :search-path (to-directory file)) +- (unless (cffi:foreign-library-loaded-p name) +- (cffi:load-foreign-library name)))) ++ (let ((name (make-pathname :name (format nil "lib~a" file) ++ :type #+unix "so" ++ #+darwin "dylib"))) ++ (or (find-if (lambda (lib) ++ (equal (cffi:foreign-library-pathname lib) ++ (namestring name))) ++ (cffi:list-foreign-libraries)) ++ (cffi:load-foreign-library name)))) + + (defun ensure-lib-loaded (file) + (cond ((pathnamep file) \ No newline at end of file diff --git a/pkgs/development/lisp-modules-new/patches/qtools-use-nix-libs.patch b/pkgs/development/lisp-modules-new/patches/qtools-use-nix-libs.patch new file mode 100644 index 000000000000..b380894b04a8 --- /dev/null +++ b/pkgs/development/lisp-modules-new/patches/qtools-use-nix-libs.patch @@ -0,0 +1,19 @@ +Dont use the qt+libs system for managing Qt dependencies, because Nix provides +them already. +Don't build the deploy.lisp helper file, because Nix also can handle deployment. +--- a/qtools.asd ++++ b/qtools.asd +@@ -33,10 +33,9 @@ + (:file "generate") + (:file "dynamic") + (:file "precompile") +- (:file "deploy") + (:file "fast-call") + (:file "documentation")) +- :depends-on (:qt+libs ++ :depends-on (:qt + :deploy + :cl-ppcre + :closer-mop + +Diff finished. Sun Oct 2 14:38:06 2022 \ No newline at end of file From f9969a941e38239a25fdeb9ddf559ef6d31d4149 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Mon, 31 Oct 2022 15:04:17 +0100 Subject: [PATCH 004/117] efivar: 37 -> 38 --- pkgs/tools/system/efivar/default.nix | 42 ++++------------------------ 1 file changed, 5 insertions(+), 37 deletions(-) diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix index ed831c5ecf6d..09394beb3931 100644 --- a/pkgs/tools/system/efivar/default.nix +++ b/pkgs/tools/system/efivar/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, buildPackages, fetchFromGitHub, fetchurl, pkg-config, popt }: +{ lib, stdenv, buildPackages, fetchFromGitHub, pkg-config, popt, mandoc }: stdenv.mkDerivation rec { pname = "efivar"; - version = "37"; + version = "38"; outputs = [ "bin" "out" "dev" "man" ]; @@ -10,42 +10,10 @@ stdenv.mkDerivation rec { owner = "rhinstaller"; repo = "efivar"; rev = version; - sha256 = "1z2dw5x74wgvqgd8jvibfff0qhwkc53kxg54v12pzymyibagwf09"; + hash = "sha256-A38BKGMK3Vo+85wzgxmzTjzZXtpcY9OpbZaONWnMYNk="; }; - patches = [ - (fetchurl { - name = "r13y.patch"; - url = "https://patch-diff.githubusercontent.com/raw/rhboot/efivar/pull/133.patch"; - sha256 = "038cwldb8sqnal5l6mhys92cqv8x7j8rgsl8i4fiv9ih9znw26i6"; - }) - (fetchurl { - name = "fix-misaligned-pointer.patch"; - url = "https://github.com/rhboot/efivar/commit/b98ba8921010d03f46704a476c69861515deb1ca.patch"; - sha256 = "0ni9mz7y40a2wf1d1q5n9y5dhcbydxvfdhqic7zsmgnaxs3a0p27"; - }) - (fetchurl { - name = "fix-gcc9-error.patch"; - url = "https://github.com/rhboot/efivar/commit/c3c553db85ff10890209d0fe48fb4856ad68e4e0.patch"; - sha256 = "0lc38npydp069nlcga25wzzm204ww9l6mpjfn6wmhdfhn0pgjwky"; - }) - (fetchurl { - name = "remove_unused_variable.patch"; - url = "https://github.com/rhboot/efivar/commit/fdb803402fb32fa6d020bac57a40c7efe4aabb7d.patch"; - sha256 = "1xhy8v8ff9lyxb830n9hci2fbh7rfps6rwsqrjh4lw7316gwllsd"; - }) - (fetchurl { - name = "check_string_termination.patch"; - url = "https://github.com/rhboot/efivar/commit/4e04afc2df9bbc26e5ab524b53a6f4f1e61d7c9e.patch"; - sha256 = "1ajj11wwsvamfspq4naanvw08h63gr0g71q0dfbrrywrhc0jlmdw"; - }) - ]; - NIX_CFLAGS_COMPILE = [ - "-Wno-error=stringop-truncation" - "-flto-partition=none" - ]; - - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config mandoc ]; buildInputs = [ popt ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -62,6 +30,6 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; description = "Tools and library to manipulate EFI variables"; platforms = platforms.linux; - license = licenses.lgpl21; + license = licenses.lgpl21Only; }; } From 49d994ef5bf70fa64e73f5ea0c9ceffe170f85e7 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Mon, 31 Oct 2022 15:25:09 +0100 Subject: [PATCH 005/117] efibootmgr: 17 -> 18 --- pkgs/tools/system/efibootmgr/default.nix | 27 ++++++++++-------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/system/efibootmgr/default.nix b/pkgs/tools/system/efibootmgr/default.nix index fd7eceede159..1eda5cbbce55 100644 --- a/pkgs/tools/system/efibootmgr/default.nix +++ b/pkgs/tools/system/efibootmgr/default.nix @@ -1,36 +1,31 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, efivar, popt }: +{ lib, stdenv, fetchFromGitHub, pkg-config, efivar, popt }: stdenv.mkDerivation rec { pname = "efibootmgr"; - version = "17"; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ efivar popt ]; + version = "18"; src = fetchFromGitHub { owner = "rhboot"; repo = "efibootmgr"; rev = version; - sha256 = "1niicijxg59rsmiw3rsjwy4bvi1n42dynvm01lnp9haixdzdpq03"; + hash = "sha256-DYYQGALEn2+mRHgqCJsA7OQCF7xirIgQlWexZ9uoKcg="; }; - patches = [ - (fetchpatch { - name = "remove-extra-decl.patch"; - url = "https://github.com/rhboot/efibootmgr/commit/99b578501643377e0b1994b2a068b790d189d5ad.patch"; - sha256 = "1sbijvlpv4khkix3vix9mbhzffj8lp8zpnbxm9gnzjz8yssz9p5h"; - }) - ]; + nativeBuildInputs = [ pkg-config ]; - makeFlags = [ "EFIDIR=nixos" "PKG_CONFIG=${stdenv.cc.targetPrefix}pkg-config" ]; + buildInputs = [ efivar popt ]; + + makeFlags = [ + "EFIDIR=nixos" + "PKG_CONFIG=${stdenv.cc.targetPrefix}pkg-config" + ]; installFlags = [ "prefix=$(out)" ]; meta = with lib; { description = "A Linux user-space application to modify the Intel Extensible Firmware Interface (EFI) Boot Manager"; homepage = "https://github.com/rhboot/efibootmgr"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ ]; platforms = platforms.linux; }; From 186bd9088465860b98e21948f76bfd93c3fbbf4f Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Tue, 1 Nov 2022 09:45:33 +0100 Subject: [PATCH 006/117] python310Packages.fsspec: 2022.8.2 -> 2022.10.0 --- pkgs/development/python-modules/fsspec/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index 72e8ad60e066..452d9b49edfe 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -17,16 +17,16 @@ buildPythonPackage rec { pname = "fsspec"; - version = "2022.8.2"; + version = "2022.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = "intake"; + owner = "fsspec"; repo = "filesystem_spec"; rev = version; - hash = "sha256-eT1zqTbU5kfQ7bvzigT9579HfXU6VaOEjRg8VG/DHMI="; + hash = "sha256-+lPt/zqI3Mkt+QRNXq+Dxm3h/ryZJsfrmayVi/BTtbg="; }; propagatedBuildInputs = [ @@ -68,7 +68,7 @@ buildPythonPackage rec { meta = with lib; { description = "A specification that Python filesystems should adhere to"; - homepage = "https://github.com/intake/filesystem_spec"; + homepage = "https://github.com/fsspec/filesystem_spec"; changelog = "https://github.com/fsspec/filesystem_spec/raw/${version}/docs/source/changelog.rst"; license = licenses.bsd3; maintainers = with maintainers; [ costrouc ]; From deea4c34afb7741db6cfa51c97f5b0b0f7defd8d Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Tue, 1 Nov 2022 15:00:24 +0100 Subject: [PATCH 007/117] python310Packages.gcsfs: 2022.8.2 -> 2022.10.0 --- pkgs/development/python-modules/gcsfs/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gcsfs/default.nix b/pkgs/development/python-modules/gcsfs/default.nix index 6ac2d6e23bf7..76847827bdaf 100644 --- a/pkgs/development/python-modules/gcsfs/default.nix +++ b/pkgs/development/python-modules/gcsfs/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "gcsfs"; - version = "2022.8.2"; + version = "2022.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "fsspec"; repo = pname; rev = version; - hash = "sha256-BnnKFrWz47izKc7nS8NR1Vze1x9kJdYBsQT2KEY9ghM="; + hash = "sha256-+S4AziibYWos/hZ1v3883b1Vv3y4xjIDUrQ8c2XJ1MQ="; }; propagatedBuildInputs = [ @@ -66,6 +66,7 @@ buildPythonPackage rec { meta = with lib; { description = "Convenient Filesystem interface over GCS"; homepage = "https://github.com/fsspec/gcsfs"; + changelog = "https://github.com/fsspec/gcsfs/raw/${version}/docs/source/changelog.rst"; license = licenses.bsd3; maintainers = with maintainers; [ nbren12 ]; }; From d7ab2aa51ced7f2ffc92c2aebf35c0db5413c987 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Tue, 1 Nov 2022 15:07:20 +0100 Subject: [PATCH 008/117] python310Packages.s3fs: 2022.8.2 -> 2022.10.0 --- pkgs/development/python-modules/s3fs/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index 343d637db0ab..b1bebfce47c0 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "s3fs"; - version = "2022.8.2"; + version = "2022.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PKBwGomp4SWijekIKdGflvQd2x2LQ3kHbCntgsSvhs0="; + hash = "sha256-6N64DyC9CyBZFBuHT9udauuMzjUxLqXywCsiWnigBAY="; }; buildInputs = [ @@ -42,8 +42,9 @@ buildPythonPackage rec { meta = with lib; { broken = stdenv.isDarwin; - homepage = "https://github.com/dask/s3fs/"; description = "A Pythonic file interface for S3"; + homepage = "https://github.com/fsspec/s3fs"; + changelog = "https://github.com/fsspec/s3fs/raw/${version}/docs/source/changelog.rst"; license = licenses.bsd3; maintainers = with maintainers; [ teh ]; }; From e358319a5b5aaba76186253e52671023c81d157c Mon Sep 17 00:00:00 2001 From: Bruno Inec Date: Fri, 4 Nov 2022 15:15:24 +0100 Subject: [PATCH 009/117] goeland: init at version 0.11.0 --- maintainers/maintainer-list.nix | 6 +++ .../feedreaders/goeland/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 45 insertions(+) create mode 100644 pkgs/applications/networking/feedreaders/goeland/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 99907a6877f8..84620f2a63d9 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13222,6 +13222,12 @@ githubId = 19905904; name = "Simon Weber"; }; + sweenu = { + name = "sweenu"; + email = "contact@sweenu.xyz"; + github = "sweenu"; + githubId = 7051978; + }; swflint = { email = "swflint@flintfam.org"; github = "swflint"; diff --git a/pkgs/applications/networking/feedreaders/goeland/default.nix b/pkgs/applications/networking/feedreaders/goeland/default.nix new file mode 100644 index 000000000000..fa80860769e0 --- /dev/null +++ b/pkgs/applications/networking/feedreaders/goeland/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "goeland"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "slurdge"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-9SxlxRco+eLyyIrMjNCdqAyttDnoc8nuMh+ecCpk3bg="; + }; + + vendorSha256 = "sha256-a29TtT6xSapIiHvC9KHQm4gd1QCK3l0RpKe1ieaKUKA="; + + ldflags = [ + "-s" + "-w" + "-X github.com/slurdge/goeland/version.GitCommit=${version}" + ]; + + meta = with lib; { + description = "An alternative to RSS2Email written in golang with many filters."; + longDescription = '' + Goeland excels at creating beautiful emails from RSS, + tailored for daily or weekly digest. It include a number of + filters that can transform the RSS content along the way. + It can also consume other sources, such as a Imgur tag. + ''; + homepage = "https://github.com/slurdge/goeland"; + license = with licenses; [ mit ]; + maintainers = [ maintainers.sweenu ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05d687b152e3..d1a7bf11229e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7355,6 +7355,8 @@ with pkgs; godot-server = callPackage ../development/tools/godot/3/server.nix { }; + goeland = callPackage ../applications/networking/feedreaders/goeland { }; + go-mtpfs = callPackage ../tools/filesystems/go-mtpfs { }; goofys = callPackage ../tools/filesystems/goofys { }; From 40b0879469f32f365b943f20b7b452c7c3016fe9 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Thu, 27 Oct 2022 13:50:32 +0300 Subject: [PATCH 010/117] nanomq: init at 0.13.0 --- pkgs/servers/mqtt/nanomq/default.nix | 36 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/servers/mqtt/nanomq/default.nix diff --git a/pkgs/servers/mqtt/nanomq/default.nix b/pkgs/servers/mqtt/nanomq/default.nix new file mode 100644 index 000000000000..3d0cbcb37e6b --- /dev/null +++ b/pkgs/servers/mqtt/nanomq/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchFromGitHub, cmake, ninja, mbedtls, sqlite }: + +stdenv.mkDerivation rec { + pname = "nanomq"; + version = "0.13.0"; + + src = fetchFromGitHub { + owner = "emqx"; + repo = "nanomq"; + rev = version; + hash = "sha256-fxV/X34yohh/bxOsnoVngBKiwqABQDthLgZxvomC0+g="; + fetchSubmodules = true; + }; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "DESTINATION /etc" "DESTINATION $out/etc" + ''; + + nativeBuildInputs = [ cmake ninja ]; + + buildInputs = [ mbedtls sqlite ]; + + cmakeFlags = [ + "-DNNG_ENABLE_TLS=ON" + "-DNNG_ENABLE_SQLITE=ON" + ]; + + meta = with lib; { + description = "An ultra-lightweight and blazing-fast MQTT broker for IoT edge"; + homepage = "https://nanomq.io/"; + license = licenses.mit; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71d86e1a69a0..2cb8b793d7a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21167,6 +21167,8 @@ with pkgs; mosquitto = callPackage ../servers/mqtt/mosquitto { }; + nanomq = callPackage ../servers/mqtt/nanomq { }; + mps = callPackage ../development/libraries/mps { stdenv = gcc10StdenvCompat; }; libmpeg2 = callPackage ../development/libraries/libmpeg2 { }; From bb94951bd32a6e2bd0805cb7119dc878ddab53f7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Nov 2022 07:10:53 +0000 Subject: [PATCH 011/117] aws-c-common: 0.8.4 -> 0.8.5 --- pkgs/development/libraries/aws-c-common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix index ead22a8c9db7..c2c2016649c0 100644 --- a/pkgs/development/libraries/aws-c-common/default.nix +++ b/pkgs/development/libraries/aws-c-common/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "aws-c-common"; - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8RKx3OPb53hCquFcT+AbtX+LDNEvzLHuqtkbvXewqRs="; + sha256 = "sha256-kAwcVB39rcS59I2qJhYc7Xr3mXMWtKfN45jo+8BNHwA="; }; nativeBuildInputs = [ cmake ]; From 953c8abe0a9e92bb038172a3bd006683b516ab4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20B=C3=B6schen?= Date: Mon, 7 Nov 2022 22:04:17 +0100 Subject: [PATCH 012/117] maintainers: add catouc --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 99907a6877f8..5e09613f2478 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2265,6 +2265,12 @@ githubId = 5394722; name = "Spencer Baugh"; }; + catouc = { + email = "catouc@philipp.boeschen.me"; + github = "catouc"; + githubId = 25623213; + name = "Philipp Böschen"; + }; caugner = { email = "nixos@caugner.de"; github = "caugner"; From 6d4a903dfc907c31fa927739304fa1e57671a9b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20B=C3=B6schen?= Date: Mon, 7 Nov 2022 22:07:29 +0100 Subject: [PATCH 013/117] semver: init at v1.0.0 Release notes https://github.com/catouc/semver-go/releases/tag/v1.0.0 --- pkgs/applications/misc/semver/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/applications/misc/semver/default.nix diff --git a/pkgs/applications/misc/semver/default.nix b/pkgs/applications/misc/semver/default.nix new file mode 100644 index 000000000000..5453467b9ef6 --- /dev/null +++ b/pkgs/applications/misc/semver/default.nix @@ -0,0 +1,23 @@ +{ lib, buildGoModule, fetchFromGitHub, git }: + +buildGoModule rec { + pname = "semver"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "catouc"; + repo = "semver-go"; + rev = "v${version}"; + sha256 = "0v3j7rw917wnmp4lyjscqzk4qf4azfiz70ynbq3wl4gwp1m783vv"; + }; + + vendorSha256 = null; + nativeBuildInputs = [ git ]; + + meta = with lib; { + homepage = "https://github.com/catouc/semver-go"; + description = "A small CLI to fish out the current or next semver version from a git repository"; + maintainers = with maintainers; [ catouc ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51a52a449159..90dfe651ff97 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31715,6 +31715,8 @@ with pkgs; semiphemeral = callPackage ../tools/misc/semiphemeral { }; + semver = callPackage ../applications/misc/semver { }; + sent = callPackage ../applications/misc/sent { }; seq24 = callPackage ../applications/audio/seq24 { }; From 30260eac707435f5896e5039bd38027d1e2a9e77 Mon Sep 17 00:00:00 2001 From: Nathan Henrie Date: Mon, 7 Nov 2022 16:09:20 -0700 Subject: [PATCH 014/117] libvirt: fix running EFI VM images on aarch64-darwin --- pkgs/development/libraries/libvirt/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 71e89e07d8f7..a8f612678d04 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -59,6 +59,7 @@ # Darwin , gmp , libiconv +, qemu , Carbon , AppKit @@ -154,6 +155,9 @@ stdenv.mkDerivation rec { '' + optionalString isDarwin '' sed -i '/qemucapabilitiestest/d' tests/meson.build sed -i '/vircryptotest/d' tests/meson.build + sed -i '/domaincapstest/d' tests/meson.build + sed -i '/qemufirmwaretest/d' tests/meson.build + sed -i '/qemuvhostusertest/d' tests/meson.build '' + optionalString (isDarwin && isx86_64) '' sed -i '/qemucaps2xmltest/d' tests/meson.build sed -i '/qemuhotplugtest/d' tests/meson.build @@ -267,6 +271,7 @@ stdenv.mkDerivation rec { (cfg "runstatedir" "/run") (cfg "init_script" (if isDarwin then "none" else "systemd")) + (cfg "qemu_datadir" (if isDarwin then "${qemu}/share/qemu" else "")) (feat "apparmor" isLinux) (feat "attr" isLinux) From c4c95950c5ce51b71228bef31144850064eeb76c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 8 Nov 2022 04:20:00 +0000 Subject: [PATCH 015/117] aws-c-common: add nix as reverse dependency to passthru.tests --- pkgs/development/libraries/aws-c-common/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix index c2c2016649c0..235c328da85e 100644 --- a/pkgs/development/libraries/aws-c-common/default.nix +++ b/pkgs/development/libraries/aws-c-common/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , cmake -, coreutils +, nix }: stdenv.mkDerivation rec { @@ -43,6 +43,10 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.tests = { + inherit nix; + }; + meta = with lib; { description = "AWS SDK for C common core"; homepage = "https://github.com/awslabs/aws-c-common"; From 1b823ac6a9266ca94ccab14333988332840f3b47 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 8 Nov 2022 10:20:54 -0500 Subject: [PATCH 016/117] tree-sitter: update grammars --- .../parsing/tree-sitter/grammars/tree-sitter-julia.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-perl.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-scheme.json | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json index 5b968a05ec6a..94d548e75919 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-julia", - "rev": "8fb38abff74652c4faddbf04d2d5bbbc6b4bae25", - "date": "2022-11-01T17:30:42-05:00", - "path": "/nix/store/58qk62ilnkwqbqc5y0ah1ky5z4n4d4xr-tree-sitter-julia", - "sha256": "06h5nyxw72z3w5a62y59332w2xg90sm3c2j6na7vvf7nark7vb8v", + "rev": "bedd19f3c3d745c3da8451a35c7bfc5f48d07ee6", + "date": "2022-11-05T17:27:50-05:00", + "path": "/nix/store/ldklarlvv3jlxsfi7gnqmim7csnxp2qf-tree-sitter-julia", + "sha256": "0cnp0rff6igjfz9i8ckffj9r1fr2nzdw82hag6dml331z7nbjjkf", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json index aaf8f656bed1..b70beb42a1f7 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json @@ -1,9 +1,9 @@ { "url": "https://github.com/ganezdragon/tree-sitter-perl", - "rev": "ff5c3108083af6fcb7575e32a7558b8165a05bcd", - "date": "2022-07-18T20:23:41+05:30", - "path": "/nix/store/29ijys20vg6qyc2999vjiylwi9nrq3y4-tree-sitter-perl", - "sha256": "1zsffd55sldc1148wyjm0kh8knm4849wgwvdvwhchpzn6ji6yf8i", + "rev": "749d26fe13fb131b92e6515416096e572575b981", + "date": "2022-11-05T19:54:52+05:30", + "path": "/nix/store/b2w0s5livx7ysni6jlwwpmkd0f3wvqnh-tree-sitter-perl", + "sha256": "1ldl83nia3ij7ps5nx5fqzz5pzwzcmphajjhjf1vnrbm11zfzqjl", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json index b77bf59251b6..c417a035d857 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json @@ -1,9 +1,9 @@ { "url": "https://github.com/6cdh/tree-sitter-scheme", - "rev": "af0fd1fa452cb2562dc7b5c8a8c55551c39273b9", - "date": "2022-09-30T20:37:24+08:00", - "path": "/nix/store/gra9hiqd3rqgvvq10m3z6lzjf0y0lfz0-tree-sitter-scheme", - "sha256": "1pk1q8lmgj2mh7fmyvsr610qdv1c7nmfqdbr1bln1ar356dv6zrb", + "rev": "bdcd2c8496701153506a9e3e1b76dfed852873ba", + "date": "2022-11-06T17:17:49+08:00", + "path": "/nix/store/l096qb2872kab34avgscn9bwizrzail5-tree-sitter-scheme", + "sha256": "12knvhmayck9da3zj2w55al4yjhkkr9gxmfdmrjiz7vn9wc1dxr9", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, From f77532fac5bbee14bf78edf618393d59da5959e5 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 8 Nov 2022 10:24:26 -0500 Subject: [PATCH 017/117] tree-sitter-grammars: remove agda as it is abandoned --- .../tools/parsing/tree-sitter/grammars/default.nix | 1 - .../tree-sitter/grammars/tree-sitter-agda.json | 11 ----------- pkgs/development/tools/parsing/tree-sitter/update.nix | 3 ++- 3 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-agda.json diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index b3e325ffc9a6..fdedd3ad3e1b 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -1,6 +1,5 @@ { lib }: { - tree-sitter-agda = lib.importJSON ./tree-sitter-agda.json; tree-sitter-bash = lib.importJSON ./tree-sitter-bash.json; tree-sitter-beancount = lib.importJSON ./tree-sitter-beancount.json; tree-sitter-bibtex = lib.importJSON ./tree-sitter-bibtex.json; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-agda.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-agda.json deleted file mode 100644 index 36dd834d4d0f..000000000000 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-agda.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "url": "https://github.com/tree-sitter/tree-sitter-agda", - "rev": "d710ff14d15ddee3764fd73a0837c6c4c8c913e9", - "date": "2019-09-20T18:06:06+08:00", - "path": "/nix/store/wqz9v9znaiwhhqi19hgig9bn0yvl4i9s-tree-sitter-agda", - "sha256": "1wpfj47l97pxk3i9rzdylqipy849r482fnj3lmx8byhalv7z1vm6", - "fetchLFS": false, - "fetchSubmodules": false, - "deepClone": false, - "leaveDotGit": false -} diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index 63f749c890b4..5405fe048397 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -31,7 +31,6 @@ let "tree-sitter-scala" "tree-sitter-ocaml" "tree-sitter-julia" - "tree-sitter-agda" "tree-sitter-fluent" "tree-sitter-html" "tree-sitter-haskell" @@ -73,6 +72,8 @@ let "tree-sitter-graph" # abandoned "tree-sitter-swift" + # abandoned + "tree-sitter-agda" ]; ignoredTreeSitterOrgReposJson = jsonFile "ignored-tree-sitter-org-repos" ignoredTreeSitterOrgRepos; From 42e147380ac65ac2a7d791c9d1ccab02403dced7 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 8 Nov 2022 10:24:54 -0500 Subject: [PATCH 018/117] tree-sitter-grammars: remove fluent as it is abandoned --- .../tools/parsing/tree-sitter/grammars/default.nix | 1 - .../tree-sitter/grammars/tree-sitter-fluent.json | 11 ----------- pkgs/development/tools/parsing/tree-sitter/update.nix | 3 ++- 3 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fluent.json diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index fdedd3ad3e1b..de6ff5f66042 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -24,7 +24,6 @@ tree-sitter-erlang = lib.importJSON ./tree-sitter-erlang.json; tree-sitter-fennel = lib.importJSON ./tree-sitter-fennel.json; tree-sitter-fish = lib.importJSON ./tree-sitter-fish.json; - tree-sitter-fluent = lib.importJSON ./tree-sitter-fluent.json; tree-sitter-fortran = lib.importJSON ./tree-sitter-fortran.json; tree-sitter-gdscript = lib.importJSON ./tree-sitter-gdscript.json; tree-sitter-glimmer = lib.importJSON ./tree-sitter-glimmer.json; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fluent.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fluent.json deleted file mode 100644 index 6eeb5ccfe0a5..000000000000 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fluent.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "url": "https://github.com/tree-sitter/tree-sitter-fluent", - "rev": "858fdd6f1e81992e00d3541bfb31bac9365d7a47", - "date": "2018-06-18T13:00:38-07:00", - "path": "/nix/store/zbj8abdlrqi9swm8qn8rhpqmjwcz145f-tree-sitter-fluent", - "sha256": "0528v9w0cs73p9048xrddb1wpdhr92sn1sw8yyqfrq5sq0danr9k", - "fetchLFS": false, - "fetchSubmodules": false, - "deepClone": false, - "leaveDotGit": false -} diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index 5405fe048397..0c56a9929c84 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -31,7 +31,6 @@ let "tree-sitter-scala" "tree-sitter-ocaml" "tree-sitter-julia" - "tree-sitter-fluent" "tree-sitter-html" "tree-sitter-haskell" "tree-sitter-regex" @@ -74,6 +73,8 @@ let "tree-sitter-swift" # abandoned "tree-sitter-agda" + # abandoned + "tree-sitter-fluent" ]; ignoredTreeSitterOrgReposJson = jsonFile "ignored-tree-sitter-org-repos" ignoredTreeSitterOrgRepos; From 8d9133c67d25c15348ec12720ee2ce90762d4d4c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 8 Nov 2022 16:30:14 +0100 Subject: [PATCH 019/117] linux_4_9: remove Support will be dropped on 01 Jan 2023[1]. Normally we'd keep it around until then, but considering that it's an LTS kernel it may be better to do it before 22.11 to make sure there are no unpleasant surprises. Closes #199933 [1] https://endoflife.date/linux --- .../from_md/release-notes/rl-2211.section.xml | 6 + .../manual/release-notes/rl-2211.section.md | 2 + .../kernel/cpu-cgroup-v2-patches/4.9.patch | 784 ------------------ pkgs/os-specific/linux/kernel/linux-4.9.nix | 12 - pkgs/top-level/linux-kernels.nix | 11 +- 5 files changed, 10 insertions(+), 805 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.9.patch delete mode 100644 pkgs/os-specific/linux/kernel/linux-4.9.nix 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 9600901537ff..9562eb7ffad0 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 @@ -861,6 +861,12 @@ for termonad has been removed. + + + Linux 4.9 has been removed because it will reach its end of + life within the lifespan of 22.11. + + (Neo)Vim can not be configured with diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index b3495063f39b..622e1db6da32 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -265,6 +265,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - The top-level `termonad-with-packages` alias for `termonad` has been removed. +- Linux 4.9 has been removed because it will reach its end of life within the lifespan of 22.11. + - (Neo)Vim can not be configured with `configure.pathogen` anymore to reduce maintainance burden. Use `configure.packages` instead. - Neovim can not be configured with plug anymore (still works for vim). diff --git a/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.9.patch b/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.9.patch deleted file mode 100644 index 596718b83c43..000000000000 --- a/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.9.patch +++ /dev/null @@ -1,784 +0,0 @@ -commit 280858b0bb3384b9ec06b455e196b453888bd6b8 -Author: Tejun Heo -Date: Fri Mar 11 07:31:23 2016 -0500 - - sched: Misc preps for cgroup unified hierarchy interface - - Make the following changes in preparation for the cpu controller - interface implementation for the unified hierarchy. This patch - doesn't cause any functional differences. - - * s/cpu_stats_show()/cpu_cfs_stats_show()/ - - * s/cpu_files/cpu_legacy_files/ - - * Separate out cpuacct_stats_read() from cpuacct_stats_show(). While - at it, make the @val array u64 for consistency. - - Signed-off-by: Tejun Heo - Cc: Ingo Molnar - Cc: Peter Zijlstra - Cc: Li Zefan - Cc: Johannes Weiner - -diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index 154fd689fe02..57472485b79c 100644 ---- a/kernel/sched/core.c -+++ b/kernel/sched/core.c -@@ -8705,7 +8705,7 @@ static int __cfs_schedulable(struct task_group *tg, u64 period, u64 quota) - return ret; - } - --static int cpu_stats_show(struct seq_file *sf, void *v) -+static int cpu_cfs_stats_show(struct seq_file *sf, void *v) - { - struct task_group *tg = css_tg(seq_css(sf)); - struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth; -@@ -8745,7 +8745,7 @@ static u64 cpu_rt_period_read_uint(struct cgroup_subsys_state *css, - } - #endif /* CONFIG_RT_GROUP_SCHED */ - --static struct cftype cpu_files[] = { -+static struct cftype cpu_legacy_files[] = { - #ifdef CONFIG_FAIR_GROUP_SCHED - { - .name = "shares", -@@ -8766,7 +8766,7 @@ static struct cftype cpu_files[] = { - }, - { - .name = "stat", -- .seq_show = cpu_stats_show, -+ .seq_show = cpu_cfs_stats_show, - }, - #endif - #ifdef CONFIG_RT_GROUP_SCHED -@@ -8791,7 +8791,7 @@ struct cgroup_subsys cpu_cgrp_subsys = { - .fork = cpu_cgroup_fork, - .can_attach = cpu_cgroup_can_attach, - .attach = cpu_cgroup_attach, -- .legacy_cftypes = cpu_files, -+ .legacy_cftypes = cpu_legacy_files, - .early_init = true, - }; - -diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c -index bc0b309c3f19..d1e5dd0b3a64 100644 ---- a/kernel/sched/cpuacct.c -+++ b/kernel/sched/cpuacct.c -@@ -276,26 +276,33 @@ static int cpuacct_all_seq_show(struct seq_file *m, void *V) - return 0; - } - --static int cpuacct_stats_show(struct seq_file *sf, void *v) -+static void cpuacct_stats_read(struct cpuacct *ca, -+ u64 (*val)[CPUACCT_STAT_NSTATS]) - { -- struct cpuacct *ca = css_ca(seq_css(sf)); -- s64 val[CPUACCT_STAT_NSTATS]; - int cpu; -- int stat; - -- memset(val, 0, sizeof(val)); -+ memset(val, 0, sizeof(*val)); -+ - for_each_possible_cpu(cpu) { - u64 *cpustat = per_cpu_ptr(ca->cpustat, cpu)->cpustat; - -- val[CPUACCT_STAT_USER] += cpustat[CPUTIME_USER]; -- val[CPUACCT_STAT_USER] += cpustat[CPUTIME_NICE]; -- val[CPUACCT_STAT_SYSTEM] += cpustat[CPUTIME_SYSTEM]; -- val[CPUACCT_STAT_SYSTEM] += cpustat[CPUTIME_IRQ]; -- val[CPUACCT_STAT_SYSTEM] += cpustat[CPUTIME_SOFTIRQ]; -+ (*val)[CPUACCT_STAT_USER] += cpustat[CPUTIME_USER]; -+ (*val)[CPUACCT_STAT_USER] += cpustat[CPUTIME_NICE]; -+ (*val)[CPUACCT_STAT_SYSTEM] += cpustat[CPUTIME_SYSTEM]; -+ (*val)[CPUACCT_STAT_SYSTEM] += cpustat[CPUTIME_IRQ]; -+ (*val)[CPUACCT_STAT_SYSTEM] += cpustat[CPUTIME_SOFTIRQ]; - } -+} -+ -+static int cpuacct_stats_show(struct seq_file *sf, void *v) -+{ -+ u64 val[CPUACCT_STAT_NSTATS]; -+ int stat; -+ -+ cpuacct_stats_read(css_ca(seq_css(sf)), &val); - - for (stat = 0; stat < CPUACCT_STAT_NSTATS; stat++) { -- seq_printf(sf, "%s %lld\n", -+ seq_printf(sf, "%s %llu\n", - cpuacct_stat_desc[stat], - cputime64_to_clock_t(val[stat])); - } - -commit 015cbdcb90034fd566d00de9d3d405613da3cd26 -Author: Tejun Heo -Date: Fri Mar 11 07:31:23 2016 -0500 - - sched: Implement interface for cgroup unified hierarchy - - While the cpu controller doesn't have any functional problems, there - are a couple interface issues which can be addressed in the v2 - interface. - - * cpuacct being a separate controller. This separation is artificial - and rather pointless as demonstrated by most use cases co-mounting - the two controllers. It also forces certain information to be - accounted twice. - - * Use of different time units. Writable control knobs use - microseconds, some stat fields use nanoseconds while other cpuacct - stat fields use centiseconds. - - * Control knobs which can't be used in the root cgroup still show up - in the root. - - * Control knob names and semantics aren't consistent with other - controllers. - - This patchset implements cpu controller's interface on the unified - hierarchy which adheres to the controller file conventions described - in Documentation/cgroups/unified-hierarchy.txt. Overall, the - following changes are made. - - * cpuacct is implictly enabled and disabled by cpu and its information - is reported through "cpu.stat" which now uses microseconds for all - time durations. All time duration fields now have "_usec" appended - to them for clarity. While this doesn't solve the double accounting - immediately, once majority of users switch to v2, cpu can directly - account and report the relevant stats and cpuacct can be disabled on - the unified hierarchy. - - Note that cpuacct.usage_percpu is currently not included in - "cpu.stat". If this information is actually called for, it can be - added later. - - * "cpu.shares" is replaced with "cpu.weight" and operates on the - standard scale defined by CGROUP_WEIGHT_MIN/DFL/MAX (1, 100, 10000). - The weight is scaled to scheduler weight so that 100 maps to 1024 - and the ratio relationship is preserved - if weight is W and its - scaled value is S, W / 100 == S / 1024. While the mapped range is a - bit smaller than the orignal scheduler weight range, the dead zones - on both sides are relatively small and covers wider range than the - nice value mappings. This file doesn't make sense in the root - cgroup and isn't create on root. - - * "cpu.cfs_quota_us" and "cpu.cfs_period_us" are replaced by "cpu.max" - which contains both quota and period. - - * "cpu.rt_runtime_us" and "cpu.rt_period_us" are replaced by - "cpu.rt.max" which contains both runtime and period. - - v2: cpu_stats_show() was incorrectly using CONFIG_FAIR_GROUP_SCHED for - CFS bandwidth stats and also using raw division for u64. Use - CONFIG_CFS_BANDWITH and do_div() instead. - - The semantics of "cpu.rt.max" is not fully decided yet. Dropped - for now. - - Signed-off-by: Tejun Heo - Cc: Ingo Molnar - Cc: Peter Zijlstra - Cc: Li Zefan - Cc: Johannes Weiner - -diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index 57472485b79c..c0ae869f51c4 100644 ---- a/kernel/sched/core.c -+++ b/kernel/sched/core.c -@@ -8784,6 +8784,139 @@ static struct cftype cpu_legacy_files[] = { - { } /* terminate */ - }; - -+static int cpu_stats_show(struct seq_file *sf, void *v) -+{ -+ cpuacct_cpu_stats_show(sf); -+ -+#ifdef CONFIG_CFS_BANDWIDTH -+ { -+ struct task_group *tg = css_tg(seq_css(sf)); -+ struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth; -+ u64 throttled_usec; -+ -+ throttled_usec = cfs_b->throttled_time; -+ do_div(throttled_usec, NSEC_PER_USEC); -+ -+ seq_printf(sf, "nr_periods %d\n" -+ "nr_throttled %d\n" -+ "throttled_usec %llu\n", -+ cfs_b->nr_periods, cfs_b->nr_throttled, -+ throttled_usec); -+ } -+#endif -+ return 0; -+} -+ -+#ifdef CONFIG_FAIR_GROUP_SCHED -+static u64 cpu_weight_read_u64(struct cgroup_subsys_state *css, -+ struct cftype *cft) -+{ -+ struct task_group *tg = css_tg(css); -+ u64 weight = scale_load_down(tg->shares); -+ -+ return DIV_ROUND_CLOSEST_ULL(weight * CGROUP_WEIGHT_DFL, 1024); -+} -+ -+static int cpu_weight_write_u64(struct cgroup_subsys_state *css, -+ struct cftype *cftype, u64 weight) -+{ -+ /* -+ * cgroup weight knobs should use the common MIN, DFL and MAX -+ * values which are 1, 100 and 10000 respectively. While it loses -+ * a bit of range on both ends, it maps pretty well onto the shares -+ * value used by scheduler and the round-trip conversions preserve -+ * the original value over the entire range. -+ */ -+ if (weight < CGROUP_WEIGHT_MIN || weight > CGROUP_WEIGHT_MAX) -+ return -ERANGE; -+ -+ weight = DIV_ROUND_CLOSEST_ULL(weight * 1024, CGROUP_WEIGHT_DFL); -+ -+ return sched_group_set_shares(css_tg(css), scale_load(weight)); -+} -+#endif -+ -+static void __maybe_unused cpu_period_quota_print(struct seq_file *sf, -+ long period, long quota) -+{ -+ if (quota < 0) -+ seq_puts(sf, "max"); -+ else -+ seq_printf(sf, "%ld", quota); -+ -+ seq_printf(sf, " %ld\n", period); -+} -+ -+/* caller should put the current value in *@periodp before calling */ -+static int __maybe_unused cpu_period_quota_parse(char *buf, -+ u64 *periodp, u64 *quotap) -+{ -+ char tok[21]; /* U64_MAX */ -+ -+ if (!sscanf(buf, "%s %llu", tok, periodp)) -+ return -EINVAL; -+ -+ *periodp *= NSEC_PER_USEC; -+ -+ if (sscanf(tok, "%llu", quotap)) -+ *quotap *= NSEC_PER_USEC; -+ else if (!strcmp(tok, "max")) -+ *quotap = RUNTIME_INF; -+ else -+ return -EINVAL; -+ -+ return 0; -+} -+ -+#ifdef CONFIG_CFS_BANDWIDTH -+static int cpu_max_show(struct seq_file *sf, void *v) -+{ -+ struct task_group *tg = css_tg(seq_css(sf)); -+ -+ cpu_period_quota_print(sf, tg_get_cfs_period(tg), tg_get_cfs_quota(tg)); -+ return 0; -+} -+ -+static ssize_t cpu_max_write(struct kernfs_open_file *of, -+ char *buf, size_t nbytes, loff_t off) -+{ -+ struct task_group *tg = css_tg(of_css(of)); -+ u64 period = tg_get_cfs_period(tg); -+ u64 quota; -+ int ret; -+ -+ ret = cpu_period_quota_parse(buf, &period, "a); -+ if (!ret) -+ ret = tg_set_cfs_bandwidth(tg, period, quota); -+ return ret ?: nbytes; -+} -+#endif -+ -+static struct cftype cpu_files[] = { -+ { -+ .name = "stat", -+ .flags = CFTYPE_NOT_ON_ROOT, -+ .seq_show = cpu_stats_show, -+ }, -+#ifdef CONFIG_FAIR_GROUP_SCHED -+ { -+ .name = "weight", -+ .flags = CFTYPE_NOT_ON_ROOT, -+ .read_u64 = cpu_weight_read_u64, -+ .write_u64 = cpu_weight_write_u64, -+ }, -+#endif -+#ifdef CONFIG_CFS_BANDWIDTH -+ { -+ .name = "max", -+ .flags = CFTYPE_NOT_ON_ROOT, -+ .seq_show = cpu_max_show, -+ .write = cpu_max_write, -+ }, -+#endif -+ { } /* terminate */ -+}; -+ - struct cgroup_subsys cpu_cgrp_subsys = { - .css_alloc = cpu_cgroup_css_alloc, - .css_released = cpu_cgroup_css_released, -@@ -8792,7 +8925,15 @@ struct cgroup_subsys cpu_cgrp_subsys = { - .can_attach = cpu_cgroup_can_attach, - .attach = cpu_cgroup_attach, - .legacy_cftypes = cpu_legacy_files, -+ .dfl_cftypes = cpu_files, - .early_init = true, -+#ifdef CONFIG_CGROUP_CPUACCT -+ /* -+ * cpuacct is enabled together with cpu on the unified hierarchy -+ * and its stats are reported through "cpu.stat". -+ */ -+ .depends_on = 1 << cpuacct_cgrp_id, -+#endif - }; - - #endif /* CONFIG_CGROUP_SCHED */ -diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c -index d1e5dd0b3a64..57f390514c39 100644 ---- a/kernel/sched/cpuacct.c -+++ b/kernel/sched/cpuacct.c -@@ -347,6 +347,31 @@ static struct cftype files[] = { - { } /* terminate */ - }; - -+/* used to print cpuacct stats in cpu.stat on the unified hierarchy */ -+void cpuacct_cpu_stats_show(struct seq_file *sf) -+{ -+ struct cgroup_subsys_state *css; -+ u64 usage, val[CPUACCT_STAT_NSTATS]; -+ -+ css = cgroup_get_e_css(seq_css(sf)->cgroup, &cpuacct_cgrp_subsys); -+ -+ usage = cpuusage_read(css, seq_cft(sf)); -+ cpuacct_stats_read(css_ca(css), &val); -+ -+ val[CPUACCT_STAT_USER] *= TICK_NSEC; -+ val[CPUACCT_STAT_SYSTEM] *= TICK_NSEC; -+ do_div(usage, NSEC_PER_USEC); -+ do_div(val[CPUACCT_STAT_USER], NSEC_PER_USEC); -+ do_div(val[CPUACCT_STAT_SYSTEM], NSEC_PER_USEC); -+ -+ seq_printf(sf, "usage_usec %llu\n" -+ "user_usec %llu\n" -+ "system_usec %llu\n", -+ usage, val[CPUACCT_STAT_USER], val[CPUACCT_STAT_SYSTEM]); -+ -+ css_put(css); -+} -+ - /* - * charge this task's execution time to its accounting group. - * -diff --git a/kernel/sched/cpuacct.h b/kernel/sched/cpuacct.h -index ba72807c73d4..ddf7af466d35 100644 ---- a/kernel/sched/cpuacct.h -+++ b/kernel/sched/cpuacct.h -@@ -2,6 +2,7 @@ - - extern void cpuacct_charge(struct task_struct *tsk, u64 cputime); - extern void cpuacct_account_field(struct task_struct *tsk, int index, u64 val); -+extern void cpuacct_cpu_stats_show(struct seq_file *sf); - - #else - -@@ -14,4 +15,8 @@ cpuacct_account_field(struct task_struct *tsk, int index, u64 val) - { - } - -+static inline void cpuacct_cpu_stats_show(struct seq_file *sf) -+{ -+} -+ - #endif - -commit 5019fe3d7ec456b58d451ef06fe1f81d7d9f28a9 -Author: Tejun Heo -Date: Fri Aug 5 12:41:01 2016 -0400 - - cgroup: add documentation regarding CPU controller cgroup v2 support - - Signed-off-by: Tejun Heo - -diff --git a/Documentation/cgroup-v2-cpu.txt b/Documentation/cgroup-v2-cpu.txt -new file mode 100644 -index 000000000000..1ed7032d4472 ---- /dev/null -+++ b/Documentation/cgroup-v2-cpu.txt -@@ -0,0 +1,368 @@ -+ -+ -+CPU Controller on Control Group v2 -+ -+August, 2016 Tejun Heo -+ -+ -+While most controllers have support for cgroup v2 now, the CPU -+controller support is not upstream yet due to objections from the -+scheduler maintainers on the basic designs of cgroup v2. This -+document explains the current situation as well as an interim -+solution, and details the disagreements and arguments. The latest -+version of this document can be found at the following URL. -+ -+ https://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git/tree/Documentation/cgroup-v2-cpu.txt?h=cgroup-v2-cpu -+ -+This document was posted to the linux-kernel and cgroup mailing lists. -+Unfortunately, no consensus was reached as of Oct, 2016. The thread -+can be found at the following URL. -+ -+ http://lkml.kernel.org/r/20160805170752.GK2542@mtj.duckdns.org -+ -+ -+CONTENTS -+ -+1. Current Situation and Interim Solution -+2. Disagreements and Arguments -+ 2-1. Contentious Restrictions -+ 2-1-1. Process Granularity -+ 2-1-2. No Internal Process Constraint -+ 2-2. Impact on CPU Controller -+ 2-2-1. Impact of Process Granularity -+ 2-2-2. Impact of No Internal Process Constraint -+ 2-3. Arguments for cgroup v2 -+3. Way Forward -+4. References -+ -+ -+1. Current Situation and Interim Solution -+ -+All objections from the scheduler maintainers apply to cgroup v2 core -+design, and there are no known objections to the specifics of the CPU -+controller cgroup v2 interface. The only blocked part is changes to -+expose the CPU controller interface on cgroup v2, which comprises the -+following two patches: -+ -+ [1] sched: Misc preps for cgroup unified hierarchy interface -+ [2] sched: Implement interface for cgroup unified hierarchy -+ -+The necessary changes are superficial and implement the interface -+files on cgroup v2. The combined diffstat is as follows. -+ -+ kernel/sched/core.c | 149 +++++++++++++++++++++++++++++++++++++++++++++++-- -+ kernel/sched/cpuacct.c | 57 ++++++++++++------ -+ kernel/sched/cpuacct.h | 5 + -+ 3 files changed, 189 insertions(+), 22 deletions(-) -+ -+The patches are easy to apply and forward-port. The following git -+branch will always carry the two patches on top of the latest release -+of the upstream kernel. -+ -+ git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git/cgroup-v2-cpu -+ -+There also are versioned branches going back to v4.4. -+ -+ git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git/cgroup-v2-cpu-$KERNEL_VER -+ -+While it's difficult to tell whether the CPU controller support will -+be merged, there are crucial resource control features in cgroup v2 -+that are only possible due to the design choices that are being -+objected to, and every effort will be made to ease enabling the CPU -+controller cgroup v2 support out-of-tree for parties which choose to. -+ -+ -+2. Disagreements and Arguments -+ -+There have been several lengthy discussion threads [3][4] on LKML -+around the structural constraints of cgroup v2. The two that affect -+the CPU controller are process granularity and no internal process -+constraint. Both arise primarily from the need for common resource -+domain definition across different resources. -+ -+The common resource domain is a powerful concept in cgroup v2 that -+allows controllers to make basic assumptions about the structural -+organization of processes and controllers inside the cgroup hierarchy, -+and thus solve problems spanning multiple types of resources. The -+prime example for this is page cache writeback: dirty page cache is -+regulated through throttling buffered writers based on memory -+availability, and initiating batched write outs to the disk based on -+IO capacity. Tracking and controlling writeback inside a cgroup thus -+requires the direct cooperation of the memory and the IO controller. -+ -+This easily extends to other areas, such as CPU cycles consumed while -+performing memory reclaim or IO encryption. -+ -+ -+2-1. Contentious Restrictions -+ -+For controllers of different resources to work together, they must -+agree on a common organization. This uniform model across controllers -+imposes two contentious restrictions on the CPU controller: process -+granularity and the no-internal-process constraint. -+ -+ -+ 2-1-1. Process Granularity -+ -+ For memory, because an address space is shared between all threads -+ of a process, the terminal consumer is a process, not a thread. -+ Separating the threads of a single process into different memory -+ control domains doesn't make semantical sense. cgroup v2 ensures -+ that all controller can agree on the same organization by requiring -+ that threads of the same process belong to the same cgroup. -+ -+ There are other reasons to enforce process granularity. One -+ important one is isolating system-level management operations from -+ in-process application operations. The cgroup interface, being a -+ virtual filesystem, is very unfit for multiple independent -+ operations taking place at the same time as most operations have to -+ be multi-step and there is no way to synchronize multiple accessors. -+ See also [5] Documentation/cgroup-v2.txt, "R-2. Thread Granularity" -+ -+ -+ 2-1-2. No Internal Process Constraint -+ -+ cgroup v2 does not allow processes to belong to any cgroup which has -+ child cgroups when resource controllers are enabled on it (the -+ notable exception being the root cgroup itself). This is because, -+ for some resources, a resource domain (cgroup) is not directly -+ comparable to the terminal consumer (process/task) of said resource, -+ and so putting the two into a sibling relationship isn't meaningful. -+ -+ - Differing Control Parameters and Capabilities -+ -+ A cgroup controller has different resource control parameters and -+ capabilities from a terminal consumer, be that a task or process. -+ There are a couple cases where a cgroup control knob can be mapped -+ to a per-task or per-process API but they are exceptions and the -+ mappings aren't obvious even in those cases. -+ -+ For example, task priorities (also known as nice values) set -+ through setpriority(2) are mapped to the CPU controller -+ "cpu.shares" values. However, how exactly the two ranges map and -+ even the fact that they map to each other at all are not obvious. -+ -+ The situation gets further muddled when considering other resource -+ types and control knobs. IO priorities set through ioprio_set(2) -+ cannot be mapped to IO controller weights and most cgroup resource -+ control knobs including the bandwidth control knobs of the CPU -+ controller don't have counterparts in the terminal consumers. -+ -+ - Anonymous Resource Consumption -+ -+ For CPU, every time slice consumed from inside a cgroup, which -+ comprises most but not all of consumed CPU time for the cgroup, -+ can be clearly attributed to a specific task or process. Because -+ these two types of entities are directly comparable as consumers -+ of CPU time, it's theoretically possible to mix tasks and cgroups -+ on the same tree levels and let them directly compete for the time -+ quota available to their common ancestor. -+ -+ However, the same can't be said for resource types like memory or -+ IO: the memory consumed by the page cache, for example, can be -+ tracked on a per-cgroup level, but due to mismatches in lifetimes -+ of involved objects (page cache can persist long after processes -+ are gone), shared usages and the implementation overhead of -+ tracking persistent state, it can no longer be attributed to -+ individual processes after instantiation. Consequently, any IO -+ incurred by page cache writeback can be attributed to a cgroup, -+ but not to the individual consumers inside the cgroup. -+ -+ For memory and IO, this makes a resource domain (cgroup) an object -+ of a fundamentally different type than a terminal consumer -+ (process). A process can't be a first class object in the resource -+ distribution graph as its total resource consumption can't be -+ described without the containing resource domain. -+ -+ Disallowing processes in internal cgroups avoids competition between -+ cgroups and processes which cannot be meaningfully defined for these -+ resources. All resource control takes place among cgroups and a -+ terminal consumer interacts with the containing cgroup the same way -+ it would with the system without cgroup. -+ -+ Root cgroup is exempt from this constraint, which is in line with -+ how root cgroup is handled in general - it's excluded from cgroup -+ resource accounting and control. -+ -+ -+Enforcing process granularity and no internal process constraint -+allows all controllers to be on the same footing in terms of resource -+distribution hierarchy. -+ -+ -+2-2. Impact on CPU Controller -+ -+As indicated earlier, the CPU controller's resource distribution graph -+is the simplest. Every schedulable resource consumption can be -+attributed to a specific task. In addition, for weight based control, -+the per-task priority set through setpriority(2) can be translated to -+and from a per-cgroup weight. As such, the CPU controller can treat a -+task and a cgroup symmetrically, allowing support for any tree layout -+of cgroups and tasks. Both process granularity and the no internal -+process constraint restrict how the CPU controller can be used. -+ -+ -+ 2-2-1. Impact of Process Granularity -+ -+ Process granularity prevents tasks belonging to the same process to -+ be assigned to different cgroups. It was pointed out [6] that this -+ excludes the valid use case of hierarchical CPU distribution within -+ processes. -+ -+ To address this issue, the rgroup (resource group) [7][8][9] -+ interface, an extension of the existing setpriority(2) API, was -+ proposed, which is in line with other programmable priority -+ mechanisms and eliminates the risk of in-application configuration -+ and system configuration stepping on each other's toes. -+ Unfortunately, the proposal quickly turned into discussions around -+ cgroup v2 design decisions [4] and no consensus could be reached. -+ -+ -+ 2-2-2. Impact of No Internal Process Constraint -+ -+ The no internal process constraint disallows tasks from competing -+ directly against cgroups. Here is an excerpt from Peter Zijlstra -+ pointing out the issue [10] - R, L and A are cgroups; t1, t2, t3 and -+ t4 are tasks: -+ -+ -+ R -+ / | \ -+ t1 t2 A -+ / \ -+ t3 t4 -+ -+ -+ Is fundamentally different from: -+ -+ -+ R -+ / \ -+ L A -+ / \ / \ -+ t1 t2 t3 t4 -+ -+ -+ Because if in the first hierarchy you add a task (t5) to R, all of -+ its A will run at 1/4th of total bandwidth where before it had -+ 1/3rd, whereas with the second example, if you add our t5 to L, A -+ doesn't get any less bandwidth. -+ -+ -+ It is true that the trees are semantically different from each other -+ and the symmetric handling of tasks and cgroups is aesthetically -+ pleasing. However, it isn't clear what the practical usefulness of -+ a layout with direct competition between tasks and cgroups would be, -+ considering that number and behavior of tasks are controlled by each -+ application, and cgroups primarily deal with system level resource -+ distribution; changes in the number of active threads would directly -+ impact resource distribution. Real world use cases of such layouts -+ could not be established during the discussions. -+ -+ -+2-3. Arguments for cgroup v2 -+ -+There are strong demands for comprehensive hierarchical resource -+control across all major resources, and establishing a common resource -+hierarchy is an essential step. As with most engineering decisions, -+common resource hierarchy definition comes with its trade-offs. With -+cgroup v2, the trade-offs are in the form of structural constraints -+which, among others, restrict the CPU controller's space of possible -+configurations. -+ -+However, even with the restrictions, cgroup v2, in combination with -+rgroup, covers most of identified real world use cases while enabling -+new important use cases of resource control across multiple resource -+types that were fundamentally broken previously. -+ -+Furthermore, for resource control, treating resource domains as -+objects of a different type from terminal consumers has important -+advantages - it can account for resource consumptions which are not -+tied to any specific terminal consumer, be that a task or process, and -+allows decoupling resource distribution controls from in-application -+APIs. Even the CPU controller may benefit from it as the kernel can -+consume significant amount of CPU cycles in interrupt context or tasks -+shared across multiple resource domains (e.g. softirq). -+ -+Finally, it's important to note that enabling cgroup v2 support for -+the CPU controller doesn't block use cases which require the features -+which are not available on cgroup v2. Unlikely, but should anybody -+actually rely on the CPU controller's symmetric handling of tasks and -+cgroups, backward compatibility is and will be maintained by being -+able to disconnect the controller from the cgroup v2 hierarchy and use -+it standalone. This also holds for cpuset which is often used in -+highly customized configurations which might be a poor fit for common -+resource domains. -+ -+The required changes are minimal, the benefits for the target use -+cases are critical and obvious, and use cases which have to use v1 can -+continue to do so. -+ -+ -+3. Way Forward -+ -+cgroup v2 primarily aims to solve the problem of comprehensive -+hierarchical resource control across all major computing resources, -+which is one of the core problems of modern server infrastructure -+engineering. The trade-offs that cgroup v2 took are results of -+pursuing that goal and gaining a better understanding of the nature of -+resource control in the process. -+ -+I believe that real world usages will prove cgroup v2's model right, -+considering the crucial pieces of comprehensive resource control that -+cannot be implemented without common resource domains. This is not to -+say that cgroup v2 is fixed in stone and can't be updated; if there is -+an approach which better serves both comprehensive resource control -+and the CPU controller's flexibility, we will surely move towards -+that. It goes without saying that discussions around such approach -+should consider practical aspects of resource control as a whole -+rather than absolutely focusing on a particular controller. -+ -+Until such consensus can be reached, the CPU controller cgroup v2 -+support will be maintained out of the mainline kernel in an easily -+accessible form. If there is anything cgroup developers can do to -+ease the pain, please feel free to contact us on the cgroup mailing -+list at cgroups@vger.kernel.org. -+ -+ -+4. References -+ -+[1] http://lkml.kernel.org/r/20160105164834.GE5995@mtj.duckdns.org -+ [PATCH 1/2] sched: Misc preps for cgroup unified hierarchy interface -+ Tejun Heo -+ -+[2] http://lkml.kernel.org/r/20160105164852.GF5995@mtj.duckdns.org -+ [PATCH 2/2] sched: Implement interface for cgroup unified hierarchy -+ Tejun Heo -+ -+[3] http://lkml.kernel.org/r/1438641689-14655-4-git-send-email-tj@kernel.org -+ [PATCH 3/3] sched: Implement interface for cgroup unified hierarchy -+ Tejun Heo -+ -+[4] http://lkml.kernel.org/r/20160407064549.GH3430@twins.programming.kicks-ass.net -+ Re: [PATCHSET RFC cgroup/for-4.6] cgroup, sched: implement resource group and PRIO_RGRP -+ Peter Zijlstra -+ -+[5] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/cgroup-v2.txt -+ Control Group v2 -+ Tejun Heo -+ -+[6] http://lkml.kernel.org/r/CAPM31RJNy3jgG=DYe6GO=wyL4BPPxwUm1f2S6YXacQmo7viFZA@mail.gmail.com -+ Re: [PATCH 3/3] sched: Implement interface for cgroup unified hierarchy -+ Paul Turner -+ -+[7] http://lkml.kernel.org/r/20160105154503.GC5995@mtj.duckdns.org -+ [RFD] cgroup: thread granularity support for cpu controller -+ Tejun Heo -+ -+[8] http://lkml.kernel.org/r/1457710888-31182-1-git-send-email-tj@kernel.org -+ [PATCHSET RFC cgroup/for-4.6] cgroup, sched: implement resource group and PRIO_RGRP -+ Tejun Heo -+ -+[9] http://lkml.kernel.org/r/20160311160522.GA24046@htj.duckdns.org -+ Example program for PRIO_RGRP -+ Tejun Heo -+ -+[10] http://lkml.kernel.org/r/20160407082810.GN3430@twins.programming.kicks-ass.net -+ Re: [PATCHSET RFC cgroup/for-4.6] cgroup, sched: implement resource -+ Peter Zijlstra diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix deleted file mode 100644 index c58e05b485e5..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: - -buildLinux (args // rec { - version = "4.9.332"; - extraMeta.branch = "4.9"; - extraMeta.broken = stdenv.isAarch64; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1kiqa9kw4932n5qglkyymsrak849wbbszw9rnq1aygmdinjz4c8i"; - }; -} // (args.argsOverride or {})) diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index efd71e23ce74..46072e65ef20 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -95,14 +95,7 @@ in { linux_4_4 = throw "linux 4.4 was removed because it reached its end of life upstream"; - linux_4_9 = callPackage ../os-specific/linux/kernel/linux-4.9.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper_updated - kernelPatches.cpu-cgroup-v2."4.9" - kernelPatches.modinst_arg_list_too_long - ]; - }; + linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; linux_4_14 = callPackage ../os-specific/linux/kernel/linux-4.14.nix { kernelPatches = @@ -519,7 +512,7 @@ in { vanillaPackages = { # recurse to build modules for the kernels linux_4_4 = throw "linux 4.4 was removed because it reached its end of life upstream"; # Added 2022-02-11 - linux_4_9 = recurseIntoAttrs (packagesFor kernels.linux_4_9); + linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; # Added 2022-11-08 linux_4_14 = recurseIntoAttrs (packagesFor kernels.linux_4_14); linux_4_19 = recurseIntoAttrs (packagesFor kernels.linux_4_19); linux_5_4 = recurseIntoAttrs (packagesFor kernels.linux_5_4); From e7da2487fddb72cf083f09930e6bad133ae81d28 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 8 Nov 2022 10:30:28 -0500 Subject: [PATCH 020/117] tree-sitter-grammars: use maintained repo for tree-sitter-sql --- .../parsing/tree-sitter/grammars/tree-sitter-sql.json | 10 +++++----- pkgs/development/tools/parsing/tree-sitter/update.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json index c80f1eaddd1e..5149a66fee35 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json @@ -1,9 +1,9 @@ { - "url": "https://github.com/m-novikov/tree-sitter-sql", - "rev": "218b672499729ef71e4d66a949e4a1614488aeaa", - "date": "2022-06-30T19:50:55+02:00", - "path": "/nix/store/rcdcgwb28jblgb65k5zjw5zgmigiqjfl-tree-sitter-sql", - "sha256": "1j68h5jzc0d3a44v5mw005lh3zsrh0salfzydl9br1n8byl1awms", + "url": "https://github.com/derekstride/tree-sitter-sql", + "rev": "70c50264ae022193adb364ffa7a767d765ed9857", + "date": "2022-11-02T09:36:19-04:00", + "path": "/nix/store/f1pg3pf4fyfmls30l1ma1nlwq61fxxqs-tree-sitter-sql", + "sha256": "16s58bvll2r80zga63fjzjbkfxm3zdr3vljjk69cvjwnpy668yfh", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index 0c56a9929c84..92a755e4da6c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -139,7 +139,7 @@ let repo = "tree-sitter-svelte"; }; "tree-sitter-sql" = { - orga = "m-novikov"; + orga = "derekstride"; repo = "tree-sitter-sql"; }; "tree-sitter-vim" = { From 36d5e2658ce7dceaee693a4f276846a75db7acc6 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 8 Nov 2022 16:32:37 +0100 Subject: [PATCH 021/117] linuxKernels: remove attrs for kernels EOLed before 22.05 Now that we actually do cleanups for 22.11, it's a good time to drop these tombstones from before 22.05. For dropped kernel attributes one NixOS release is IMHO enough as a grace period. --- pkgs/top-level/aliases.nix | 4 ---- pkgs/top-level/linux-kernels.nix | 6 ------ 2 files changed, 10 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b778cc11bab0..0ca5ebbe3516 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -801,11 +801,9 @@ mapAliases ({ linux-rt_5_4 = linuxKernel.kernels.linux_rt_5_4; linuxPackages_4_14 = linuxKernel.packages.linux_4_14; linuxPackages_4_19 = linuxKernel.packages.linux_4_19; - linuxPackages_4_4 = linuxKernel.packages.linux_4_4; linuxPackages_4_9 = linuxKernel.packages.linux_4_9; linuxPackages_5_10 = linuxKernel.packages.linux_5_10; linuxPackages_5_15 = linuxKernel.packages.linux_5_15; - linuxPackages_5_16 = linuxKernel.packages.linux_5_16; linuxPackages_5_17 = linuxKernel.packages.linux_5_17; linuxPackages_5_18 = linuxKernel.packages.linux_5_18; linuxPackages_5_19 = linuxKernel.packages.linux_5_19; @@ -822,11 +820,9 @@ mapAliases ({ linuxPackages_rt_5_4 = linuxKernel.packages.linux_rt_5_4; linux_4_14 = linuxKernel.kernels.linux_4_14; linux_4_19 = linuxKernel.kernels.linux_4_19; - linux_4_4 = linuxKernel.kernels.linux_4_4; linux_4_9 = linuxKernel.kernels.linux_4_9; linux_5_10 = linuxKernel.kernels.linux_5_10; linux_5_15 = linuxKernel.kernels.linux_5_15; - linux_5_16 = linuxKernel.kernels.linux_5_16; linux_5_17 = linuxKernel.kernels.linux_5_17; linux_5_18 = linuxKernel.kernels.linux_5_18; linux_5_19 = linuxKernel.kernels.linux_5_19; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 46072e65ef20..ddf69ea75ad4 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -93,8 +93,6 @@ in { rpiVersion = 4; }; - linux_4_4 = throw "linux 4.4 was removed because it reached its end of life upstream"; - linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; linux_4_14 = callPackage ../os-specific/linux/kernel/linux-4.14.nix { @@ -153,8 +151,6 @@ in { ]; }; - linux_5_16 = throw "linux 5.16 was removed because it has reached its end of life upstream"; - linux_5_17 = throw "linux 5.17 was removed because it has reached its end of life upstream"; linux_5_18 = throw "linux 5.18 was removed because it has reached its end of life upstream"; @@ -511,14 +507,12 @@ in { vanillaPackages = { # recurse to build modules for the kernels - linux_4_4 = throw "linux 4.4 was removed because it reached its end of life upstream"; # Added 2022-02-11 linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; # Added 2022-11-08 linux_4_14 = recurseIntoAttrs (packagesFor kernels.linux_4_14); linux_4_19 = recurseIntoAttrs (packagesFor kernels.linux_4_19); linux_5_4 = recurseIntoAttrs (packagesFor kernels.linux_5_4); linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10); linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15); - linux_5_16 = throw "linux 5.16 was removed because it reached its end of life upstream"; # Added 2022-04-23 linux_5_17 = throw "linux 5.17 was removed because it reached its end of life upstream"; # Added 2022-06-23 linux_5_18 = throw "linux 5.18 was removed because it reached its end of life upstream"; # Added 2022-09-17 linux_5_19 = throw "linux 5.19 was removed because it reached its end of life upstream"; # Added 2022-11-01 From 4854f55666e42f39677e88621dd2776f2af57012 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Tue, 8 Nov 2022 20:58:51 +0100 Subject: [PATCH 022/117] palemoon: 31.3.0.1 -> 31.3.1 --- pkgs/applications/networking/browsers/palemoon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index aa4e5ed47b4b..3d3339d06b5e 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -45,7 +45,7 @@ assert with lib.strings; ( stdenv.mkDerivation rec { pname = "palemoon"; - version = "31.3.0.1"; + version = "31.3.1"; src = fetchFromGitea { domain = "repo.palemoon.org"; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { repo = "Pale-Moon"; rev = "${version}_Release"; fetchSubmodules = true; - sha256 = "sha256-qspzTlhK9MRJBsXxmYzl5K6in09LZPvaVc+ibovJAD8="; + sha256 = "sha256-oLtCS5Izdk2ImyzKx2IXkzv6pJp86mvP99P0+XIteRA="; }; nativeBuildInputs = [ From 3fe48462e36001437c0eba9bca740597907a260e Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 8 Nov 2022 16:27:09 -0500 Subject: [PATCH 023/117] roon-server: 2.0-1143 -> 2.0-1148 --- pkgs/servers/roon-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index e01a9eb220fa..1558cd863b10 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -15,7 +15,7 @@ , stdenv }: let - version = "2.0-1143"; + version = "2.0-1148"; urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "0" ] version; in stdenv.mkDerivation { @@ -24,7 +24,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2"; - hash = "sha256-qSqSiqO3SzVmRacbbAphVLp0ablQCjR4Zn2HIQaqSPs="; + hash = "sha256-TTewFN2VsBcoGwBwZ4wWRQd68nF0sfNHAcAOiyK/bd8="; }; dontConfigure = true; From 5c1561a9da70758a32270a813021c946254136d9 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Wed, 9 Nov 2022 11:57:57 +0300 Subject: [PATCH 024/117] seaweedfs: 3.32 -> 3.34 --- pkgs/applications/networking/seaweedfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index 6ff9b6bd26fd..cf23d2208739 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "3.32"; + version = "3.34"; src = fetchFromGitHub { owner = "chrislusf"; repo = "seaweedfs"; rev = version; - hash = "sha256-GMOLlkBfY3ShVojdRrmpMYgoea52kq4aXr/oZj5bJWo="; + hash = "sha256-lOCZHkLJCDvaT3CcHUBbsybdy0H6BfKKGpd/73cxcWA="; }; - vendorHash = "sha256-cEzPKx54rssyAytYenIcud3K0f7xuO8WzE8wdMqZipE="; + vendorHash = "sha256-1RUWONkXArXYg8gQogKUhMSGdIYyT3lq5qWuUQBsFig="; subPackages = [ "weed" ]; From 63f8fdcf0798da3f93d98cd957c7dedf8825b2df Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Nov 2022 12:36:19 +0000 Subject: [PATCH 025/117] fluent-bit: 2.0.3 -> 2.0.4 --- pkgs/tools/misc/fluent-bit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index b1da8e5ff6d6..c40f1c41a729 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "2.0.3"; + version = "2.0.4"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "sha256-8P28xaFyaU0GrIrO+D+Rp9H4xgOymHtbAbd2mI79vSI="; + sha256 = "sha256-Fn6+hAVGgbsqR6wQc2tGcslyxlX5XIqc1PYLyhjTfh0="; }; nativeBuildInputs = [ cmake flex bison ]; From 7523165c213aeb2e4dc9c2345b57a9961482a640 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 9 Nov 2022 10:11:09 -0300 Subject: [PATCH 026/117] lxqt.libqtxdg: 3.9.1 -> 3.10.0 --- pkgs/desktops/lxqt/libqtxdg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix index 4496cade9685..066d2ec1ecdd 100644 --- a/pkgs/desktops/lxqt/libqtxdg/default.nix +++ b/pkgs/desktops/lxqt/libqtxdg/default.nix @@ -10,13 +10,13 @@ mkDerivation rec { pname = "libqtxdg"; - version = "3.9.1"; + version = "3.10.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "zrlaOiIsfbwjHFjqhYZ9lCo+oTsddICxl2UAum9Xoi4="; + sha256 = "Lynm6Qxy02Os69YQ1cb2W0hV7sq9kBhbACqjHTGj7Tw="; }; nativeBuildInputs = [ From e17d0fc0f68364afafe80f8a1895bcfb65425308 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 9 Nov 2022 10:11:10 -0300 Subject: [PATCH 027/117] lxqt.libfm-qt: 1.1.0 -> 1.2.0 --- pkgs/desktops/lxqt/libfm-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix index 7ef8fb7ca1b1..1d3c29802e3a 100644 --- a/pkgs/desktops/lxqt/libfm-qt/default.nix +++ b/pkgs/desktops/lxqt/libfm-qt/default.nix @@ -16,13 +16,13 @@ mkDerivation rec { pname = "libfm-qt"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "libfm-qt"; rev = version; - sha256 = "kF3u1Eh45l/HvL5R0PazIfGIdOVYyB2VAI33NwRfLJk="; + sha256 = "Lg+BQ0VFLF5Nhxzr4eeaDVWQG/pC1/w60pQg+lTddHY="; }; nativeBuildInputs = [ From 0116afa2d19f6f60eb30f38a167991af37498c6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 9 Nov 2022 10:11:10 -0300 Subject: [PATCH 028/117] lxqt.liblxqt: 1.1.0 -> 1.2.0 --- pkgs/desktops/lxqt/liblxqt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix index 41d8ea6222d8..4528abd0cec7 100644 --- a/pkgs/desktops/lxqt/liblxqt/default.nix +++ b/pkgs/desktops/lxqt/liblxqt/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "liblxqt"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "vfqEB9Vh/BL47dlEvnyWwDBO0pRIUS1IuixW8A0PRds="; + sha256 = "x1gzqmTHDnpAdLxacKyl+gDob1M7toTDUufaM0y+AHA="; }; nativeBuildInputs = [ From 918dd09b197981984d02d6a11935914cf80ae6df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 9 Nov 2022 10:11:10 -0300 Subject: [PATCH 029/117] lxqt.lximage-qt: 1.1.0 -> 1.2.0 --- pkgs/desktops/lxqt/lximage-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix index 4672e402c9ad..f0cdb88c95f4 100644 --- a/pkgs/desktops/lxqt/lximage-qt/default.nix +++ b/pkgs/desktops/lxqt/lximage-qt/default.nix @@ -18,13 +18,13 @@ mkDerivation rec { pname = "lximage-qt"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "QvQ0LBGP9XD7vwuUD+A1x8oGDvqTeCkYyd2XyjU0fUo="; + sha256 = "T/LvxnHi0094wvxjB+6W7Ztg2lxkSu5yzjGx/jSzM8Y="; }; nativeBuildInputs = [ From 84fd3117993c665d2e357c33f57d037210cd7b06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 9 Nov 2022 10:11:10 -0300 Subject: [PATCH 030/117] lxqt.lxqt-about: 1.1.0 -> 1.2.0 --- pkgs/desktops/lxqt/lxqt-about/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-about/default.nix b/pkgs/desktops/lxqt/lxqt-about/default.nix index 1ccd00e2208f..cc021c4fc5ea 100644 --- a/pkgs/desktops/lxqt/lxqt-about/default.nix +++ b/pkgs/desktops/lxqt/lxqt-about/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "lxqt-about"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "GTnjmMVbkO5CeNLxNisD6XncqX32otaATZSka4YVNHo="; + sha256 = "aOGbT8DwDAfp8odcOkNsZkuI/guSRbQnETii5o24jcU="; }; nativeBuildInputs = [ From a894652346b0a99bbca1d947358cae543072700d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 9 Nov 2022 10:11:10 -0300 Subject: [PATCH 031/117] lxqt.lxqt-admin: 1.1.0 -> 1.2.0 --- pkgs/desktops/lxqt/lxqt-admin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-admin/default.nix b/pkgs/desktops/lxqt/lxqt-admin/default.nix index e634a3ba9ead..75aa6a6a2571 100644 --- a/pkgs/desktops/lxqt/lxqt-admin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-admin/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "lxqt-admin"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "A5dpw/vG92tC4W1q1wpDyMdRn1ScEH7m287MCEGOp9w="; + sha256 = "0b6I45O4hUSnhP+IJJV8jesJgWpg3Y53TEaROhGQctY="; }; nativeBuildInputs = [ From af64bc3d272fd6f97b500527af4b426a948c24b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 9 Nov 2022 10:11:10 -0300 Subject: [PATCH 032/117] lxqt.lxqt-archiver: 0.6.0 -> 0.7.0 --- pkgs/desktops/lxqt/lxqt-archiver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/pkgs/desktops/lxqt/lxqt-archiver/default.nix index bfbd4381a97f..f3099b83592c 100644 --- a/pkgs/desktops/lxqt/lxqt-archiver/default.nix +++ b/pkgs/desktops/lxqt/lxqt-archiver/default.nix @@ -16,13 +16,13 @@ mkDerivation rec { pname = "lxqt-archiver"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "lxqt-archiver"; rev = version; - sha256 = "ay0nWCe/uMsJFFtBAQnsuxR6I/8q3xv6zK/qYr3BQyw="; + sha256 = "aHN17sugIoH5UfbOn11mDofq2EY7KByYCWE5NJRJWbo="; }; nativeBuildInputs = [ From fc1df44c381d77049fac8430eceafdbd80764b25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 9 Nov 2022 10:11:10 -0300 Subject: [PATCH 033/117] lxqt.lxqt-build-tools: 0.11.0 -> 0.12.0 --- .../lxqt/lxqt-build-tools/default.nix | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix index 6da001a554c2..6797c24946b7 100644 --- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix +++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix @@ -14,30 +14,15 @@ mkDerivation rec { pname = "lxqt-build-tools"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "vzppKTDwADBG5pOaluT858cWCKFFRaSbHz2Qhe6799E="; + sha256 = "18+xSHBjYmtENGJuTf8yJh4C4QTNYttr8ucRU8KK1HU="; }; - patches = [ - # in master post 0.11.0, see https://github.com/lxqt/lxqt-build-tools/pull/76 - (fetchpatch { - name = "fix-pkg-config.patch"; - url = "https://github.com/lxqt/lxqt-build-tools/pull/76/commits/fa9672b671ede3f46b004f81580f9afb50fedf00.patch"; - sha256 = "0dl7n1afcc6ky9vd9lpc65p9grpszpql7lfjq2vlzlilixnv8xv1"; - }) - # Fix build failure of libqtxdg with GLib 2.73.1+ - # https://github.com/lxqt/lxqt-build-tools/pull/79 - (fetchpatch { - url = "https://github.com/lxqt/lxqt-build-tools/commit/4991811d9212ec1176af6d1cbe88aa37efad4836.patch"; - sha256 = "sha256-PsYJKonMG6A9O4Li+RC1qBjFUzYgxVAwzSqHq/phmPc="; - }) - ]; - postPatch = '' # Nix clang on darwin identifies as 'Clang', not 'AppleClang' # Without this, dependants fail to link. From a2d45e5fc79c5045e0ec2b2d66dbd6b3607530f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 9 Nov 2022 10:11:10 -0300 Subject: [PATCH 034/117] lxqt.lxqt-config: 1.1.0 -> 1.2.0 --- pkgs/desktops/lxqt/lxqt-config/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix index 4d3af9fee117..55239caf2bd1 100644 --- a/pkgs/desktops/lxqt/lxqt-config/default.nix +++ b/pkgs/desktops/lxqt/lxqt-config/default.nix @@ -20,13 +20,13 @@ mkDerivation rec { pname = "lxqt-config"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "ncoJLpKzE1tqOV+KuUiGLDWiDvzJg0le4m4BMKFw6Mg="; + sha256 = "WgrcHM4iJLZsJO2obqSkjHHMB+/kcadQArkcXC5FB24="; }; nativeBuildInputs = [ From 0e04eac47f12fe62cb982230036e17639d72db7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 9 Nov 2022 10:11:10 -0300 Subject: [PATCH 035/117] lxqt.lxqt-globalkeys: 1.1.0 -> 1.2.0 --- pkgs/desktops/lxqt/lxqt-globalkeys/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix index b362e3ee4de7..18b50333752d 100644 --- a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix +++ b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "lxqt-globalkeys"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "6io6gH+n7dodTDQjvCqxjvaafQ4E9H7kx+s2QiAm3mY="; + sha256 = "GZ5E8OAx7Wb1bEwqwmYdOVcOXFaTxD1SibADgTWhdbg="; }; nativeBuildInputs = [ From 28243114401919e43d7d1ff2cea29da9e8ceee68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 9 Nov 2022 10:11:10 -0300 Subject: [PATCH 036/117] lxqt.lxqt-notificationd: 1.1.0 -> 1.2.0 --- pkgs/desktops/lxqt/lxqt-notificationd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix index fc30d2884b45..e567da7f2a50 100644 --- a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix +++ b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "lxqt-notificationd"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "YXwWqab6OW1KE7Zct92xdK/f/QaDVqEMVM+Cb9kNe7E="; + sha256 = "RbOkMsz3jejoij/GnRbGuoA7vW4GTZxPnkIfbhq64qI="; }; nativeBuildInputs = [ From c19da6c02de2f91021f176cf1c127319c94fc406 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 9 Nov 2022 10:11:10 -0300 Subject: [PATCH 037/117] lxqt.lxqt-openssh-askpass: 1.1.0 -> 1.2.0 --- pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix index b1d2ba4eb55c..1c6dc6ab492f 100644 --- a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix +++ b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "lxqt-openssh-askpass"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "s1ywmlcHsbeaRi5zrhFMPS0SJ1s8IYnDXWkFvB1kaI4="; + sha256 = "1uBgP4cOKypZZbMVYdvgM7GyZI2Ef3XmuAfs0nPzHd0="; }; nativeBuildInputs = [ From 71a36df2c7807ecc9da5d95886688a8ec6de4d58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 9 Nov 2022 10:11:11 -0300 Subject: [PATCH 038/117] lxqt.lxqt-panel: 1.1.0 -> 1.2.0 --- pkgs/desktops/lxqt/lxqt-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix index 8e65df114612..21292e15ac1d 100644 --- a/pkgs/desktops/lxqt/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix @@ -30,13 +30,13 @@ mkDerivation rec { pname = "lxqt-panel"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "w5/uS8kRb5yFUXd1NImWMXxx40YtzxMZMS87e9syb6A="; + sha256 = "A/zoK6V+4tFeu8mSFukLeKnFVKl66QtKLtu7N7Z2P2w="; }; nativeBuildInputs = [ From e67e084bd28f5b4f26b9b789eefa8f8a56257f4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 9 Nov 2022 10:11:11 -0300 Subject: [PATCH 039/117] lxqt.lxqt-policykit: 1.1.0 -> 1.2.0 --- pkgs/desktops/lxqt/lxqt-policykit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix index 6b05fca37b56..6c50ae6fbc5b 100644 --- a/pkgs/desktops/lxqt/lxqt-policykit/default.nix +++ b/pkgs/desktops/lxqt/lxqt-policykit/default.nix @@ -19,13 +19,13 @@ mkDerivation rec { pname = "lxqt-policykit"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "Fs3N9r8RkawbXnX8jv8Fx63ijwAfy+OfrCpjeHDjKio="; + sha256 = "SvJ4XN0JZs2VAt5H9CJXrJhThxnQnlbsLP44CW7zpGM="; }; nativeBuildInputs = [ From a69d6a6e801c37005a03bd795df0d84298c25856 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 9 Nov 2022 10:11:11 -0300 Subject: [PATCH 040/117] lxqt.lxqt-powermanagement: 1.1.0 -> 1.2.0 --- pkgs/desktops/lxqt/lxqt-powermanagement/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix index 7f20c96c7702..38a78203c354 100644 --- a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix +++ b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix @@ -18,13 +18,13 @@ mkDerivation rec { pname = "lxqt-powermanagement"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "+FpJD5PEH2/HOSWDQEwMX2sV2JJH0kjcoohBolhSP1A="; + sha256 = "yUQYvAWAsbaa2acwzIqnlFt5bsFLT63/RQdvWUsopqc="; }; nativeBuildInputs = [ From 33f4b71e38a881e9fe3316c8067e65227eda7719 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 9 Nov 2022 10:11:11 -0300 Subject: [PATCH 041/117] lxqt.lxqt-qtplugin: 1.1.0 -> 1.2.0 --- pkgs/desktops/lxqt/lxqt-qtplugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix index b0672b4ca58f..ade0157742bd 100644 --- a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "lxqt-qtplugin"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "mTA+3sXFWFYUEQhZOnAy6D/tYVAU+9AXbuLmLi7axlc="; + sha256 = "oxETofSxje7fNEI8AahSUCaT+k/flfU6XJroMhtdiCw="; }; nativeBuildInputs = [ From 8f5c7486974affcc18fde86ae836e2b9c1437919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 9 Nov 2022 10:11:11 -0300 Subject: [PATCH 042/117] lxqt.lxqt-runner: 1.1.0 -> 1.2.0 --- pkgs/desktops/lxqt/lxqt-runner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix index 285067c3944e..8a27606ec977 100644 --- a/pkgs/desktops/lxqt/lxqt-runner/default.nix +++ b/pkgs/desktops/lxqt/lxqt-runner/default.nix @@ -20,13 +20,13 @@ mkDerivation rec { pname = "lxqt-runner"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "hnuzoHKXqM6xEzN0jvHVjVWUXRxuwdhD3BiBfFMmZSk="; + sha256 = "fJHTw7xPn7rWVd+H1cDnNmeu3BPlE/ta0VOfJsUfSNs="; }; nativeBuildInputs = [ From aeb8c5172f97a577fcc44767de054b3bb52c02f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 9 Nov 2022 10:11:11 -0300 Subject: [PATCH 043/117] lxqt.lxqt-session: 1.1.1 -> 1.2.0 --- pkgs/desktops/lxqt/lxqt-session/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix index 3a2db7b8dffa..2241d3e8f361 100644 --- a/pkgs/desktops/lxqt/lxqt-session/default.nix +++ b/pkgs/desktops/lxqt/lxqt-session/default.nix @@ -20,13 +20,13 @@ mkDerivation rec { pname = "lxqt-session"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "NOwuHz5SiygE/9cLrYPz24L5v8BE6Hwqp6uKD5SnOBU="; + sha256 = "EmaMIoVouC1/B/WrLwynynx3F9A1Ae5kT3uhl5HVQg8="; }; nativeBuildInputs = [ From 5fbb56c58d9c673c694ce5e4fd5c3ecbb71382dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 9 Nov 2022 10:11:11 -0300 Subject: [PATCH 044/117] lxqt.lxqt-sudo: 1.1.0 -> 1.2.0 --- pkgs/desktops/lxqt/lxqt-sudo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/lxqt-sudo/default.nix index 1ef839b20c96..9d3cc4aeacb9 100644 --- a/pkgs/desktops/lxqt/lxqt-sudo/default.nix +++ b/pkgs/desktops/lxqt/lxqt-sudo/default.nix @@ -16,13 +16,13 @@ mkDerivation rec { pname = "lxqt-sudo"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "Oa4OYIDXQUIQ96pEY7rGBq+spwVSU+kgDS7250tYNuc="; + sha256 = "oa6q85iPOrhou1ii7/CsdIWnf5VNkxs55QMtiQWRM2c="; }; nativeBuildInputs = [ From 47d0ac70a651c876a71340ca5b811aba4940a0d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 9 Nov 2022 10:11:11 -0300 Subject: [PATCH 045/117] lxqt.lxqt-themes: 1.1.0 -> 1.2.0 --- pkgs/desktops/lxqt/lxqt-themes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-themes/default.nix b/pkgs/desktops/lxqt/lxqt-themes/default.nix index 94e7e82b837a..442bf0268278 100644 --- a/pkgs/desktops/lxqt/lxqt-themes/default.nix +++ b/pkgs/desktops/lxqt/lxqt-themes/default.nix @@ -8,13 +8,13 @@ mkDerivation rec { pname = "lxqt-themes"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "OEl6ZfMKdqjONRA1LPZ69KyFjp1c21Uib/riYDWSRWE="; + sha256 = "c7SGsnF2t2IrQFZODVmZS0ijJ7G1KiLWOLm7Rs2hehs="; }; nativeBuildInputs = [ From a40f98a82e369d2b6f70d13666d1be57f7ce9185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 9 Nov 2022 10:11:11 -0300 Subject: [PATCH 046/117] lxqt.pavucontrol-qt: 1.1.0 -> 1.2.0 --- pkgs/desktops/lxqt/pavucontrol-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix index a3ff84150ce9..e39bf81c56c9 100644 --- a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix +++ b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "pavucontrol-qt"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "zHV9tR5gDjKDbfhnhVnCnw7whJDugMAGARA3UNs/6aA="; + sha256 = "OCMdfwbvgjb+7IYDp/NKF/gI4luJGFfFRKZH64JsPP8="; }; nativeBuildInputs = [ From f93d192990374ae3fef30eda1474ae78dfc673de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 9 Nov 2022 10:11:11 -0300 Subject: [PATCH 047/117] lxqt.pcmanfm-qt: 1.1.0 -> 1.2.0 --- pkgs/desktops/lxqt/pcmanfm-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix index b3fadab60fa7..2f61efa31c7a 100644 --- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix +++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix @@ -17,13 +17,13 @@ mkDerivation rec { pname = "pcmanfm-qt"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "AgNupKdjSigrgY2U9bnkQCV0BrRCw2X9WR4jUH6YmEU="; + sha256 = "3N+4rhmvVUvQ6svtyOMY0+eP2Kz7EpkmZ3Ua+W4gg0Y="; }; nativeBuildInputs = [ From 1f1d9f6916ada1b56d20bcb192b20d26b8143cb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 9 Nov 2022 10:11:11 -0300 Subject: [PATCH 048/117] lxqt.qps: 2.5.0 -> 2.6.0 --- pkgs/desktops/lxqt/qps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix index 1523a9e6ed3d..544a4dbadf0a 100644 --- a/pkgs/desktops/lxqt/qps/default.nix +++ b/pkgs/desktops/lxqt/qps/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "qps"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "hkcl9bBQP994TGr4CQQlRZR88IZiRdcbUNOXXf4kXdg="; + sha256 = "A0JIZNNv/6lUlKnEp8MbBe+3lIQzyjqSPjlYcwbpENk="; }; nativeBuildInputs = [ From baee8a7333046a18066ba87e39768c7d2bca5622 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 9 Nov 2022 10:11:12 -0300 Subject: [PATCH 049/117] lxqt.qterminal: 1.1.0 -> 1.2.0 --- pkgs/desktops/lxqt/qterminal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix index d4ec676bb487..21ec713868fc 100644 --- a/pkgs/desktops/lxqt/qterminal/default.nix +++ b/pkgs/desktops/lxqt/qterminal/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "qterminal"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "x+rgDrijDsMMdpU7afkn0dsSQbuBbEI9agoaLVsR/q8="; + sha256 = "7fsMJdObNjXSXfmS2TxXtbErnRCZCJZb7WitE6y1xjg="; }; nativeBuildInputs = [ From 82fce881c8a4e386429b831f4e36f1c5585ca253 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 9 Nov 2022 10:11:12 -0300 Subject: [PATCH 050/117] lxqt.qtermwidget: 1.1.0 -> 1.2.0 --- pkgs/desktops/lxqt/qtermwidget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix index ec441cbcf155..9eea77ca16b9 100644 --- a/pkgs/desktops/lxqt/qtermwidget/default.nix +++ b/pkgs/desktops/lxqt/qtermwidget/default.nix @@ -11,13 +11,13 @@ mkDerivation rec { pname = "qtermwidget"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "tb1Vlkv8HsNlFCFOYfPnJlhdJmhyDmLE9SaTXZT0gGs="; + sha256 = "utQC0CNZtwHD0yAaV9Tr0iEUBa8DcrEMNKmWyuhj6GQ="; }; nativeBuildInputs = [ From b441e688949ae4408202a00b4138c894d2994828 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 9 Nov 2022 10:11:12 -0300 Subject: [PATCH 051/117] lxqt.qtxdg-tools: 3.9.1 -> 3.10.0 --- pkgs/desktops/lxqt/qtxdg-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/qtxdg-tools/default.nix b/pkgs/desktops/lxqt/qtxdg-tools/default.nix index 22567be83492..10ca3ce7dc96 100644 --- a/pkgs/desktops/lxqt/qtxdg-tools/default.nix +++ b/pkgs/desktops/lxqt/qtxdg-tools/default.nix @@ -10,13 +10,13 @@ mkDerivation rec { pname = "qtxdg-tools"; - version = "3.9.1"; + version = "3.10.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "sha256-NUSeXEJ6zjTz6p/8R6YTVfPQEnk1ukZ2ikdDdkaPeSw="; + sha256 = "sha256-8jrb1Mdn9dhQzIEu6E0kz5F8eEnKAREwjXuypqfhw60="; }; nativeBuildInputs = [ From 9805f97297086832dcb4d02ecca04a675fd6afe9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 9 Nov 2022 10:11:12 -0300 Subject: [PATCH 052/117] lxqt.screengrab: 2.4.0 -> 2.5.0 --- pkgs/desktops/lxqt/screengrab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix index 6041c57b980f..00b793a15f6b 100644 --- a/pkgs/desktops/lxqt/screengrab/default.nix +++ b/pkgs/desktops/lxqt/screengrab/default.nix @@ -17,13 +17,13 @@ mkDerivation rec { pname = "screengrab"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "EWmEbXY2EEUW2Hq7JwLW/KDgQ8KHs4DZzuGgFjNthPQ="; + sha256 = "QEe1vOAeUDOlQfTh5/BvwBv9+v40NsuoMbC77+U6GCA="; }; nativeBuildInputs = [ From d9c32d863cdaba9bde718f2354d5a5bbdb847b04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 9 Nov 2022 10:11:12 -0300 Subject: [PATCH 053/117] lxqt.xdg-desktop-portal-lxqt: 0.2.0 -> 0.3.0 --- pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix index 5fb51936bb83..8d317dadd8cb 100644 --- a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix +++ b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "xdg-desktop-portal-lxqt"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "15wld2p07sbf2i2qv86ljm479q0nr9r65wavmabmn3fkzkz5vlgf"; + sha256 = "oEcFRBIYb/ZJQo9W+yIiq3l3eU1GqUzfDdF/Rvq5SKs="; }; nativeBuildInputs = [ From 168ad716e08368b7038d167b9e4b6eb3667900eb Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 9 Nov 2022 02:34:11 +0100 Subject: [PATCH 054/117] nixos/redis: add extraParams --- nixos/modules/services/databases/redis.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index 319cbbf965c5..1bcd0f0b20c6 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -105,6 +105,13 @@ in { ''; }; + extraParams = mkOption { + type = with types; listOf str; + default = []; + description = lib.mdDoc "Extra parameters to append to redis-server invocation"; + example = [ "--sentinel" ]; + }; + bind = mkOption { type = with types; nullOr str; default = "127.0.0.1"; @@ -340,7 +347,7 @@ in { after = [ "network.target" ]; serviceConfig = { - ExecStart = "${cfg.package}/bin/redis-server /run/${redisName name}/redis.conf"; + ExecStart = "${cfg.package}/bin/redis-server /run/${redisName name}/redis.conf ${escapeShellArgs conf.extraParams}"; ExecStartPre = [("+"+pkgs.writeShellScript "${redisName name}-credentials" ('' install -o '${conf.user}' -m 600 ${redisConfig conf.settings} /run/${redisName name}/redis.conf '' + optionalString (conf.requirePassFile != null) '' From 467ecea0911827aacfa5ca5c2b7aee61c96e53ed Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Wed, 9 Nov 2022 13:20:37 -0500 Subject: [PATCH 055/117] libfprint: 1.94.4 -> 1.94.5 --- .../libraries/libfprint/default.nix | 40 ++++++++++++------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix index e05f67e01fa6..1def54a3aed2 100644 --- a/pkgs/development/libraries/libfprint/default.nix +++ b/pkgs/development/libraries/libfprint/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "libfprint"; - version = "1.94.4"; + version = "1.94.5"; outputs = [ "out" "devdoc" ]; src = fetchFromGitLab { @@ -27,9 +27,18 @@ stdenv.mkDerivation rec { owner = "libfprint"; repo = pname; rev = "v${version}"; - sha256 = "sha256-C8vBjk0cZm/GSqc6mgNbXG8FycnWRaXhj9wIrLcWzfE="; + hash = "sha256-+eSvzbXxjemVKMeD8tp/0/tGBjw2EOlmyxb8KfyZKtA="; }; + postPatch = '' + patchShebangs \ + tests/test-runner.sh \ + tests/unittest_inspector.py \ + tests/virtual-image.py \ + tests/umockdev-test.py \ + tests/test-generated-hwdb.sh + ''; + nativeBuildInputs = [ pkg-config meson @@ -49,10 +58,6 @@ stdenv.mkDerivation rec { libgudev ]; - checkInputs = [ - python3 - ]; - mesonFlags = [ "-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d" # Include virtual drivers for fprintd tests @@ -60,15 +65,22 @@ stdenv.mkDerivation rec { "-Dudev_hwdb_dir=${placeholder "out"}/lib/udev/hwdb.d" ]; - doCheck = true; + installCheckInputs = [ + (python3.withPackages (p: with p; [ pygobject3 ])) + ]; - postPatch = '' - patchShebangs \ - tests/test-runner.sh \ - tests/unittest_inspector.py \ - tests/virtual-image.py \ - tests/umockdev-test.py \ - tests/test-generated-hwdb.sh + # We need to run tests _after_ install so all the paths that get loaded are in + # the right place. + doCheck = false; + + doInstallCheck = true; + + installCheckPhase = '' + runHook preInstallCheck + + ninjaCheckPhase + + runHook postInstallCheck ''; meta = with lib; { From bc4e9a890c5421e7a760da15ec474098735985ff Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 9 Nov 2022 02:35:39 +0100 Subject: [PATCH 056/117] nixos/redis: store config in state directory this is needed because certain redis features, like sentinel, require the config file to be persistent --- .../from_md/release-notes/rl-2211.section.xml | 7 +++++ .../manual/release-notes/rl-2211.section.md | 2 ++ nixos/modules/services/databases/redis.nix | 28 ++++++++++++------- 3 files changed, 27 insertions(+), 10 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 9c5db2f8a586..817e3bdd139b 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 @@ -1189,6 +1189,13 @@ signald -d /var/lib/signald/db \ will be removed once the transition to CommonMark is complete. + + + The redis module now persists each instance’s configuration + file in the state directory, in order to support some more + advanced use cases like sentinel. + + The udisks2 service, available at diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 6da610157282..92a2e45d8d1d 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -362,6 +362,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - The `documentation.nixos.options.allowDocBook` option was added to ease the transition to CommonMark option documentation. Setting this option to `false` causes an error for every option included in the manual that uses DocBook documentation; it defaults to `true` to preserve the previous behavior and will be removed once the transition to CommonMark is complete. +- The redis module now persists each instance's configuration file in the state directory, in order to support some more advanced use cases like sentinel. + - The udisks2 service, available at `services.udisks2.enable`, is now disabled by default. It will automatically be enabled through services and desktop environments as needed. This also means that polkit will now actually be disabled by default. The default for `security.polkit.enable` was already flipped in the previous release, but udisks2 being enabled by default re-enabled it. diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index 1bcd0f0b20c6..1f143f9c66f6 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -347,16 +347,24 @@ in { after = [ "network.target" ]; serviceConfig = { - ExecStart = "${cfg.package}/bin/redis-server /run/${redisName name}/redis.conf ${escapeShellArgs conf.extraParams}"; - ExecStartPre = [("+"+pkgs.writeShellScript "${redisName name}-credentials" ('' - install -o '${conf.user}' -m 600 ${redisConfig conf.settings} /run/${redisName name}/redis.conf - '' + optionalString (conf.requirePassFile != null) '' - { - printf requirePass' ' - cat ${escapeShellArg conf.requirePassFile} - } >>/run/${redisName name}/redis.conf - '') - )]; + ExecStart = "${cfg.package}/bin/redis-server /var/lib/${redisName name}/redis.conf ${escapeShellArgs conf.extraParams}"; + ExecStartPre = "+"+pkgs.writeShellScript "${redisName name}-prep-conf" (let + redisConfVar = "/var/lib/${redisName name}/redis.conf"; + redisConfRun = "/run/${redisName name}/nixos.conf"; + redisConfStore = redisConfig conf.settings; + in '' + touch "${redisConfVar}" "${redisConfRun}" + chown '${conf.user}' "${redisConfVar}" "${redisConfRun}" + chmod 0600 "${redisConfVar}" "${redisConfRun}" + if [ ! -s ${redisConfVar} ]; then + echo 'include "${redisConfRun}"' > "${redisConfVar}" + fi + echo 'include "${redisConfStore}"' > "${redisConfRun}" + ${optionalString (conf.requirePassFile != null) '' + {echo -n "requirepass " + cat ${escapeShellArg conf.requirePassFile}} >> "${redisConfRun}" + ''} + ''); Type = "notify"; # User and group User = conf.user; From cc136d85d9d2d9fce2f0a1e459f2eb322d61708a Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 9 Nov 2022 23:38:36 +0100 Subject: [PATCH 057/117] chromium: 107.0.5304.87 -> 107.0.5304.110 https://chromereleases.googleblog.com/2022/11/stable-channel-update-for-desktop.html This update includes 10 security fixes. CVEs: CVE-2022-3885 CVE-2022-3886 CVE-2022-3887 CVE-2022-3888 CVE-2022-3889 CVE-2022-3890 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 76603241099c..e973a8b6fca4 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "107.0.5304.87", - "sha256": "0n9wr5v7zcdmbqs7mmnyydjvzw0glh5l3skpj7i1nap2hv0h03kc", - "sha256bin64": "16a6qisxkfmx60qh67rvfy3knp66hdgxan48cga6j3zd683inas2", + "version": "107.0.5304.110", + "sha256": "1k7yjsb4i7m8i5mk018v7z25r4x1ypyprz4hnyrn7vk2983lhdfk", + "sha256bin64": "06rlxwbvp7rpw2rdpnjzl1cn7cr1rwlb20wz8r0cndjcjyzd3rjj", "deps": { "gn": { "version": "2022-09-14", From 81b2f56045995274207bc29a0dff800d41235058 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 9 Nov 2022 23:38:36 +0100 Subject: [PATCH 058/117] chromiumBeta: 108.0.5359.30 -> 108.0.5359.40 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 76603241099c..63d51e72c2c4 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "108.0.5359.30", - "sha256": "1sxvlmz9k6r3qmlpljlis3p7vac26k62w21n8x29733hsq3hdra7", - "sha256bin64": "03x79s394xzwncfcgc4lw825q15i1ww2kmy2y7lcld9h52qyns8q", + "version": "108.0.5359.40", + "sha256": "1fsp5fkabgqx4jp650nkngkc49vzcy8rgnfqqz4dsyl92ng8q34y", + "sha256bin64": "1zd8dbs5w2vdnck91pqiymwa2bnz53jgjbg89cr96y6jwab3i4b0", "deps": { "gn": { "version": "2022-10-05", From 6477a3bdc39b4cae06a5c058c47c4422034b1887 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 9 Nov 2022 23:38:36 +0100 Subject: [PATCH 059/117] ungoogled-chromium: 107.0.5304.88 -> 107.0.5304.110 --- .../networking/browsers/chromium/upstream-info.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 76603241099c..9bad55cbdca5 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -45,9 +45,9 @@ } }, "ungoogled-chromium": { - "version": "107.0.5304.88", - "sha256": "1k4j4j9b1m7kjybfgns9akb7adfby3gnjpibk0kjd22n3sprar8y", - "sha256bin64": null, + "version": "107.0.5304.110", + "sha256": "1k7yjsb4i7m8i5mk018v7z25r4x1ypyprz4hnyrn7vk2983lhdfk", + "sha256bin64": "06rlxwbvp7rpw2rdpnjzl1cn7cr1rwlb20wz8r0cndjcjyzd3rjj", "deps": { "gn": { "version": "2022-09-14", @@ -56,8 +56,8 @@ "sha256": "1c0dvpp4im1hf277bs5w7rgqxz3g2bax266i2g6smi3pl7a8jpnp" }, "ungoogled-patches": { - "rev": "107.0.5304.88-1", - "sha256": "1m9hjbs79ga5jw7x332jl882lh7yrr4n4r4qrzy37ai75x371pz2" + "rev": "107.0.5304.110-1", + "sha256": "14z9qi9i9l7kjx7gf74lzs63bpxqyd3wbqqpsvzvqgr2v0cgqahx" } } } From cdc5c9bbe06f6326e911e473be9d0c4af1ccc8f3 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sat, 5 Nov 2022 17:43:49 -0700 Subject: [PATCH 060/117] humility: update libusb alias and vendor hash --- pkgs/development/tools/rust/humility/default.nix | 10 +++++++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/humility/default.nix b/pkgs/development/tools/rust/humility/default.nix index 92e3e78077c1..eb8ce703eae1 100644 --- a/pkgs/development/tools/rust/humility/default.nix +++ b/pkgs/development/tools/rust/humility/default.nix @@ -1,10 +1,12 @@ { lib +, stdenv , rustPlatform , fetchFromGitHub -, libusb +, libusb1 , libftdi , cargo-readme , pkg-config +, AppKit }: rustPlatform.buildRustPackage rec { @@ -12,7 +14,9 @@ rustPlatform.buildRustPackage rec { version = "unstable-2022-09-15"; nativeBuildInputs = [ pkg-config cargo-readme ]; - buildInputs = [ libusb libftdi ]; + buildInputs = [ libusb1 libftdi ] ++ lib.optionals stdenv.isDarwin [ + AppKit + ]; src = fetchFromGitHub { owner = "oxidecomputer"; @@ -21,7 +25,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-yW7QcxTWbL2YsV2bvfhbqQ2nawlPQbYxBfIGCWo28GY="; }; - cargoSha256 = "sha256-UhO8VO3OCfYc8Xq/P+l9f5ZrhOD/TBzSClAeAXLJLlc="; + cargoSha256 = "sha256-IurLI0ZQNpmiYwfcMZuxi7FWtSX+Ts7GYWFwUfD+Ji8="; meta = with lib; { description = "Debugger for Hubris"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cdf564bd7644..bc510f62795a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24995,7 +24995,9 @@ with pkgs; htop-vim = callPackage ../tools/system/htop/htop-vim.nix { }; - humility = callPackage ../development/tools/rust/humility {}; + humility = callPackage ../development/tools/rust/humility { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; btop = callPackage ../tools/system/btop { stdenv = gcc11Stdenv; From f26a020b32f46a4fedb9a4b4e5c14d178a6ea969 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 10 Nov 2022 09:10:30 +0100 Subject: [PATCH 061/117] python310Packages.meshtastic: 2.0.2 -> 2.0.3 --- 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 1e3dad2c1633..741388f363c1 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.2"; + version = "2.0.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-Z2/nzsHRpaykqLRkJoPdNGSLNbJvd4GOUpTYl8MG8mw="; + hash = "sha256-h8OuDmm9I8lElhAGSpPx8sPUTY+EnFp2VXOYrYjiYNk="; }; propagatedBuildInputs = [ From dd925f7ea16056915b64b296a016d6d96624a70e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 10 Nov 2022 09:11:49 +0100 Subject: [PATCH 062/117] python310Packages.oralb-ble: 0.14.0 -> 0.14.1 --- pkgs/development/python-modules/oralb-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oralb-ble/default.nix b/pkgs/development/python-modules/oralb-ble/default.nix index cae423cf5a95..d24029f87d0d 100644 --- a/pkgs/development/python-modules/oralb-ble/default.nix +++ b/pkgs/development/python-modules/oralb-ble/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "oralb-ble"; - version = "0.14.0"; + version = "0.14.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7EHU/UqKy576FZ1E5bOHHOvH38yoyU+55wC/YO3yt4Y="; + hash = "sha256-Tg2sk8E4+UjgP2PyZH6ZqNJv6Yg/muTl7QPaBlXHUj0="; }; nativeBuildInputs = [ From 0bcb3f15e44cc899a366a02710268cf28a4c1f95 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 10 Nov 2022 09:17:31 +0100 Subject: [PATCH 063/117] python310Packages.lsassy: 3.1.3 -> 3.1.4 --- pkgs/development/python-modules/lsassy/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lsassy/default.nix b/pkgs/development/python-modules/lsassy/default.nix index f1a62b8856d3..8a47fb08404c 100644 --- a/pkgs/development/python-modules/lsassy/default.nix +++ b/pkgs/development/python-modules/lsassy/default.nix @@ -3,19 +3,23 @@ , fetchFromGitHub , impacket , netaddr +, pythonOlder , pypykatz , rich }: buildPythonPackage rec { pname = "lsassy"; - version = "3.1.3"; + version = "3.1.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Hackndo"; repo = pname; rev = "v${version}"; - sha256 = "sha256-h99wqgRNy2GkiertDddFJQN4hv2R26bo72zNwLPR3mk="; + hash = "sha256-/YDBzH8Mji6PWBEIbsgZcTvoAWAsBbJV3cHfySY/gGA="; }; propagatedBuildInputs = [ From 9f5353bcc37f2485eace3223a4a50bbd3a8068dd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 10 Nov 2022 09:20:31 +0100 Subject: [PATCH 064/117] python310Packages.pyskyqremote: 0.3.17 -> 0.3.19 --- pkgs/development/python-modules/pyskyqremote/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyskyqremote/default.nix b/pkgs/development/python-modules/pyskyqremote/default.nix index 165ded03e2ab..293ab15a37f9 100644 --- a/pkgs/development/python-modules/pyskyqremote/default.nix +++ b/pkgs/development/python-modules/pyskyqremote/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyskyqremote"; - version = "0.3.17"; + version = "0.3.19"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "RogerSelwyn"; repo = "skyq_remote"; rev = "refs/tags/${version}"; - sha256 = "sha256-jOeJXl/0LUozwKoE3R67tts6v283Li7zHIatr0nadCk="; + sha256 = "sha256-yN1d0Q6kbtQ+f+3WgTVZR9NVcV5K7VEZQ44H1bcP5Fk="; }; propagatedBuildInputs = [ From 7a5c2f5b50e121342e344d26370ba8115ed2179e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 10 Nov 2022 09:21:53 +0100 Subject: [PATCH 065/117] python310Packages.pyswitchbee: 1.6.1 -> 1.6.2 --- pkgs/development/python-modules/pyswitchbee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyswitchbee/default.nix b/pkgs/development/python-modules/pyswitchbee/default.nix index d5b3d5d7fa4f..2bb02397f3a2 100644 --- a/pkgs/development/python-modules/pyswitchbee/default.nix +++ b/pkgs/development/python-modules/pyswitchbee/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyswitchbee"; - version = "1.6.1"; + version = "1.6.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "jafar-atili"; repo = "pySwitchbee"; rev = "refs/tags/${version}"; - hash = "sha256-5Mc70yi9Yj+8ye81v9NbKZnNoD5PQmBVAiYF5IM5ix8="; + hash = "sha256-MDutpeHI6MW1VwCRTPJK/y08ee4eidOHluMf6lPQfEk="; }; postPatch = '' From 777a1847589e44d0244fccc76b3dcd8838b6dd46 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 10 Nov 2022 09:25:09 +0100 Subject: [PATCH 066/117] python310Packages.sensor-state-data: 2.11.0 -> 2.12.0 --- pkgs/development/python-modules/sensor-state-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sensor-state-data/default.nix b/pkgs/development/python-modules/sensor-state-data/default.nix index 1ef15fee0af3..e6e411c1f6e5 100644 --- a/pkgs/development/python-modules/sensor-state-data/default.nix +++ b/pkgs/development/python-modules/sensor-state-data/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sensor-state-data"; - version = "2.11.0"; + version = "2.12.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-znDEdXCWYmzk5xG1sSUyXRUhLGxtoBv46JcSnysu1A4="; + hash = "sha256-u17vtw3yu8ibi/omTriy6s33/243WjxM03Nss3pFAYk="; }; nativeBuildInputs = [ From bd9a3bcd2388958736f8acc0ae277797e4b9afac Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 10 Nov 2022 09:26:47 +0100 Subject: [PATCH 067/117] python310Packages.marshmallow-dataclass: 8.5.9 -> 8.5.10 --- .../python-modules/marshmallow-dataclass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow-dataclass/default.nix b/pkgs/development/python-modules/marshmallow-dataclass/default.nix index 9ebb16b83305..0324d1687ac5 100644 --- a/pkgs/development/python-modules/marshmallow-dataclass/default.nix +++ b/pkgs/development/python-modules/marshmallow-dataclass/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "marshmallow-dataclass"; - version = "8.5.9"; + version = "8.5.10"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "lovasoa"; repo = "marshmallow_dataclass"; rev = "v${version}"; - sha256 = "sha256-gA5GxE2as/P5yT3ymvXmLQfG2GyZE7Fj+zBaT88O4vY="; + sha256 = "sha256-AxUZf1dRe/7Y96DYJnziMqHKW5xyQv4FIrMMwSZTuGQ="; }; propagatedBuildInputs = [ From 095269c8622e878eaaac117cc6b63dd1a4970a68 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Wed, 9 Nov 2022 22:30:00 +0100 Subject: [PATCH 068/117] treewide: use `types.port` in nixos modules --- nixos/modules/services/audio/ympd.nix | 2 +- nixos/modules/services/backup/bacula.nix | 6 +++--- nixos/modules/services/backup/duplicati.nix | 2 +- nixos/modules/services/databases/opentsdb.nix | 2 +- nixos/modules/services/databases/pgmanage.nix | 2 +- nixos/modules/services/games/teeworlds.nix | 2 +- nixos/modules/services/misc/airsonic.nix | 2 +- nixos/modules/services/misc/ankisyncd.nix | 2 +- nixos/modules/services/misc/apache-kafka.nix | 2 +- nixos/modules/services/misc/exhibitor.nix | 2 +- nixos/modules/services/misc/gogs.nix | 4 ++-- nixos/modules/services/misc/gollum.nix | 2 +- nixos/modules/services/misc/parsoid.nix | 2 +- nixos/modules/services/misc/pykms.nix | 2 +- nixos/modules/services/misc/redmine.nix | 2 +- nixos/modules/services/misc/rippled.nix | 2 +- nixos/modules/services/misc/tautulli.nix | 2 +- nixos/modules/services/misc/zoneminder.nix | 2 +- nixos/modules/services/misc/zookeeper.nix | 2 +- nixos/modules/services/monitoring/alerta.nix | 2 +- nixos/modules/services/monitoring/cadvisor.nix | 2 +- nixos/modules/services/monitoring/grafana-reporter.nix | 4 ++-- .../services/monitoring/prometheus/exporters/mail.nix | 2 +- .../services/monitoring/prometheus/exporters/tor.nix | 2 +- nixos/modules/services/monitoring/zabbix-server.nix | 2 +- nixos/modules/services/networking/bitlbee.nix | 2 +- nixos/modules/services/networking/dnscrypt-wrapper.nix | 4 ++-- nixos/modules/services/networking/eternal-terminal.nix | 2 +- nixos/modules/services/networking/nntp-proxy.nix | 4 ++-- nixos/modules/services/networking/ostinato.nix | 2 +- nixos/modules/services/networking/polipo.nix | 2 +- nixos/modules/services/networking/shadowsocks.nix | 2 +- nixos/modules/services/networking/smokeping.nix | 2 +- nixos/modules/services/networking/sslh.nix | 2 +- nixos/modules/services/networking/teleport.nix | 2 +- nixos/modules/services/networking/tox-bootstrapd.nix | 2 +- nixos/modules/services/networking/toxvpn.nix | 2 +- nixos/modules/services/networking/xrdp.nix | 2 +- nixos/modules/services/networking/zerotierone.nix | 2 +- nixos/modules/services/search/solr.nix | 2 +- nixos/modules/services/web-apps/atlassian/crowd.nix | 4 ++-- nixos/modules/services/web-apps/peertube.nix | 6 +++--- nixos/modules/services/web-apps/restya-board.nix | 4 ++-- nixos/modules/services/web-apps/trilium.nix | 2 +- nixos/modules/services/web-apps/tt-rss.nix | 2 +- nixos/modules/services/web-apps/youtrack.nix | 2 +- nixos/modules/system/boot/initrd-ssh.nix | 2 +- 47 files changed, 57 insertions(+), 57 deletions(-) diff --git a/nixos/modules/services/audio/ympd.nix b/nixos/modules/services/audio/ympd.nix index f14c81cdb8dd..811b81030efc 100644 --- a/nixos/modules/services/audio/ympd.nix +++ b/nixos/modules/services/audio/ympd.nix @@ -29,7 +29,7 @@ in { }; port = mkOption { - type = types.int; + type = types.port; default = config.services.mpd.network.port; defaultText = literalExpression "config.services.mpd.network.port"; description = lib.mdDoc "The port where MPD is listening."; diff --git a/nixos/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix index d4f6ac8f5d37..0acbf1b3eabb 100644 --- a/nixos/modules/services/backup/bacula.nix +++ b/nixos/modules/services/backup/bacula.nix @@ -314,7 +314,7 @@ in { port = mkOption { default = 9102; - type = types.int; + type = types.port; description = lib.mdDoc '' This specifies the port number on which the Client listens for Director connections. It must agree with the FDPort specified in @@ -374,7 +374,7 @@ in { port = mkOption { default = 9103; - type = types.int; + type = types.port; description = lib.mdDoc '' Specifies port number on which the Storage daemon listens for Director connections. @@ -451,7 +451,7 @@ in { port = mkOption { default = 9101; - type = types.int; + type = types.port; description = lib.mdDoc '' Specify the port (a positive integer) on which the Director daemon will listen for Bacula Console connections. This same port number diff --git a/nixos/modules/services/backup/duplicati.nix b/nixos/modules/services/backup/duplicati.nix index 47f0b618c8d9..007396ebfc9b 100644 --- a/nixos/modules/services/backup/duplicati.nix +++ b/nixos/modules/services/backup/duplicati.nix @@ -12,7 +12,7 @@ in port = mkOption { default = 8200; - type = types.int; + type = types.port; description = lib.mdDoc '' Port serving the web interface ''; diff --git a/nixos/modules/services/databases/opentsdb.nix b/nixos/modules/services/databases/opentsdb.nix index 45c84b12a50e..3a11e1c20429 100644 --- a/nixos/modules/services/databases/opentsdb.nix +++ b/nixos/modules/services/databases/opentsdb.nix @@ -49,7 +49,7 @@ in { }; port = mkOption { - type = types.int; + type = types.port; default = 4242; description = lib.mdDoc '' Which port OpenTSDB listens on. diff --git a/nixos/modules/services/databases/pgmanage.nix b/nixos/modules/services/databases/pgmanage.nix index 71ce1d8eca47..cbf988d596f4 100644 --- a/nixos/modules/services/databases/pgmanage.nix +++ b/nixos/modules/services/databases/pgmanage.nix @@ -85,7 +85,7 @@ in { }; port = mkOption { - type = types.int; + type = types.port; default = 8080; description = lib.mdDoc '' This tells pgmanage what port to listen on for browser requests. diff --git a/nixos/modules/services/games/teeworlds.nix b/nixos/modules/services/games/teeworlds.nix index 083ab3ba94ea..ffef440330c4 100644 --- a/nixos/modules/services/games/teeworlds.nix +++ b/nixos/modules/services/games/teeworlds.nix @@ -70,7 +70,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 8303; description = lib.mdDoc '' Port the server will listen on. diff --git a/nixos/modules/services/misc/airsonic.nix b/nixos/modules/services/misc/airsonic.nix index e4448d70a0e4..b8e9dcaf4663 100644 --- a/nixos/modules/services/misc/airsonic.nix +++ b/nixos/modules/services/misc/airsonic.nix @@ -48,7 +48,7 @@ in { }; port = mkOption { - type = types.int; + type = types.port; default = 4040; description = lib.mdDoc '' The port on which Airsonic will listen for diff --git a/nixos/modules/services/misc/ankisyncd.nix b/nixos/modules/services/misc/ankisyncd.nix index 907bd348d7e2..5198b8242023 100644 --- a/nixos/modules/services/misc/ankisyncd.nix +++ b/nixos/modules/services/misc/ankisyncd.nix @@ -44,7 +44,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 27701; description = lib.mdDoc "ankisyncd port"; }; diff --git a/nixos/modules/services/misc/apache-kafka.nix b/nixos/modules/services/misc/apache-kafka.nix index c428cfbc67e0..598907aaf1c6 100644 --- a/nixos/modules/services/misc/apache-kafka.nix +++ b/nixos/modules/services/misc/apache-kafka.nix @@ -40,7 +40,7 @@ in { port = mkOption { description = lib.mdDoc "Port number the broker should listen on."; default = 9092; - type = types.int; + type = types.port; }; hostname = mkOption { diff --git a/nixos/modules/services/misc/exhibitor.nix b/nixos/modules/services/misc/exhibitor.nix index d804b21fd4f9..b75ce07c91e9 100644 --- a/nixos/modules/services/misc/exhibitor.nix +++ b/nixos/modules/services/misc/exhibitor.nix @@ -78,7 +78,7 @@ in # See https://github.com/soabase/exhibitor/wiki/Running-Exhibitor for what these mean # General options for any type of config port = mkOption { - type = types.int; + type = types.port; default = 8080; description = lib.mdDoc '' The port for exhibitor to listen on and communicate with other exhibitors. diff --git a/nixos/modules/services/misc/gogs.nix b/nixos/modules/services/misc/gogs.nix index e726f2c5c7ce..fa172ed277dc 100644 --- a/nixos/modules/services/misc/gogs.nix +++ b/nixos/modules/services/misc/gogs.nix @@ -90,7 +90,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 3306; description = lib.mdDoc "Database host port."; }; @@ -167,7 +167,7 @@ in }; httpPort = mkOption { - type = types.int; + type = types.port; default = 3000; description = lib.mdDoc "HTTP listen port."; }; diff --git a/nixos/modules/services/misc/gollum.nix b/nixos/modules/services/misc/gollum.nix index ca6f42736a10..c889658a27a7 100644 --- a/nixos/modules/services/misc/gollum.nix +++ b/nixos/modules/services/misc/gollum.nix @@ -21,7 +21,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 4567; description = lib.mdDoc "Port on which the web server will run."; }; diff --git a/nixos/modules/services/misc/parsoid.nix b/nixos/modules/services/misc/parsoid.nix index 101ece5ab4c6..6f4a340c8a18 100644 --- a/nixos/modules/services/misc/parsoid.nix +++ b/nixos/modules/services/misc/parsoid.nix @@ -70,7 +70,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 8000; description = lib.mdDoc '' Port to listen on. diff --git a/nixos/modules/services/misc/pykms.nix b/nixos/modules/services/misc/pykms.nix index d24cd1bfa05b..314388e0152e 100644 --- a/nixos/modules/services/misc/pykms.nix +++ b/nixos/modules/services/misc/pykms.nix @@ -28,7 +28,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 1688; description = lib.mdDoc "The port on which to listen."; }; diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index 5fd7e79230ea..75c5a4e26e0f 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -161,7 +161,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = if cfg.database.type == "postgresql" then 5432 else 3306; defaultText = literalExpression "3306"; description = lib.mdDoc "Database host port."; diff --git a/nixos/modules/services/misc/rippled.nix b/nixos/modules/services/misc/rippled.nix index a3ba3dd2c37d..d14b6421b742 100644 --- a/nixos/modules/services/misc/rippled.nix +++ b/nixos/modules/services/misc/rippled.nix @@ -98,7 +98,7 @@ let port = mkOption { description = lib.mdDoc "Port where rippled listens."; - type = types.int; + type = types.port; }; protocol = mkOption { diff --git a/nixos/modules/services/misc/tautulli.nix b/nixos/modules/services/misc/tautulli.nix index 0efd0839bc19..b29e9dc0c8d5 100644 --- a/nixos/modules/services/misc/tautulli.nix +++ b/nixos/modules/services/misc/tautulli.nix @@ -27,7 +27,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 8181; description = lib.mdDoc "TCP port where Tautulli listens."; }; diff --git a/nixos/modules/services/misc/zoneminder.nix b/nixos/modules/services/misc/zoneminder.nix index e031fab5970b..109415a20ee6 100644 --- a/nixos/modules/services/misc/zoneminder.nix +++ b/nixos/modules/services/misc/zoneminder.nix @@ -97,7 +97,7 @@ in { }; port = mkOption { - type = types.int; + type = types.port; default = 8095; description = lib.mdDoc '' The port on which to listen. diff --git a/nixos/modules/services/misc/zookeeper.nix b/nixos/modules/services/misc/zookeeper.nix index 17d4a00f28f1..3487ac097228 100644 --- a/nixos/modules/services/misc/zookeeper.nix +++ b/nixos/modules/services/misc/zookeeper.nix @@ -33,7 +33,7 @@ in { port = mkOption { description = lib.mdDoc "Zookeeper Client port."; default = 2181; - type = types.int; + type = types.port; }; id = mkOption { diff --git a/nixos/modules/services/monitoring/alerta.nix b/nixos/modules/services/monitoring/alerta.nix index cf94f9813e86..6c7ebec4191c 100644 --- a/nixos/modules/services/monitoring/alerta.nix +++ b/nixos/modules/services/monitoring/alerta.nix @@ -24,7 +24,7 @@ in enable = mkEnableOption (lib.mdDoc "alerta"); port = mkOption { - type = types.int; + type = types.port; default = 5000; description = lib.mdDoc "Port of Alerta"; }; diff --git a/nixos/modules/services/monitoring/cadvisor.nix b/nixos/modules/services/monitoring/cadvisor.nix index d5e440310162..94f1ca80c943 100644 --- a/nixos/modules/services/monitoring/cadvisor.nix +++ b/nixos/modules/services/monitoring/cadvisor.nix @@ -22,7 +22,7 @@ in { port = mkOption { default = 8080; - type = types.int; + type = types.port; description = lib.mdDoc "Cadvisor listening port"; }; diff --git a/nixos/modules/services/monitoring/grafana-reporter.nix b/nixos/modules/services/monitoring/grafana-reporter.nix index add725e7ba2a..eac304d63aa1 100644 --- a/nixos/modules/services/monitoring/grafana-reporter.nix +++ b/nixos/modules/services/monitoring/grafana-reporter.nix @@ -23,7 +23,7 @@ in { port = mkOption { description = lib.mdDoc "Grafana port."; default = 3000; - type = types.int; + type = types.port; }; }; @@ -36,7 +36,7 @@ in { port = mkOption { description = lib.mdDoc "Listening port."; default = 8686; - type = types.int; + type = types.port; }; templateDir = mkOption { diff --git a/nixos/modules/services/monitoring/prometheus/exporters/mail.nix b/nixos/modules/services/monitoring/prometheus/exporters/mail.nix index 129c73eba4ad..15079f5841f4 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/mail.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/mail.nix @@ -33,7 +33,7 @@ let ''; }; port = mkOption { - type = types.int; + type = types.port; example = 587; description = lib.mdDoc '' Port to use for SMTP. diff --git a/nixos/modules/services/monitoring/prometheus/exporters/tor.nix b/nixos/modules/services/monitoring/prometheus/exporters/tor.nix index edf9b57607a3..7a9167110a27 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/tor.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/tor.nix @@ -17,7 +17,7 @@ in }; torControlPort = mkOption { - type = types.int; + type = types.port; default = 9051; description = lib.mdDoc '' Tor control port. diff --git a/nixos/modules/services/monitoring/zabbix-server.nix b/nixos/modules/services/monitoring/zabbix-server.nix index b40437100fc8..2b50280e3969 100644 --- a/nixos/modules/services/monitoring/zabbix-server.nix +++ b/nixos/modules/services/monitoring/zabbix-server.nix @@ -94,7 +94,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/networking/bitlbee.nix b/nixos/modules/services/networking/bitlbee.nix index 668ed388ae2c..88c04597e2bc 100644 --- a/nixos/modules/services/networking/bitlbee.nix +++ b/nixos/modules/services/networking/bitlbee.nix @@ -68,7 +68,7 @@ in portNumber = mkOption { default = 6667; - type = types.int; + type = types.port; description = lib.mdDoc '' Number of the port BitlBee will be listening to. ''; diff --git a/nixos/modules/services/networking/dnscrypt-wrapper.nix b/nixos/modules/services/networking/dnscrypt-wrapper.nix index 06b7ea24e2d9..082e0195093e 100644 --- a/nixos/modules/services/networking/dnscrypt-wrapper.nix +++ b/nixos/modules/services/networking/dnscrypt-wrapper.nix @@ -135,7 +135,7 @@ in { }; port = mkOption { - type = types.int; + type = types.port; default = 5353; description = lib.mdDoc '' The DNSCrypt wrapper will listen for DNS queries on this port. @@ -182,7 +182,7 @@ in { }; upstream.port = mkOption { - type = types.int; + type = types.port; default = 53; description = lib.mdDoc '' The port of the upstream DNS server DNSCrypt will "wrap". diff --git a/nixos/modules/services/networking/eternal-terminal.nix b/nixos/modules/services/networking/eternal-terminal.nix index 555307459e39..c6b6b04dcf72 100644 --- a/nixos/modules/services/networking/eternal-terminal.nix +++ b/nixos/modules/services/networking/eternal-terminal.nix @@ -20,7 +20,7 @@ in port = mkOption { default = 2022; - type = types.int; + type = types.port; description = lib.mdDoc '' The port the server should listen on. Will use the server's default (2022) if not specified. diff --git a/nixos/modules/services/networking/nntp-proxy.nix b/nixos/modules/services/networking/nntp-proxy.nix index 06a8bb8b87d7..b887c0e16ef4 100644 --- a/nixos/modules/services/networking/nntp-proxy.nix +++ b/nixos/modules/services/networking/nntp-proxy.nix @@ -71,7 +71,7 @@ in }; upstreamPort = mkOption { - type = types.int; + type = types.port; default = 563; description = lib.mdDoc '' Upstream server port @@ -112,7 +112,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 5555; description = lib.mdDoc '' Proxy listen port diff --git a/nixos/modules/services/networking/ostinato.nix b/nixos/modules/services/networking/ostinato.nix index 1e4dcf37f64f..40c227ea0c68 100644 --- a/nixos/modules/services/networking/ostinato.nix +++ b/nixos/modules/services/networking/ostinato.nix @@ -29,7 +29,7 @@ in enable = mkEnableOption (lib.mdDoc "Ostinato agent-controller (Drone)"); port = mkOption { - type = types.int; + type = types.port; default = 7878; description = lib.mdDoc '' Port to listen on. diff --git a/nixos/modules/services/networking/polipo.nix b/nixos/modules/services/networking/polipo.nix index d820e1b397b8..7feb62212b69 100644 --- a/nixos/modules/services/networking/polipo.nix +++ b/nixos/modules/services/networking/polipo.nix @@ -36,7 +36,7 @@ in }; proxyPort = mkOption { - type = types.int; + type = types.port; default = 8123; description = lib.mdDoc "TCP port on which Polipo will listen."; }; diff --git a/nixos/modules/services/networking/shadowsocks.nix b/nixos/modules/services/networking/shadowsocks.nix index 8eee40711a6d..2034dca6f26b 100644 --- a/nixos/modules/services/networking/shadowsocks.nix +++ b/nixos/modules/services/networking/shadowsocks.nix @@ -48,7 +48,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 8388; description = lib.mdDoc '' Port which the server uses. diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix index 3a5fb7dfb9e2..ee82fe64a168 100644 --- a/nixos/modules/services/networking/smokeping.nix +++ b/nixos/modules/services/networking/smokeping.nix @@ -186,7 +186,7 @@ in ''; }; port = mkOption { - type = types.int; + type = types.port; default = 8081; description = lib.mdDoc "TCP port to use for the web server."; }; diff --git a/nixos/modules/services/networking/sslh.nix b/nixos/modules/services/networking/sslh.nix index 9d76d69152fa..daf2f2f3668e 100644 --- a/nixos/modules/services/networking/sslh.nix +++ b/nixos/modules/services/networking/sslh.nix @@ -70,7 +70,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 443; description = lib.mdDoc "Listening port."; }; diff --git a/nixos/modules/services/networking/teleport.nix b/nixos/modules/services/networking/teleport.nix index 802907a00dc5..6433554f87da 100644 --- a/nixos/modules/services/networking/teleport.nix +++ b/nixos/modules/services/networking/teleport.nix @@ -65,7 +65,7 @@ in }; port = mkOption { - type = int; + type = port; default = 3000; description = lib.mdDoc "Metrics and diagnostics port."; }; diff --git a/nixos/modules/services/networking/tox-bootstrapd.nix b/nixos/modules/services/networking/tox-bootstrapd.nix index e6dc36bf9ecf..5c7e7a4c2208 100644 --- a/nixos/modules/services/networking/tox-bootstrapd.nix +++ b/nixos/modules/services/networking/tox-bootstrapd.nix @@ -29,7 +29,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 33445; description = lib.mdDoc "Listening port (UDP)."; }; diff --git a/nixos/modules/services/networking/toxvpn.nix b/nixos/modules/services/networking/toxvpn.nix index d0ff5bc4e813..3a14b5f73091 100644 --- a/nixos/modules/services/networking/toxvpn.nix +++ b/nixos/modules/services/networking/toxvpn.nix @@ -14,7 +14,7 @@ with lib; }; port = mkOption { - type = types.int; + type = types.port; default = 33445; description = lib.mdDoc "udp port for toxcore, port-forward to help with connectivity if you run many nodes behind one NAT"; }; diff --git a/nixos/modules/services/networking/xrdp.nix b/nixos/modules/services/networking/xrdp.nix index 554fb66f36eb..ed7f1dadd370 100644 --- a/nixos/modules/services/networking/xrdp.nix +++ b/nixos/modules/services/networking/xrdp.nix @@ -54,7 +54,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 3389; description = lib.mdDoc '' Specifies on which port the xrdp daemon listens. diff --git a/nixos/modules/services/networking/zerotierone.nix b/nixos/modules/services/networking/zerotierone.nix index 30f75cd85d43..0d9e25cfc52c 100644 --- a/nixos/modules/services/networking/zerotierone.nix +++ b/nixos/modules/services/networking/zerotierone.nix @@ -19,7 +19,7 @@ in options.services.zerotierone.port = mkOption { default = 9993; - type = types.int; + type = types.port; description = lib.mdDoc '' Network port used by ZeroTier. ''; diff --git a/nixos/modules/services/search/solr.nix b/nixos/modules/services/search/solr.nix index 48570412b0c2..05592e9fa247 100644 --- a/nixos/modules/services/search/solr.nix +++ b/nixos/modules/services/search/solr.nix @@ -21,7 +21,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 8983; description = lib.mdDoc "Port on which Solr is ran."; }; diff --git a/nixos/modules/services/web-apps/atlassian/crowd.nix b/nixos/modules/services/web-apps/atlassian/crowd.nix index ac571e188806..c8d1eaef31d8 100644 --- a/nixos/modules/services/web-apps/atlassian/crowd.nix +++ b/nixos/modules/services/web-apps/atlassian/crowd.nix @@ -61,7 +61,7 @@ in }; listenPort = mkOption { - type = types.int; + type = types.port; default = 8092; description = lib.mdDoc "Port to listen on."; }; @@ -95,7 +95,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 443; example = 80; description = lib.mdDoc "Port used at the proxy"; diff --git a/nixos/modules/services/web-apps/peertube.nix b/nixos/modules/services/web-apps/peertube.nix index a42d1a1a932e..76ff5782ba8c 100644 --- a/nixos/modules/services/web-apps/peertube.nix +++ b/nixos/modules/services/web-apps/peertube.nix @@ -96,13 +96,13 @@ in { }; listenHttp = lib.mkOption { - type = lib.types.int; + type = lib.types.port; default = 9000; description = lib.mdDoc "listen port for HTTP server."; }; listenWeb = lib.mkOption { - type = lib.types.int; + type = lib.types.port; default = 9000; description = lib.mdDoc "listen port for WEB server."; }; @@ -177,7 +177,7 @@ in { }; port = lib.mkOption { - type = lib.types.int; + type = lib.types.port; default = 5432; description = lib.mdDoc "Database host port."; }; diff --git a/nixos/modules/services/web-apps/restya-board.nix b/nixos/modules/services/web-apps/restya-board.nix index 69f9b3ebe5b4..4b32f06826e2 100644 --- a/nixos/modules/services/web-apps/restya-board.nix +++ b/nixos/modules/services/web-apps/restya-board.nix @@ -69,7 +69,7 @@ in }; listenPort = mkOption { - type = types.int; + type = types.port; default = 3000; description = lib.mdDoc '' Listen port for the virtualhost to use. @@ -132,7 +132,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 25; description = lib.mdDoc '' Port used to connect to SMTP server. diff --git a/nixos/modules/services/web-apps/trilium.nix b/nixos/modules/services/web-apps/trilium.nix index 81ed7ca83bc2..a91d64f620b6 100644 --- a/nixos/modules/services/web-apps/trilium.nix +++ b/nixos/modules/services/web-apps/trilium.nix @@ -67,7 +67,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 8080; description = lib.mdDoc '' The port number to bind to. diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 870e8f4795b5..6f494fae4cc1 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -208,7 +208,7 @@ let }; port = mkOption { - type = types.nullOr types.int; + type = types.nullOr types.port; default = null; description = lib.mdDoc '' The database's port. If not set, the default ports will be provided (5432 diff --git a/nixos/modules/services/web-apps/youtrack.nix b/nixos/modules/services/web-apps/youtrack.nix index 0db8a98d1eb3..09a2b9e965c0 100644 --- a/nixos/modules/services/web-apps/youtrack.nix +++ b/nixos/modules/services/web-apps/youtrack.nix @@ -68,7 +68,7 @@ in The port youtrack will listen on. ''; default = 8080; - type = types.int; + type = types.port; }; statePath = mkOption { diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix index 256aa608ac43..673655f20ee8 100644 --- a/nixos/modules/system/boot/initrd-ssh.nix +++ b/nixos/modules/system/boot/initrd-ssh.nix @@ -25,7 +25,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 22; description = lib.mdDoc '' Port on which SSH initrd service should listen. From b4674b39c1928f05118ea0c1c4fb8ab66190edd6 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Wed, 9 Nov 2022 22:45:00 +0100 Subject: [PATCH 069/117] treewide: use `mkEnableOption` in nixos modules --- nixos/modules/hardware/brillo.nix | 5 ++--- nixos/modules/hardware/ubertooth.nix | 2 +- nixos/modules/hardware/wooting.nix | 2 +- nixos/modules/programs/kclock.nix | 2 +- nixos/modules/services/cluster/kubernetes/flannel.nix | 2 +- .../modules/services/computing/foldingathome/client.nix | 2 +- nixos/modules/services/databases/couchdb.nix | 8 +------- nixos/modules/services/databases/opentsdb.nix | 8 +------- nixos/modules/services/home-automation/zigbee2mqtt.nix | 2 +- nixos/modules/services/logging/fluentd.nix | 6 +----- nixos/modules/services/logging/logcheck.nix | 8 +------- nixos/modules/services/misc/exhibitor.nix | 9 ++------- nixos/modules/services/misc/gollum.nix | 6 +----- nixos/modules/services/misc/zookeeper.nix | 6 +----- nixos/modules/services/monitoring/arbtt.nix | 8 +------- nixos/modules/services/monitoring/bosun.nix | 8 +------- nixos/modules/services/monitoring/cadvisor.nix | 6 +----- nixos/modules/services/monitoring/datadog-agent.nix | 8 +------- nixos/modules/services/monitoring/heapster.nix | 6 +----- nixos/modules/services/monitoring/prometheus/default.nix | 8 +------- nixos/modules/services/monitoring/riemann.nix | 9 ++------- .../modules/services/network-filesystems/samba-wsdd.nix | 2 +- .../networking/magic-wormhole-mailbox-server.nix | 2 +- nixos/modules/services/networking/mozillavpn.nix | 9 ++------- nixos/modules/services/networking/networkmanager.nix | 2 +- nixos/modules/services/networking/onedrive.nix | 6 +----- nixos/modules/services/networking/owamp.nix | 2 +- nixos/modules/services/networking/polipo.nix | 6 +----- nixos/modules/services/networking/smokeping.nix | 7 ++----- nixos/modules/services/web-apps/peertube.nix | 2 +- nixos/modules/services/x11/clight.nix | 8 +------- 31 files changed, 36 insertions(+), 131 deletions(-) diff --git a/nixos/modules/hardware/brillo.nix b/nixos/modules/hardware/brillo.nix index 92239de5aaec..612061718fad 100644 --- a/nixos/modules/hardware/brillo.nix +++ b/nixos/modules/hardware/brillo.nix @@ -8,13 +8,12 @@ in options = { hardware.brillo = { enable = mkEnableOption (lib.mdDoc '' - Enable brillo in userspace. - This will allow brightness control from users in the video group. + brillo in userspace. + This will allow brightness control from users in the video group ''); }; }; - config = mkIf cfg.enable { services.udev.packages = [ pkgs.brillo ]; environment.systemPackages = [ pkgs.brillo ]; diff --git a/nixos/modules/hardware/ubertooth.nix b/nixos/modules/hardware/ubertooth.nix index 4b87abe5beb9..e2db2068d900 100644 --- a/nixos/modules/hardware/ubertooth.nix +++ b/nixos/modules/hardware/ubertooth.nix @@ -10,7 +10,7 @@ let }; in { options.hardware.ubertooth = { - enable = mkEnableOption (lib.mdDoc "Enable the Ubertooth software and its udev rules."); + enable = mkEnableOption (lib.mdDoc "Ubertooth software and its udev rules"); group = mkOption { type = types.str; diff --git a/nixos/modules/hardware/wooting.nix b/nixos/modules/hardware/wooting.nix index 2843dbfd7b2b..90d046d49f4e 100644 --- a/nixos/modules/hardware/wooting.nix +++ b/nixos/modules/hardware/wooting.nix @@ -3,7 +3,7 @@ with lib; { options.hardware.wooting.enable = - mkEnableOption (lib.mdDoc "Enable support for Wooting keyboards"); + mkEnableOption (lib.mdDoc "support for Wooting keyboards"); config = mkIf config.hardware.wooting.enable { environment.systemPackages = [ pkgs.wootility ]; diff --git a/nixos/modules/programs/kclock.nix b/nixos/modules/programs/kclock.nix index 049e237187e3..63d6fb1e2d7f 100644 --- a/nixos/modules/programs/kclock.nix +++ b/nixos/modules/programs/kclock.nix @@ -4,7 +4,7 @@ let cfg = config.programs.kclock; kclockPkg = pkgs.libsForQt5.kclock; in { - options.programs.kclock = { enable = mkEnableOption (lib.mdDoc "Enable KClock"); }; + options.programs.kclock = { enable = mkEnableOption (lib.mdDoc "KClock"); }; config = mkIf cfg.enable { services.dbus.packages = [ kclockPkg ]; diff --git a/nixos/modules/services/cluster/kubernetes/flannel.nix b/nixos/modules/services/cluster/kubernetes/flannel.nix index 3ca85a8183c3..53003287fc9c 100644 --- a/nixos/modules/services/cluster/kubernetes/flannel.nix +++ b/nixos/modules/services/cluster/kubernetes/flannel.nix @@ -12,7 +12,7 @@ in { ###### interface options.services.kubernetes.flannel = { - enable = mkEnableOption (lib.mdDoc "enable flannel networking"); + enable = mkEnableOption (lib.mdDoc "flannel networking"); }; ###### implementation diff --git a/nixos/modules/services/computing/foldingathome/client.nix b/nixos/modules/services/computing/foldingathome/client.nix index d8dd17a5cebb..1229e5ac987e 100644 --- a/nixos/modules/services/computing/foldingathome/client.nix +++ b/nixos/modules/services/computing/foldingathome/client.nix @@ -18,7 +18,7 @@ in '') ]; options.services.foldingathome = { - enable = mkEnableOption (lib.mdDoc "Enable the Folding@home client"); + enable = mkEnableOption (lib.mdDoc "Folding@home client"); package = mkOption { type = types.package; diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix index 2a570d09a2c4..16b82b867a3d 100644 --- a/nixos/modules/services/databases/couchdb.nix +++ b/nixos/modules/services/databases/couchdb.nix @@ -34,13 +34,7 @@ in { services.couchdb = { - enable = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Whether to run CouchDB Server. - ''; - }; + enable = mkEnableOption (lib.mdDoc "CouchDB Server"); package = mkOption { type = types.package; diff --git a/nixos/modules/services/databases/opentsdb.nix b/nixos/modules/services/databases/opentsdb.nix index 3a11e1c20429..288b716fce03 100644 --- a/nixos/modules/services/databases/opentsdb.nix +++ b/nixos/modules/services/databases/opentsdb.nix @@ -15,13 +15,7 @@ in { services.opentsdb = { - enable = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Whether to run OpenTSDB. - ''; - }; + enable = mkEnableOption (lib.mdDoc "OpenTSDB"); package = mkOption { type = types.package; diff --git a/nixos/modules/services/home-automation/zigbee2mqtt.nix b/nixos/modules/services/home-automation/zigbee2mqtt.nix index 691ca62208e8..71f6e7a25840 100644 --- a/nixos/modules/services/home-automation/zigbee2mqtt.nix +++ b/nixos/modules/services/home-automation/zigbee2mqtt.nix @@ -18,7 +18,7 @@ in ]; options.services.zigbee2mqtt = { - enable = mkEnableOption (lib.mdDoc "enable zigbee2mqtt service"); + enable = mkEnableOption (lib.mdDoc "zigbee2mqtt service"); package = mkOption { description = lib.mdDoc "Zigbee2mqtt package to use"; diff --git a/nixos/modules/services/logging/fluentd.nix b/nixos/modules/services/logging/fluentd.nix index fe9f4b07e162..7764aafb2d1a 100644 --- a/nixos/modules/services/logging/fluentd.nix +++ b/nixos/modules/services/logging/fluentd.nix @@ -12,11 +12,7 @@ in { options = { services.fluentd = { - enable = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc "Whether to enable fluentd."; - }; + enable = mkEnableOption (lib.mdDoc "fluentd"); config = mkOption { type = types.lines; diff --git a/nixos/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix index b1279f0fe586..8a277cea6e46 100644 --- a/nixos/modules/services/logging/logcheck.nix +++ b/nixos/modules/services/logging/logcheck.nix @@ -109,13 +109,7 @@ in { options = { services.logcheck = { - enable = mkOption { - default = false; - type = types.bool; - description = lib.mdDoc '' - Enable the logcheck cron job. - ''; - }; + enable = mkEnableOption (lib.mdDoc "logcheck cron job"); user = mkOption { default = "logcheck"; diff --git a/nixos/modules/services/misc/exhibitor.nix b/nixos/modules/services/misc/exhibitor.nix index b75ce07c91e9..91a87b55af59 100644 --- a/nixos/modules/services/misc/exhibitor.nix +++ b/nixos/modules/services/misc/exhibitor.nix @@ -68,13 +68,8 @@ in { options = { services.exhibitor = { - enable = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Whether to enable the exhibitor server. - ''; - }; + enable = mkEnableOption (lib.mdDoc "exhibitor server"); + # See https://github.com/soabase/exhibitor/wiki/Running-Exhibitor for what these mean # General options for any type of config port = mkOption { diff --git a/nixos/modules/services/misc/gollum.nix b/nixos/modules/services/misc/gollum.nix index c889658a27a7..4eec9610b5e9 100644 --- a/nixos/modules/services/misc/gollum.nix +++ b/nixos/modules/services/misc/gollum.nix @@ -8,11 +8,7 @@ in { options.services.gollum = { - enable = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc "Enable the Gollum service."; - }; + enable = mkEnableOption (lib.mdDoc "Gollum service"); address = mkOption { type = types.str; diff --git a/nixos/modules/services/misc/zookeeper.nix b/nixos/modules/services/misc/zookeeper.nix index 3487ac097228..fb51be698e72 100644 --- a/nixos/modules/services/misc/zookeeper.nix +++ b/nixos/modules/services/misc/zookeeper.nix @@ -24,11 +24,7 @@ let in { options.services.zookeeper = { - enable = mkOption { - description = lib.mdDoc "Whether to enable Zookeeper."; - default = false; - type = types.bool; - }; + enable = mkEnableOption (lib.mdDoc "Zookeeper"); port = mkOption { description = lib.mdDoc "Zookeeper Client port."; diff --git a/nixos/modules/services/monitoring/arbtt.nix b/nixos/modules/services/monitoring/arbtt.nix index 8bf4f78cc727..f07ecc5d5dd0 100644 --- a/nixos/modules/services/monitoring/arbtt.nix +++ b/nixos/modules/services/monitoring/arbtt.nix @@ -7,13 +7,7 @@ let in { options = { services.arbtt = { - enable = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Enable the arbtt statistics capture service. - ''; - }; + enable = mkEnableOption (lib.mdDoc "Arbtt statistics capture service"); package = mkOption { type = types.package; diff --git a/nixos/modules/services/monitoring/bosun.nix b/nixos/modules/services/monitoring/bosun.nix index 27966e089eb9..dc75fda6ed8a 100644 --- a/nixos/modules/services/monitoring/bosun.nix +++ b/nixos/modules/services/monitoring/bosun.nix @@ -22,13 +22,7 @@ in { services.bosun = { - enable = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Whether to run bosun. - ''; - }; + enable = mkEnableOption (lib.mdDoc "bosun"); package = mkOption { type = types.package; diff --git a/nixos/modules/services/monitoring/cadvisor.nix b/nixos/modules/services/monitoring/cadvisor.nix index 94f1ca80c943..a8fba4e6e8ce 100644 --- a/nixos/modules/services/monitoring/cadvisor.nix +++ b/nixos/modules/services/monitoring/cadvisor.nix @@ -8,11 +8,7 @@ let in { options = { services.cadvisor = { - enable = mkOption { - default = false; - type = types.bool; - description = lib.mdDoc "Whether to enable cadvisor service."; - }; + enable = mkEnableOption (lib.mdDoc "Cadvisor service"); listenAddress = mkOption { default = "127.0.0.1"; diff --git a/nixos/modules/services/monitoring/datadog-agent.nix b/nixos/modules/services/monitoring/datadog-agent.nix index a7f6fa23aa65..15deef18b60f 100644 --- a/nixos/modules/services/monitoring/datadog-agent.nix +++ b/nixos/modules/services/monitoring/datadog-agent.nix @@ -49,13 +49,7 @@ let }; in { options.services.datadog-agent = { - enable = mkOption { - description = lib.mdDoc '' - Whether to enable the datadog-agent v7 monitoring service - ''; - default = false; - type = types.bool; - }; + enable = mkEnableOption (lib.mdDoc "Datadog-agent v7 monitoring service"); package = mkOption { default = pkgs.datadog-agent; diff --git a/nixos/modules/services/monitoring/heapster.nix b/nixos/modules/services/monitoring/heapster.nix index 2f2467477ae2..fc63276b62f7 100644 --- a/nixos/modules/services/monitoring/heapster.nix +++ b/nixos/modules/services/monitoring/heapster.nix @@ -6,11 +6,7 @@ let cfg = config.services.heapster; in { options.services.heapster = { - enable = mkOption { - description = lib.mdDoc "Whether to enable heapster monitoring"; - default = false; - type = types.bool; - }; + enable = mkEnableOption (lib.mdDoc "Heapster monitoring"); source = mkOption { description = lib.mdDoc "Heapster metric source"; diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index 1dc6a65973d7..f6bae8f9e965 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -1563,13 +1563,7 @@ in options.services.prometheus = { - enable = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Enable the Prometheus monitoring daemon. - ''; - }; + enable = mkEnableOption (lib.mdDoc "Prometheus monitoring daemon"); package = mkOption { type = types.package; diff --git a/nixos/modules/services/monitoring/riemann.nix b/nixos/modules/services/monitoring/riemann.nix index 8d61ec2a308f..7ab8af85ed79 100644 --- a/nixos/modules/services/monitoring/riemann.nix +++ b/nixos/modules/services/monitoring/riemann.nix @@ -27,13 +27,8 @@ in { options = { services.riemann = { - enable = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Enable the Riemann network monitoring daemon. - ''; - }; + enable = mkEnableOption (lib.mdDoc "Riemann network monitoring daemon"); + config = mkOption { type = types.lines; description = lib.mdDoc '' diff --git a/nixos/modules/services/network-filesystems/samba-wsdd.nix b/nixos/modules/services/network-filesystems/samba-wsdd.nix index e28fe4cf9c4d..24407f05de6a 100644 --- a/nixos/modules/services/network-filesystems/samba-wsdd.nix +++ b/nixos/modules/services/network-filesystems/samba-wsdd.nix @@ -9,7 +9,7 @@ in { options = { services.samba-wsdd = { enable = mkEnableOption (lib.mdDoc '' - Enable Web Services Dynamic Discovery host daemon. This enables (Samba) hosts, like your local NAS device, + Web Services Dynamic Discovery host daemon. This enables (Samba) hosts, like your local NAS device, to be found by Web Service Discovery Clients like Windows. ::: {.note} diff --git a/nixos/modules/services/networking/magic-wormhole-mailbox-server.nix b/nixos/modules/services/networking/magic-wormhole-mailbox-server.nix index 326abe8cfce4..9dd1f62350af 100644 --- a/nixos/modules/services/networking/magic-wormhole-mailbox-server.nix +++ b/nixos/modules/services/networking/magic-wormhole-mailbox-server.nix @@ -9,7 +9,7 @@ let in { options.services.magic-wormhole-mailbox-server = { - enable = mkEnableOption (lib.mdDoc "Enable Magic Wormhole Mailbox Server"); + enable = mkEnableOption (lib.mdDoc "Magic Wormhole Mailbox Server"); }; config = mkIf cfg.enable { diff --git a/nixos/modules/services/networking/mozillavpn.nix b/nixos/modules/services/networking/mozillavpn.nix index 71cbb0470412..cf962879b421 100644 --- a/nixos/modules/services/networking/mozillavpn.nix +++ b/nixos/modules/services/networking/mozillavpn.nix @@ -1,13 +1,8 @@ { config, lib, pkgs, ... }: { - options.services.mozillavpn.enable = lib.mkOption { - type = lib.types.bool; - default = false; - description = lib.mdDoc '' - Enable the Mozilla VPN daemon. - ''; - }; + options.services.mozillavpn.enable = + lib.mkEnableOption (lib.mdDoc "Mozilla VPN daemon"); config = lib.mkIf config.services.mozillavpn.enable { environment.systemPackages = [ pkgs.mozillavpn ]; diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 0aa301251bb6..3b28cec83cb7 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -365,7 +365,7 @@ in { If you enable this option the `networkmanager_strongswan` plugin will be added to the {option}`networking.networkmanager.plugins` option - so you don't need to to that yourself. + so you don't need to do that yourself. ''; }; diff --git a/nixos/modules/services/networking/onedrive.nix b/nixos/modules/services/networking/onedrive.nix index 5a531d7a47fd..d782ec05352b 100644 --- a/nixos/modules/services/networking/onedrive.nix +++ b/nixos/modules/services/networking/onedrive.nix @@ -26,11 +26,7 @@ in { ### Interface options.services.onedrive = { - enable = lib.mkOption { - type = lib.types.bool; - default = false; - description = lib.mdDoc "Enable OneDrive service"; - }; + enable = lib.mkEnableOption (lib.mdDoc "OneDrive service"); package = lib.mkOption { type = lib.types.package; diff --git a/nixos/modules/services/networking/owamp.nix b/nixos/modules/services/networking/owamp.nix index e7a5bfea5258..32b2dab9e3c7 100644 --- a/nixos/modules/services/networking/owamp.nix +++ b/nixos/modules/services/networking/owamp.nix @@ -10,7 +10,7 @@ in ###### interface options = { - services.owamp.enable = mkEnableOption (lib.mdDoc "Enable OWAMP server"); + services.owamp.enable = mkEnableOption (lib.mdDoc "OWAMP server"); }; diff --git a/nixos/modules/services/networking/polipo.nix b/nixos/modules/services/networking/polipo.nix index 7feb62212b69..8581553829bf 100644 --- a/nixos/modules/services/networking/polipo.nix +++ b/nixos/modules/services/networking/polipo.nix @@ -23,11 +23,7 @@ in services.polipo = { - enable = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc "Whether to run the polipo caching web proxy."; - }; + enable = mkEnableOption (lib.mdDoc "polipo caching web proxy"); proxyAddress = mkOption { type = types.str; diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix index ee82fe64a168..2e67f8b77c08 100644 --- a/nixos/modules/services/networking/smokeping.nix +++ b/nixos/modules/services/networking/smokeping.nix @@ -49,11 +49,8 @@ in { options = { services.smokeping = { - enable = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc "Enable the smokeping service"; - }; + enable = mkEnableOption (lib.mdDoc "smokeping service"); + alertConfig = mkOption { type = types.lines; default = '' diff --git a/nixos/modules/services/web-apps/peertube.nix b/nixos/modules/services/web-apps/peertube.nix index 76ff5782ba8c..046577e61566 100644 --- a/nixos/modules/services/web-apps/peertube.nix +++ b/nixos/modules/services/web-apps/peertube.nix @@ -75,7 +75,7 @@ let in { options.services.peertube = { - enable = lib.mkEnableOption (lib.mdDoc "Enable Peertube’s service"); + enable = lib.mkEnableOption (lib.mdDoc "Peertube"); user = lib.mkOption { type = lib.types.str; diff --git a/nixos/modules/services/x11/clight.nix b/nixos/modules/services/x11/clight.nix index 8a17b7e801e5..0f66e191fe28 100644 --- a/nixos/modules/services/x11/clight.nix +++ b/nixos/modules/services/x11/clight.nix @@ -28,13 +28,7 @@ let cfg.settings)); in { options.services.clight = { - enable = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Whether to enable clight or not. - ''; - }; + enable = mkEnableOption (lib.mdDoc "clight"); temperature = { day = mkOption { From 01923230d5fb10c100ff6a3e34611c26b110bc11 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 10 Nov 2022 09:31:32 +0100 Subject: [PATCH 070/117] python310Packages.xiaomi-ble: 0.10.0 -> 0.11.0 --- 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 b64d2d5f39c0..676afd2a44dd 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.10.0"; + version = "0.11.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-qpGw9c7O8MC6AEutRIqCEdZncJSQKesaHFRQjOxpa2U="; + hash = "sha256-qAqXg+skA7FfAjRXljt1UpyOcC3KYghc+5wjiRzlyyg="; }; nativeBuildInputs = [ From 207e7e254e2549b20f910a3b2f19800b3a4c5519 Mon Sep 17 00:00:00 2001 From: paki23 Date: Sun, 11 Sep 2022 21:36:58 +0200 Subject: [PATCH 071/117] ludusavi: init at 0.15.0 Co-authored-by: Azat Bahawi --- pkgs/applications/backup/ludusavi/default.nix | 85 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 87 insertions(+) create mode 100644 pkgs/applications/backup/ludusavi/default.nix diff --git a/pkgs/applications/backup/ludusavi/default.nix b/pkgs/applications/backup/ludusavi/default.nix new file mode 100644 index 000000000000..e7826fc6e949 --- /dev/null +++ b/pkgs/applications/backup/ludusavi/default.nix @@ -0,0 +1,85 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, cmake +, pkg-config +, makeWrapper +, bzip2 +, fontconfig +, freetype +, libGL +, libX11 +, libXcursor +, libXrandr +, libXi +, gnome +, kdialog +}: + +rustPlatform.buildRustPackage rec { + pname = "ludusavi"; + version = "0.15.0"; + + src = fetchFromGitHub { + owner = "mtkennerly"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-3nh1EhjiH+dUBw3CNeFSg/+Wkxr5AYgVdM1HzVKbqJI="; + }; + + cargoSha256 = "sha256-l9jYqmKC0GJL9MSRbrNng4rO6/dx4q8EVCxfuin4v6E="; + + nativeBuildInputs = [ + cmake + pkg-config + makeWrapper + ]; + + buildInputs = [ + fontconfig + freetype + libX11 + libXcursor + libXrandr + libXi + ]; + + postInstall = '' + install -Dm644 assets/com.github.mtkennerly.ludusavi.metainfo.xml -t \ + "$out/share/metainfo/" + install -Dm644 assets/icon.png \ + "$out/share/icons/hicolor/64x64/apps/${pname}.png" + install -Dm644 assets/icon.svg \ + "$out/share/icons/hicolor/scalable/apps/${pname}.svg" + install -Dm644 "assets/${pname}.desktop" -t "$out/share/applications/" + install -Dm644 assets/MaterialIcons-Regular.ttf -t "$out/share/fonts/TTF/" + install -Dm644 LICENSE -t "$out/share/licenses/${pname}/" + ''; + + postFixup = + let + libPath = lib.makeLibraryPath [ + libGL + bzip2 + fontconfig + freetype + libX11 + libXcursor + libXrandr + libXi + ]; + in + '' + patchelf --set-rpath "${libPath}" "$out/bin/$pname" + wrapProgram $out/bin/$pname --prefix PATH : ${lib.makeBinPath [ gnome.zenity kdialog ]} + ''; + + + meta = with lib; { + description = "Backup tool for PC game saves"; + homepage = "https://github.com/mtkennerly/ludusavi"; + changelog = "https://github.com/mtkennerly/ludusavi/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ pasqui23 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93ddf1774edf..25823d77f6c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1589,6 +1589,8 @@ with pkgs; libmirage = callPackage ../applications/emulators/cdemu/libmirage.nix { }; + ludusavi = callPackage ../applications/backup/ludusavi { }; + maiko = callPackage ../applications/emulators/maiko { }; mame = libsForQt5.callPackage ../applications/emulators/mame { From 0d56b2db67add209d115cb81a9aae1f93e0b654c Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 10 Nov 2022 10:32:52 +0100 Subject: [PATCH 072/117] zellij: 0.32.0 -> 0.33.0 Signed-off-by: Matthias Beyer --- pkgs/tools/misc/zellij/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix index a1cc57ea52f0..fcd2f735fd3d 100644 --- a/pkgs/tools/misc/zellij/default.nix +++ b/pkgs/tools/misc/zellij/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.32.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "zellij-org"; repo = "zellij"; rev = "v${version}"; - sha256 = "sha256-AZSchcWYg9G7lps6EgupPksXbvKzrs8wlse1jsbC8Rs="; + sha256 = "sha256-u+D7DKa2hb6kd6LPcJydkkChsPKW101bJWXx6C87rPs="; }; - cargoSha256 = "sha256-UZb5jVO5E4Yin5ua9QVsRzQGa35Onm4s/w7ys31+vX4="; + cargoSha256 = "sha256-OxoIWH/eW36fy6xujWHmgAhK6dSodMVASw8rzKFZDSk="; nativeBuildInputs = [ mandown From 0c4c00d2d7c668c329fed403c5430bfb03959157 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 10 Nov 2022 11:29:37 +0100 Subject: [PATCH 073/117] python310Packages.netutils: 1.2.0 -> 1.3.0 --- pkgs/development/python-modules/netutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/netutils/default.nix b/pkgs/development/python-modules/netutils/default.nix index 4e01e3ed6e8d..7bb23f3f6410 100644 --- a/pkgs/development/python-modules/netutils/default.nix +++ b/pkgs/development/python-modules/netutils/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "netutils"; - version = "1.2.0"; + version = "1.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "networktocode"; repo = pname; rev = "v${version}"; - hash = "sha256-6FoadV5QMZCJnF/eD3FXRsyP4MymO5nayJ/54PJXOB4="; + hash = "sha256-3c44ZJIEBhKggtqs77gt2fY3tI00ZGmFGLIGR8LF6aE="; }; nativeBuildInputs = [ From 30f5be4c2848fbd433b36886182e7cdb02261bae Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 10 Nov 2022 10:11:09 +0100 Subject: [PATCH 074/117] python310Packages.watchfiles: 0.18.0 -> 0.18.1 --- pkgs/development/python-modules/watchfiles/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/watchfiles/default.nix b/pkgs/development/python-modules/watchfiles/default.nix index 79e8395d6d49..034566f90acf 100644 --- a/pkgs/development/python-modules/watchfiles/default.nix +++ b/pkgs/development/python-modules/watchfiles/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "watchfiles"; - version = "0.18.0"; + version = "0.18.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,13 +24,13 @@ buildPythonPackage rec { owner = "samuelcolvin"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-biGGn0YAUbSO1hCJ4kU0ZWlqlXl/HRrBS3iIA3myRI8="; + hash = "sha256-XEhu6M1hFi3/gAKZcei7KJSrIhhlZhlvZvbfyA6VLR4="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-nmkIKA4EDMOeppOxKwLSh3oREInlDIcFzE7/EYZRGKY="; + hash = "sha256-IWONA3o+2emJ7cKEw5xYSMdWzGuUSwn1B70zUDzj7Cw="; }; nativeBuildInputs = [ From 5bdef060bafbc232ff58c1d114a64866e76ab6b7 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Thu, 10 Nov 2022 07:37:59 +0000 Subject: [PATCH 075/117] grc: use installShellFiles --- pkgs/tools/misc/grc/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix index 7692c49fa696..5ba9ffb86f9f 100644 --- a/pkgs/tools/misc/grc/default.nix +++ b/pkgs/tools/misc/grc/default.nix @@ -1,6 +1,7 @@ { lib , fetchFromGitHub , buildPythonApplication +, installShellFiles }: buildPythonApplication rec { @@ -22,10 +23,14 @@ buildPythonApplication rec { done ''; + nativeBuildInputs = [ installShellFiles ]; + installPhase = '' runHook preInstall + ./install.sh "$out" "$out" - install -Dm444 -t $out/share/zsh/vendor-completions _grc + installShellCompletion --zsh --name _grc _grc + runHook postInstall ''; From 9ed3ef30532e25153f53d80bb01d03a4de651ca1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Thu, 10 Nov 2022 08:13:51 -0300 Subject: [PATCH 076/117] sublime4: 4126 -> 4142 --- pkgs/applications/editors/sublime/4/packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/sublime/4/packages.nix b/pkgs/applications/editors/sublime/4/packages.nix index 512ac86210aa..0972edbfe55a 100644 --- a/pkgs/applications/editors/sublime/4/packages.nix +++ b/pkgs/applications/editors/sublime/4/packages.nix @@ -5,9 +5,9 @@ let in { sublime4 = common { - buildVersion = "4126"; - x64sha256 = "sha256-XGTlNMzgAy5U08cCjo1rO97yjz/SiiYkSjYKLOdUUKE="; - aarch64sha256 = "0gmnxyczj2wk9dilhkpa6gi2fkvbic6smyiimd3lq0s7ilbarm0a"; + buildVersion = "4142"; + x64sha256 = "JrFL17trcsUcS/bYbSbMhTnSMyla6AkoMII2lt2nAwY="; + aarch64sha256 = "r6bxOYXVA2RAo8prdBQ7/gSNKFPmwDW5osblIE0azT4="; } {}; sublime4-dev = common { From d2efce5f7c8d61e6967af43e2b0cc369260371da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Nov 2022 11:52:02 +0000 Subject: [PATCH 077/117] sq: 0.15.6 -> 0.15.11 --- pkgs/development/tools/sq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/sq/default.nix b/pkgs/development/tools/sq/default.nix index 4aa6dd211f70..4e96594fcb3c 100644 --- a/pkgs/development/tools/sq/default.nix +++ b/pkgs/development/tools/sq/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, sq }: buildGoModule rec { pname = "sq"; - version = "0.15.6"; + version = "0.15.11"; src = fetchFromGitHub { owner = "neilotoole"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QEg80di2DmMfIrvsRFp7nELs7LiJRVa/wENDnf1zQ2Y="; + sha256 = "sha256-sYaQb7MFeTgJ/WPuCuMYjLcgmO/FhMGgOvY1HfGh2ag="; }; nativeBuildInputs = [ installShellFiles ]; From 771f3338e1f04a64be3614ffea9635a6edc75d58 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Nov 2022 11:54:40 +0000 Subject: [PATCH 078/117] sqlc: 1.15.0 -> 1.16.0 --- pkgs/development/tools/database/sqlc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/sqlc/default.nix b/pkgs/development/tools/database/sqlc/default.nix index 12133f6daa87..ad9dd660315e 100644 --- a/pkgs/development/tools/database/sqlc/default.nix +++ b/pkgs/development/tools/database/sqlc/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitHub }: let - version = "1.15.0"; + version = "1.16.0"; in buildGoModule { pname = "sqlc"; @@ -11,11 +11,11 @@ buildGoModule { owner = "kyleconroy"; repo = "sqlc"; rev = "v${version}"; - sha256 = "sha256-Ufa5A+lsFSyxe7s0DbLhWW298Y1yaSCazMjGBryyMYY="; + sha256 = "sha256-YxGMfGhcPT3Pcyxu1hAkadkJnEBMX26fE/rGfGSTsyc="; }; proxyVendor = true; - vendorSha256 = "sha256-KatF4epCzyQCoAGk1verjAYNrFcmcLiVyDI2542Vm3k="; + vendorSha256 = "sha256-cMYTQ8rATCXOquSxc4iZ2MvxIaMO3RG8PZkpOwwntyc="; subPackages = [ "cmd/sqlc" ]; From 9b9388185888067d91295d49cd8cff8062788217 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Nov 2022 11:57:52 +0000 Subject: [PATCH 079/117] srvc: 0.7.0 -> 0.8.0 --- pkgs/applications/version-management/srvc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/srvc/default.nix b/pkgs/applications/version-management/srvc/default.nix index a3e8d5dc8135..0379acbd158f 100644 --- a/pkgs/applications/version-management/srvc/default.nix +++ b/pkgs/applications/version-management/srvc/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "srvc"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "insilica"; repo = "rs-srvc"; rev = "v${version}"; - sha256 = "sha256-XGZ6Jr/RVDOLDa0sANZIsKtNjY3pEBlOtei+xNGPBBY="; + sha256 = "sha256-2eEuKAMxxTwjDInpYcOlFJha5DTe0IrxT5rI6ymN0hc="; }; - cargoSha256 = "sha256-sjMg5XMnAQZjp6z9prtRq+0pyNQ1oTm0/KWOZPxDW4w="; + cargoSha256 = "sha256-nJM7/w4awbCZQysUOSTO6bfsBXO3agJRdp1RyRZhtUY="; buildInputs = lib.optionals stdenv.isDarwin [ Security From 9cfee4cb8a6e084892a659896b87187bd0744257 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Nov 2022 12:27:55 +0000 Subject: [PATCH 080/117] tasktimer: 1.9.4 -> 1.11.0 --- pkgs/applications/misc/tasktimer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/tasktimer/default.nix b/pkgs/applications/misc/tasktimer/default.nix index 669fead0a0e8..ca5d6227375e 100644 --- a/pkgs/applications/misc/tasktimer/default.nix +++ b/pkgs/applications/misc/tasktimer/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tasktimer"; - version = "1.9.4"; + version = "1.11.0"; src = fetchFromGitHub { owner = "caarlos0"; repo = pname; rev = "v${version}"; - sha256 = "sha256-M88JzcK9HwHeWbQ0McbCF1rIEiKnwh08oEoRck4A/Ho="; + sha256 = "sha256-CAqOsxmJxDgQRMx8cN23TajHd6BNiCFraFvhf5kKnzc="; }; - vendorSha256 = "sha256-5OSAa7tGPtGyx0bet82FRoIozhhlFtakbPt6PtCTHd0="; + vendorSha256 = "sha256-Tk0yI/WFr0FV0AxJDStlP3XLem3v78ueuXyadhrLAog="; postInstall = '' mv $out/bin/tasktimer $out/bin/tt From 2eb4dbd88caae7cfa7b81492ac7b0feca2618ee4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Nov 2022 12:32:19 +0000 Subject: [PATCH 081/117] tbls: 1.56.6 -> 1.56.8 --- pkgs/tools/misc/tbls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tbls/default.nix b/pkgs/tools/misc/tbls/default.nix index f7c03c884c0b..fff80b4fc1ae 100644 --- a/pkgs/tools/misc/tbls/default.nix +++ b/pkgs/tools/misc/tbls/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "tbls"; - version = "1.56.6"; + version = "1.56.8"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; rev = "v${version}"; - hash = "sha256-GscA0nLGnz8Ae6V6vBgn7TCGj9AgzrIJREqkLKsZEH0="; + hash = "sha256-ARqWLm2EEqeV3/VxjSRTXoXywrmQLLGxHab4H6+JMpg="; }; vendorHash = "sha256-pmnSeQHZEtsshldfq6D/r5pMYA5ivMWkzjOq2/WseYU="; From bf989a8adb089d71a31f92ca81d37316782e8b56 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Nov 2022 12:33:57 +0000 Subject: [PATCH 082/117] terragrunt: 0.40.0 -> 0.40.1 --- pkgs/applications/networking/cluster/terragrunt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index f2cafe7f1d9a..813aa43bef4e 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.40.0"; + version = "0.40.1"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZDoGlm/H2xh9+azb7N1EWUXwfF919K9B4PmQZol4RV8="; + sha256 = "sha256-jTo+CydRpb0Pak8NUwAJbSJDUZnDz4vUZ1577OZQOHg="; }; vendorSha256 = "sha256-CqImT90jFFLi6XR7jfzFKwhnCHK6B+aM+Ba/L+G3bEg="; From 18389ae11fb6685d36e994766c593ca801414e75 Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Wed, 2 Nov 2022 17:12:02 +0100 Subject: [PATCH 083/117] routinator: 0.11.3 -> 0.12.0 --- pkgs/servers/routinator/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix index 071d851f0523..e1493e9528db 100644 --- a/pkgs/servers/routinator/default.nix +++ b/pkgs/servers/routinator/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "routinator"; - version = "0.11.3"; + version = "0.12.0"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zQ68PN3CbLx6Z84jFeuAck6mzp9f3sbALgVqssecsUU="; + sha256 = "sha256-anc2nFZXYO0Ab5xwDasXGw8/SluNt15C6pRmQfUJVDs="; }; - cargoSha256 = "sha256-M8JO4E8TwLbPGdwslO2Uw+ooAJkIoyc1t1wgxw8CFF0="; + cargoSha256 = "sha256-EyrQR9gevInCI4kBZvUW5U9FrE0ZHbRUFyLKVZefKEE="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; From 83b70c04c8f63d798a41455e227b0a147eeb8151 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 10 Nov 2022 14:23:56 +0100 Subject: [PATCH 084/117] samba4: 4.15.9 -> 4.17.2 - package uses the vendored heimdal kerberos now - does not call waf directly anymore, because it complained - a lot of upstream releases: - https://www.samba.org/samba/history/samba-4.16.0.html - https://www.samba.org/samba/history/samba-4.17.0.html - https://www.samba.org/samba/history/samba-4.17.1.html - https://www.samba.org/samba/history/samba-4.17.2.html --- pkgs/servers/samba/4.x.nix | 12 +-- ...uilt-heimdal-build-tools-in-case-of-.patch | 95 ------------------- 2 files changed, 4 insertions(+), 103 deletions(-) delete mode 100644 pkgs/servers/samba/build-find-pre-built-heimdal-build-tools-in-case-of-.patch diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index c5607b4d037e..27c5282fe285 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -1,7 +1,6 @@ { lib, stdenv , buildPackages , fetchurl -, wafHook , pkg-config , bison , flex @@ -46,11 +45,11 @@ with lib; stdenv.mkDerivation rec { pname = "samba"; - version = "4.15.9"; + version = "4.17.2"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz"; - sha256 = "sha256-loKixxwv8lOqJ8uwEmDqyJf/YlzznbIO4yBz5Thv4hk="; + hash = "sha256-5V3fTVF4+MhDFqv1PF7dezU5njt9hry4G3UmHIJ7s7g="; }; outputs = [ "out" "dev" "man" ]; @@ -60,17 +59,16 @@ stdenv.mkDerivation rec { ./patch-source3__libads__kerberos_keytab.c.patch ./4.x-no-persistent-install-dynconfig.patch ./4.x-fix-makeflags-parsing.patch - ./build-find-pre-built-heimdal-build-tools-in-case-of-.patch ]; nativeBuildInputs = [ python3Packages.python - wafHook pkg-config bison flex perl perl.pkgs.ParseYapp + perl.pkgs.JSON libxslt buildPackages.stdenv.cc heimdal @@ -108,8 +106,6 @@ stdenv.mkDerivation rec { ++ optional enableAcl acl ++ optional enablePam pam; - wafPath = "buildtools/bin/waf"; - postPatch = '' # Removes absolute paths in scripts sed -i 's,/sbin/,,g' ctdb/config/functions @@ -124,7 +120,7 @@ stdenv.mkDerivation rec { export PKGCONFIG="$PKG_CONFIG" ''; - wafConfigureFlags = [ + configureFlags = [ "--with-static-modules=NONE" "--with-shared-modules=ALL" "--enable-fhs" diff --git a/pkgs/servers/samba/build-find-pre-built-heimdal-build-tools-in-case-of-.patch b/pkgs/servers/samba/build-find-pre-built-heimdal-build-tools-in-case-of-.patch deleted file mode 100644 index ff264fe1c0af..000000000000 --- a/pkgs/servers/samba/build-find-pre-built-heimdal-build-tools-in-case-of-.patch +++ /dev/null @@ -1,95 +0,0 @@ -From f3f98c6ecc6febd8e79696672668e33d11fc19cb Mon Sep 17 00:00:00 2001 -From: Pascal Bach -Date: Wed, 22 Sep 2021 09:42:42 +0200 -Subject: [PATCH] build: find pre-built heimdal build tools in case of embedded - heimdal - -This patch fixes the case of finding asn1_compile and compile_et for -building embedded heimdal, by setting ---bundled-libraries='!asn1_compile,!compile_et' as configure flags. - -The Heimdal build tools compile_et and asn1_compile are needed *only* -if we use the embedded heimdal (otherwise we don't build heimdal and -use headers that have been generated by those tools elsewhere). - -For cross-compilation with embedded heimdal, it is vital to use host build -tools, and so asn1_compile and compile_et must be supplied and not -built. One way of doing this would be to set the COMPILE_ET and -ASN1_COMPILE env vars to the location of supplied binaries. Another way, -which is more commonly used, is to exclude asn1_compile and compile_et -from bundled packages via the switch --bundled-libraries='!asn1_compile,!compile_et'. When this is done, -the build script searches the path for those tools and sets the -ASN1_COMPILE and COMPILE_ET vars accordingly. (this is admittedly -kind of a round-about way of doing things but this has become the -de-facto standard amongst embedded distro builders). - -In commit 8061983d4882f3ba3f12da71443b035d7b672eec, this process of -finding the binaris has been moved to be carried out only in the -system heimdal case. As explained above, we only need these tools, -and hence the check, in bundled mode. - -BUG: https://bugzilla.samba.org/show_bug.cgi?id=14164 - -Signed-off-by: Uri Simchoni -Signed-off-by: Bernd Kuhls -[Bachp: rebased for version 4.15.0] - -# Conflicts: -# wscript_configure_system_heimdal ---- - wscript_configure_embedded_heimdal | 11 +++++++++++ - wscript_configure_system_heimdal | 11 ----------- - 2 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/wscript_configure_embedded_heimdal b/wscript_configure_embedded_heimdal -index 1c7801f705e..edcab15a88e 100644 ---- a/wscript_configure_embedded_heimdal -+++ b/wscript_configure_embedded_heimdal -@@ -6,3 +6,14 @@ if not conf.env['BISON']: - - conf.define('USING_EMBEDDED_HEIMDAL', 1) - conf.RECURSE('source4/heimdal_build') -+ -+def check_system_heimdal_binary(name): -+ if conf.LIB_MAY_BE_BUNDLED(name): -+ return False -+ if not conf.find_program(name, var=name.upper()): -+ return False -+ conf.define('USING_SYSTEM_%s' % name.upper(), 1) -+ return True -+ -+check_system_heimdal_binary("compile_et") -+check_system_heimdal_binary("asn1_compile") -diff --git a/wscript_configure_system_heimdal b/wscript_configure_system_heimdal -index 67d8804d0ff..20aee31aac7 100644 ---- a/wscript_configure_system_heimdal -+++ b/wscript_configure_system_heimdal -@@ -37,14 +37,6 @@ def check_system_heimdal_lib(name, functions='', headers='', onlyif=None): - conf.define('USING_SYSTEM_%s' % name.upper(), 1) - return True - --def check_system_heimdal_binary(name): -- if conf.LIB_MAY_BE_BUNDLED(name): -- return False -- if not conf.find_program(name, var=name.upper()): -- return False -- conf.define('USING_SYSTEM_%s' % name.upper(), 1) -- return True -- - check_system_heimdal_lib("com_err", "com_right_r com_err", "com_err.h") - - if check_system_heimdal_lib("roken", "rk_socket_set_reuseaddr", "roken.h"): -@@ -96,9 +88,6 @@ finally: - #if conf.CHECK_BUNDLED_SYSTEM('tommath', checkfunctions='mp_init', headers='tommath.h'): - # conf.define('USING_SYSTEM_TOMMATH', 1) - --check_system_heimdal_binary("compile_et") --check_system_heimdal_binary("asn1_compile") -- - conf.env.KRB5_VENDOR = 'heimdal' - conf.define('USING_SYSTEM_KRB5', 1) - conf.define('USING_SYSTEM_HEIMDAL', 1) --- -2.33.0 - From d0ea6eada2170aa19ed4619d6f8ba08e4fede31a Mon Sep 17 00:00:00 2001 From: Maximilian Wende Date: Thu, 10 Nov 2022 14:28:02 +0100 Subject: [PATCH 085/117] astc-encoder: 3.6 -> 4.2.0 --- pkgs/tools/graphics/astc-encoder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/astc-encoder/default.nix b/pkgs/tools/graphics/astc-encoder/default.nix index e2af1494874b..9f8afe4a3bef 100644 --- a/pkgs/tools/graphics/astc-encoder/default.nix +++ b/pkgs/tools/graphics/astc-encoder/default.nix @@ -31,13 +31,13 @@ with rec { gccStdenv.mkDerivation rec { pname = "astc-encoder"; - version = "3.6"; + version = "4.2.0"; src = fetchFromGitHub { owner = "ARM-software"; repo = "astc-encoder"; rev = version; - sha256 = "sha256-TzVO2xQOuE87h8j4UwkpnAaFwkvy5dZge8zDNR/mVf0="; + sha256 = "sha256-zE0rXCmRz3z1P1wLm8aO7iQ/Yf1TJeEZqz9fB0Shsz4="; }; nativeBuildInputs = [ cmake ]; From 1fa1b22364eff95154097914877e3e7b6bf151b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Nov 2022 13:43:04 +0000 Subject: [PATCH 086/117] tippecanoe: 2.9.1 -> 2.11.0 --- pkgs/applications/misc/tippecanoe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/tippecanoe/default.nix b/pkgs/applications/misc/tippecanoe/default.nix index 085c8881095f..d3fa86aedcde 100644 --- a/pkgs/applications/misc/tippecanoe/default.nix +++ b/pkgs/applications/misc/tippecanoe/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tippecanoe"; - version = "2.9.1"; + version = "2.11.0"; src = fetchFromGitHub { owner = "felt"; repo = "tippecanoe"; rev = finalAttrs.version; - hash = "sha256-DNIkQwJUeBdVdx06NM0KMWpTTwtMyBfKc/PwGiK4wvQ="; + hash = "sha256-WFvpq0g+P9gs0VudKB5mVTo/cvWMsaxf13ZORUTf/7c="; }; buildInputs = [ sqlite zlib ]; From dba211a608a24923419db6c7c6c0371fc39d2c0b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Nov 2022 14:06:14 +0000 Subject: [PATCH 087/117] utf8cpp: 3.2.1 -> 3.2.2 --- pkgs/development/libraries/utf8cpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/utf8cpp/default.nix b/pkgs/development/libraries/utf8cpp/default.nix index c5d4fd061a07..4e0130fe07f4 100644 --- a/pkgs/development/libraries/utf8cpp/default.nix +++ b/pkgs/development/libraries/utf8cpp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "utf8cpp"; - version = "3.2.1"; + version = "3.2.2"; src = fetchFromGitHub { owner = "nemtrif"; repo = "utfcpp"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "0gsbwif97i025bxgyax4fbf6v9z44zrca4s6wwd8x36ac8qzjppf"; + sha256 = "sha256-L58OMNrKd1+yco0V/jpOfWgDr0K1y8jOJ3TasUMRw0k="; }; cmakeFlags = [ From 80cb5e65f8ceacb8a1c174ea7e4235e6a5a3a80b Mon Sep 17 00:00:00 2001 From: Maximilian Wende Date: Thu, 10 Nov 2022 15:11:48 +0100 Subject: [PATCH 088/117] astc-encoder: fix darwin build --- pkgs/tools/graphics/astc-encoder/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/graphics/astc-encoder/default.nix b/pkgs/tools/graphics/astc-encoder/default.nix index 9f8afe4a3bef..b9d30adf396a 100644 --- a/pkgs/tools/graphics/astc-encoder/default.nix +++ b/pkgs/tools/graphics/astc-encoder/default.nix @@ -1,5 +1,5 @@ { lib -, gccStdenv +, stdenv , fetchFromGitHub , cmake , simdExtensions ? null @@ -8,7 +8,7 @@ with rec { # SIMD instruction sets to compile for. If none are specified by the user, # an appropriate one is selected based on the detected host system - isas = with gccStdenv.hostPlatform; + isas = with stdenv.hostPlatform; if simdExtensions != null then lib.toList simdExtensions else if avx2Support then [ "AVX2" ] else if sse4_1Support then [ "SSE41" ] @@ -16,7 +16,7 @@ with rec { else if isAarch64 then [ "NEON" ] else [ "NONE" ]; - archFlags = lib.optionals gccStdenv.hostPlatform.isAarch64 [ "-DARCH=aarch64" ]; + archFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "-DARCH=aarch64" ]; # CMake Build flags for the selected ISAs. For a list of flags, see # https://github.com/ARM-software/astc-encoder/blob/main/Docs/Building.md @@ -24,12 +24,12 @@ with rec { # The suffix of the binary to link as 'astcenc' mainBinary = builtins.replaceStrings - [ "AVX2" "SSE41" "SSE2" "NEON" "NONE" ] - [ "avx2" "sse4.1" "sse2" "neon" "none" ] + [ "AVX2" "SSE41" "SSE2" "NEON" "NONE" "NATIVE" ] + [ "avx2" "sse4.1" "sse2" "neon" "none" "native" ] ( builtins.head isas ); }; -gccStdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "astc-encoder"; version = "4.2.0"; @@ -43,7 +43,7 @@ gccStdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; cmakeFlags = isaFlags ++ archFlags ++ [ - "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_BUILD_TYPE=RelWithDebInfo" ]; # Set a fixed build year to display within help output (otherwise, it would be 1980) @@ -52,9 +52,8 @@ gccStdenv.mkDerivation rec { --replace 'string(TIMESTAMP astcencoder_YEAR "%Y")' 'set(astcencoder_YEAR "2022")' ''; - # Link binaries into environment and provide 'astcenc' link + # Provide 'astcenc' link to main executable postInstall = '' - mv $out/astcenc $out/bin ln -s $out/bin/astcenc-${mainBinary} $out/bin/astcenc ''; @@ -73,6 +72,6 @@ gccStdenv.mkDerivation rec { platforms = platforms.unix; license = licenses.asl20; maintainers = with maintainers; [ dasisdormax ]; - broken = !gccStdenv.is64bit; + broken = !stdenv.is64bit; }; } From 0451fd2be7abab4a46cb9a0a9ee56fd6bf093d52 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 10 Nov 2022 14:43:53 +0100 Subject: [PATCH 089/117] diffoscope: fix build on darwin by skipping pythonPackages.rpm dependency --- pkgs/tools/misc/diffoscope/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index af1461ad8af9..2045f3ededc4 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -46,9 +46,9 @@ python3Packages.buildPythonApplication rec { ] ++ (with python3Packages; [ argcomplete debian defusedxml jsondiff jsbeautifier libarchive-c - python-magic progressbar33 pypdf2 rpm tlsh + python-magic progressbar33 pypdf2 tlsh ]) - ++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr acl cdrkit dtc ] + ++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr python3Packages.rpm acl cdrkit dtc ] ++ lib.optionals enableBloat ([ abootimg apksigner apktool cbfstool colord enjarify ffmpeg fpc ghc ghostscriptX giflib gnupg gnumeric hdf5 imagemagick libcaca llvm jdk mono ocaml odt2txt oggvideotools openssh pdftk poppler_utils procyon qemu R tcpdump ubootTools wabt radare2 xmlbeans From e1e25aad77d93275d9b508a13417e01d6873a644 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Nov 2022 14:53:29 +0000 Subject: [PATCH 090/117] werf: 1.2.187 -> 1.2.188 --- pkgs/applications/networking/cluster/werf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index fe9dc5876c34..f42a3be95944 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "werf"; - version = "1.2.187"; + version = "1.2.188"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-rezLmdAR6OCDVsi/rguc3iLjkeQ7Jrny4MlnCFYD5+4="; + hash = "sha256-C8y86q+uf+8EZ9kBAZehld7PpGByJLjhYQOrc3YKH1A="; }; vendorHash = "sha256-GjcmpHyjhjCWE5gQR/oTHfhHYg5WRu8uhgAuWhdxlYk="; From 4eb5bc476bc50718ebf77f336dfcd7d90de89904 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Tue, 8 Nov 2022 23:21:16 -0800 Subject: [PATCH 091/117] wgpu-utils: 0.10.0 -> 0.14.1 --- pkgs/tools/graphics/wgpu-utils/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/graphics/wgpu-utils/default.nix b/pkgs/tools/graphics/wgpu-utils/default.nix index ab5eac27315a..460d45c1eac2 100644 --- a/pkgs/tools/graphics/wgpu-utils/default.nix +++ b/pkgs/tools/graphics/wgpu-utils/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wgpu-utils"; - version = "0.10.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "gfx-rs"; repo = "wgpu"; - rev = "utils-${version}"; - sha256 = "sha256-bOUcLtT5iPZuUgor2d/pJQ4Y+I1LMzREgj1cwLAvd+s="; + rev = "v${version}"; + hash = "sha256-jHjV2A949m/KyAkkdaP00d5j+V96jRQah4LKs8LcYQk="; }; - cargoSha256 = "sha256-SSEG8JApQrgP7RWlXqb+xuy482oQZ5frE2IaVMruuG0="; + cargoHash = "sha256-XbEgcPLL3UZ4zdV90AEFI8RlkZAMuLXznlkBcAG/0l8="; nativeBuildInputs = [ pkg-config From 90e7699ad7a28ffc8dbe253a2cecac5c8438bb16 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Wed, 9 Nov 2022 10:43:31 +0100 Subject: [PATCH 092/117] nix: revive nix_2_6 The critical regression bug in https://github.com/NixOS/nix/issues/6572 does not appear (at least as often) in nix 2.6 according to the discussion there, so we need to allow people to pin this older version. Partial revert of https://github.com/NixOS/nixpkgs/commit/b2eea05b06baa2886039d61485d37c338ad3d578 --- pkgs/tools/package-management/nix/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 46f92a468815..6295449c7f9b 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -50,7 +50,13 @@ in lib.makeExtensible (self: { nix_2_5 = throw "nixVersions.nix_2_5 has been removed"; - nix_2_6 = throw "nixVersions.nix_2_6 has been removed"; + # This is the last version of nix where https://github.com/NixOS/nix/issues/6572 + # is not an unsolved breaking bug. Please keep it until the issue is fixed + # and in latest stable nix. + nix_2_6 = common { + version = "2.6.1"; + sha256 = "sha256-E9iQ7f+9Z6xFcUvvfksTEfn8LsDfzmwrcRBC//5B3V0="; + }; nix_2_7 = common { version = "2.7.0"; From a8c1b3702f9cfca6e7053c81ed1210f6e305e081 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Nov 2022 10:37:52 +0000 Subject: [PATCH 093/117] signal-cli: 0.11.4 -> 0.11.5.1 --- .../networking/instant-messengers/signal-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index be0d00eeda81..d102e144c521 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.11.4"; + version = "0.11.5.1"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}-Linux.tar.gz"; - sha256 = "sha256-1NwaR8EMH2EQKskkPSrfWbUu8Ib7DwI6UNL3nOtc/tM="; + sha256 = "sha256-VHQz7FlEugTv5gJrJr5WLdYHkoQ6lTlUP3JVy20j1mM="; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; From d64fbd8f5fef205017bfc42a3c125ac7c4a54787 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 10 Nov 2022 19:00:43 +0300 Subject: [PATCH 094/117] linux-firmware: 20221012 -> 20221109 --- pkgs/os-specific/linux/firmware/linux-firmware/source.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/source.nix b/pkgs/os-specific/linux/firmware/linux-firmware/source.nix index 7e0f6bcefc4e..fefd7c56d761 100644 --- a/pkgs/os-specific/linux/firmware/linux-firmware/source.nix +++ b/pkgs/os-specific/linux/firmware/linux-firmware/source.nix @@ -1,6 +1,6 @@ # This file is autogenerated! Run ./update.sh to regenerate. { - version = "20221012"; - sourceHash = "sha256-Lm7MHAgybnyYL668KJ2MMFNA4tGAu5NGK+jSkhOj890="; - outputHash = "sha256-xk5n9mQHpM+nNv8WqSaPpcsm9B8Gr4fGJouRWEfM2z0="; + version = "20221109"; + sourceHash = "sha256-77xRUo4g24j5rGWYzVn/DZ1rfY+Ks9cmZ/+GCHELP5E="; + outputHash = "sha256-pPhqbi4PRr+0FQ7K8M/SibgYeI45spcdqgb5garyJo8="; } From 847774470eba277e341f6770c40b4457e3ddec11 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Thu, 10 Nov 2022 12:23:42 +0100 Subject: [PATCH 095/117] nixos/github-runners: restart service if exit code signals a retryable error On some occasions, the GitHub runner service encounters errors which are deemed retryable but result in the runner's termination. To signal a retryable error, the runner exits with status code 2: https://github.com/actions/runner/blob/40ed7f8/src/Runner.Common/Constants.cs#L146 To account for that behavior, this commit sets `RestartForceExitStatus=2` which results in a service restart regardless of using an ephemeral runner or not. --- .../services/continuous-integration/github-runner/service.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/continuous-integration/github-runner/service.nix b/nixos/modules/services/continuous-integration/github-runner/service.nix index 49195410bb42..cd81631582f9 100644 --- a/nixos/modules/services/continuous-integration/github-runner/service.nix +++ b/nixos/modules/services/continuous-integration/github-runner/service.nix @@ -170,6 +170,9 @@ with lib; # If running in ephemeral mode, restart the service on-exit (i.e., successful de-registration of the runner) # to trigger a fresh registration. Restart = if cfg.ephemeral then "on-success" else "no"; + # If the runner exits with `ReturnCode.RetryableError = 2`, always restart the service: + # https://github.com/actions/runner/blob/40ed7f8/src/Runner.Common/Constants.cs#L146 + RestartForceExitStatus = [ 2 ]; # Contains _diag LogsDirectory = [ systemdDir ]; From 0947d3e2307dd89f374dcd7122adfea21ab89512 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 10 Nov 2022 13:29:46 +0100 Subject: [PATCH 096/117] uwsgi: fix build on aarch64-darwin --- pkgs/servers/uwsgi/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 95b89093a880..01fa28d5d41e 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -1,4 +1,5 @@ { stdenv, nixosTests, lib, pkg-config, jansson, pcre, libxcrypt +, expat, zlib # plugins: list of strings, eg. [ "python2" "python3" ] , plugins ? [] , pam, withPAM ? stdenv.isLinux @@ -77,6 +78,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python3 pkg-config makeWrapper ]; buildInputs = [ jansson pcre libxcrypt ] + ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ expat zlib ] ++ lib.optional withPAM pam ++ lib.optional withSystemd systemd ++ lib.optional withCap libcap From 5a4a53dbc64b99f8997ab587f3f1f69e3819c23a Mon Sep 17 00:00:00 2001 From: Gauvain 'GovanifY' Roussel-Tarbouriech Date: Sun, 6 Nov 2022 17:11:48 +0100 Subject: [PATCH 097/117] nixos/mautrix-telegram: fix crash on postgresql database usage --- nixos/modules/services/matrix/mautrix-telegram.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/nixos/modules/services/matrix/mautrix-telegram.nix b/nixos/modules/services/matrix/mautrix-telegram.nix index cbca6435d6c2..fc8b95051ddb 100644 --- a/nixos/modules/services/matrix/mautrix-telegram.nix +++ b/nixos/modules/services/matrix/mautrix-telegram.nix @@ -128,6 +128,18 @@ in { after = [ "network-online.target" ] ++ cfg.serviceDependencies; path = [ pkgs.lottieconverter ]; + # mautrix-telegram tries to generate a dotfile in the home directory of + # the running user if using a postgresql databse: + # + # File "python3.10/site-packages/asyncpg/connect_utils.py", line 257, in _dot_postgre> + # return (pathlib.Path.home() / '.postgresql' / filename).resolve() + # File "python3.10/pathlib.py", line 1000, in home + # return cls("~").expanduser() + # File "python3.10/pathlib.py", line 1440, in expanduser + # raise RuntimeError("Could not determine home directory.") + # RuntimeError: Could not determine home directory. + environment.HOME = dataDir; + preStart = '' # Not all secrets can be passed as environment variable (yet) # https://github.com/tulir/mautrix-telegram/issues/584 From e705e179689b54e9efbdbad67069a6ebf185f3e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Nov 2022 16:57:43 +0000 Subject: [PATCH 098/117] xh: 0.16.1 -> 0.17.0 --- pkgs/tools/networking/xh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/xh/default.nix b/pkgs/tools/networking/xh/default.nix index 086dea7301ab..219d7a4057f5 100644 --- a/pkgs/tools/networking/xh/default.nix +++ b/pkgs/tools/networking/xh/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "xh"; - version = "0.16.1"; + version = "0.17.0"; src = fetchFromGitHub { owner = "ducaale"; repo = "xh"; rev = "v${version}"; - sha256 = "sha256-y+Bixr+WRoTGjenkHSLbVmb9IHr9nicrAWyvkg5ey8E="; + sha256 = "sha256-4rFtbCfx6QFdp62FPjOYAhSWM03g3rXsF4pD22+EhcA="; }; - cargoSha256 = "sha256-wyK10D9MMyNF+JSacWW6GQcaMYMbDf1PHhuZ5LwZo+I="; + cargoSha256 = "sha256-av/F1FHMd0o9NvwA2Q9mqSd89ZEqmUaVxC+JmSwEHhI="; buildFeatures = lib.optional withNativeTls "native-tls"; From a72fc0d5b9966373c3855de0f721158ab05cf7ed Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Fri, 11 Nov 2022 00:57:52 +0800 Subject: [PATCH 099/117] perf: add default d3-flame-graph templates for flamegraph script (#198028) Co-authored-by: Sandro --- .../os-specific/linux/kernel/perf/default.nix | 114 ++++++++++++++---- 1 file changed, 92 insertions(+), 22 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/perf/default.nix b/pkgs/os-specific/linux/kernel/perf/default.nix index 969d1e2bb657..e3a387b8115b 100644 --- a/pkgs/os-specific/linux/kernel/perf/default.nix +++ b/pkgs/os-specific/linux/kernel/perf/default.nix @@ -1,11 +1,58 @@ -{ lib, stdenv, fetchpatch, kernel, elfutils, python2, python3, python3Packages, perl, newt, slang, asciidoc, xmlto, makeWrapper -, docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkg-config, libunwind, binutils-unwrapped -, libiberty, audit, libbfd, libbfd_2_38, libopcodes, libopcodes_2_38, openssl, systemtap, numactl +{ lib +, stdenv +, fetchpatch +, fetchurl +, kernel +, elfutils +, python2 +, python3 +, python3Packages +, perl +, newt +, slang +, asciidoc +, xmlto +, makeWrapper +, docbook_xsl +, docbook_xml_dtd_45 +, libxslt +, flex +, bison +, pkg-config +, libunwind +, binutils-unwrapped +, libiberty +, audit +, libbfd +, libbfd_2_38 +, libopcodes +, libopcodes_2_38 +, openssl +, systemtap +, numactl , zlib -, withGtk ? false, gtk2 -, withZstd ? true, zstd -, withLibcap ? true, libcap +, withGtk ? false +, gtk2 +, withZstd ? true +, zstd +, withLibcap ? true +, libcap }: +let + d3-flame-graph-templates = stdenv.mkDerivation rec { + pname = "d3-flame-graph-templates"; + version = "4.1.3"; + + src = fetchurl { + url = "https://registry.npmjs.org/d3-flame-graph/-/d3-flame-graph-${version}.tgz"; + sha256 = "sha256-W5/Vh5jarXUV224aIiTB2TnBFYT3naEIcG2945QjY8Q="; + }; + + installPhase = '' + install -D -m 0755 -t $out/share/d3-flame-graph/ ./dist/templates/* + ''; + }; +in stdenv.mkDerivation { pname = "perf-linux"; @@ -20,6 +67,14 @@ stdenv.mkDerivation { ./5.19-binutils-2.39-support.patch ]; + postPatch = '' + patchShebangs scripts tools/perf/pmu-events/jevents.py + + substituteInPlace tools/perf/scripts/python/flamegraph.py \ + --replace "/usr/share/d3-flame-graph/d3-flamegraph-base.html" \ + "${d3-flame-graph-templates}/share/d3-flame-graph/d3-flamegraph-base.html" + ''; + preConfigure = '' cd tools/perf @@ -35,26 +90,45 @@ stdenv.mkDerivation { fi ''; - makeFlags = ["prefix=$(out)" "WERROR=0"] ++ kernel.makeFlags; + makeFlags = [ "prefix=$(out)" "WERROR=0" ] ++ kernel.makeFlags; hardeningDisable = [ "format" ]; # perf refers both to newt and slang nativeBuildInputs = [ - asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt - flex bison libiberty audit makeWrapper pkg-config python3 + asciidoc + xmlto + docbook_xsl + docbook_xml_dtd_45 + libxslt + flex + bison + libiberty + audit + makeWrapper + pkg-config + python3 ]; + buildInputs = [ - elfutils newt slang libunwind zlib openssl systemtap.stapBuild numactl - python3 perl + elfutils + newt + slang + libunwind + zlib + openssl + systemtap.stapBuild + numactl + python3 + perl ] ++ (if (lib.versionAtLeast kernel.version "5.19") - then [ libbfd libopcodes ] - else [ libbfd_2_38 libopcodes_2_38 ]) - ++ lib.optional withGtk gtk2 - ++ (if (lib.versionAtLeast kernel.version "4.19") then [ python3 ] else [ python2 ]) - ++ lib.optional withZstd zstd - ++ lib.optional withLibcap libcap - ++ lib.optional (lib.versionAtLeast kernel.version "6.0") python3Packages.setuptools; + then [ libbfd libopcodes ] + else [ libbfd_2_38 libopcodes_2_38 ]) + ++ lib.optional withGtk gtk2 + ++ (if (lib.versionAtLeast kernel.version "4.19") then [ python3 ] else [ python2 ]) + ++ lib.optional withZstd zstd + ++ lib.optional withLibcap libcap + ++ lib.optional (lib.versionAtLeast kernel.version "6.0") python3Packages.setuptools; NIX_CFLAGS_COMPILE = toString [ "-Wno-error=cpp" @@ -63,10 +137,6 @@ stdenv.mkDerivation { "-Wno-error=stringop-truncation" ]; - postPatch = '' - patchShebangs scripts tools/perf/pmu-events/jevents.py - ''; - doCheck = false; # requires "sparse" doInstallCheck = false; # same From aba5969b74f34987529325e3df8a3b62b24f3a39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 10 Nov 2022 18:59:22 +0100 Subject: [PATCH 100/117] nextcloud-client: 3.6.1 -> 3.6.2 --- pkgs/applications/networking/nextcloud-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 605a06add3ff..30376e57da79 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -26,7 +26,7 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.6.1"; + version = "3.6.2"; outputs = [ "out" "dev" ]; @@ -34,7 +34,7 @@ mkDerivation rec { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-RCYiUxTZSuZbDocueW0d8PdsRTR9bTjDgx0H53UGDP4="; + sha256 = "sha256-eTcQrbYYY+V87i6PuIEWCFczIqL8oxtdojPY/mZpJBU="; }; patches = [ From 621fa84767b5e46886b852b61eeda31c134d125b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 8 Nov 2022 18:27:39 -0800 Subject: [PATCH 101/117] python310Packages.pikepdf: 6.0.2 -> 6.2.2 https://github.com/pikepdf/pikepdf/blob/v6.2.2/docs/releasenotes/version6.rst --- pkgs/development/python-modules/pikepdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 256c30919a0b..d86e740b2885 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "6.0.2"; + version = "6.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -39,7 +39,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-rwMSmARUrScG2nmiYBSkcq0NuUMhn0pHOPvgdKZbH7w="; + hash = "sha256-194CaN7Ei3/ja55BWsUst4EN/B7/JUmJxtCmnN9Z/bI="; }; patches = [ From 5b1d10d31e46bb5a8beb6f9067fc961fc0e420c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 8 Nov 2022 18:26:06 -0800 Subject: [PATCH 102/117] python310Packages.ocrmypdf: 13.7.0 -> 14.0.1 https://github.com/ocrmypdf/OCRmyPDF/blob/v14.0.1/docs/release_notes.rst --- .../python-modules/ocrmypdf/default.nix | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index 77dee64bb45f..f61f94f00c26 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -1,12 +1,13 @@ { lib , buildPythonPackage , coloredlogs +, deprecation , fetchFromGitHub , ghostscript , img2pdf -, importlib-metadata , importlib-resources , jbig2enc +, packaging , pdfminer-six , pikepdf , pillow @@ -16,18 +17,23 @@ , pytestCheckHook , pythonOlder , reportlab +, setuptools , setuptools-scm -, setuptools-scm-git-archive , substituteAll , tesseract , tqdm +, typing-extensions , unpaper , installShellFiles }: buildPythonPackage rec { pname = "ocrmypdf"; - version = "13.7.0"; + version = "14.0.1"; + + disabled = pythonOlder "3.8"; + + format = "pyproject"; src = fetchFromGitHub { owner = "ocrmypdf"; @@ -39,7 +45,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-cw2wZMPhWzxRpeM90g9NmuYBYpU13R2iDzs7a8SS/CY="; + hash = "sha256-eYn24FkAXj/ESCoC0QaLY+wRhkxZP1KnuY4VU1WiG24="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -56,25 +62,27 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ - setuptools-scm-git-archive + setuptools setuptools-scm installShellFiles ]; propagatedBuildInputs = [ coloredlogs + deprecation img2pdf + packaging pdfminer-six pikepdf pillow pluggy reportlab tqdm - ] ++ (lib.optionals (pythonOlder "3.8") [ - importlib-metadata - ]) ++ (lib.optionals (pythonOlder "3.9") [ + ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources - ]); + ] ++ lib.optionals (pythonOlder "3.10") [ + typing-extensions + ]; checkInputs = [ pytest-xdist From d1f31de066da64da271ceab2cad3320019a0576a Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 10 Nov 2022 13:14:30 -0500 Subject: [PATCH 103/117] srvc: fix build on darwin, set meta.mainProgram --- .../version-management/srvc/default.nix | 6 +++- .../srvc/tests-no-timeout.patch | 36 +++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/version-management/srvc/tests-no-timeout.patch diff --git a/pkgs/applications/version-management/srvc/default.nix b/pkgs/applications/version-management/srvc/default.nix index 0379acbd158f..7547d6d4051e 100644 --- a/pkgs/applications/version-management/srvc/default.nix +++ b/pkgs/applications/version-management/srvc/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, stdenv, Security }: +{ lib, rustPlatform, fetchFromGitHub, stdenv, Security }: rustPlatform.buildRustPackage rec { pname = "srvc"; @@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-nJM7/w4awbCZQysUOSTO6bfsBXO3agJRdp1RyRZhtUY="; + # remove timeouts in tests to make them less flaky + patches = [ ./tests-no-timeout.patch ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; @@ -22,5 +25,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/insilica/rs-srvc"; license = licenses.asl20; maintainers = with maintainers; [ john-shaffer ]; + mainProgram = "sr"; }; } diff --git a/pkgs/applications/version-management/srvc/tests-no-timeout.patch b/pkgs/applications/version-management/srvc/tests-no-timeout.patch new file mode 100644 index 000000000000..d353b9e5f44b --- /dev/null +++ b/pkgs/applications/version-management/srvc/tests-no-timeout.patch @@ -0,0 +1,36 @@ +--- a/tests/common/mod.rs ++++ b/tests/common/mod.rs +@@ -1,15 +1,13 @@ + #![allow(dead_code)] + + use std::path::PathBuf; +-use std::time::Duration; + + use assert_cmd::Command; + #[cfg(unix)] + use rexpect::session::PtySession; + +-pub fn cmd(timeout_millis: u64) -> Command { ++pub fn cmd(_: u64) -> Command { + let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap(); +- cmd.timeout(Duration::from_millis(timeout_millis)); + cmd.env_remove("RUST_BACKTRACE"); + cmd + } +@@ -19,14 +17,14 @@ pub fn spawn( + dir: &str, + args: Vec<&str>, + timestamp_override: u64, +- timeout_millis: u64, ++ _: u64, + ) -> Result { + let mut cmd = std::process::Command::new(env!("CARGO_BIN_EXE_sr")); + cmd.args(args); + cmd.current_dir(dir); + cmd.env("SR_TIMESTAMP_OVERRIDE", timestamp_override.to_string()); + cmd.env_remove("RUST_BACKTRACE"); +- Ok(rexpect::session::spawn_command(cmd, Some(timeout_millis))?) ++ rexpect::session::spawn_command(cmd, None) + } + + pub fn remove_sink(dir: &str) -> Result<(), std::io::Error> { From 73c49c896fa5ad251cb1cfd2bc4ad3d39f424f3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 10 Nov 2022 19:33:42 +0100 Subject: [PATCH 104/117] xh: remove myself from maintainers --- pkgs/tools/networking/xh/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/xh/default.nix b/pkgs/tools/networking/xh/default.nix index 086dea7301ab..e46f459bbe73 100644 --- a/pkgs/tools/networking/xh/default.nix +++ b/pkgs/tools/networking/xh/default.nix @@ -61,6 +61,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/ducaale/xh"; changelog = "https://github.com/ducaale/xh/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ payas SuperSandro2000 ]; + maintainers = with maintainers; [ payas ]; }; } From 733ea72e166733abbe4f6ba9aed25f1bfff3d0a5 Mon Sep 17 00:00:00 2001 From: amesgen Date: Thu, 10 Nov 2022 20:06:32 +0100 Subject: [PATCH 105/117] nixos/rss2email: remove unnecessary cfg file indirection to fix test (#200108) Previously, the NixOS test often failed as the copied config file is not overwriteable. In actual setups, the restart interval is much bigger, such that systemd-tmpfiles will correct the permissions inbetween. --- nixos/modules/services/mail/rss2email.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/services/mail/rss2email.nix b/nixos/modules/services/mail/rss2email.nix index 7b74db1e711b..54404c5b5f4c 100644 --- a/nixos/modules/services/mail/rss2email.nix +++ b/nixos/modules/services/mail/rss2email.nix @@ -110,7 +110,6 @@ in { in { preStart = '' - cp ${conf} /var/rss2email/conf.cfg if [ ! -f /var/rss2email/db.json ]; then echo '{"version":2,"feeds":[]}' > /var/rss2email/db.json fi @@ -118,7 +117,7 @@ in { path = [ pkgs.system-sendmail ]; serviceConfig = { ExecStart = - "${pkgs.rss2email}/bin/r2e -c /var/rss2email/conf.cfg -d /var/rss2email/db.json run"; + "${pkgs.rss2email}/bin/r2e -c ${conf} -d /var/rss2email/db.json run"; User = "rss2email"; }; }; From 883420d94bf292717b76dae36a1555b5c7026e56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 1 Nov 2022 18:23:13 -0700 Subject: [PATCH 106/117] perlPackages.Tirex: 0.6.1 -> 0.7.0 https://github.com/openstreetmap/tirex/releases/tag/v0.7.0 --- pkgs/top-level/perl-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6e92eecf8375..91daaf811283 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -26137,13 +26137,13 @@ let Tirex = buildPerlPackage rec { pname = "Tirex"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "openstreetmap"; repo = "tirex"; rev = "v${version}"; - hash = "sha256-8GXhF2v04ZSF0h0WNKPp4bgYcvPYCml6HtCbikFxUzc="; + hash = "sha256-0QbPfCPBdNBbUiZ8Ppg2zao98+Ddl3l+yX6y1/J50rg="; }; buildInputs = [ @@ -26158,6 +26158,7 @@ let ]; installPhase = '' + install -m 755 -d $out/usr/libexec make install DESTDIR=$out INSTALLOPTS="" mv $out/$out/lib $out/$out/share $out rmdir $out/$out $out/nix/store $out/nix From 86c23953dc9898fbfcd9fffb9ecbf8fe28785d43 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 10 Nov 2022 15:52:37 -0500 Subject: [PATCH 107/117] emacsPackages.tree-sitter-langs: update defaults --- .../elisp-packages/tree-sitter-langs/default-grammars.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/default-grammars.json b/pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/default-grammars.json index 746ec60669df..1cfa52fed5b5 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/default-grammars.json +++ b/pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/default-grammars.json @@ -1,5 +1,4 @@ [ - "tree-sitter-agda", "tree-sitter-bash", "tree-sitter-c", "tree-sitter-c-sharp", @@ -7,11 +6,11 @@ "tree-sitter-css", "tree-sitter-elixir", "tree-sitter-elm", - "tree-sitter-fluent", "tree-sitter-go", "tree-sitter-haskell", "tree-sitter-hcl", "tree-sitter-html", + "tree-sitter-janet-simple", "tree-sitter-java", "tree-sitter-javascript", "tree-sitter-jsdoc", @@ -19,6 +18,8 @@ "tree-sitter-julia", "tree-sitter-nix", "tree-sitter-ocaml", + "tree-sitter-perl", + "tree-sitter-pgn", "tree-sitter-php", "tree-sitter-prisma", "tree-sitter-python", @@ -27,5 +28,6 @@ "tree-sitter-scala", "tree-sitter-typescript", "tree-sitter-verilog", + "tree-sitter-yaml", "tree-sitter-zig" ] From 1d344d6d6477c906f926f0a1378c0ef8dc18278c Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 6 Nov 2022 20:43:09 +0100 Subject: [PATCH 108/117] nvtop: 2.0.4 -> 3.0.1 --- pkgs/tools/system/nvtop/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/system/nvtop/default.nix b/pkgs/tools/system/nvtop/default.nix index 621d51a4a55c..97712207467b 100644 --- a/pkgs/tools/system/nvtop/default.nix +++ b/pkgs/tools/system/nvtop/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , gtest , cudatoolkit @@ -10,6 +9,7 @@ , addOpenGLRunpath , amd ? true , nvidia ? true +, udev }: let @@ -25,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "nvtop" + pname-suffix; - version = "2.0.4"; + version = "3.0.1"; src = fetchFromGitHub { owner = "Syllo"; repo = "nvtop"; rev = version; - sha256 = "sha256-WOXVmKnVNRjWqShbOUZ0Z4hd0m9njLmCGLnV9FBS3Us="; + hash = "sha256-vLvt2sankpQWAVZBPo3OePs4LDy7YfVnMkZLfN6ERAc="; }; cmakeFlags = with lib; [ @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ++ optional amd "-DLibdrm_INCLUDE_DIRS=${libdrm}/lib/stubs/libdrm.so.2" ; nativeBuildInputs = [ cmake gtest ] ++ lib.optional nvidia addOpenGLRunpath; - buildInputs = with lib; [ ncurses ] + buildInputs = with lib; [ ncurses udev ] ++ optional nvidia cudatoolkit ++ optional amd libdrm ; @@ -55,12 +55,13 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - description = "A (h)top like task monitor for AMD and NVIDIA GPUs"; + description = "A (h)top like task monitor for AMD, Intel and NVIDIA GPUs"; longDescription = '' - Nvtop stands for Neat Videocard TOP, a (h)top like task monitor for AMD and NVIDIA GPUs. It can handle multiple GPUs and print information about them in a htop familiar way. + Nvtop stands for Neat Videocard TOP, a (h)top like task monitor for AMD, Intel and NVIDIA GPUs. It can handle multiple GPUs and print information about them in a htop familiar way. ''; homepage = "https://github.com/Syllo/nvtop"; - license = licenses.gpl3; + changelog = "https://github.com/Syllo/nvtop/releases/tag/${version}"; + license = licenses.gpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ willibutz gbtb ]; mainProgram = "nvtop"; From 22a77842fcb38137fdc16438df4d95712cb4705c Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 6 Nov 2022 20:42:37 +0100 Subject: [PATCH 109/117] nvtop: add anthonyroussel to maintainers --- pkgs/tools/system/nvtop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/nvtop/default.nix b/pkgs/tools/system/nvtop/default.nix index 97712207467b..053437dc3e95 100644 --- a/pkgs/tools/system/nvtop/default.nix +++ b/pkgs/tools/system/nvtop/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/Syllo/nvtop/releases/tag/${version}"; license = licenses.gpl3Only; platforms = platforms.linux; - maintainers = with maintainers; [ willibutz gbtb ]; + maintainers = with maintainers; [ willibutz gbtb anthonyroussel ]; mainProgram = "nvtop"; }; } From 0d5df5ef49c29da3c9327b94e5526feec4246e32 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 10 Nov 2022 22:22:56 +0100 Subject: [PATCH 110/117] python310Packages.numdifftools: 0.9.40 -> 0.9.41 --- pkgs/development/python-modules/numdifftools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numdifftools/default.nix b/pkgs/development/python-modules/numdifftools/default.nix index bc5914be721c..fced2ae4cead 100644 --- a/pkgs/development/python-modules/numdifftools/default.nix +++ b/pkgs/development/python-modules/numdifftools/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "numdifftools"; - version = "0.9.40"; + version = "0.9.41"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pbrod"; repo = pname; rev = "v${version}"; - hash = "sha256-YLi9cNHcZ/PlhrhvYOMfRTOt4kinQcfxvqInT8/0Qpg="; + hash = "sha256-HYacLaowSDdrwkxL1h3h+lw/8ahzaecpXEnwrCqMCWk="; }; propagatedBuildInputs = [ From b6ab99e519112fd9e6427448e0ffc5d288dc7b61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 10 Nov 2022 10:23:05 -0800 Subject: [PATCH 111/117] igraph: 0.9.10 -> 0.10.2 https://github.com/igraph/igraph/blob/0.10.2/CHANGELOG.md --- pkgs/development/libraries/igraph/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index 9381f1b9ea30..4220922567db 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -17,7 +17,6 @@ , plfit , python3 , sourceHighlight -, suitesparse , xmlto }: @@ -27,22 +26,17 @@ assert (blas.isILP64 == lapack.isILP64 && stdenv.mkDerivation rec { pname = "igraph"; - version = "0.9.10"; + version = "0.10.2"; src = fetchFromGitHub { owner = "igraph"; repo = pname; rev = version; - hash = "sha256-prDadHsNhDRkNp1i0niKIYxE0g85Zs0ngvUy6uK8evk="; + hash = "sha256-6zX9hyz/8H7r+wzpVwz8jDMfd3nqit3pT+wlP0C40Rg="; }; postPatch = '' echo "${version}" > IGRAPH_VERSION - '' + lib.optionalString stdenv.isAarch64 '' - # https://github.com/igraph/igraph/issues/1694 - substituteInPlace tests/CMakeLists.txt \ - --replace "igraph_scg_grouping3" "" \ - --replace "igraph_scg_semiprojectors2" "" ''; outputs = [ "out" "dev" "doc" ]; @@ -68,7 +62,6 @@ stdenv.mkDerivation rec { lapack libxml2 plfit - suitesparse ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; @@ -78,7 +71,6 @@ stdenv.mkDerivation rec { "-DIGRAPH_USE_INTERNAL_LAPACK=OFF" "-DIGRAPH_USE_INTERNAL_ARPACK=OFF" "-DIGRAPH_USE_INTERNAL_GLPK=OFF" - "-DIGRAPH_USE_INTERNAL_CXSPARSE=OFF" "-DIGRAPH_USE_INTERNAL_GMP=OFF" "-DIGRAPH_USE_INTERNAL_PLFIT=OFF" "-DIGRAPH_GLPK_SUPPORT=ON" @@ -101,7 +93,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "The network analysis package"; + description = "C library for complex network analysis and graph theory"; homepage = "https://igraph.org/"; changelog = "https://github.com/igraph/igraph/blob/${src.rev}/CHANGELOG.md"; license = licenses.gpl2Plus; From 6adb657a541cb6ac6efe358d48ee0e468b106400 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 10 Nov 2022 10:24:14 -0800 Subject: [PATCH 112/117] python310Packages.igraph: 0.9.11 -> 0.10.2 https://github.com/igraph/python-igraph/blob/0.10.2/CHANGELOG.md --- pkgs/development/python-modules/igraph/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/igraph/default.nix b/pkgs/development/python-modules/igraph/default.nix index 6afa32d35bfb..cc995746f297 100644 --- a/pkgs/development/python-modules/igraph/default.nix +++ b/pkgs/development/python-modules/igraph/default.nix @@ -5,20 +5,20 @@ , pkg-config , igraph , texttable -, python +, unittestCheckHook }: buildPythonPackage rec { pname = "igraph"; - version = "0.9.11"; + version = "0.10.2"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "igraph"; repo = "python-igraph"; rev = version; - hash = "sha256-tvkV5ve9X+LXx3LOdHIPljQKZc1v6yts0juo4SwDmfY="; + hash = "sha256-ro2EkJQxW8aHejAvkaXI9mJC5XgFt31akhzFDAPZ4ow="; }; postPatch = '' @@ -42,9 +42,9 @@ buildPythonPackage rec { # told to do it. ~ C. setupPyGlobalFlags = [ "--use-pkg-config" ]; - checkPhase = '' - ${python.interpreter} -m unittest - ''; + checkInputs = [ + unittestCheckHook + ]; pythonImportsCheck = [ "igraph" ]; From 510109763ccb20645bbdaa577b0306ae18d795e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 10 Nov 2022 10:51:21 -0800 Subject: [PATCH 113/117] libdeltachat: 1.97.0 -> 1.100.0 https://github.com/deltachat/deltachat-core-rust/blob/1.100.0/CHANGELOG.md --- pkgs/development/libraries/libdeltachat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 24b4ec87df74..a2b17cbb6b7e 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.97.0"; + version = "1.100.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-njeNlpXSeqKrozN1UfKnnhVJN24ZJh+MuR4Vd3S/gSQ="; + hash = "sha256-p7IqvxV9C3Ej0xNUA9iRtmkXrUgGWx1OR+/SBDzhcZE="; }; patches = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-bf79yqQv516k0xCp0yd1Vid1yf8EppFFvC3HJ4RczoA="; + hash = "sha256-Wfk2cHGTO2ZvhVAvOs6xOSnldyrkiAinMc6ErLy8QpA="; }; nativeBuildInputs = [ From b5a6fbbcffc1deb23bd9f0b8faa27d470a1be6a3 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 8 Nov 2022 18:17:18 +0300 Subject: [PATCH 114/117] lls: init at 0.1.0 Really nice little tool made by a person in the Rust Matrix room. --- pkgs/applications/networking/lls/default.nix | 26 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/applications/networking/lls/default.nix diff --git a/pkgs/applications/networking/lls/default.nix b/pkgs/applications/networking/lls/default.nix new file mode 100644 index 000000000000..9935d7ba9efd --- /dev/null +++ b/pkgs/applications/networking/lls/default.nix @@ -0,0 +1,26 @@ +{ + rustPlatform, + fetchFromGitHub, + lib, +}: +rustPlatform.buildRustPackage rec { + pname = "lls"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "jcaesar"; + repo = "lls"; + rev = "v${version}"; + hash = "sha256-Aq0MGhzSoJCkM0Wt/r5JSOz96LyRSgSryD7+m4aFZEA="; + }; + + cargoSha256 = "sha256-WY4MnPNDWFEzFOehm7TqCL05Ea6n93f8VWBTOuqjBAg="; + + meta = with lib; { + description = "Tool to list listening sockets"; + license = licenses.mit; + maintainers = [ maintainers.k900 ]; + platforms = platforms.linux; + homepage = "https://github.com/jcaesar/lls"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9456fdfe6487..4aa040e28d2c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29986,6 +29986,8 @@ with pkgs; inherit (ocaml-ng.ocamlPackages_4_09) ocaml; }; + lls = callPackage ../applications/networking/lls { }; + lmms = libsForQt5.callPackage ../applications/audio/lmms { lame = null; libsoundio = null; From 2e05240fdf8d7e99899b834757903ab25a6951f7 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 10 Nov 2022 23:55:06 +0100 Subject: [PATCH 115/117] fluent-bit: does not build on darwin --- pkgs/tools/misc/fluent-bit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index c40f1c41a729..3e04a2ae98e9 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://fluentbit.io"; maintainers = with maintainers; [ samrose fpletz ]; license = licenses.asl20; - platforms = platforms.unix; + platforms = platforms.linux; }; } From 699e05b52a4158a45e13b7cb3206b4c047081bf8 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 11 Nov 2022 00:59:19 +0100 Subject: [PATCH 116/117] root5: migrate to gsl (#200455) --- pkgs/applications/science/misc/root/5.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix index 1b4d6bcd0486..14a7d33af786 100644 --- a/pkgs/applications/science/misc/root/5.nix +++ b/pkgs/applications/science/misc/root/5.nix @@ -17,7 +17,7 @@ , libxcrypt , lz4 , xz -, gsl_1 +, gsl , xxHash , Cocoa , OpenGL @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ pcre python2 zlib libxml2 lz4 xz gsl_1 xxHash libxcrypt ] + buildInputs = [ pcre python2 zlib libxml2 lz4 xz gsl xxHash libxcrypt ] ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] ++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ; @@ -144,6 +144,7 @@ stdenv.mkDerivation rec { homepage = "https://root.cern.ch/"; description = "A data analysis framework"; platforms = platforms.unix; + broken = !stdenv.isx86_64; maintainers = with maintainers; [ veprbl ]; license = licenses.lgpl21; }; From 6d83b977f61da3ef540879283b9bec3f492bdd6c Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 10 Nov 2022 16:10:18 -0800 Subject: [PATCH 117/117] arangod: tidy maintainers, preConfigure (#200210) Co-authored-by: Sandro --- pkgs/servers/nosql/arangodb/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index afb84fe70e32..9b2ac7a5567f 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -49,7 +49,6 @@ gcc10Stdenv.mkDerivation rec { # prevent failing with "cmake-3.13.4/nix-support/setup-hook: line 10: ./3rdParty/rocksdb/RocksDBConfig.cmake.in: No such file or directory" dontFixCmake = true; NIX_CFLAGS_COMPILE = "-Wno-error"; - preConfigure = "patchShebangs utils"; postPatch = '' sed -ie 's!/bin/echo!echo!' 3rdParty/V8/gypfiles/*.gypi @@ -59,6 +58,10 @@ gcc10Stdenv.mkDerivation rec { substituteInPlace js/server/server.js --replace "require('@arangodb').checkAvailableVersions();" "" ''; + preConfigure = '' + patchShebangs utils + ''; + cmakeFlags = [ "-DUSE_MAINTAINER_MODE=OFF" "-DUSE_GOOGLE_TESTS=OFF" @@ -76,6 +79,6 @@ gcc10Stdenv.mkDerivation rec { description = "A native multi-model database with flexible data models for documents, graphs, and key-values"; license = licenses.asl20; platforms = [ "x86_64-linux" ]; - maintainers = [ maintainers.flosse maintainers.jsoo1 ]; + maintainers = with maintainers; [ flosse jsoo1 ]; }; }