From d70b4df686a714f4a7f97bdf67eda1473f87707a Mon Sep 17 00:00:00 2001 From: Aidan Gauland Date: Tue, 21 Jun 2022 15:36:41 +1200 Subject: [PATCH 001/142] tensorrt: init at 8.4.0.6 Add derivation for TensorRT 8, a high-performance deep learning interface SDK from NVIDIA, which is at this point non-redistributable. The current version aldo requires CUDA 11, so this is left out of the cudaPackages_10* scopes. --- .../libraries/science/math/tensorrt/8.nix | 79 +++++++++++++++++++ .../python-modules/tensorrt/default.nix | 52 ++++++++++++ pkgs/top-level/cuda-packages.nix | 15 +++- pkgs/top-level/python-packages.nix | 2 + 4 files changed, 146 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/science/math/tensorrt/8.nix create mode 100644 pkgs/development/python-modules/tensorrt/default.nix diff --git a/pkgs/development/libraries/science/math/tensorrt/8.nix b/pkgs/development/libraries/science/math/tensorrt/8.nix new file mode 100644 index 000000000000..e80d5f3a6fe0 --- /dev/null +++ b/pkgs/development/libraries/science/math/tensorrt/8.nix @@ -0,0 +1,79 @@ +{ lib +, stdenv +, requireFile +, autoPatchelfHook +, autoAddOpenGLRunpathHook +, cudaVersion +, cudatoolkit +, cudnn +}: + +assert lib.assertMsg (lib.strings.versionAtLeast cudaVersion "11.0") + "This version of TensorRT requires at least CUDA 11.0 (current version is ${cudaVersion})"; +assert lib.assertMsg (lib.strings.versionAtLeast cudnn.version "8.3") + "This version of TensorRT requires at least cuDNN 8.3 (current version is ${cudnn.version})"; + +stdenv.mkDerivation rec { + pname = "cudatoolkit-${cudatoolkit.majorVersion}-tensorrt"; + version = "8.4.0.6"; + src = requireFile rec { + name = "TensorRT-${version}.Linux.x86_64-gnu.cuda-11.6.cudnn8.3.tar.gz"; + sha256 = "sha256-DNgHHXF/G4cK2nnOWImrPXAkOcNW6Wy+8j0LRpAH/LQ="; + message = '' + To use the TensorRT derivation, you must join the NVIDIA Developer Program + and download the ${version} Linux x86_64 TAR package from + ${meta.homepage}. + + Once you have downloaded the file, add it to the store with the following + command, and try building this derivation again. + + $ nix-store --add-fixed sha256 ${name} + ''; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ + autoPatchelfHook + autoAddOpenGLRunpathHook + ]; + + # Used by autoPatchelfHook + buildInputs = [ + cudatoolkit.cc.cc.lib # libstdc++ + cudatoolkit + cudnn + ]; + + sourceRoot = "TensorRT-${version}"; + + installPhase = '' + install --directory "$dev" "$out" + mv include "$dev" + mv targets/x86_64-linux-gnu/lib "$out" + install -D --target-directory="$out/bin" targets/x86_64-linux-gnu/bin/trtexec + ''; + + # Tell autoPatchelf about runtime dependencies. + # (postFixup phase is run before autoPatchelfHook.) + postFixup = + let + mostOfVersion = builtins.concatStringsSep "." + (lib.take 3 (lib.versions.splitVersion version)); + in + '' + echo 'Patching RPATH of libnvinfer libs' + patchelf --debug --add-needed libnvinfer.so \ + "$out/lib/libnvinfer.so.${mostOfVersion}" \ + "$out/lib/libnvinfer_plugin.so.${mostOfVersion}" \ + "$out/lib/libnvinfer_builder_resource.so.${mostOfVersion}" + ''; + + meta = with lib; { + description = "TensorRT: a high-performance deep learning interface"; + homepage = "https://developer.nvidia.com/tensorrt"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ aidalgol ]; + }; +} diff --git a/pkgs/development/python-modules/tensorrt/default.nix b/pkgs/development/python-modules/tensorrt/default.nix new file mode 100644 index 000000000000..30da346c810e --- /dev/null +++ b/pkgs/development/python-modules/tensorrt/default.nix @@ -0,0 +1,52 @@ +{ lib +, python +, buildPythonPackage +, autoPatchelfHook +, unzip +, cudaPackages +}: + +let + pyVersion = "${lib.versions.major python.version}${lib.versions.minor python.version}"; +in +buildPythonPackage rec { + pname = "tensorrt"; + version = cudaPackages.tensorrt.version; + + src = cudaPackages.tensorrt.src; + + format = "wheel"; + # We unpack the wheel ourselves because of the odd packaging. + dontUseWheelUnpack = true; + + nativeBuildInputs = [ + unzip + autoPatchelfHook + cudaPackages.autoAddOpenGLRunpathHook + ]; + + preUnpack = '' + mkdir -p dist + tar --strip-components=2 -xf "$src" --directory=dist \ + "TensorRT-${version}/python/tensorrt-${version}-cp${pyVersion}-none-linux_x86_64.whl" + ''; + + sourceRoot = "."; + + buildInputs = [ + cudaPackages.cudnn + cudaPackages.tensorrt + ]; + + pythonCheckImports = [ + "tensorrt" + ]; + + meta = with lib; { + description = "Python bindings for TensorRT, a high-performance deep learning interface"; + homepage = "https://developer.nvidia.com/tensorrt"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ aidalgol ]; + }; +} diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix index 211540260d10..af8beb9b58c3 100644 --- a/pkgs/top-level/cuda-packages.nix +++ b/pkgs/top-level/cuda-packages.nix @@ -43,6 +43,16 @@ let }; in { inherit cutensor; }; + tensorrtExtension = final: prev: let + ### Tensorrt + + inherit (final) cudaMajorMinorVersion cudaMajorVersion; + + # TODO: Add derivations for TensorRT versions that support older CUDA versions. + + tensorrt = final.callPackage ../development/libraries/science/math/tensorrt/8.nix { }; + in { inherit tensorrt; }; + extraPackagesExtension = final: prev: { nccl = final.callPackage ../development/libraries/science/math/nccl { }; @@ -58,7 +68,7 @@ let }; - composedExtension = composeManyExtensions [ + composedExtension = composeManyExtensions ([ extraPackagesExtension (import ../development/compilers/cudatoolkit/extension.nix) (import ../development/compilers/cudatoolkit/redist/extension.nix) @@ -67,6 +77,7 @@ let (import ../test/cuda/cuda-samples/extension.nix) (import ../test/cuda/cuda-library-samples/extension.nix) cutensorExtension - ]; + ] ++ (lib.optional (lib.strings.versionAtLeast cudaVersion "11.0") tensorrtExtension)); + # We only package the current version of TensorRT, which requires CUDA 11. in (scope.overrideScope' composedExtension) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d958958d0618..9f525e31bd40 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10384,6 +10384,8 @@ in { tensorly = callPackage ../development/python-modules/tensorly { }; + tensorrt = callPackage ../development/python-modules/tensorrt { }; + tellduslive = callPackage ../development/python-modules/tellduslive { }; termcolor = callPackage ../development/python-modules/termcolor { }; From df653dcfbc4a23aa46aeba2f49f81a2d59dd4160 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Wed, 29 Jun 2022 08:20:26 +0200 Subject: [PATCH 002/142] cudatoolkit: get redistrib_11.7.0.json from https://developer.download.nvidia.com/compute/cuda/redist/ --- .../redist/manifests/redistrib_11.7.0.json | 879 ++++++++++++++++++ 1 file changed, 879 insertions(+) create mode 100644 pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_11.7.0.json diff --git a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_11.7.0.json b/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_11.7.0.json new file mode 100644 index 000000000000..2374cabfe1e6 --- /dev/null +++ b/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_11.7.0.json @@ -0,0 +1,879 @@ +{ + "release_date": "2022-05-11", + "cuda_cccl": { + "name": "CXX Core Compute Libraries", + "license": "CUDA Toolkit", + "version": "11.7.58", + "linux-x86_64": { + "relative_path": "cuda_cccl/linux-x86_64/cuda_cccl-linux-x86_64-11.7.58-archive.tar.xz", + "sha256": "a66261d174a3f8fea87e0dc91e5cd084dda89be8bb0a1f5ca0ab5d05a93ade4a", + "md5": "674edc3ec85126c08f78e4e3280789fd", + "size": "1004048" + }, + "linux-ppc64le": { + "relative_path": "cuda_cccl/linux-ppc64le/cuda_cccl-linux-ppc64le-11.7.58-archive.tar.xz", + "sha256": "5482355647143e61b15cb6193f33a317dce94bb2475123d4b08eebbd7a801802", + "md5": "64c9f42b84cb64a7f67645cb74d2153f", + "size": "1004332" + }, + "linux-sbsa": { + "relative_path": "cuda_cccl/linux-sbsa/cuda_cccl-linux-sbsa-11.7.58-archive.tar.xz", + "sha256": "70a8a42135e4ab817cd3c3413dd993bfc7920a42f057838d2a4a2ff0966258bd", + "md5": "f6ac243b4b8d182941025040b0c375c3", + "size": "1003936" + }, + "windows-x86_64": { + "relative_path": "cuda_cccl/windows-x86_64/cuda_cccl-windows-x86_64-11.7.58-archive.zip", + "sha256": "29958e300229c7af43df57bed0519f34f3aa64332c84fb80e481c131e4594938", + "md5": "3a40e674c975fc35376e66b08b93a42c", + "size": "2563581" + } + }, + "cuda_cudart": { + "name": "CUDA Runtime (cudart)", + "license": "CUDA Toolkit", + "version": "11.7.60", + "linux-x86_64": { + "relative_path": "cuda_cudart/linux-x86_64/cuda_cudart-linux-x86_64-11.7.60-archive.tar.xz", + "sha256": "1c079add60a107f6dd9e72a0cc9cde03eb9d833506f355c22b9177c47a977552", + "md5": "1ef515eb31691f2c43fb0de1443893a3", + "size": "854744" + }, + "linux-ppc64le": { + "relative_path": "cuda_cudart/linux-ppc64le/cuda_cudart-linux-ppc64le-11.7.60-archive.tar.xz", + "sha256": "95ea51eb4d60754a080920105aa578cc8da8772295912f198fcaa13fafce6d24", + "md5": "ce9c3ac2d0a25de182e5519354e0e01b", + "size": "795244" + }, + "linux-sbsa": { + "relative_path": "cuda_cudart/linux-sbsa/cuda_cudart-linux-sbsa-11.7.60-archive.tar.xz", + "sha256": "bdfdb8467a0d1a5c6aeb696ec0c203d1da732093b5e5ee0a79b03ef53f5ab622", + "md5": "7d6290b6e7a0086c5dbf5706013dfdda", + "size": "798208" + }, + "windows-x86_64": { + "relative_path": "cuda_cudart/windows-x86_64/cuda_cudart-windows-x86_64-11.7.60-archive.zip", + "sha256": "e1c72413c42e9bda52d1868bb67136d66d03b394b9accdfd9224080bb5a9663e", + "md5": "bbeee57a158e8ce3abce79b19eae7110", + "size": "2884824" + } + }, + "cuda_cuobjdump": { + "name": "cuobjdump", + "license": "CUDA Toolkit", + "version": "11.7.50", + "linux-x86_64": { + "relative_path": "cuda_cuobjdump/linux-x86_64/cuda_cuobjdump-linux-x86_64-11.7.50-archive.tar.xz", + "sha256": "f901085d83f83ae549de45e4410c74c3adddd2d541ba2780c23105df39008820", + "md5": "76a614c84b7221cc9282a3bf009ca401", + "size": "127416" + }, + "linux-ppc64le": { + "relative_path": "cuda_cuobjdump/linux-ppc64le/cuda_cuobjdump-linux-ppc64le-11.7.50-archive.tar.xz", + "sha256": "2fe257ab7027c7598d1351bb473d6a67a8da81fec17f60b389d16ef076c31da7", + "md5": "9ffb04f10fced993411d0601709c80fd", + "size": "140924" + }, + "linux-sbsa": { + "relative_path": "cuda_cuobjdump/linux-sbsa/cuda_cuobjdump-linux-sbsa-11.7.50-archive.tar.xz", + "sha256": "d44352344de0408d175b045401865ab82db4a53f3894e50c01445f42bbebdf8f", + "md5": "0b3bb58d13089bea74b3351cd7ed03d2", + "size": "123968" + }, + "windows-x86_64": { + "relative_path": "cuda_cuobjdump/windows-x86_64/cuda_cuobjdump-windows-x86_64-11.7.50-archive.zip", + "sha256": "3e7072d0a09c021252925ff9644d67294793afc5dc55ff2fac291528711ba0f9", + "md5": "070b5f13066888c471b90868485767ae", + "size": "2523866" + } + }, + "cuda_cupti": { + "name": "CUPTI", + "license": "CUDA Toolkit", + "version": "11.7.50", + "linux-x86_64": { + "relative_path": "cuda_cupti/linux-x86_64/cuda_cupti-linux-x86_64-11.7.50-archive.tar.xz", + "sha256": "441f7da2608d1965f0e3e2e03aeea86b0a3454cbea8e7af8112529c9acef3853", + "md5": "6433be7629030ddbcf37f5286464bb0d", + "size": "16577596" + }, + "linux-ppc64le": { + "relative_path": "cuda_cupti/linux-ppc64le/cuda_cupti-linux-ppc64le-11.7.50-archive.tar.xz", + "sha256": "df70ad634864572b4eff7ebe15b768d48d909aabddf3b54da05cf7e27442bd8f", + "md5": "011ea37fd2f4af0755414c5432ba2649", + "size": "8627816" + }, + "linux-sbsa": { + "relative_path": "cuda_cupti/linux-sbsa/cuda_cupti-linux-sbsa-11.7.50-archive.tar.xz", + "sha256": "4615695d9240a423926238640c69d4b39044acc44d3d513bc08c51f16bea371e", + "md5": "53cefdd716d8c40ff7143822341c09b7", + "size": "8436580" + }, + "windows-x86_64": { + "relative_path": "cuda_cupti/windows-x86_64/cuda_cupti-windows-x86_64-11.7.50-archive.zip", + "sha256": "42a04b9ef71e4d95bc235a68dd4a75d1501a44e9964371435994f7a7c59cd489", + "md5": "4c61155dc79555ef6b389284a4f7b65a", + "size": "11546349" + } + }, + "cuda_cuxxfilt": { + "name": "CUDA cuxxfilt (demangler)", + "license": "CUDA Toolkit", + "version": "11.7.50", + "linux-x86_64": { + "relative_path": "cuda_cuxxfilt/linux-x86_64/cuda_cuxxfilt-linux-x86_64-11.7.50-archive.tar.xz", + "sha256": "8a9cb0af698fe39c1b92d179e9ac22e8acb752eb8c531dbfdd049ddcd3c2caa6", + "md5": "0f7eb48184c16e51ad76574cc112e01c", + "size": "186432" + }, + "linux-ppc64le": { + "relative_path": "cuda_cuxxfilt/linux-ppc64le/cuda_cuxxfilt-linux-ppc64le-11.7.50-archive.tar.xz", + "sha256": "a2a9a5ace0908071f0bcf4fa1e537c8373d7ef6a18d086d85a2c72cb8dc245b7", + "md5": "6be41e32ff0274c1be4cb3b6a6429b21", + "size": "181612" + }, + "linux-sbsa": { + "relative_path": "cuda_cuxxfilt/linux-sbsa/cuda_cuxxfilt-linux-sbsa-11.7.50-archive.tar.xz", + "sha256": "c7c014ec407c77eae16451559a7499c8ff371606abc8e1b40e47eedab8d5a5b8", + "md5": "2a7553a48f6c8048d1667c16fec03035", + "size": "172292" + }, + "windows-x86_64": { + "relative_path": "cuda_cuxxfilt/windows-x86_64/cuda_cuxxfilt-windows-x86_64-11.7.50-archive.zip", + "sha256": "e93e1d37332ad5adf663a712250710d03a718f4d85702aec4e24b5bf98e2fe7a", + "md5": "f34c83f9a81d0fdae3950a9778442345", + "size": "168940" + } + }, + "cuda_demo_suite": { + "name": "CUDA Demo Suite", + "license": "CUDA Toolkit", + "version": "11.7.50", + "linux-x86_64": { + "relative_path": "cuda_demo_suite/linux-x86_64/cuda_demo_suite-linux-x86_64-11.7.50-archive.tar.xz", + "sha256": "10dec9f42f7c60ba8d2e839bedf155addb6a02ebf9a3b2b1c7acbcc47e6e4721", + "md5": "4501fa48dcf450f1de5e7b0352859dfa", + "size": "3985972" + }, + "windows-x86_64": { + "relative_path": "cuda_demo_suite/windows-x86_64/cuda_demo_suite-windows-x86_64-11.7.50-archive.zip", + "sha256": "803bab94b1b4f304ddba4c2adcc013a1aaf5251f962d154287f6d880cb3f16a1", + "md5": "a240da5cbf8ddcbf44ec969a7c57d68d", + "size": "5023822" + } + }, + "cuda_documentation": { + "name": "CUDA Documentation", + "license": "CUDA Toolkit", + "version": "11.7.50", + "linux-x86_64": { + "relative_path": "cuda_documentation/linux-x86_64/cuda_documentation-linux-x86_64-11.7.50-archive.tar.xz", + "sha256": "90a169f4c1c782cdd1b1bf1e13f3e9f4ef57f731d87d8fefae115b166032a084", + "md5": "1d5f61928ed525f7324e1f600719a786", + "size": "67056" + }, + "linux-ppc64le": { + "relative_path": "cuda_documentation/linux-ppc64le/cuda_documentation-linux-ppc64le-11.7.50-archive.tar.xz", + "sha256": "8c799c128afcf870ea63e73b8a33d924d60bc4281ef77c32c92d0081a7d523c8", + "md5": "e5f4d0b477f90698adb4919e1341c407", + "size": "67060" + }, + "linux-sbsa": { + "relative_path": "cuda_documentation/linux-sbsa/cuda_documentation-linux-sbsa-11.7.50-archive.tar.xz", + "sha256": "a2f50b49fe31b0637602743a756df16e6ec3dfc95279d4bb25a9eb1f6de3a80b", + "md5": "9316169eca11c975157e77e3649f8a1f", + "size": "67060" + }, + "windows-x86_64": { + "relative_path": "cuda_documentation/windows-x86_64/cuda_documentation-windows-x86_64-11.7.50-archive.zip", + "sha256": "2c497e6ca5ffb440d0504adef51d4e979273959d42a6a22b20cd702085b71f39", + "md5": "957cde6fd6211919ac4ca823d3cc90e9", + "size": "105283" + } + }, + "cuda_gdb": { + "name": "CUDA GDB", + "license": "CUDA Toolkit", + "version": "11.7.50", + "linux-x86_64": { + "relative_path": "cuda_gdb/linux-x86_64/cuda_gdb-linux-x86_64-11.7.50-archive.tar.xz", + "sha256": "ff44bffb8034a694ba6a2c5e171fc766ddc6d9e328b29eab8dd02177d6914f6c", + "md5": "72b1fa5a914443acc3eeda12da0aa059", + "size": "64209508" + }, + "linux-ppc64le": { + "relative_path": "cuda_gdb/linux-ppc64le/cuda_gdb-linux-ppc64le-11.7.50-archive.tar.xz", + "sha256": "e442ef2eaaa778ffadb6af3ed92316eddff0dff15b69e334338da5f450203f43", + "md5": "6a02488128531898f252163a41c84f93", + "size": "64109072" + }, + "linux-sbsa": { + "relative_path": "cuda_gdb/linux-sbsa/cuda_gdb-linux-sbsa-11.7.50-archive.tar.xz", + "sha256": "f67bae946aaa60a57d7b781a2fe044bde267da58c418067d8be6cbb63959966b", + "md5": "3a654d775d9b1466ca00585adc179744", + "size": "64025944" + } + }, + "cuda_memcheck": { + "name": "CUDA Memcheck", + "license": "CUDA Toolkit", + "version": "11.7.50", + "linux-x86_64": { + "relative_path": "cuda_memcheck/linux-x86_64/cuda_memcheck-linux-x86_64-11.7.50-archive.tar.xz", + "sha256": "12fa99422d9a7ce1714e100cc9faa4c9d37590d79d0af93abc8321217cbf5abd", + "md5": "5b29092a20eb8501651f64af028623aa", + "size": "139652" + }, + "linux-ppc64le": { + "relative_path": "cuda_memcheck/linux-ppc64le/cuda_memcheck-linux-ppc64le-11.7.50-archive.tar.xz", + "sha256": "3bed410c4fcaf106f1411a9373bb0091ee46a29f2e980eba4ee274710d8e4f19", + "md5": "952e68b3e321df1bdc94327ea186603d", + "size": "148036" + }, + "windows-x86_64": { + "relative_path": "cuda_memcheck/windows-x86_64/cuda_memcheck-windows-x86_64-11.7.50-archive.zip", + "sha256": "79294688bdbed786b68873bc02f8a279b6ce7a468486da365642e3c727cedd9e", + "md5": "a6512b0c6fe6aa4f81a6027a64110860", + "size": "172868" + } + }, + "cuda_nsight": { + "name": "Nsight Eclipse Edition Plugin", + "license": "CUDA Toolkit", + "version": "11.7.50", + "linux-x86_64": { + "relative_path": "cuda_nsight/linux-x86_64/cuda_nsight-linux-x86_64-11.7.50-archive.tar.xz", + "sha256": "483a4970a38c9366c2d3bf7d2ea9d2e2486a13ecaa3bd6ed143a4b18a8fe84b9", + "md5": "50eaa0de2047b89aa358682c6937a83a", + "size": "118603148" + }, + "linux-ppc64le": { + "relative_path": "cuda_nsight/linux-ppc64le/cuda_nsight-linux-ppc64le-11.7.50-archive.tar.xz", + "sha256": "93ece42ff578135e10cc7d8bfa4c42449f259d955cf1b71652b7436e2f6854f2", + "md5": "9e2cfb70f748efcc22c611938099ccbf", + "size": "118603136" + } + }, + "cuda_nvcc": { + "name": "CUDA NVCC", + "license": "CUDA Toolkit", + "version": "11.7.64", + "linux-x86_64": { + "relative_path": "cuda_nvcc/linux-x86_64/cuda_nvcc-linux-x86_64-11.7.64-archive.tar.xz", + "sha256": "7721fcfa3eb183ecb1d7fe138ce52d8238f0a6ecf1e9964cf8cfe5d8b7ec3c92", + "md5": "640e1e412e0ff6d7eee95e513f67cadb", + "size": "37056600" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvcc/linux-ppc64le/cuda_nvcc-linux-ppc64le-11.7.64-archive.tar.xz", + "sha256": "59792975fe7ba2cb75977965a1eebfc684d4e301a34c43f5f4295124d21c097c", + "md5": "0f409845cbe3ed70a6abc971024b1d72", + "size": "34873208" + }, + "linux-sbsa": { + "relative_path": "cuda_nvcc/linux-sbsa/cuda_nvcc-linux-sbsa-11.7.64-archive.tar.xz", + "sha256": "4ba91cfcc7b12b997ed2ceced176f6aa1f7c101a65c0ab6faae9a8fee6d107f1", + "md5": "a3ef626196d63f7db7c3c62d80564ab3", + "size": "32632012" + }, + "windows-x86_64": { + "relative_path": "cuda_nvcc/windows-x86_64/cuda_nvcc-windows-x86_64-11.7.64-archive.zip", + "sha256": "dcb47e8c04560a369cc6154242afdb29223e8ceaaf6ea6097e2add09ed64d386", + "md5": "de3eb321caac960358731fb07c26e2a2", + "size": "47659565" + } + }, + "cuda_nvdisasm": { + "name": "CUDA nvdisasm", + "license": "CUDA Toolkit", + "version": "11.7.50", + "linux-x86_64": { + "relative_path": "cuda_nvdisasm/linux-x86_64/cuda_nvdisasm-linux-x86_64-11.7.50-archive.tar.xz", + "sha256": "4e22b735b9553a286390dc76b02e5a7f21dc71234852d7f4f8cf2572fef1a479", + "md5": "471deeab3bc3ce504c75b77670ad5140", + "size": "32776640" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvdisasm/linux-ppc64le/cuda_nvdisasm-linux-ppc64le-11.7.50-archive.tar.xz", + "sha256": "1111d62bd0baefdf86de2dd148e44815d04c53d66dff2a1f5a700dd6ec32cce5", + "md5": "a1ec03d58d37927080425425a820dee8", + "size": "32780884" + }, + "linux-sbsa": { + "relative_path": "cuda_nvdisasm/linux-sbsa/cuda_nvdisasm-linux-sbsa-11.7.50-archive.tar.xz", + "sha256": "3a9ece8dfb6e93c0e9b6da6753c77c9fb815b42ffc91ee710fbc02b421b0d864", + "md5": "3e2cb3ff5390077d97d0d847c423d499", + "size": "32730316" + }, + "windows-x86_64": { + "relative_path": "cuda_nvdisasm/windows-x86_64/cuda_nvdisasm-windows-x86_64-11.7.50-archive.zip", + "sha256": "03403fc8ea81178855e5338623700421c91606e71ef8747568554a0ab5b18355", + "md5": "03ea5bb697502568d5b9fb9577974cf7", + "size": "33004702" + } + }, + "cuda_nvml_dev": { + "name": "CUDA NVML Headers", + "license": "CUDA Toolkit", + "version": "11.7.50", + "linux-x86_64": { + "relative_path": "cuda_nvml_dev/linux-x86_64/cuda_nvml_dev-linux-x86_64-11.7.50-archive.tar.xz", + "sha256": "b6f101106e5ed980bf89b2868cf0b32dd36a28c47e879ee70fca1b85de047fba", + "md5": "f8c3a8033eda7215cf2a7b0b1325b5f1", + "size": "76548" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvml_dev/linux-ppc64le/cuda_nvml_dev-linux-ppc64le-11.7.50-archive.tar.xz", + "sha256": "a3f4dbeeec6d6eb6562fd4c432c70a5071aa3e0bbf008118a1676079b4bf646f", + "md5": "cd92d1a16f3e60e9620320d18c0e5a6a", + "size": "76088" + }, + "linux-sbsa": { + "relative_path": "cuda_nvml_dev/linux-sbsa/cuda_nvml_dev-linux-sbsa-11.7.50-archive.tar.xz", + "sha256": "ddc4d1c7dafa9a05e387048a561ec01cad16e33276358201f8682780e451037d", + "md5": "156e76ed54c7547a11fc6a725d212762", + "size": "76728" + }, + "windows-x86_64": { + "relative_path": "cuda_nvml_dev/windows-x86_64/cuda_nvml_dev-windows-x86_64-11.7.50-archive.zip", + "sha256": "f3cea20a5c75dbe341b11c3fabfbafcc2da6d0d60654cdd46960e941e33dca50", + "md5": "2d92f9c4ef5dac8253f5e73e6f428251", + "size": "106750" + } + }, + "cuda_nvprof": { + "name": "CUDA nvprof", + "license": "CUDA Toolkit", + "version": "11.7.50", + "linux-x86_64": { + "relative_path": "cuda_nvprof/linux-x86_64/cuda_nvprof-linux-x86_64-11.7.50-archive.tar.xz", + "sha256": "8222eebaf3fe6ca1e4df6fda09cbd58f11de6d5b80b5596dcf5c5c45ae246028", + "md5": "1fa983b921821b0d38dfc7c5b8234d88", + "size": "1944796" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvprof/linux-ppc64le/cuda_nvprof-linux-ppc64le-11.7.50-archive.tar.xz", + "sha256": "dbf2f41b1c42fe05c9ce0865dfefe867c91a22394acfb03606a4de9cbf07f236", + "md5": "865a189bcdc7900e55f1a3e545c312da", + "size": "1600116" + }, + "linux-sbsa": { + "relative_path": "cuda_nvprof/linux-sbsa/cuda_nvprof-linux-sbsa-11.7.50-archive.tar.xz", + "sha256": "5894195fdaf1e550601649fdf93aa93fa042bd3e298867cf95007080b10757ac", + "md5": "e3e336dd70f215866864131b889a8261", + "size": "16148" + }, + "windows-x86_64": { + "relative_path": "cuda_nvprof/windows-x86_64/cuda_nvprof-windows-x86_64-11.7.50-archive.zip", + "sha256": "3a115b5bc3bf733cb6fe9d414ae5375928ea75fb1f84112b897015434bc4fc25", + "md5": "7fc781f7e740bb6a7a45b593fe8c70a0", + "size": "1603305" + } + }, + "cuda_nvprune": { + "name": "CUDA nvprune", + "license": "CUDA Toolkit", + "version": "11.7.50", + "linux-x86_64": { + "relative_path": "cuda_nvprune/linux-x86_64/cuda_nvprune-linux-x86_64-11.7.50-archive.tar.xz", + "sha256": "b5c13830f910979be229943cefe70297382ba6c1bddba91174d4837a94c7922d", + "md5": "d57409d45bd27a917b90e05e78941326", + "size": "55220" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvprune/linux-ppc64le/cuda_nvprune-linux-ppc64le-11.7.50-archive.tar.xz", + "sha256": "ecace952b4b4631fa347f77371de485f7611525773bc90587f4c639cd51362e7", + "md5": "5359a59af33523f5d5d58d0bf6cb6b9a", + "size": "55928" + }, + "linux-sbsa": { + "relative_path": "cuda_nvprune/linux-sbsa/cuda_nvprune-linux-sbsa-11.7.50-archive.tar.xz", + "sha256": "dfc069568ca54425a8bb8c674f2d70218546f64a6836fb918d233becff046624", + "md5": "6fdc59145fe540946f9e3ea793f09152", + "size": "47656" + }, + "windows-x86_64": { + "relative_path": "cuda_nvprune/windows-x86_64/cuda_nvprune-windows-x86_64-11.7.50-archive.zip", + "sha256": "605aed14b9832712c81cf36acf389a22023a0737604ff3a1cbdd7338b0780ea4", + "md5": "3f105e39da981703ab5a95bfeaf112b9", + "size": "144827" + } + }, + "cuda_nvrtc": { + "name": "CUDA NVRTC", + "license": "CUDA Toolkit", + "version": "11.7.50", + "linux-x86_64": { + "relative_path": "cuda_nvrtc/linux-x86_64/cuda_nvrtc-linux-x86_64-11.7.50-archive.tar.xz", + "sha256": "a0891b98d5d38f6ae64833c483ccf51417e25b54f0242a5872fabc7c96300f3a", + "md5": "e1e1bdd085b979196fc87d2d7d20d237", + "size": "28103056" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvrtc/linux-ppc64le/cuda_nvrtc-linux-ppc64le-11.7.50-archive.tar.xz", + "sha256": "b801983bd480b6a75eeb3b4db41a840de66d3f764ca89440e135d62ae249144e", + "md5": "f39ef8fbca0ed175a4815b2c4482b676", + "size": "26239068" + }, + "linux-sbsa": { + "relative_path": "cuda_nvrtc/linux-sbsa/cuda_nvrtc-linux-sbsa-11.7.50-archive.tar.xz", + "sha256": "5d4788a5b3c06d88179824976c8e5e7c76683dfe3bd1e5634ac2037de62b385f", + "md5": "609d991b06e17e9f0a85c6e93bbf052b", + "size": "26084572" + }, + "windows-x86_64": { + "relative_path": "cuda_nvrtc/windows-x86_64/cuda_nvrtc-windows-x86_64-11.7.50-archive.zip", + "sha256": "252ae0cd65b1b73208454966f91239d0e8f11232de966c41d8cf3009fe402415", + "md5": "6476681ad45cfd18e7cc3f5b16c9111b", + "size": "93548358" + } + }, + "cuda_nvtx": { + "name": "CUDA NVTX", + "license": "CUDA Toolkit", + "version": "11.7.50", + "linux-x86_64": { + "relative_path": "cuda_nvtx/linux-x86_64/cuda_nvtx-linux-x86_64-11.7.50-archive.tar.xz", + "sha256": "b90454efe80e4fcd328e6250279e4392a01db9035c7317355760c66048899568", + "md5": "b14a508a57f1311321b6cb552fde7a9f", + "size": "48176" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvtx/linux-ppc64le/cuda_nvtx-linux-ppc64le-11.7.50-archive.tar.xz", + "sha256": "3dc37a91b9a7769d4ab329d99d8779b7f6feaae63e8fc69d7d5da284cb82efe9", + "md5": "eae8b204b8af373dc52ec1cad399dce5", + "size": "48156" + }, + "linux-sbsa": { + "relative_path": "cuda_nvtx/linux-sbsa/cuda_nvtx-linux-sbsa-11.7.50-archive.tar.xz", + "sha256": "b803160fe20715c23a6266849d2a23d298fe7c7e427ec77aca9121d667526441", + "md5": "5262caba03904cf79884266f30962f8b", + "size": "48768" + }, + "windows-x86_64": { + "relative_path": "cuda_nvtx/windows-x86_64/cuda_nvtx-windows-x86_64-11.7.50-archive.zip", + "sha256": "cec2aabca78c95a2d6c793372684b060fc695035f568225fd735880331d71e25", + "md5": "27b8357312c82ee327b3ec86cb2cecec", + "size": "65690" + } + }, + "cuda_nvvp": { + "name": "CUDA NVVP", + "license": "CUDA Toolkit", + "version": "11.7.50", + "linux-x86_64": { + "relative_path": "cuda_nvvp/linux-x86_64/cuda_nvvp-linux-x86_64-11.7.50-archive.tar.xz", + "sha256": "6489169df1a4f37cba0c00c3c0e24ac6265bfe06fcca1d4bf3f5824bc937ef9f", + "md5": "94951715e2f099553ddd57f40ab4f06c", + "size": "117571592" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvvp/linux-ppc64le/cuda_nvvp-linux-ppc64le-11.7.50-archive.tar.xz", + "sha256": "b54fa7fc79788f991332139ecf722cc834b544d111f476531a3db82b8c15c2b0", + "md5": "ece4a0e7524037f64cd81a9a6c85db0c", + "size": "117008156" + }, + "windows-x86_64": { + "relative_path": "cuda_nvvp/windows-x86_64/cuda_nvvp-windows-x86_64-11.7.50-archive.zip", + "sha256": "8b8ddaca9958a58a78f7f50f87ecee3ecb148fe99b0cce6ed37e3ba0ecb6d14f", + "md5": "6880ab3d2ae9526e6d5a376fb24dea8e", + "size": "120360546" + } + }, + "cuda_sanitizer_api": { + "name": "CUDA Compute Sanitizer API", + "license": "CUDA Toolkit", + "version": "11.7.50", + "linux-x86_64": { + "relative_path": "cuda_sanitizer_api/linux-x86_64/cuda_sanitizer_api-linux-x86_64-11.7.50-archive.tar.xz", + "sha256": "9555ae397290608c7a64c929fc80186860008cc8c4afb0bd49deece3a5ca2fc4", + "md5": "6b5910c5096decaa4b5c30f3bff3df38", + "size": "8314100" + }, + "linux-ppc64le": { + "relative_path": "cuda_sanitizer_api/linux-ppc64le/cuda_sanitizer_api-linux-ppc64le-11.7.50-archive.tar.xz", + "sha256": "f303a56fd501ce13aa7f12c03137fefd823899b19c26ab53cd314baf47b9b3c7", + "md5": "6dc14023de7354aa6f17b833d3adf89e", + "size": "7739868" + }, + "linux-sbsa": { + "relative_path": "cuda_sanitizer_api/linux-sbsa/cuda_sanitizer_api-linux-sbsa-11.7.50-archive.tar.xz", + "sha256": "14c5ffde6606c97a92b7e72dd0987509c3fe876ad57bfe3a88d2b897125a442e", + "md5": "84fd52cea0512e63d95ebf62038137f0", + "size": "6453516" + }, + "windows-x86_64": { + "relative_path": "cuda_sanitizer_api/windows-x86_64/cuda_sanitizer_api-windows-x86_64-11.7.50-archive.zip", + "sha256": "090f657396b35d749f0f755b684151d274ae3f392790055f3b659daeee068622", + "md5": "685f72ea969afbbebeaba721310618ed", + "size": "13477221" + } + }, + "fabricmanager": { + "name": "NVIDIA Fabric Manager", + "license": "NVIDIA Driver", + "version": "515.43.04", + "linux-x86_64": { + "relative_path": "fabricmanager/linux-x86_64/fabricmanager-linux-x86_64-515.43.04-archive.tar.xz", + "sha256": "2f4bce4620ce69683428d1752464adcaef466fc471d82618e28d554c7591efe6", + "md5": "3dfc3ea1f13a346cfc155c09d80fb48c", + "size": "1470572" + }, + "linux-sbsa": { + "relative_path": "fabricmanager/linux-sbsa/fabricmanager-linux-sbsa-515.43.04-archive.tar.xz", + "sha256": "eb5cda2505cb5fcc3508ab84e8703d9cf318e0df5c2e5b0a832b4fa243b88bea", + "md5": "6fd2d3c94b8ccb826d4986fa970261f1", + "size": "1358156" + } + }, + "libcublas": { + "name": "CUDA cuBLAS", + "license": "CUDA Toolkit", + "version": "11.10.1.25", + "linux-x86_64": { + "relative_path": "libcublas/linux-x86_64/libcublas-linux-x86_64-11.10.1.25-archive.tar.xz", + "sha256": "27f5975b0b373f5fc96ac2f4ec9f28de3eb07f674acc0b0a5262dd2c76ddc5ff", + "md5": "f183769621c14cd447bb50fa51088c7b", + "size": "432986132" + }, + "linux-ppc64le": { + "relative_path": "libcublas/linux-ppc64le/libcublas-linux-ppc64le-11.10.1.25-archive.tar.xz", + "sha256": "85aa62b4c23f42f28bc428e84604b4dcb04960db1926c8c2216d5747f0366ab1", + "md5": "ca6ce43480df02cd6e5b96e416a02e64", + "size": "422295044" + }, + "linux-sbsa": { + "relative_path": "libcublas/linux-sbsa/libcublas-linux-sbsa-11.10.1.25-archive.tar.xz", + "sha256": "76c50490afd19dc5fdab31281380e0d1a7217dfebecb31477e78e452cac4e0a6", + "md5": "748bd159248469f80f67edd4028ac2dd", + "size": "422563144" + }, + "windows-x86_64": { + "relative_path": "libcublas/windows-x86_64/libcublas-windows-x86_64-11.10.1.25-archive.zip", + "sha256": "d1b47527b0fc33f1b185af38590a1d5d7d04c0c71c74c19a488547f9c0a62e7c", + "md5": "989c46ebd961d177f8bc2ba0a03955b7", + "size": "311249638" + } + }, + "libcufft": { + "name": "CUDA cuFFT", + "license": "CUDA Toolkit", + "version": "10.7.2.50", + "linux-x86_64": { + "relative_path": "libcufft/linux-x86_64/libcufft-linux-x86_64-10.7.2.50-archive.tar.xz", + "sha256": "70c4c2abb9d77210a5d2313abfdddf1857d654d1cf925946a645793bc14714c5", + "md5": "fe80583fbf4ce9195db760dc9465da2f", + "size": "213404700" + }, + "linux-ppc64le": { + "relative_path": "libcufft/linux-ppc64le/libcufft-linux-ppc64le-10.7.2.50-archive.tar.xz", + "sha256": "f229818bfee4d90aa4a9022a00d26efa749fdb4f61af1ba47b65a9f8dffd1521", + "md5": "66768c4e73bd0402be32486ef9ff4952", + "size": "213735112" + }, + "linux-sbsa": { + "relative_path": "libcufft/linux-sbsa/libcufft-linux-sbsa-10.7.2.50-archive.tar.xz", + "sha256": "9aaeae3c1a53ee4cc17c05557f2e30b65581d5d590130d5e205193beceed345d", + "md5": "967617dbb350fdd19771bea836e68744", + "size": "212335968" + }, + "windows-x86_64": { + "relative_path": "libcufft/windows-x86_64/libcufft-windows-x86_64-10.7.2.50-archive.zip", + "sha256": "931f380e666dd8dc44b72fb79224c27c720d37310312e9e421e71f16a5e312e1", + "md5": "24eb68afe151ab2d7a2c787aeb382d9a", + "size": "287120306" + } + }, + "libcufile": { + "name": "CUDA cuFile", + "license": "CUDA Toolkit", + "version": "1.3.0.44", + "linux-x86_64": { + "relative_path": "libcufile/linux-x86_64/libcufile-linux-x86_64-1.3.0.44-archive.tar.xz", + "sha256": "2a0a9102596c84afa9afed014fee73630a534ceaef2857c43646f6c9ffba2b95", + "md5": "1bacdbc9a48e4e188dfffe15ab062358", + "size": "46784140" + } + }, + "libcurand": { + "name": "CUDA cuRAND", + "license": "CUDA Toolkit", + "version": "10.2.10.50", + "linux-x86_64": { + "relative_path": "libcurand/linux-x86_64/libcurand-linux-x86_64-10.2.10.50-archive.tar.xz", + "sha256": "a05411f1775d5783800b71f6b43fae660e3baf900ae07efb853e615116ee479b", + "md5": "a9f272f6683a79c7b8fa02ae1149f3ad", + "size": "82110640" + }, + "linux-ppc64le": { + "relative_path": "libcurand/linux-ppc64le/libcurand-linux-ppc64le-10.2.10.50-archive.tar.xz", + "sha256": "4c9bc79ab38c3aca8081ea4fcd05876742657659f640c87f7af2a00f4f968787", + "md5": "6c714d6725554dd57265812c7a721454", + "size": "82156504" + }, + "linux-sbsa": { + "relative_path": "libcurand/linux-sbsa/libcurand-linux-sbsa-10.2.10.50-archive.tar.xz", + "sha256": "78577951e086501bb9222a55a07bd271dceae5fecdce17625bc453db549e96eb", + "md5": "911370c7ba791366d281e4ff62daa2b4", + "size": "82100856" + }, + "windows-x86_64": { + "relative_path": "libcurand/windows-x86_64/libcurand-windows-x86_64-10.2.10.50-archive.zip", + "sha256": "c96a539a76e6062222e66abde64ca19ff6d89729af81a0efc157ba50277edfa9", + "md5": "6afa80c834b57ab398708e735b564592", + "size": "53656547" + } + }, + "libcusolver": { + "name": "CUDA cuSOLVER", + "license": "CUDA Toolkit", + "version": "11.3.5.50", + "linux-x86_64": { + "relative_path": "libcusolver/linux-x86_64/libcusolver-linux-x86_64-11.3.5.50-archive.tar.xz", + "sha256": "7ed168c7fda04a4a640f6225cb76d5251a39e3d35db7630d3646cec58de724f8", + "md5": "cc6b0e4d97d7d73f302095cda1499167", + "size": "80742472" + }, + "linux-ppc64le": { + "relative_path": "libcusolver/linux-ppc64le/libcusolver-linux-ppc64le-11.3.5.50-archive.tar.xz", + "sha256": "341889b3c3107f7e3700693fcf815f816a8ffdfc6f2a1ca0f132ea651cb51739", + "md5": "0f038f45a4d5195d771d812ba47a34fa", + "size": "80769552" + }, + "linux-sbsa": { + "relative_path": "libcusolver/linux-sbsa/libcusolver-linux-sbsa-11.3.5.50-archive.tar.xz", + "sha256": "4832fd6dca50b2b05d07f086eaa44f953e9b1cd0f00b083f780e0ee1c17461db", + "md5": "a7361cc09dc63a6dee54937a12a8004b", + "size": "79972404" + }, + "windows-x86_64": { + "relative_path": "libcusolver/windows-x86_64/libcusolver-windows-x86_64-11.3.5.50-archive.zip", + "sha256": "918a8ed855ef683fa2b4f38e50e8275246b48c266e1066fdcf2bf6db16c9fc6a", + "md5": "68c75bd8d556a24d6d204e8007eb1f38", + "size": "111712983" + } + }, + "libcusparse": { + "name": "CUDA cuSPARSE", + "license": "CUDA Toolkit", + "version": "11.7.3.50", + "linux-x86_64": { + "relative_path": "libcusparse/linux-x86_64/libcusparse-linux-x86_64-11.7.3.50-archive.tar.xz", + "sha256": "c56ddd2d4deebb02bf1e082905f13cac7c685bfa415f1c489dd5fe382cf1f5de", + "md5": "04a62c2f92bc0608989bd82b4034d91f", + "size": "199048536" + }, + "linux-ppc64le": { + "relative_path": "libcusparse/linux-ppc64le/libcusparse-linux-ppc64le-11.7.3.50-archive.tar.xz", + "sha256": "d756707e6c84c9ae4b174467d8afba10883f8f286aba26a9230698b73fd187e3", + "md5": "bf56661d346440de2242530fed4027b9", + "size": "199115552" + }, + "linux-sbsa": { + "relative_path": "libcusparse/linux-sbsa/libcusparse-linux-sbsa-11.7.3.50-archive.tar.xz", + "sha256": "e2f8a0339739c3d7aa163d98452dcf3e6b71b164d7ff5b999dd35af31d950bc4", + "md5": "21ae0da8af1b60bb0e9f658c16730300", + "size": "198793236" + }, + "windows-x86_64": { + "relative_path": "libcusparse/windows-x86_64/libcusparse-windows-x86_64-11.7.3.50-archive.zip", + "sha256": "e7044f4cbce8712f407d041f2116cf61a8831e21d96f28c4c9ca8512847afc28", + "md5": "b20eef48a3a956b8643eb7cf457764b9", + "size": "167174067" + } + }, + "libnpp": { + "name": "CUDA NPP", + "license": "CUDA Toolkit", + "version": "11.7.3.21", + "linux-x86_64": { + "relative_path": "libnpp/linux-x86_64/libnpp-linux-x86_64-11.7.3.21-archive.tar.xz", + "sha256": "4d5f12e756304828cdbbe67dfa94a75432ee07cfe11f034aa4325e59e3c708f7", + "md5": "9c7ba42831e40f15b5b94543c659a74b", + "size": "164601168" + }, + "linux-ppc64le": { + "relative_path": "libnpp/linux-ppc64le/libnpp-linux-ppc64le-11.7.3.21-archive.tar.xz", + "sha256": "e3064176e6e0843e5f2d1bd247512be76ca3018364fd7bf77fec34b0bfae37a2", + "md5": "4106d95423169f59b5af3bbe3a9e38bf", + "size": "164864392" + }, + "linux-sbsa": { + "relative_path": "libnpp/linux-sbsa/libnpp-linux-sbsa-11.7.3.21-archive.tar.xz", + "sha256": "9cb63cd9d79a490a2504dbf8186d35d391d3e69f74353784955d33d550c83010", + "md5": "d5780f7e9a1ba1c3441f810fad68fc32", + "size": "163688528" + }, + "windows-x86_64": { + "relative_path": "libnpp/windows-x86_64/libnpp-windows-x86_64-11.7.3.21-archive.zip", + "sha256": "490a171c6db5e42f67502c0774678166f8018fe464f7e6c8a7b47e10c9fa3861", + "md5": "db863d019ff3029a9a14855ff85f6958", + "size": "125480452" + } + }, + "libnvidia_nscq": { + "name": "NVIDIA NSCQ API", + "license": "NVIDIA Driver", + "version": "515.43.04", + "linux-x86_64": { + "relative_path": "libnvidia_nscq/linux-x86_64/libnvidia_nscq-linux-x86_64-515.43.04-archive.tar.xz", + "sha256": "b0690b271e65cc2096a0de15aa7003c64e336bc5f4c48a7fc87a9b355d240e2a", + "md5": "03edfd4d08b358ec3cc98cef63e5138c", + "size": "334904" + } + }, + "libnvjpeg": { + "name": "CUDA nvJPEG", + "license": "CUDA Toolkit", + "version": "11.7.2.34", + "linux-x86_64": { + "relative_path": "libnvjpeg/linux-x86_64/libnvjpeg-linux-x86_64-11.7.2.34-archive.tar.xz", + "sha256": "0457a11af6903d63aec942e2884e02002c3d579071eacd89f08a25cab339f5eb", + "md5": "d6acf73e518edb33c4b7e7f3cb85aa46", + "size": "2042120" + }, + "linux-ppc64le": { + "relative_path": "libnvjpeg/linux-ppc64le/libnvjpeg-linux-ppc64le-11.7.2.34-archive.tar.xz", + "sha256": "70afb2d27b430dd4c43f1dc342e8725d148701093cdebc68a75d6dbaf6615d3f", + "md5": "acdf6594c58b6178cf0d83948e8c69b5", + "size": "2060012" + }, + "linux-sbsa": { + "relative_path": "libnvjpeg/linux-sbsa/libnvjpeg-linux-sbsa-11.7.2.34-archive.tar.xz", + "sha256": "8638f70021ad0e9006ec78c0b4f88f787e9d7862176447288f84a2b7d68769f2", + "md5": "e3d6b429ab22b4c16476df2f936e46ba", + "size": "1893316" + }, + "windows-x86_64": { + "relative_path": "libnvjpeg/windows-x86_64/libnvjpeg-windows-x86_64-11.7.2.34-archive.zip", + "sha256": "a3594ff7a5431495bc70763c2578ade0a32c74745803b820e49ef52cca2a872b", + "md5": "c4c259d4b7833e6cbe1505bf6b62229d", + "size": "2055730" + } + }, + "nsight_compute": { + "name": "Nsight Compute", + "license": "NVIDIA SLA", + "version": "2022.2.0.13", + "linux-x86_64": { + "relative_path": "nsight_compute/linux-x86_64/nsight_compute-linux-x86_64-2022.2.0.13-archive.tar.xz", + "sha256": "426949d42646164b884ee3025bd5e6b6fef8e904ed69705b7cf3cab9af1fc531", + "md5": "0f5700c465c92210a1eadea199b9e07a", + "size": "420951860" + }, + "linux-ppc64le": { + "relative_path": "nsight_compute/linux-ppc64le/nsight_compute-linux-ppc64le-2022.2.0.13-archive.tar.xz", + "sha256": "42c090ffe500b3a6c54c60a17b4f4856d230c558642841edb2b7bb725438be8c", + "md5": "ee1f8f57b827862c36bc6807e9a38424", + "size": "126737380" + }, + "linux-sbsa": { + "relative_path": "nsight_compute/linux-sbsa/nsight_compute-linux-sbsa-2022.2.0.13-archive.tar.xz", + "sha256": "4a442d5b6d0b599669ae30d342f46a0c8d047b3a7476b4419435dfe7187e23b8", + "md5": "11eec62f941d071b9f7c46855cc75a0b", + "size": "246004808" + }, + "windows-x86_64": { + "relative_path": "nsight_compute/windows-x86_64/nsight_compute-windows-x86_64-2022.2.0.13-archive.zip", + "sha256": "1f06f2d769c9c61c691c59f8c33f214aae6514d41f3eac5073c9310b7b487764", + "md5": "c2eb253d66b9258babc1bf9471033691", + "size": "354364680" + } + }, + "nsight_nvtx": { + "name": "Nsight NVTX", + "license": "CUDA Toolkit", + "version": "1.21018621", + "windows-x86_64": { + "relative_path": "nsight_nvtx/windows-x86_64/nsight_nvtx-windows-x86_64-1.21018621-archive.zip", + "sha256": "d99b015bfb1308206f9d7c16ea401bf426fed3a5a99953b855fe4e68be5ed2d1", + "md5": "34ee04d45cfca1c4e3cbfba0ec8f6f80", + "size": "315692" + } + }, + "nsight_systems": { + "name": "Nsight Systems", + "license": "NVIDIA SLA", + "version": "2022.1.3.3", + "linux-x86_64": { + "relative_path": "nsight_systems/linux-x86_64/nsight_systems-linux-x86_64-2022.1.3.3-archive.tar.xz", + "sha256": "bd95553d573f117be2e3b2bda6e79d14dbb038b136c12c6e5467bbd9a891681d", + "md5": "40d12d33aa2d496817d959a9551418aa", + "size": "166785296" + }, + "linux-ppc64le": { + "relative_path": "nsight_systems/linux-ppc64le/nsight_systems-linux-ppc64le-2022.1.3.3-archive.tar.xz", + "sha256": "4c228bfbd38b80612afeb65a406cba829d2b2e2352ea4a810cd6a386d6190151", + "md5": "0d5da67cb5393a0e961509cd7dab98f1", + "size": "49700384" + }, + "linux-sbsa": { + "relative_path": "nsight_systems/linux-sbsa/nsight_systems-linux-sbsa-2022.1.3.3-archive.tar.xz", + "sha256": "9025f56b9fe70288ee3f2d30477c9cfbe8c17a304b31f7f22caf7f78153d8d23", + "md5": "3559eeb8416d9a984012d2b397560740", + "size": "50415564" + }, + "windows-x86_64": { + "relative_path": "nsight_systems/windows-x86_64/nsight_systems-windows-x86_64-2022.1.3.3-archive.zip", + "sha256": "294738ba0aa0621395740a6d039a490aa0bf5fceec449b1fd4135a97b81eda0f", + "md5": "91e316744714c168c1a75804c9a198c9", + "size": "315748009" + } + }, + "nsight_vse": { + "name": "Nsight Visual Studio Edition (VSE)", + "license": "NVIDIA SLA", + "version": "2022.2.0.22095", + "windows-x86_64": { + "relative_path": "nsight_vse/windows-x86_64/nsight_vse-windows-x86_64-2022.2.0.22095-archive.zip", + "sha256": "b346aadf59d633b114b5e5b3ed437f8eee2bb2b8d532da0ee374ef8af9149cb2", + "md5": "63d3a5f0c9abaa027efbe0f476dc7c21", + "size": "459001482" + } + }, + "nvidia_driver": { + "name": "NVIDIA Linux Driver", + "license": "NVIDIA Driver", + "version": "515.43.04", + "linux-x86_64": { + "relative_path": "nvidia_driver/linux-x86_64/nvidia_driver-linux-x86_64-515.43.04-archive.tar.xz", + "sha256": "933ffd8f73e86e78299daf0b8612f8c24fe4b55cc15c2be353fbfbda3f1d62ea", + "md5": "19cf2b2e3d3f6f7786791db89e3a193a", + "size": "361628336" + }, + "linux-ppc64le": { + "relative_path": "nvidia_driver/linux-ppc64le/nvidia_driver-linux-ppc64le-515.43.04-archive.tar.xz", + "sha256": "369998c33a867945193cc3c1c3c78defa7c0309767d926bc871cc02ad659ed61", + "md5": "486f222d765d7ce5163d257a4b0e5420", + "size": "75667264" + }, + "linux-sbsa": { + "relative_path": "nvidia_driver/linux-sbsa/nvidia_driver-linux-sbsa-515.43.04-archive.tar.xz", + "sha256": "a534d8112bc15deb5f0e1c471382d776f4daebef25244869eaf5c935016b8fb7", + "md5": "5e699844a414a6f40e8c1399dd0f4c9d", + "size": "221246660" + } + }, + "nvidia_fs": { + "name": "NVIDIA filesystem", + "license": "CUDA Toolkit", + "version": "2.12.4", + "linux-x86_64": { + "relative_path": "nvidia_fs/linux-x86_64/nvidia_fs-linux-x86_64-2.12.4-archive.tar.xz", + "sha256": "913010942a7b6781a9e8fb8082654fda7ad0cce703f726e05d571fe6551f450a", + "md5": "48d30f73ec1b6c8df7e70139aefeec4e", + "size": "67152" + } + }, + "visual_studio_integration": { + "name": "CUDA Visual Studio Integration", + "license": "CUDA Toolkit", + "version": "11.7.50", + "windows-x86_64": { + "relative_path": "visual_studio_integration/windows-x86_64/visual_studio_integration-windows-x86_64-11.7.50-archive.zip", + "sha256": "4eb993cfb46ec925b6907f1433102ae00f0141e57bcfd40489eeaf72e67f0eeb", + "md5": "d770d51465dc15345a1ca1307e269832", + "size": "517028" + } + } +} \ No newline at end of file From c8fba8254a5f984a215164f84a4fd43c28c6ed82 Mon Sep 17 00:00:00 2001 From: Aidan Gauland Date: Sat, 2 Jul 2022 09:53:27 +1200 Subject: [PATCH 003/142] tensorrt: support multiple CUDA versions Refactor derivation to pick the version that supports the current CUDA version. Based on the implementation of the same concept in the cudnn derivation. --- .../science/math/tensorrt/extension.nix | 63 +++++++++++++++++++ .../math/tensorrt/{8.nix => generic.nix} | 29 ++++++--- pkgs/top-level/cuda-packages.nix | 14 +---- 3 files changed, 85 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/libraries/science/math/tensorrt/extension.nix rename pkgs/development/libraries/science/math/tensorrt/{8.nix => generic.nix} (67%) diff --git a/pkgs/development/libraries/science/math/tensorrt/extension.nix b/pkgs/development/libraries/science/math/tensorrt/extension.nix new file mode 100644 index 000000000000..8e9f64885bad --- /dev/null +++ b/pkgs/development/libraries/science/math/tensorrt/extension.nix @@ -0,0 +1,63 @@ +final: prev: let + + inherit (final) callPackage; + inherit (prev) cudatoolkit cudaVersion lib pkgs; + + ### TensorRT + + buildTensorRTPackage = args: + callPackage ./generic.nix { } args; + + toUnderscore = str: lib.replaceStrings ["."] ["_"] str; + + majorMinorPatch = str: lib.concatStringsSep "." (lib.take 3 (lib.splitVersion str)); + + tensorRTPackages = with lib; let + # Check whether a file is supported for our cuda version + isSupported = fileData: elem cudaVersion fileData.supportedCudaVersions; + # Return the first file that is supported. In practice there should only ever be one anyway. + supportedFile = files: findFirst isSupported null files; + # Supported versions with versions as keys and file as value + supportedVersions = filterAttrs (version: file: file !=null ) (mapAttrs (version: files: supportedFile files) tensorRTVersions); + # Compute versioned attribute name to be used in this package set + computeName = version: "tensorrt_${toUnderscore version}"; + # Add all supported builds as attributes + allBuilds = mapAttrs' (version: file: nameValuePair (computeName version) (buildTensorRTPackage (removeAttrs file ["fileVersionCuda"]))) supportedVersions; + # Set the default attributes, e.g. tensorrt = tensorrt_8_4; + defaultBuild = { "tensorrt" = allBuilds.${computeName tensorRTDefaultVersion}; }; + in allBuilds // defaultBuild; + + tensorRTVersions = { + "8.4.0" = [ + rec { + fileVersionCuda = "11.6"; + fileVersionCudnn = "8.3"; + fullVersion = "8.4.0.6"; + sha256 = "sha256-DNgHHXF/G4cK2nnOWImrPXAkOcNW6Wy+8j0LRpAH/LQ="; + tarball = "TensorRT-${fullVersion}.Linux.x86_64-gnu.cuda-${fileVersionCuda}.cudnn${fileVersionCudnn}.tar.gz"; + supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.5" "11.6" ]; + } + rec { + fileVersionCuda = "10.2"; + fileVersionCudnn = "8.3"; + fullVersion = "8.4.0.6"; + sha256 = "sha256-aCzH0ZI6BrJ0v+e5Bnm7b8mNltA7NNuIa8qRKzAQv+I="; + tarball = "TensorRT-${fullVersion}.Linux.x86_64-gnu.cuda-${fileVersionCuda}.cudnn${fileVersionCudnn}.tar.gz"; + supportedCudaVersions = [ "10.2" ]; + } + ]; + }; + + # Default attributes + tensorRTDefaultVersion = { + "10.2" = "8.4.0"; + "11.0" = "8.4.0"; + "11.1" = "8.4.0"; + "11.2" = "8.4.0"; + "11.3" = "8.4.0"; + "11.4" = "8.4.0"; + "11.5" = "8.4.0"; + "11.6" = "8.4.0"; + }.${cudaVersion}; + +in tensorRTPackages diff --git a/pkgs/development/libraries/science/math/tensorrt/8.nix b/pkgs/development/libraries/science/math/tensorrt/generic.nix similarity index 67% rename from pkgs/development/libraries/science/math/tensorrt/8.nix rename to pkgs/development/libraries/science/math/tensorrt/generic.nix index e80d5f3a6fe0..3447087051f1 100644 --- a/pkgs/development/libraries/science/math/tensorrt/8.nix +++ b/pkgs/development/libraries/science/math/tensorrt/generic.nix @@ -8,20 +8,25 @@ , cudnn }: -assert lib.assertMsg (lib.strings.versionAtLeast cudaVersion "11.0") - "This version of TensorRT requires at least CUDA 11.0 (current version is ${cudaVersion})"; -assert lib.assertMsg (lib.strings.versionAtLeast cudnn.version "8.3") - "This version of TensorRT requires at least cuDNN 8.3 (current version is ${cudnn.version})"; +{ fullVersion +, fileVersionCudnn +, tarball +, sha256 +, supportedCudaVersions ? [ ] +}: + +assert lib.assertMsg (lib.strings.versionAtLeast cudnn.version fileVersionCudnn) + "This version of TensorRT requires at least cuDNN ${fileVersionCudnn} (current version is ${cudnn.version})"; stdenv.mkDerivation rec { pname = "cudatoolkit-${cudatoolkit.majorVersion}-tensorrt"; - version = "8.4.0.6"; + version = fullVersion; src = requireFile rec { - name = "TensorRT-${version}.Linux.x86_64-gnu.cuda-11.6.cudnn8.3.tar.gz"; - sha256 = "sha256-DNgHHXF/G4cK2nnOWImrPXAkOcNW6Wy+8j0LRpAH/LQ="; + name = tarball; + inherit sha256; message = '' - To use the TensorRT derivation, you must join the NVIDIA Developer Program - and download the ${version} Linux x86_64 TAR package from + To use the TensorRT derivation, you must join the NVIDIA Developer Program and + download the ${version} Linux x86_64 TAR package for CUDA ${cudaVersion} from ${meta.homepage}. Once you have downloaded the file, add it to the store with the following @@ -70,6 +75,12 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + # Check that the cudatoolkit version satisfies our min/max constraints (both + # inclusive). We mark the package as broken if it fails to satisfies the + # official version constraints (as recorded in default.nix). In some cases + # you _may_ be able to smudge version constraints, just know that you're + # embarking into unknown and unsupported territory when doing so. + broken = !(elem cudaVersion supportedCudaVersions); description = "TensorRT: a high-performance deep learning interface"; homepage = "https://developer.nvidia.com/tensorrt"; license = licenses.unfree; diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix index af8beb9b58c3..70d57672a0f5 100644 --- a/pkgs/top-level/cuda-packages.nix +++ b/pkgs/top-level/cuda-packages.nix @@ -43,16 +43,6 @@ let }; in { inherit cutensor; }; - tensorrtExtension = final: prev: let - ### Tensorrt - - inherit (final) cudaMajorMinorVersion cudaMajorVersion; - - # TODO: Add derivations for TensorRT versions that support older CUDA versions. - - tensorrt = final.callPackage ../development/libraries/science/math/tensorrt/8.nix { }; - in { inherit tensorrt; }; - extraPackagesExtension = final: prev: { nccl = final.callPackage ../development/libraries/science/math/nccl { }; @@ -74,10 +64,10 @@ let (import ../development/compilers/cudatoolkit/redist/extension.nix) (import ../development/compilers/cudatoolkit/redist/overrides.nix) (import ../development/libraries/science/math/cudnn/extension.nix) + (import ../development/libraries/science/math/tensorrt/extension.nix) (import ../test/cuda/cuda-samples/extension.nix) (import ../test/cuda/cuda-library-samples/extension.nix) cutensorExtension - ] ++ (lib.optional (lib.strings.versionAtLeast cudaVersion "11.0") tensorrtExtension)); - # We only package the current version of TensorRT, which requires CUDA 11. + ]); in (scope.overrideScope' composedExtension) From e28a8e07a6a518645625d0041d72493e3a0e2764 Mon Sep 17 00:00:00 2001 From: Aidan Gauland Date: Sat, 2 Jul 2022 11:09:45 +1200 Subject: [PATCH 004/142] cudnn: fix incorrect hash Hash mismatch for cudnn_8_3_2 discovered when building cudaPackages_10_2.tensorrt, which depends on this version of cudnn. --- pkgs/development/libraries/science/math/cudnn/extension.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/cudnn/extension.nix b/pkgs/development/libraries/science/math/cudnn/extension.nix index f1bdfb9836ed..265e09f436ab 100644 --- a/pkgs/development/libraries/science/math/cudnn/extension.nix +++ b/pkgs/development/libraries/science/math/cudnn/extension.nix @@ -85,7 +85,7 @@ final: prev: let rec { fileVersion = "10.2"; fullVersion = "8.3.2.44"; - hash = "sha256-mKh4TpKGLyABjSDCgbMNSgzZUfk2lPZDPM9K6cUCumo="; + hash = "sha256-1vVu+cqM+PketzIQumw9ykm6REbBZhv6/lXB7EC2aaw="; url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${fileVersion}-archive.tar.xz"; supportedCudaVersions = [ "10.2" ]; } From 8a8c18b31e5f34cbdce47271571ed39e730aeb88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Fri, 22 Jul 2022 18:46:13 -0400 Subject: [PATCH 005/142] flatbuffers: 2.0.0 -> 2.0.6 - Looks like the tests need access to files in the '/tests' directory, so this path needs to be patched now. (Apparently upstream uses 'cmake .', and something broke between the versions for out of source builds.) - Python is needed to generate tests, according to CMake output. - Disable generation of universal binaries on Darwin. --- .../libraries/flatbuffers/default.nix | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix index a6eefe77c460..d5675990cc3a 100644 --- a/pkgs/development/libraries/flatbuffers/default.nix +++ b/pkgs/development/libraries/flatbuffers/default.nix @@ -3,33 +3,30 @@ , fetchFromGitHub , fetchpatch , cmake +, python3 }: stdenv.mkDerivation rec { pname = "flatbuffers"; - version = "2.0.0"; + version = "2.0.6"; src = fetchFromGitHub { owner = "google"; repo = "flatbuffers"; rev = "v${version}"; - sha256 = "1zbf6bdpps8369r1ql00irxrp58jnalycc8jcapb8iqg654vlfz8"; + sha256 = "sha256-0bJ0n/5yzj6lHXLKJzHUS0Bnlmys+X7pY/3LGapVh6k="; }; - patches = [ - # Pull patch pending upstream inclustion for gcc-12 support: - # https://github.com/google/flatbuffers/pull/6946 - (fetchpatch { - name = "gcc-12.patch"; - url = "https://github.com/google/flatbuffers/commit/17d9f0c4cf47a9575b4f43a2ac33eb35ba7f9e3e.patch"; - sha256 = "0sksk47hi7camja9ppnjr88jfdgj0nxqxy8976qs1nx73zkgbpf9"; - }) - ]; + nativeBuildInputs = [ cmake python3 ]; - nativeBuildInputs = [ cmake ]; + postPatch = '' + # Fix default value of "test_data_path" to make tests work + substituteInPlace tests/test.cpp --replace '"tests/";' '"../tests/";' + ''; cmakeFlags = [ "-DFLATBUFFERS_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" + "-DFLATBUFFERS_OSX_BUILD_UNIVERSAL=OFF" ]; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; From bc279962123fadb47726c47f12d5bb7eff16b8c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Tue, 26 Jul 2022 01:10:06 -0400 Subject: [PATCH 006/142] pmd: 6.43.0 -> 6.47.0 - Download from GitHub releases as the webpage does. - Fix installation: - Put jars into a private `$out/lib/pmd` directory. - Don't install .bat files into `$out/bin`. - Don't use `run.sh` as the main binary, put it in `$out/libexec` with a proper name. - Create binary wrappers for all programs instead of using `run.sh `. --- .../tools/analysis/pmd/default.nix | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index 503d5c630498..25259ae64cd3 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -2,20 +2,32 @@ stdenv.mkDerivation rec { pname = "pmd"; - version = "6.43.0"; + version = "6.47.0"; src = fetchurl { - url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "sha256-+eJCN890vm4WBcMZ2VCGOS8WUyIckL+DfQVNaUSovGE="; + url = "https://github.com/pmd/pmd/releases/download/pmd_releases/${version}/pmd-bin-${version}.zip"; + hash = "sha256-0rOV6l5VCdBkk5+F/k2vYtHQWzwugvp3ogaTRuXUKXE="; }; nativeBuildInputs = [ unzip makeWrapper ]; + dontConfigure = true; + dontBuild = true; + installPhase = '' runHook preInstall - mkdir -p $out - cp -R {bin,lib} $out - wrapProgram $out/bin/run.sh --prefix PATH : ${openjdk.jre}/bin + + install -Dm755 bin/run.sh $out/libexec/pmd + install -Dm644 lib/*.jar -t $out/lib/pmd + + wrapProgram $out/libexec/pmd \ + --prefix PATH : ${openjdk.jre}/bin \ + --set LIB_DIR $out/lib/pmd + + for app in pmd cpd cpdgui designer bgastviewer designerold ast-dump; do + makeWrapper $out/libexec/pmd $out/bin/$app --argv0 $app --add-flags $app + done + runHook postInstall ''; From 92fbf8d9b987af2a6215d044d0b0b46a78112954 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Jul 2022 22:34:05 +0000 Subject: [PATCH 007/142] sentry-native: 0.4.15 -> 0.4.18 --- pkgs/development/libraries/sentry-native/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sentry-native/default.nix b/pkgs/development/libraries/sentry-native/default.nix index 1c29b85bebe7..a52751af71de 100644 --- a/pkgs/development/libraries/sentry-native/default.nix +++ b/pkgs/development/libraries/sentry-native/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sentry-native"; - version = "0.4.15"; + version = "0.4.18"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; rev = version; - sha256 = "sha256-XHJa4erDxSFiy0u8S9ODQlMNDb1wrz+d1PzWeq5BZLY="; + sha256 = "sha256-2WNmpx6ReVmsRvKHAaZznGuugvmLxK25P1WdmorNj/g="; }; nativeBuildInputs = [ cmake ]; From 1f6f5044077b3c79db8e4a491f82b5099bdd3480 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 30 Jul 2022 15:51:56 +0800 Subject: [PATCH 008/142] wdt: unstable-2022-03-24 -> unstable-2022-07-08, add updateScript --- .../networking/sync/wdt/default.nix | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/sync/wdt/default.nix b/pkgs/applications/networking/sync/wdt/default.nix index 53a112790bae..f24e1255d5e8 100644 --- a/pkgs/applications/networking/sync/wdt/default.nix +++ b/pkgs/applications/networking/sync/wdt/default.nix @@ -1,14 +1,26 @@ -{ stdenv, lib, fetchFromGitHub, cmake, folly, boost, gflags, glog, openssl, double-conversion, fmt }: +{ stdenv +, lib +, fetchFromGitHub +, cmake +, folly +, boost +, gflags +, glog +, openssl +, double-conversion +, fmt +, unstableGitUpdater +}: stdenv.mkDerivation { pname = "wdt"; - version = "unstable-2022-03-24"; + version = "unstable-2022-07-08"; src = fetchFromGitHub { owner = "facebook"; repo = "wdt"; - rev = "43319e59d0c77092468367cdadab37d12d7a2383"; - sha256 = "sha256-MajYK2eTUbWhEql0iTlgW5yLg9xAGZQk+Dx4fNxFFqw="; + rev = "8f01b7558a80e5f08b06244d2821c3eb5c1d6e9b"; + sha256 = "sha256-ozii7EA3j3F/o+lE2mPsUY5lrm3OOtK75gjGkrvoaQ0="; }; nativeBuildInputs = [ cmake ]; @@ -24,6 +36,10 @@ stdenv.mkDerivation { "-DWDT_USE_SYSTEM_FOLLY=ON" ]; + passthru = { + updateScript = unstableGitUpdater { }; + }; + meta = with lib; { description = "Warp speed Data Transfer"; homepage = "https://github.com/facebook/wdt"; From c0fd5047a22501e802992b11bfe49aa119a78666 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Jul 2022 02:47:40 +0000 Subject: [PATCH 009/142] svls: 0.2.0 -> 0.2.4 --- pkgs/development/tools/misc/svls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/svls/default.nix b/pkgs/development/tools/misc/svls/default.nix index 2e3075c7b128..22703a4afc38 100644 --- a/pkgs/development/tools/misc/svls/default.nix +++ b/pkgs/development/tools/misc/svls/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "svls"; - version = "0.2.0"; + version = "0.2.4"; src = fetchFromGitHub { owner = "dalance"; repo = "svls"; rev = "v${version}"; - sha256 = "sha256-WZuFYiPV6HbBH9QT4h9FbnmkbFBadUaV0HujiQ0hu7I="; + sha256 = "sha256-m7xV5sQZnRytT3QY1a9qihZV0Ub6zKjfDytZ+TDwdFg="; }; - cargoSha256 = "sha256-tafxN3ots1UTSv950NlwCs6TItMnKz5tn5vw7PTcARU="; + cargoSha256 = "sha256-993XWYSUC2KuV2/dgTYAatoy5lGIveT3lL7eOYsbCig="; meta = with lib; { description = "SystemVerilog language server"; From dfec31bd4a9bae52a9ad88bc6a187a425806bfe8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Jul 2022 03:34:28 +0000 Subject: [PATCH 010/142] tilt: 0.30.4 -> 0.30.5 --- pkgs/applications/networking/cluster/tilt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index 1dd8361f2032..b97b20d6be6a 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.30.4"; + version = "0.30.5"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AdT3qL0frsTi4R4AbmZlPDx0Q2RixC3e4AyEMgGgnlc="; + sha256 = "sha256-K7vQ2Pz35/ye5AhUez/fN7PhW3KRv5/4duG4JpvO5vY="; }; vendorSha256 = null; From f1290637525519dc29709b17cb23d4aa2f557539 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Jul 2022 03:56:45 +0000 Subject: [PATCH 011/142] trunk: 0.15.0 -> 0.16.0 --- pkgs/development/tools/trunk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/trunk/default.nix b/pkgs/development/tools/trunk/default.nix index 3c40a0c0ce8e..804acffc2df1 100644 --- a/pkgs/development/tools/trunk/default.nix +++ b/pkgs/development/tools/trunk/default.nix @@ -3,13 +3,13 @@ rustPlatform.buildRustPackage rec { pname = "trunk"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "thedodd"; repo = "trunk"; rev = "v${version}"; - sha256 = "sha256-VHUs/trR1M5WacEA0gwKLkGtsws9GFmn1vK0kRxpNII="; + sha256 = "sha256-6o+frbLtuw+DwJiWv4x11qX4GUffhxF19pi/7FLYmHA="; }; nativeBuildInputs = [ pkg-config ]; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { # requires network checkFlags = [ "--skip=tools::tests::download_and_install_binaries" ]; - cargoSha256 = "sha256-czXe9W+oR1UV7zGZiiHcbydzH6sowa/8upm+5lkPG1U="; + cargoSha256 = "sha256-j/i2io1JfcNA7eeAXAAKMBtHORZm4J5dOFFNnzvx2cg="; meta = with lib; { homepage = "https://github.com/thedodd/trunk"; From 9dc3600b6328b8e123c9a9808577da036074f7f9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Jul 2022 05:05:38 +0000 Subject: [PATCH 012/142] uthenticode: 1.0.8 -> 1.0.9 --- pkgs/development/libraries/uthenticode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/uthenticode/default.nix b/pkgs/development/libraries/uthenticode/default.nix index c342ee4d70d3..06579c2d4731 100644 --- a/pkgs/development/libraries/uthenticode/default.nix +++ b/pkgs/development/libraries/uthenticode/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "uthenticode"; - version = "1.0.8"; + version = "1.0.9"; src = fetchFromGitHub { owner = "trailofbits"; repo = "uthenticode"; rev = "v${version}"; - hash = "sha256-H4fAHZM+vYaUkXZE4f7r2bxw9dno7O+lYrqQ9/6YPWA="; + hash = "sha256-MEpbvt03L501BP42j6S7rXE9j1d8j6D2Y5kgPNlbHzc="; }; cmakeFlags = [ "-DBUILD_TESTS=1" "-DUSE_EXTERNAL_GTEST=1" ]; From b58a1ebacc49becdfde21097c305bbfae70e938a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Jul 2022 05:05:56 +0000 Subject: [PATCH 013/142] uxplay: 1.52 -> 1.55 --- pkgs/servers/uxplay/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/uxplay/default.nix b/pkgs/servers/uxplay/default.nix index 46c68e349f46..e11cdad33519 100644 --- a/pkgs/servers/uxplay/default.nix +++ b/pkgs/servers/uxplay/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "uxplay"; - version = "1.52"; + version = "1.55"; src = fetchFromGitHub { owner = "FDH2"; repo = "UxPlay"; rev = "v${version}"; - sha256 = "sha256-2wPUG50fbXLg6w2Rni3NyeiCyUNPcOvxvqopD9QZJaQ="; + sha256 = "sha256-X5+vqGhgEQqjbzSs58t1/znlhlDJHLUwgNokYV7xNhc="; }; nativeBuildInputs = [ From a98fc8a64c6a254260d16fdd230d5ff92bb748ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Jul 2022 05:24:13 +0000 Subject: [PATCH 014/142] visualvm: 2.1.2 -> 2.1.4 --- pkgs/development/tools/java/visualvm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix index ee72bc62efae..82f93cb73e66 100644 --- a/pkgs/development/tools/java/visualvm/default.nix +++ b/pkgs/development/tools/java/visualvm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gawk }: stdenv.mkDerivation rec { - version = "2.1.2"; + version = "2.1.4"; pname = "visualvm"; src = fetchzip { url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip"; - sha256 = "sha256-khbXzdsC0PA10HEu/dIFQ87+QbKpctmTUTt/zEuxV6c="; + sha256 = "sha256-o7gcKJy3gDUV3WPo5vO+5Zyyz1UVC2wGRTxZL69RxNE="; }; desktopItem = makeDesktopItem { From 7410e16ce023661bdba0ecb74dcd59c270731f85 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Jul 2022 06:01:46 +0000 Subject: [PATCH 015/142] webdav: 4.1.1 -> 4.2.0 --- pkgs/servers/webdav/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/webdav/default.nix b/pkgs/servers/webdav/default.nix index 4a3aca9f6e91..35744ba6e3d2 100644 --- a/pkgs/servers/webdav/default.nix +++ b/pkgs/servers/webdav/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "webdav"; - version = "4.1.1"; + version = "4.2.0"; src = fetchFromGitHub { owner = "hacdias"; repo = "webdav"; rev = "v${version}"; - sha256 = "0jnh1bhc98vcx2vm6hmgak6zwfc0rx898qcdjcca5y9dni4120aq"; + sha256 = "sha256-4rgDO1vItmmCRXRiO24MPa9IPzrsfzCWLH6hl6oKkxk="; }; - vendorSha256 = "19nhz6z8h4fxpy4gjx7zz69si499jak7qj9yb17x32lar5m88gvb"; + vendorSha256 = "sha256-az+EasmKitFPWD5JfKaSKZGok/n/dPmIv90RiL750KY="; meta = with lib; { description = "Simple WebDAV server"; From 1b4010157d0e8bb96ec5ed45c85fa8f74b8a6fad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Jul 2022 07:08:26 +0000 Subject: [PATCH 016/142] yank: 1.2.0 -> 1.3.0 --- pkgs/tools/misc/yank/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/yank/default.nix b/pkgs/tools/misc/yank/default.nix index dbbe14cf3864..9579b3fa3f50 100644 --- a/pkgs/tools/misc/yank/default.nix +++ b/pkgs/tools/misc/yank/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "yank"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "mptre"; repo = "yank"; rev = "v${version}"; - sha256 = "1izygx7f1z35li74i2cwca0p28c3v8fbr7w72dwpiqdaiwywa8xc"; + sha256 = "sha256-sZiZki2Zl0Tfmls5KrLGxT94Bdf9TA9EwoaLoFOX9B4="; }; installFlags = [ "PREFIX=$(out)" ]; From 151de591c5fa0f86e9bb20b8c0106908a54499bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Jul 2022 07:27:50 +0000 Subject: [PATCH 017/142] zxcvbn-c: 2.4 -> 2.5 --- pkgs/development/libraries/zxcvbn-c/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/zxcvbn-c/default.nix b/pkgs/development/libraries/zxcvbn-c/default.nix index e74bb9ddc32e..528d545c37c6 100644 --- a/pkgs/development/libraries/zxcvbn-c/default.nix +++ b/pkgs/development/libraries/zxcvbn-c/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "zxcvbn-c"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "tsyrogit"; repo = "zxcvbn-c"; rev = "v${version}"; - sha256 = "12ksdnpxlqlmg9zhyyk3bspcf0sfj5zk735vr4ry635qi7gzcaas"; + sha256 = "sha256-RKqbv0iGkjS7Y7KikqglZ+AK1oiw4G1mB2Zg87tOlbI="; }; installPhase = '' From a1680d22dfe6def2217c14f5f86a7d2bf65c1a5c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Jul 2022 15:22:12 +0000 Subject: [PATCH 018/142] jags: 4.3.0 -> 4.3.1 --- pkgs/applications/science/math/jags/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/jags/default.nix b/pkgs/applications/science/math/jags/default.nix index 3ddcd6206d68..1acc6a287ca5 100644 --- a/pkgs/applications/science/math/jags/default.nix +++ b/pkgs/applications/science/math/jags/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "JAGS"; - version = "4.3.0"; + version = "4.3.1"; src = fetchurl { url = "mirror://sourceforge/mcmc-jags/JAGS-${version}.tar.gz"; - sha256 = "1z3icccg2ic56vmhyrpinlsvpq7kcaflk1731rgpvz9bk1bxvica"; + sha256 = "sha256-+SWDVbXp6xO9M8X6cg8MvrrOp9CkpCtxsPsUUB7hQik="; }; nativeBuildInputs = [ gfortran ]; From 7a3af371b3537a47b279de40392a401dc2273d9b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Jul 2022 17:59:01 +0000 Subject: [PATCH 019/142] kore: 4.2.1 -> 4.2.2 --- pkgs/development/web/kore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/kore/default.nix b/pkgs/development/web/kore/default.nix index 7a3ec5fe4ae3..affadf281c36 100644 --- a/pkgs/development/web/kore/default.nix +++ b/pkgs/development/web/kore/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kore"; - version = "4.2.1"; + version = "4.2.2"; src = fetchFromGitHub { owner = "jorisvink"; repo = pname; rev = version; - sha256 = "sha256-MC4PCjRuAqWuGvNDsZXKohb4HdSWMV0Oc0pZ0rnhG7Y="; + sha256 = "sha256-B1Fm02EHkV4mogz4PrqdZWvRQ8ixO+sRhvqW7ObzJjY="; }; buildInputs = [ openssl curl postgresql yajl ]; From cc8c4fe20dbba4a3940ecd2de1a40ccfda165218 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 31 Jul 2022 15:41:35 -0300 Subject: [PATCH 020/142] libsForQt5.qtstyleplugin-kvantum: 1.0.3 -> 1.0.4 --- pkgs/development/libraries/qtstyleplugin-kvantum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index 3fd891a90510..313d82c5928c 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - sha256 = "hY8QQVcP3E+GAdLOqtVbqCWBcxS2M6sMOr/vr+DryyQ="; + sha256 = "chdtcx73mfr/b1P3yVevx0m7HkMFzEYG7YLuhSyG7rk="; }; nativeBuildInputs = [ From 83b80dc8b12ccf0ad979e73bbb0e264bdb46f5ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 1 Aug 2022 06:45:19 +0000 Subject: [PATCH 021/142] pipecontrol: 0.2.2 -> 0.2.4 --- pkgs/applications/audio/pipecontrol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/pipecontrol/default.nix b/pkgs/applications/audio/pipecontrol/default.nix index 4acba5d75ee0..a2abab72ec69 100644 --- a/pkgs/applications/audio/pipecontrol/default.nix +++ b/pkgs/applications/audio/pipecontrol/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "pipecontrol"; - version = "0.2.2"; + version = "0.2.4"; src = fetchFromGitHub { owner = "portaloffreedom"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BeubRDx82MQX1gB7GnGJlQ2FyYX1S83C3gqPZgIjgoM="; + sha256 = "sha256-F3faJMkvjAY6A5ieNpAxjk6BHPb6uCvYYfwrI9/Iskg="; }; nativeBuildInputs = [ From 827a791b53b8833a26c89ac904d0dd0ca1a167fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 1 Aug 2022 08:20:49 +0000 Subject: [PATCH 022/142] python310Packages.pytest-mpl: 0.16.0 -> 0.16.1 --- pkgs/development/python-modules/pytest-mpl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-mpl/default.nix b/pkgs/development/python-modules/pytest-mpl/default.nix index 98f09edc68a1..e5bf251def6c 100644 --- a/pkgs/development/python-modules/pytest-mpl/default.nix +++ b/pkgs/development/python-modules/pytest-mpl/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "pytest-mpl"; - version = "0.16.0"; + version = "0.16.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-TTqagfB15FEAxk+VWsEfaELT+B6Tw0wtXFi3wD2kD/0="; + sha256 = "sha256-LVcWgRJOj/X04rnA0EfTfQSZ1rbY8vSaG1DN2ZMQRGk="; }; nativeBuildInputs = [ From 91a9c034eb561ce50a4b6754abcef56c6f0f6ab6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 1 Aug 2022 09:11:26 +0000 Subject: [PATCH 023/142] python310Packages.rcssmin: 1.1.0 -> 1.1.1 --- pkgs/development/python-modules/rcssmin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rcssmin/default.nix b/pkgs/development/python-modules/rcssmin/default.nix index ab74662e3b4c..1d1033944f01 100644 --- a/pkgs/development/python-modules/rcssmin/default.nix +++ b/pkgs/development/python-modules/rcssmin/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "rcssmin"; - version = "1.1.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "27fc400627fd3d328b7fe95af2a01f5d0af6b5af39731af5d071826a1f08e362"; + sha256 = "sha256-T5QAtDZtKfX1RG9Y54VJr6gzjmpZdAxzEV6fasQT3GQ="; }; # The package does not ship tests, and the setup machinary confuses From 9f1e8b93b39c22668915e9a81965c5dc04e87f47 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 1 Aug 2022 10:10:19 +0000 Subject: [PATCH 024/142] python310Packages.rjsmin: 1.2.0 -> 1.2.1 --- pkgs/development/python-modules/rjsmin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rjsmin/default.nix b/pkgs/development/python-modules/rjsmin/default.nix index 2dbc72b1d0ca..426ec492b042 100644 --- a/pkgs/development/python-modules/rjsmin/default.nix +++ b/pkgs/development/python-modules/rjsmin/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "rjsmin"; - version = "1.2.0"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "6c529feb6c400984452494c52dd9fdf59185afeacca2afc5174a28ab37751a1b"; + sha256 = "sha256-H5gr6OARQ4d3qUMHJ5tAE0o5NfwPB5MS7imXJbivVBE="; }; # The package does not ship tests, and the setup machinary confuses From 2793f7612f375b207a176a08a8619bb0fdb6608b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 1 Aug 2022 14:26:31 +0000 Subject: [PATCH 025/142] golangci-lint: 1.47.2 -> 1.47.3 --- pkgs/development/tools/golangci-lint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index c57675efa9fd..d11576a5e01e 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.47.2"; + version = "1.47.3"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "sha256-ttxRVmv1Z/NOjzVN7izBJm5xQWdSAm/jTzw0klFzyck="; + sha256 = "sha256-uY8D3VqcaLEi/QChH/kfY9SF3H2wmiScm3m6OGeWTu8="; }; - vendorSha256 = "sha256-zIsvXtyC3wjfoKcOJ1MG/KSGApuVlvuHDYDmbmGEgTc="; + vendorSha256 = "sha256-F7arWygCbh9Z6zemPt+0T6wWMcP2Wg5A1qC6A7mYngI="; doCheck = false; From 05b3ee0e454554bac7df4771a4babdcbe1b6e7da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 1 Aug 2022 21:17:41 +0000 Subject: [PATCH 026/142] strongswan: 5.9.5 -> 5.9.7 --- pkgs/tools/networking/strongswan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 560457bdaa5d..6c6dffbef14d 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -18,13 +18,13 @@ with lib; stdenv.mkDerivation rec { pname = "strongswan"; - version = "5.9.5"; # Make sure to also update when upgrading! + version = "5.9.7"; # Make sure to also update when upgrading! src = fetchFromGitHub { owner = "strongswan"; repo = "strongswan"; rev = version; - sha256 = "sha256-Jx0Wd/xgkl/WrBfcEvZPogPAQp0MW9HE+AQR2anP5Vo="; + sha256 = "sha256-4FOeY3a6DyftrbFtBqtY0nLxdIXPnY91wMAVIBm/KvY="; }; dontPatchELF = true; From 6cf054449b58fbdc19c97f0f9f136beb789eae94 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Aug 2022 05:55:23 +0000 Subject: [PATCH 027/142] wordpress: 6.0 -> 6.0.1 --- pkgs/servers/web-apps/wordpress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index 41b42f3762e7..cc13317b0be6 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wordpress"; - version = "6.0"; + version = "6.0.1"; src = fetchurl { url = "https://wordpress.org/${pname}-${version}.tar.gz"; - sha256 = "sha256-GIfzIj2wHW2Ijfd+oLO43eTGJDlhprSG0b7hvpMkvwg="; + sha256 = "sha256-9nhZaASqidfNySgIYpOEZOqyWurr/vqRrhdeFao+8FQ="; }; installPhase = '' From 2ef718e01e92370e1097955b02119b3047a805aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Aug 2022 06:53:48 +0000 Subject: [PATCH 028/142] wallabag: 2.5.0 -> 2.5.1 --- pkgs/servers/web-apps/wallabag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix index 0f47ec0dca6e..cf11bcf92981 100644 --- a/pkgs/servers/web-apps/wallabag/default.nix +++ b/pkgs/servers/web-apps/wallabag/default.nix @@ -15,7 +15,7 @@ let pname = "wallabag"; - version = "2.5.0"; + version = "2.5.1"; in stdenv.mkDerivation { inherit pname version; @@ -23,7 +23,7 @@ stdenv.mkDerivation { # GitHub distribution does not include vendored files src = fetchurl { url = "https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz"; - hash = "sha256-fE/4bVwImQ03wrfdrx6AlulO2xU1M2HIaSOGpTAb02E="; + hash = "sha256-vurjWI5Sh/SFPtxd5cHaaw7edcAzNub/duhOUF+Wshk="; }; patches = [ From e5a19c9ec939b4fa08deb16b490f2632d545e9d4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Aug 2022 07:30:39 +0000 Subject: [PATCH 029/142] xmlsec: 1.2.33 -> 1.2.34 --- pkgs/development/libraries/xmlsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index 187e6900aa07..e4c0e57e76c2 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -4,11 +4,11 @@ lib.fix (self: stdenv.mkDerivation rec { pname = "xmlsec"; - version = "1.2.33"; + version = "1.2.34"; src = fetchurl { url = "https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"; - sha256 = "sha256-JgQdNaIKJF7Vovue4HXxCCVmTSdCIMtRkDQPqHpNCTE="; + sha256 = "sha256-Us7UlD81vX0IGKOCmMFSjKSsilRED9cRNKB9LRNwomI="; }; patches = [ From b139e331a40bd93e4d35084fe67c40c2c7d5ae3d Mon Sep 17 00:00:00 2001 From: David Guibert Date: Wed, 29 Jun 2022 09:24:18 +0200 Subject: [PATCH 030/142] cudatoolkit: add 11.7 --- pkgs/development/compilers/cudatoolkit/redist/extension.nix | 1 + pkgs/development/compilers/cudatoolkit/versions.toml | 6 ++++++ pkgs/development/libraries/science/math/cudnn/extension.nix | 3 ++- pkgs/test/cuda/cuda-samples/extension.nix | 3 +++ pkgs/top-level/all-packages.nix | 3 ++- 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/cudatoolkit/redist/extension.nix b/pkgs/development/compilers/cudatoolkit/redist/extension.nix index 65057b90a03c..17327efb4013 100644 --- a/pkgs/development/compilers/cudatoolkit/redist/extension.nix +++ b/pkgs/development/compilers/cudatoolkit/redist/extension.nix @@ -11,6 +11,7 @@ final: prev: let "11.4" = ./manifests/redistrib_11.4.4.json; "11.5" = ./manifests/redistrib_11.5.2.json; "11.6" = ./manifests/redistrib_11.6.2.json; + "11.7" = ./manifests/redistrib_11.7.0.json; }; # Function to build a single cudatoolkit redist package diff --git a/pkgs/development/compilers/cudatoolkit/versions.toml b/pkgs/development/compilers/cudatoolkit/versions.toml index 46173cca12cd..51b79ca97be6 100644 --- a/pkgs/development/compilers/cudatoolkit/versions.toml +++ b/pkgs/development/compilers/cudatoolkit/versions.toml @@ -59,3 +59,9 @@ version = "11.6.1" url = "https://developer.download.nvidia.com/compute/cuda/11.6.1/local_installers/cuda_11.6.1_510.47.03_linux.run" sha256 = "sha256-qyGa/OALdCABEyaYZvv/derQN7z8I1UagzjCaEyYTX4=" gcc = "gcc11" + +["11.7"] +version = "11.7.0" +url = "https://developer.download.nvidia.com/compute/cuda/11.7.0/local_installers/cuda_11.7.0_515.43.04_linux.run" +sha256 = "sha256-CH/fy7ofeVQ7H3jkOo39rF9tskLQQt3oIOFtwYWJLyY=" +gcc = "gcc11" diff --git a/pkgs/development/libraries/science/math/cudnn/extension.nix b/pkgs/development/libraries/science/math/cudnn/extension.nix index f1bdfb9836ed..175854fd27fb 100644 --- a/pkgs/development/libraries/science/math/cudnn/extension.nix +++ b/pkgs/development/libraries/science/math/cudnn/extension.nix @@ -94,7 +94,7 @@ final: prev: let fullVersion = "8.3.2.44"; hash = "sha256-VQCVPAjF5dHd3P2iNPnvvdzb5DpTsm3AqCxyP6FwxFc="; url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${fileVersion}-archive.tar.xz"; - supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.4" "11.5" "11.6" ]; + supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.4" "11.5" "11.6" "11.7" ]; } ]; }; @@ -111,6 +111,7 @@ final: prev: let "11.4" = "8.3.2"; "11.5" = "8.3.2"; "11.6" = "8.3.2"; + "11.7" = "8.3.2"; }.${cudaVersion}; in cuDnnPackages diff --git a/pkgs/test/cuda/cuda-samples/extension.nix b/pkgs/test/cuda/cuda-samples/extension.nix index 4c93845d1db6..167b6483bb78 100644 --- a/pkgs/test/cuda/cuda-samples/extension.nix +++ b/pkgs/test/cuda/cuda-samples/extension.nix @@ -11,6 +11,9 @@ final: prev: let "11.4" = "082dkk5y34wyvjgj2p5j1d00rk8xaxb9z0mhvz16bd469r1bw2qk"; "11.5" = "sha256-AKRZbke0K59lakhTi8dX2cR2aBuWPZkiQxyKaZTvHrI="; "11.6" = "sha256-AsLNmAplfuQbXg9zt09tXAuFJ524EtTYsQuUlV1tPkE="; + # the tag 11.7 does not exists: see https://github.com/NVIDIA/cuda-samples/issues/128 + # maybe fixed by https://github.com/NVIDIA/cuda-samples/pull/133 + "11.7" = prev.lib.fakeSha256; }.${prev.cudaVersion}; in { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92c47cbd5be2..1391cdeebf37 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5192,7 +5192,8 @@ with pkgs; cudaPackages_11_4 = callPackage ./cuda-packages.nix { cudaVersion = "11.4"; }; cudaPackages_11_5 = callPackage ./cuda-packages.nix { cudaVersion = "11.5"; }; cudaPackages_11_6 = callPackage ./cuda-packages.nix { cudaVersion = "11.6"; }; - cudaPackages_11 = cudaPackages_11_6; + cudaPackages_11_7 = callPackage ./cuda-packages.nix { cudaVersion = "11.7"; }; + cudaPackages_11 = cudaPackages_11_7; cudaPackages = recurseIntoAttrs cudaPackages_11; # TODO: move to alias From 9aaf5daa7eab7db99182081e22a9d38482a8fcb4 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Thu, 30 Jun 2022 08:06:38 +0200 Subject: [PATCH 031/142] nsight_compute: qt6 for version 2022.2.0 --- .../compilers/cudatoolkit/redist/overrides.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/cudatoolkit/redist/overrides.nix b/pkgs/development/compilers/cudatoolkit/redist/overrides.nix index 588f2f2a0867..2f0a8c1f0227 100644 --- a/pkgs/development/compilers/cudatoolkit/redist/overrides.nix +++ b/pkgs/development/compilers/cudatoolkit/redist/overrides.nix @@ -37,8 +37,12 @@ in (lib.filterAttrs (attr: _: (prev ? "${attr}")) { ]; nsight_compute = prev.nsight_compute.overrideAttrs (oldAttrs: { - nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ pkgs.qt5.wrapQtAppsHook ]; - buildInputs = oldAttrs.buildInputs ++ [ pkgs.libsForQt5.qt5.qtwebview ]; + nativeBuildInputs = oldAttrs.nativeBuildInputs + ++ lib.optionals (lib.versionOlder prev.nsight_compute.version "2022.2.0") [ pkgs.qt5.wrapQtAppsHook ] + ++ lib.optionals (lib.versionAtLeast prev.nsight_compute.version "2022.2.0") [ pkgs.qt6.wrapQtAppsHook ]; + buildInputs = oldAttrs.buildInputs + ++ lib.optionals (lib.versionOlder prev.nsight_compute.version "2022.2.0") [ pkgs.qt5.qtwebview ] + ++ lib.optionals (lib.versionAtLeast prev.nsight_compute.version "2022.2.0") [ pkgs.qt6.qtwebview ]; }); nsight_systems = prev.nsight_systems.overrideAttrs (oldAttrs: { From 79bc66cea599c89925a7674c59ff5174a44a4c5e Mon Sep 17 00:00:00 2001 From: David Guibert Date: Sat, 2 Jul 2022 17:06:24 +0200 Subject: [PATCH 032/142] redistrib_11.7.0.json: add eol --- .../cudatoolkit/redist/manifests/redistrib_11.7.0.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_11.7.0.json b/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_11.7.0.json index 2374cabfe1e6..2fc999afd700 100644 --- a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_11.7.0.json +++ b/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_11.7.0.json @@ -876,4 +876,4 @@ "size": "517028" } } -} \ No newline at end of file +} From a43d296d12cc3b9e77cd1798df22cc4596373541 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Tue, 2 Aug 2022 16:15:37 +0200 Subject: [PATCH 033/142] cudnn: add 8.4.0 --- .../libraries/science/math/cudnn/extension.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/cudnn/extension.nix b/pkgs/development/libraries/science/math/cudnn/extension.nix index 175854fd27fb..14c7c147de56 100644 --- a/pkgs/development/libraries/science/math/cudnn/extension.nix +++ b/pkgs/development/libraries/science/math/cudnn/extension.nix @@ -97,6 +97,22 @@ final: prev: let supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.4" "11.5" "11.6" "11.7" ]; } ]; + "8.4.0" = [ + rec { + fileVersion = "10.2"; + fullVersion = "8.4.0.27"; + hash = "sha256-FMXjykJYJxmW0f2VnELRfFgs5Nmv9FH4RSRGnnhP0VQ="; + url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${fileVersion}-archive.tar.xz"; + supportedCudaVersions = [ "10.2" ]; + } + rec { + fileVersion = "11.6"; + fullVersion = "8.4.0.27"; + hash = "sha256-0Zva/ZgAx50p5vb/+p+eLBDREy1sL/ELFZPgV+dN0FA="; + url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${fileVersion}-archive.tar.xz"; + supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.4" "11.5" "11.6" "11.7" ]; + } + ]; }; # Default attributes @@ -111,7 +127,7 @@ final: prev: let "11.4" = "8.3.2"; "11.5" = "8.3.2"; "11.6" = "8.3.2"; - "11.7" = "8.3.2"; + "11.7" = "8.4.0"; }.${cudaVersion}; in cuDnnPackages From ace834a155c79d3a04ec8e8738564433659ba2fe Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Tue, 2 Aug 2022 12:27:46 -0700 Subject: [PATCH 034/142] svd2rust: 0.24.1 -> 0.25.0 --- pkgs/development/tools/rust/svd2rust/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/development/tools/rust/svd2rust/default.nix index 7efcfb08c479..ca40554c1832 100644 --- a/pkgs/development/tools/rust/svd2rust/default.nix +++ b/pkgs/development/tools/rust/svd2rust/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "svd2rust"; - version = "0.24.1"; + version = "0.25.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-BIATH7GsTPtvEFpCb8Kfb0k6s8K7xfhRHni+IgzAQ8k="; + sha256 = "sha256-k+/FxVCUPQuVXZFk+FE3cAtAf/YCgk/fGVtRKIeefJ8="; }; - cargoSha256 = "sha256-kg+QW84bq+aD3/t0DmtL1W8ESC5Ug4X+I0pFJRalu7Q="; + cargoSha256 = "sha256-RxpBhA5lf+mcr4VMtsrdzlxN8oDttNcWuwxQAAYN8U8="; buildInputs = lib.optional stdenv.isDarwin libiconv; From c4ba4b2562a58f0587145747e11be8b0bfed57ae Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 3 Aug 2022 11:02:48 +0800 Subject: [PATCH 035/142] jumpy: rename from fishfight, 0.4.2 -> 0.4.3 --- pkgs/games/{fishfight => jumpy}/default.nix | 10 +++++----- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) rename pkgs/games/{fishfight => jumpy}/default.nix (82%) diff --git a/pkgs/games/fishfight/default.nix b/pkgs/games/jumpy/default.nix similarity index 82% rename from pkgs/games/fishfight/default.nix rename to pkgs/games/jumpy/default.nix index 9e5bbde8cf72..2afba817fc00 100644 --- a/pkgs/games/fishfight/default.nix +++ b/pkgs/games/jumpy/default.nix @@ -13,17 +13,17 @@ }: rustPlatform.buildRustPackage rec { - pname = "fishfight"; - version = "0.4.2"; + pname = "jumpy"; + version = "0.4.3"; src = fetchFromGitHub { - owner = "fishfight"; + owner = "fishfolks"; repo = pname; rev = "v${version}"; - sha256 = "sha256-q1Hh4P/huoFuW/+Mb9yKUMKaky1RshGpjrObBHRCk+8="; + sha256 = "sha256-01zhiQi6v/8ZajsdBU+4hKUCj+PRJ/vUHluOIzy/Gi8="; }; - cargoSha256 = "sha256-PEGK95eXIHv2sxSwUU4345KtxDyRJn/+aEiJIDmkq6Y="; + cargoSha256 = "sha256-AXaGuRqSFiq+Uiy+UaqPdPVyDhCogC64KZZ0Ah1Yo7A="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3c28d18108c1..b6e7e678affe 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -423,6 +423,7 @@ mapAliases ({ firefox-wrapper = throw "'firefox-wrapper' has been renamed to/replaced by 'firefox'"; # Converted to throw 2022-02-22 firmwareLinuxNonfree = linux-firmware; # Added 2022-01-09 fish-foreign-env = throw "fish-foreign-env has been replaced with fishPlugins.foreign-env"; # Added 2020-12-29, modified 2021-01-10 + fishfight = jumpy; # Added 2022-08-03 flameGraph = throw "'flameGraph' has been renamed to/replaced by 'flamegraph'"; # Converted to throw 2022-02-22 flashplayer-standalone-debugger = throw "flashplayer-standalone-debugger has been removed as Adobe Flash Player is now deprecated"; # Added 2021-02-07 flashplayer-standalone = throw "flashplayer-standalone has been removed as Adobe Flash Player is now deprecated"; # Added 2021-02-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd8dbfa2838e..bae05b8396b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32503,7 +32503,7 @@ with pkgs; fish-fillets-ng = callPackage ../games/fish-fillets-ng { }; - fishfight = callPackage ../games/fishfight { + jumpy = callPackage ../games/jumpy { inherit (xorg) libX11 libXi; inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; }; From 6476c800c9c80343c370bcb534f11884addda3ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 Aug 2022 09:45:54 +0000 Subject: [PATCH 036/142] python310Packages.setuptools-declarative-requirements: 1.2.0 -> 1.3.0 --- .../setuptools-declarative-requirements/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/setuptools-declarative-requirements/default.nix b/pkgs/development/python-modules/setuptools-declarative-requirements/default.nix index ba6ff1649e62..86d2784beb71 100644 --- a/pkgs/development/python-modules/setuptools-declarative-requirements/default.nix +++ b/pkgs/development/python-modules/setuptools-declarative-requirements/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "setuptools-declarative-requirements"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1l8zmcnp9h8sp8hsw7b81djaa1a9yig0y7i4phh5pihqz1gdn7yi"; + sha256 = "sha256-V6W5u5rTUMJ46Kpr5M3rvNklubpx1qcSoXimGM+4mPc="; }; buildInputs = [ setuptools-scm ]; From eea6b34bf79908035363978d968775f4dc67652c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 3 Aug 2022 13:45:01 +0200 Subject: [PATCH 037/142] cutelyst: remove --- .../libraries/cutelyst/default.nix | 41 ------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 43 deletions(-) delete mode 100644 pkgs/development/libraries/cutelyst/default.nix diff --git a/pkgs/development/libraries/cutelyst/default.nix b/pkgs/development/libraries/cutelyst/default.nix deleted file mode 100644 index 51336a9e1a55..000000000000 --- a/pkgs/development/libraries/cutelyst/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook -, qtbase, libuuid, libcap, uwsgi, grantlee, pcre -}: - -stdenv.mkDerivation rec { - pname = "cutelyst"; - version = "2.14.2"; - - src = fetchFromGitHub { - owner = "cutelyst"; - repo = "cutelyst"; - rev = "v${version}"; - sha256 = "sha256-JUffOeUTeaZvEssP5hfSGipeRuQ7FzLF4bOizCFhe5o="; - }; - - nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; - buildInputs = [ - qtbase - grantlee - ] ++ lib.optionals stdenv.isLinux [ - libuuid - libcap - uwsgi - pcre - ]; - - cmakeFlags = [ - "-DPLUGIN_UWSGI=${if stdenv.isLinux then "ON" else "OFF"}" # Missing uwsgi symbols on Darwin - "-DPLUGIN_STATICCOMPRESSED=ON" - "-DPLUGIN_CSRFPROTECTION=ON" - "-DPLUGIN_VIEW_GRANTLEE=ON" - ]; - - meta = with lib; { - description = "C++ Web Framework built on top of Qt"; - homepage = "https://cutelyst.org/"; - license = licenses.lgpl21Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ fpletz ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 25f534093c8e..76c1c0c039fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17399,8 +17399,6 @@ with pkgs; cutee = callPackage ../development/libraries/cutee { }; - cutelyst = libsForQt5.callPackage ../development/libraries/cutelyst { }; - cxxtools = callPackage ../development/libraries/cxxtools { stdenv = gcc10StdenvCompat; }; cwiid = callPackage ../development/libraries/cwiid { }; From 72d98311e9217deb47824439aac69d83604f1119 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 3 Aug 2022 13:50:13 +0200 Subject: [PATCH 038/142] virtlyst: remove --- .../from_md/release-notes/rl-2211.section.xml | 6 ++ .../manual/release-notes/rl-2211.section.md | 2 + nixos/modules/module-list.nix | 1 - nixos/modules/services/web-apps/virtlyst.nix | 73 ------------------- .../virtlyst/add-admin-password-env.patch | 14 ---- pkgs/servers/web-apps/virtlyst/default.nix | 39 ---------- pkgs/top-level/all-packages.nix | 2 - 7 files changed, 8 insertions(+), 129 deletions(-) delete mode 100644 nixos/modules/services/web-apps/virtlyst.nix delete mode 100644 pkgs/servers/web-apps/virtlyst/add-admin-password-env.patch delete mode 100644 pkgs/servers/web-apps/virtlyst/default.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 882eea3c4a4a..2e3dfea8cb6e 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 @@ -279,6 +279,12 @@ available via the hardware.xone module. + + + virtlyst package and services.virtlyst + module removed, due to lack of maintainers. + + The services.graphite.api and diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index a2757d67e89c..6bc7d1917cae 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -107,6 +107,8 @@ In addition to numerous new and upgraded packages, this release has the followin - xow package removed along with the `hardware.xow` module, due to the project being deprecated in favor of `xone`, which is available via the `hardware.xone` module. +- virtlyst package and `services.virtlyst` module removed, due to lack of maintainers. + - The `services.graphite.api` and `services.graphite.beacon` NixOS options, and the `python3.pkgs.graphite_api`, `python3.pkgs.graphite_beacon` and `python3.pkgs.influxgraph` packages, have been removed due to lack of upstream diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 616f357663ca..2ae463190fb5 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1107,7 +1107,6 @@ ./services/web-apps/shiori.nix ./services/web-apps/snipe-it.nix ./services/web-apps/vikunja.nix - ./services/web-apps/virtlyst.nix ./services/web-apps/wiki-js.nix ./services/web-apps/whitebophir.nix ./services/web-apps/wordpress.nix diff --git a/nixos/modules/services/web-apps/virtlyst.nix b/nixos/modules/services/web-apps/virtlyst.nix deleted file mode 100644 index 5094367a4937..000000000000 --- a/nixos/modules/services/web-apps/virtlyst.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.services.virtlyst; - stateDir = "/var/lib/virtlyst"; - - ini = pkgs.writeText "virtlyst-config.ini" '' - [wsgi] - master = true - threads = auto - http-socket = ${cfg.httpSocket} - application = ${pkgs.virtlyst}/lib/libVirtlyst.so - chdir2 = ${stateDir} - static-map = /static=${pkgs.virtlyst}/root/static - - [Cutelyst] - production = true - DatabasePath = virtlyst.sqlite - TemplatePath = ${pkgs.virtlyst}/root/src - - [Rules] - cutelyst.* = true - virtlyst.* = true - ''; - -in - -{ - - options.services.virtlyst = { - enable = mkEnableOption "Virtlyst libvirt web interface"; - - adminPassword = mkOption { - type = types.str; - description = lib.mdDoc '' - Initial admin password with which the database will be seeded. - ''; - }; - - httpSocket = mkOption { - type = types.str; - default = "localhost:3000"; - description = lib.mdDoc '' - IP and/or port to which to bind the http socket. - ''; - }; - }; - - config = mkIf cfg.enable { - users.users.virtlyst = { - home = stateDir; - createHome = true; - group = mkIf config.virtualisation.libvirtd.enable "libvirtd"; - isSystemUser = true; - }; - - systemd.services.virtlyst = { - wantedBy = [ "multi-user.target" ]; - environment = { - VIRTLYST_ADMIN_PASSWORD = cfg.adminPassword; - }; - serviceConfig = { - ExecStart = "${pkgs.cutelyst}/bin/cutelyst-wsgi2 --ini ${ini}"; - User = "virtlyst"; - WorkingDirectory = stateDir; - }; - }; - }; - -} diff --git a/pkgs/servers/web-apps/virtlyst/add-admin-password-env.patch b/pkgs/servers/web-apps/virtlyst/add-admin-password-env.patch deleted file mode 100644 index e20acdb04a9e..000000000000 --- a/pkgs/servers/web-apps/virtlyst/add-admin-password-env.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/virtlyst.cpp b/src/virtlyst.cpp -index acd195d..8809e4f 100644 ---- a/src/virtlyst.cpp -+++ b/src/virtlyst.cpp -@@ -340,7 +340,8 @@ bool Virtlyst::createDB() - qCCritical(VIRTLYST) << "Error creating database" << query.lastError().text(); - return false; - } -- const QString password = QString::fromLatin1(QUuid::createUuid().toRfc4122().toHex()); -+ const QString password = qEnvironmentVariable("VIRTLYST_ADMIN_PASSWORD", -+ QString::fromLatin1(QUuid::createUuid().toRfc4122().toHex())); - query.bindValue(QStringLiteral(":password"), QString::fromLatin1( - CredentialPassword::createPassword(password.toUtf8(), QCryptographicHash::Sha256, 10000, 16, 16))); - if (!query.exec()) { diff --git a/pkgs/servers/web-apps/virtlyst/default.nix b/pkgs/servers/web-apps/virtlyst/default.nix deleted file mode 100644 index d6a72916fae3..000000000000 --- a/pkgs/servers/web-apps/virtlyst/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, autoPatchelfHook -, qtbase, libvirt, cutelyst, grantlee }: - -stdenv.mkDerivation rec { - pname = "virtlyst"; - version = "1.2.0"; - - src = fetchFromGitHub { - owner = "cutelyst"; - repo = "Virtlyst"; - rev = "v${version}"; - sha256 = "1vgjai34hqppkpl0ryxkyhpm9dsx1chs3bii3wc3h40hl80n6dgy"; - }; - - nativeBuildInputs = [ cmake pkg-config autoPatchelfHook ]; - buildInputs = [ qtbase libvirt cutelyst grantlee ]; - - dontWrapQtApps = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/lib - cp src/libVirtlyst${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib - cp -r ../root $out - - runHook postInstall - ''; - - patches = [ ./add-admin-password-env.patch ]; - - meta = with lib; { - description = "Web interface to manage virtual machines with libvirt"; - homepage = "https://github.com/cutelyst/Virtlyst"; - license = licenses.agpl3Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ fpletz ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76c1c0c039fd..7c5c051c4290 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23266,8 +23266,6 @@ with pkgs; virtiofsd = callPackage ../servers/misc/virtiofsd { }; - virtlyst = libsForQt5.callPackage ../servers/web-apps/virtlyst { }; - virtualenv = with python3Packages; toPythonApplication virtualenv; virtualenv-clone = with python3Packages; toPythonApplication virtualenv-clone; From 065ae9c9fc7d1d55517370a31221e921a391142f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Vitor=20de=20Lima=20Matos?= Date: Tue, 2 Aug 2022 14:09:13 -0300 Subject: [PATCH 039/142] kde/plasma: 5.25.3 -> 5.25.4 --- pkgs/desktops/plasma-5/fetch.sh | 2 +- pkgs/desktops/plasma-5/srcs.nix | 424 ++++++++++++++++---------------- 2 files changed, 213 insertions(+), 213 deletions(-) diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index ad12c222566a..549f3e3c9445 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.25.3/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.25.4/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index f7c02d8699df..4cffaba594a2 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -4,427 +4,427 @@ { bluedevil = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/bluedevil-5.25.3.tar.xz"; - sha256 = "059nm5rd5l8ql78slrjcgkjhka7g1rnh0f1nbgf57qccs7wp6qb5"; - name = "bluedevil-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/bluedevil-5.25.4.tar.xz"; + sha256 = "1cygnmigwqx1mqynfafcypkvf9bmz05rmrfwlxsksvll8yd9xn84"; + name = "bluedevil-5.25.4.tar.xz"; }; }; breeze = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/breeze-5.25.3.tar.xz"; - sha256 = "0za75ckgfcdxrh2qxgyl2c1273g2xqwmd55njsis1yvwryadypqw"; - name = "breeze-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/breeze-5.25.4.tar.xz"; + sha256 = "0lw0vj07z8l19v2z31d601kfanqixy3dbsv0lf8q273xv3li9sbp"; + name = "breeze-5.25.4.tar.xz"; }; }; breeze-grub = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/breeze-grub-5.25.3.tar.xz"; - sha256 = "12l6skbbr4wv86k5f8969lg9m30x2nrgm38w0mr7fnsqavpbm7v6"; - name = "breeze-grub-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/breeze-grub-5.25.4.tar.xz"; + sha256 = "10n380h77czwgbpcjhriai43pk9q08l9j819nqm9wbwmsw7gj31s"; + name = "breeze-grub-5.25.4.tar.xz"; }; }; breeze-gtk = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/breeze-gtk-5.25.3.tar.xz"; - sha256 = "1nmnxrhidv420bqm97cgmck44kzi6sdqaqg3bim07hbnzbq76d6r"; - name = "breeze-gtk-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/breeze-gtk-5.25.4.tar.xz"; + sha256 = "1x9a74f2anybvgmj4yl7pzz14jckjly55sb8hhlyrd1mp2k8p4mi"; + name = "breeze-gtk-5.25.4.tar.xz"; }; }; breeze-plymouth = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/breeze-plymouth-5.25.3.tar.xz"; - sha256 = "1lvsr48mrfjjvs132x2bn4dpwals8k8xinddn9nxykvqw5fiw3wd"; - name = "breeze-plymouth-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/breeze-plymouth-5.25.4.tar.xz"; + sha256 = "0wfhhaknvy51zrgfkcjrgc5s3q8y3pqb4r92nr37055cdvncwz79"; + name = "breeze-plymouth-5.25.4.tar.xz"; }; }; discover = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/discover-5.25.3.tar.xz"; - sha256 = "0bdg5gxl4zymmy44pvxs9nlk71psdra3778z20ss1j1k3x8dhlrs"; - name = "discover-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/discover-5.25.4.tar.xz"; + sha256 = "154sjr7c8dwlf1m22vh3wqiyfii8xpmxmfrf36i9r0xyb0zb5zg6"; + name = "discover-5.25.4.tar.xz"; }; }; drkonqi = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/drkonqi-5.25.3.tar.xz"; - sha256 = "11g6pqxb4gjcg9jsm3z9yiqljkks30i2mvanvas5ds1y4py3q7a1"; - name = "drkonqi-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/drkonqi-5.25.4.tar.xz"; + sha256 = "06na44x22bxd94r24xkzc373d0rhmv6l1awfq0bzh9cxpy8yg3f4"; + name = "drkonqi-5.25.4.tar.xz"; }; }; kactivitymanagerd = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/kactivitymanagerd-5.25.3.tar.xz"; - sha256 = "1095rmvgc9fzflpd9l1kzwdgk5zh7wxyyx7vzzb1kpdhvg4nwx57"; - name = "kactivitymanagerd-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/kactivitymanagerd-5.25.4.tar.xz"; + sha256 = "1cpz08jkmxw9576h9mkn15vwg3bxgk8k6w4f38rkiasxzj6zfamd"; + name = "kactivitymanagerd-5.25.4.tar.xz"; }; }; kde-cli-tools = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/kde-cli-tools-5.25.3.tar.xz"; - sha256 = "0m8v51ngxfwjianvw1ydr2dpblgik8kv7zw8mi95361kck9jh31h"; - name = "kde-cli-tools-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/kde-cli-tools-5.25.4.tar.xz"; + sha256 = "00p6vm9qw871hjclvw21nh93dq60r1ylb95hscx917gfx42dan8x"; + name = "kde-cli-tools-5.25.4.tar.xz"; }; }; kde-gtk-config = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/kde-gtk-config-5.25.3.tar.xz"; - sha256 = "0xjb0vff7mw1kfj5b472plclk80hdqxi2858m3nmkh41bl6a523r"; - name = "kde-gtk-config-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/kde-gtk-config-5.25.4.tar.xz"; + sha256 = "03cr5v7sr67vhcidr87min8z1ld5dm0n6yh79c1ghp1hp5ndscl8"; + name = "kde-gtk-config-5.25.4.tar.xz"; }; }; kdecoration = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/kdecoration-5.25.3.tar.xz"; - sha256 = "0b6ynqkndmlac89hv339k365m7wykp9y238df62jlq4vpr1r9x9y"; - name = "kdecoration-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/kdecoration-5.25.4.tar.xz"; + sha256 = "1yw7qjrf0c9xl2mncasbh3c1nf3c8x1v8ccfnp540z9slqi5qfmi"; + name = "kdecoration-5.25.4.tar.xz"; }; }; kdeplasma-addons = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/kdeplasma-addons-5.25.3.tar.xz"; - sha256 = "0z976qy49dbvn8nskkrwc1zfnjd3gdzbxzwkg0ini6vypfysybqm"; - name = "kdeplasma-addons-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/kdeplasma-addons-5.25.4.tar.xz"; + sha256 = "1lgmmqr798cfxmllalgzixf3v9xbiiazbn3vkcdqxcj6cjf730c0"; + name = "kdeplasma-addons-5.25.4.tar.xz"; }; }; kgamma5 = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/kgamma5-5.25.3.tar.xz"; - sha256 = "10750h6pb98c39s6ijk353jahwjhnj2nqmsmspx9jdz8ig20ygm0"; - name = "kgamma5-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/kgamma5-5.25.4.tar.xz"; + sha256 = "1m72dl1rxsh56pmacx0q0qda7lr4359azik2lnhw7nhs30z4p25a"; + name = "kgamma5-5.25.4.tar.xz"; }; }; khotkeys = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/khotkeys-5.25.3.tar.xz"; - sha256 = "1v4c7lljdvl56mkk8hgbrrx13jdsq7mg8ggrf3qnv1x48yi31rdj"; - name = "khotkeys-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/khotkeys-5.25.4.tar.xz"; + sha256 = "0hkicwkcjb4p4k5yh8d60h6khsvrqkhjx42aby6rxd3mgvrqd3xy"; + name = "khotkeys-5.25.4.tar.xz"; }; }; kinfocenter = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/kinfocenter-5.25.3.tar.xz"; - sha256 = "17hkyraqk4cwrv3rnlbw5jby7v8yv4mfxign1f3n5ldq76v9van1"; - name = "kinfocenter-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/kinfocenter-5.25.4.tar.xz"; + sha256 = "0ns2xsqghglg4ikq7w556y1kh20gs677km1vs0paw50xhi7jzbd2"; + name = "kinfocenter-5.25.4.tar.xz"; }; }; kmenuedit = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/kmenuedit-5.25.3.tar.xz"; - sha256 = "0y374al92r0v5adi7jxj6lghbhjg07ym78xsx09qn48h5c0s34pp"; - name = "kmenuedit-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/kmenuedit-5.25.4.tar.xz"; + sha256 = "1y3ml4jscb28nvadh7iq2y240qifv71dv2nkd32i69h52xdrvz27"; + name = "kmenuedit-5.25.4.tar.xz"; }; }; kscreen = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/kscreen-5.25.3.tar.xz"; - sha256 = "0p9pzigll9b5jj232sz05znf5syycif0dzvccxds6z0yr124jlvz"; - name = "kscreen-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/kscreen-5.25.4.tar.xz"; + sha256 = "1wjpyq56iw8axbjhsa82w67g54v6y3rv5nx623d1kddvlzlhh8pf"; + name = "kscreen-5.25.4.tar.xz"; }; }; kscreenlocker = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/kscreenlocker-5.25.3.tar.xz"; - sha256 = "1kii3r3j89avwyb00wrw80k5sj0q4wqgmy1q0yxfps9jk729k3wc"; - name = "kscreenlocker-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/kscreenlocker-5.25.4.tar.xz"; + sha256 = "0zfvkdvyqxxxgpiimqjxhavwna0z94i28ky8qmvbcmn1705x5lvx"; + name = "kscreenlocker-5.25.4.tar.xz"; }; }; ksshaskpass = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/ksshaskpass-5.25.3.tar.xz"; - sha256 = "0sfl77szvfq9c7v0gsv5nnf7h5kxigyy2z2p1cwmhm1pq4n606nk"; - name = "ksshaskpass-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/ksshaskpass-5.25.4.tar.xz"; + sha256 = "0dzhddylzigaaigacynncd5q0s4884dgr4wyrrdpqj42d47wjikz"; + name = "ksshaskpass-5.25.4.tar.xz"; }; }; ksystemstats = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/ksystemstats-5.25.3.tar.xz"; - sha256 = "0s08mazc081wxbccmb4s35i7p57an8nlxmw25lh1j83jj06gyd4f"; - name = "ksystemstats-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/ksystemstats-5.25.4.tar.xz"; + sha256 = "0ray2v90vv1j1sbd7fx4x5n7s7xwlil1zynwi4pzpgnyi13zq60x"; + name = "ksystemstats-5.25.4.tar.xz"; }; }; kwallet-pam = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/kwallet-pam-5.25.3.tar.xz"; - sha256 = "1i345vl0sfzg8zmz6h8hsxmx9cbdb7072avc6yz42ra9yf4372jb"; - name = "kwallet-pam-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/kwallet-pam-5.25.4.tar.xz"; + sha256 = "14j3xngwliqhhvw60izv5kdjvv8xhqw8cjsc4l22v8jj4m8yw2xk"; + name = "kwallet-pam-5.25.4.tar.xz"; }; }; kwayland-integration = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/kwayland-integration-5.25.3.tar.xz"; - sha256 = "0d45wigxspvv561fjam8yiyq6277n5wgv2sn8ymvqbal8v801bjf"; - name = "kwayland-integration-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/kwayland-integration-5.25.4.tar.xz"; + sha256 = "1iqnwcp08kg91pwm3i4grd0i4bqf8h1z0n0fhcw6l0cbhdkcad39"; + name = "kwayland-integration-5.25.4.tar.xz"; }; }; kwin = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/kwin-5.25.3.tar.xz"; - sha256 = "1vyh5ymvkzxsgs4904ijac6xrb5fgxpypc8mlnwcca1gd9xpr4jj"; - name = "kwin-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/kwin-5.25.4.tar.xz"; + sha256 = "0zahw7hd3g775a6iyglvv60h9vw52jc9pg9ffkg4mpqb00f159p8"; + name = "kwin-5.25.4.tar.xz"; }; }; kwrited = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/kwrited-5.25.3.tar.xz"; - sha256 = "133ampgha0348m5ild1dg48jpblk4c16d6nk759yywz8125wyapc"; - name = "kwrited-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/kwrited-5.25.4.tar.xz"; + sha256 = "0xn20irka7adbqfc8w6gnhwp0pbv7bz7l7g16qddv1wq3xix9053"; + name = "kwrited-5.25.4.tar.xz"; }; }; layer-shell-qt = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/layer-shell-qt-5.25.3.tar.xz"; - sha256 = "06rxqm4wh4mcszrwb2dbgpxj3dqfx0rccyyjp091lbsncqm1gib0"; - name = "layer-shell-qt-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/layer-shell-qt-5.25.4.tar.xz"; + sha256 = "0pd88nnp925l09gzq4cajjnx810df4n0ssd65i1bmvgnxynzh5i7"; + name = "layer-shell-qt-5.25.4.tar.xz"; }; }; libkscreen = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/libkscreen-5.25.3.tar.xz"; - sha256 = "1mxkrk04wcyw4xbfiyxbp5iwnhqr10yk39zx5bbjd9zag0vdi7z5"; - name = "libkscreen-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/libkscreen-5.25.4.tar.xz"; + sha256 = "17ib0sgrhmmf3f8w3fni0825xz5581av5vnz8gca41vyf12css25"; + name = "libkscreen-5.25.4.tar.xz"; }; }; libksysguard = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/libksysguard-5.25.3.tar.xz"; - sha256 = "1mrrrxjvqmrnkjwafvqrd2hlvl9gr9y4hn7dv0gf70lp5bl06i89"; - name = "libksysguard-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/libksysguard-5.25.4.tar.xz"; + sha256 = "1kzpimhkagsmqj0cky4cfav1kbzyfjaj2l5xdapnmaygbm6r8086"; + name = "libksysguard-5.25.4.tar.xz"; }; }; milou = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/milou-5.25.3.tar.xz"; - sha256 = "1xb3i5dn6r4mglci8llchjz484zsw3kqyl9ag8wch54b5cjmz4ap"; - name = "milou-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/milou-5.25.4.tar.xz"; + sha256 = "17npfn7gwiqrvy5w8vzpc38c4bgkx3vjgjkm1caizn04zfk7xar7"; + name = "milou-5.25.4.tar.xz"; }; }; oxygen = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/oxygen-5.25.3.tar.xz"; - sha256 = "0ynkmnmd1x36zn6x4chvpsrsi5rfqmk45qqxdx60x0w1hhi3x6bh"; - name = "oxygen-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/oxygen-5.25.4.tar.xz"; + sha256 = "1cd76fa2szhb3apabyvl76p8vdk97229g5sgv94xx9pr7rx8a67y"; + name = "oxygen-5.25.4.tar.xz"; }; }; oxygen-sounds = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/oxygen-sounds-5.25.3.tar.xz"; - sha256 = "1hdqdq3qxpcyfs5gsmlpb3pjvixyr1ny4qwqq18givz8jbah3vkz"; - name = "oxygen-sounds-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/oxygen-sounds-5.25.4.tar.xz"; + sha256 = "0v8j8kf86ri1z14mgqc1c6kkpsbih8rjph35sr5y0i4av9mh6p9b"; + name = "oxygen-sounds-5.25.4.tar.xz"; }; }; plasma-browser-integration = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-browser-integration-5.25.3.tar.xz"; - sha256 = "1krf9fchs3w0r1irzrdrxgwcgfsyhm2384q0c5vp5xg7dh10xvz2"; - name = "plasma-browser-integration-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-browser-integration-5.25.4.tar.xz"; + sha256 = "1l3n4psbqimfar5qsmrfp3nhgg3v9yy93rkjpvyqgdmizi44scqw"; + name = "plasma-browser-integration-5.25.4.tar.xz"; }; }; plasma-desktop = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-desktop-5.25.3.tar.xz"; - sha256 = "134dgqqak5d3427znlj138f0k48qhkzs7pqi19yn89fbzw5vg8s8"; - name = "plasma-desktop-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-desktop-5.25.4.tar.xz"; + sha256 = "1jkjc412n1wn17qrmx0sv91pzv5xjsljms3bsln6bbxj5fkhmkfm"; + name = "plasma-desktop-5.25.4.tar.xz"; }; }; plasma-disks = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-disks-5.25.3.tar.xz"; - sha256 = "1dyxa5x4v6w8fn8956wcc9mvncnjf43cpn0algp54f9ndy1jaalw"; - name = "plasma-disks-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-disks-5.25.4.tar.xz"; + sha256 = "04hs8jg7f5bm5rjcb6i6zidyamq6cfry5sm5mj6hqdj0qmn9i396"; + name = "plasma-disks-5.25.4.tar.xz"; }; }; plasma-firewall = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-firewall-5.25.3.tar.xz"; - sha256 = "0cwk4scadk4pd7v93arkrn1wgyc4d81995znp23vd9pmlaazyikv"; - name = "plasma-firewall-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-firewall-5.25.4.tar.xz"; + sha256 = "12rmf7x8dyyb1k5ycj43kn4c0wzidig4h5wdh1igrgcvyypmjjcl"; + name = "plasma-firewall-5.25.4.tar.xz"; }; }; plasma-integration = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-integration-5.25.3.tar.xz"; - sha256 = "1wsz0vbb0kj4542h7zca9yc6xz90ziv4lbm39d7dxr9hm94cdbjk"; - name = "plasma-integration-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-integration-5.25.4.tar.xz"; + sha256 = "1cbcp722pzbfiqfl5rcw6py74jbxg83k96kdx2m0g3ix1f0dmkbi"; + name = "plasma-integration-5.25.4.tar.xz"; }; }; plasma-mobile = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-mobile-5.25.3.tar.xz"; - sha256 = "1dzfbqg2zmdr0dlm99c3pj9iy6yagshlfj9x018sa0bzjysf29g3"; - name = "plasma-mobile-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-mobile-5.25.4.tar.xz"; + sha256 = "0b0n3mjlj33191jgs8xqbk35y5nglfz4d8dih3qmg3kbs81qizwy"; + name = "plasma-mobile-5.25.4.tar.xz"; }; }; plasma-nano = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-nano-5.25.3.tar.xz"; - sha256 = "00m95c1cb3g8v8w0d4vnbnjhjmr5hw7gljn8nc705mpxsx03c3kd"; - name = "plasma-nano-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-nano-5.25.4.tar.xz"; + sha256 = "1pn6025wb3w855f3vy77879qlrb266bikw3nhar1dzv3sfgxw4w9"; + name = "plasma-nano-5.25.4.tar.xz"; }; }; plasma-nm = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-nm-5.25.3.tar.xz"; - sha256 = "0k8zwjjy8d5lp1slky13fx5j6kjsbs4irz3x5fm54aki15hdcjx7"; - name = "plasma-nm-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-nm-5.25.4.tar.xz"; + sha256 = "147p572pmkrgg52pvwhzs8lvxy3rs8y622n9lj7hjc6hrlh14qk2"; + name = "plasma-nm-5.25.4.tar.xz"; }; }; plasma-pa = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-pa-5.25.3.tar.xz"; - sha256 = "17881v0fff5mbgh6rgx4a2hk9m35flqijckwlyj2kcrcsqi3aq21"; - name = "plasma-pa-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-pa-5.25.4.tar.xz"; + sha256 = "0v92jk826jj2kf11hlxh3xrxl9nsj6835ik2pmb192xbn6gpb4lm"; + name = "plasma-pa-5.25.4.tar.xz"; }; }; plasma-sdk = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-sdk-5.25.3.tar.xz"; - sha256 = "1hhffvqvxlhdyg8v7b7drb0n4fnkxlvy0xfffnnln66pknxk7s5w"; - name = "plasma-sdk-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-sdk-5.25.4.tar.xz"; + sha256 = "00s345l5jj1kfdvyyfq8718khfy88n6gyajb07n582q266mry39l"; + name = "plasma-sdk-5.25.4.tar.xz"; }; }; plasma-systemmonitor = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-systemmonitor-5.25.3.tar.xz"; - sha256 = "07mxkm0ynq0xiqc1p4iqjc4c1x7198hr15r9ysajgs0sf9bcd6hx"; - name = "plasma-systemmonitor-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-systemmonitor-5.25.4.tar.xz"; + sha256 = "1fj0vyjdk6h3f4p9aagh03hyhbf69y2qwlavs2zr7d0iadih7b4c"; + name = "plasma-systemmonitor-5.25.4.tar.xz"; }; }; plasma-tests = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-tests-5.25.3.tar.xz"; - sha256 = "0d7vhb75p2rhfbysa7bg80836ycryg4jcn91grag8y7pcq6m6zzn"; - name = "plasma-tests-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-tests-5.25.4.tar.xz"; + sha256 = "0d86zmlmagik2chagsm549yg78vy2qw3kl67skrlrmbkv82dhrz2"; + name = "plasma-tests-5.25.4.tar.xz"; }; }; plasma-thunderbolt = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-thunderbolt-5.25.3.tar.xz"; - sha256 = "05bdq7vdwpyyrfgvp48m8dbsjhvnaf84zhbcyjvjygvlhzdm8j57"; - name = "plasma-thunderbolt-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-thunderbolt-5.25.4.tar.xz"; + sha256 = "0hjvkss0qfmwhrsba83wfxwxhikvzf56faan325ic0iv7fdaj3ns"; + name = "plasma-thunderbolt-5.25.4.tar.xz"; }; }; plasma-vault = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-vault-5.25.3.tar.xz"; - sha256 = "1phb7rygvm2c0n0yf5xyj3xpm1apfq3knfyiasgbjl4z6aimq406"; - name = "plasma-vault-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-vault-5.25.4.tar.xz"; + sha256 = "10ym2gk46yr1vgjnm1li1shdawklvvy3yvjcanm8ic5llchbxvzq"; + name = "plasma-vault-5.25.4.tar.xz"; }; }; plasma-workspace = { - version = "5.25.3.1"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-workspace-5.25.3.1.tar.xz"; - sha256 = "09hgd1k0095s18a4147qihbsl5v8hadj7hm3zixf362sydgkal51"; - name = "plasma-workspace-5.25.3.1.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-workspace-5.25.4.tar.xz"; + sha256 = "1aw9ms6rzxrk384xzdc3sqwqs1shbnkap40vfwxp4jamjk0pyglw"; + name = "plasma-workspace-5.25.4.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-workspace-wallpapers-5.25.3.tar.xz"; - sha256 = "15swpsqjdxxzkjw0phs4h7p3l4lfshsqv6pk3qbfbp91dd05cplh"; - name = "plasma-workspace-wallpapers-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-workspace-wallpapers-5.25.4.tar.xz"; + sha256 = "1vjrfmzib17cb9r2q17rv4zmnqsk5mf55vy8kzx71djjif7gaqiy"; + name = "plasma-workspace-wallpapers-5.25.4.tar.xz"; }; }; plymouth-kcm = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plymouth-kcm-5.25.3.tar.xz"; - sha256 = "0sb0gh0sh8lc13pbqkl8icjakzk0h7r3l6v3kwg0jyvmk0if1bpj"; - name = "plymouth-kcm-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plymouth-kcm-5.25.4.tar.xz"; + sha256 = "1wbgcccc1ili3j0k1njgj1q6jl35s20gf9m25s9d3mjwd9xnxrbv"; + name = "plymouth-kcm-5.25.4.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.25.3"; + version = "1-5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/polkit-kde-agent-1-5.25.3.tar.xz"; - sha256 = "0j067ps86zk38r0spcfpv33mxiagdnrkyy033v8gnsiayhrp9pcm"; - name = "polkit-kde-agent-1-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/polkit-kde-agent-1-5.25.4.tar.xz"; + sha256 = "0skadgzv97vfl4n2x889fiy5gsr6n894fr5viq3rizs0qsqc68b5"; + name = "polkit-kde-agent-1-5.25.4.tar.xz"; }; }; powerdevil = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/powerdevil-5.25.3.tar.xz"; - sha256 = "1lfws0rj2kbqvgm7gb4h6gmrpa71jbqgfmvmd2n4l9bxxx73rbh2"; - name = "powerdevil-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/powerdevil-5.25.4.tar.xz"; + sha256 = "1nznjxi59xc6pmyh0vainznhp9ig1ini3i87iapayawpnpf8sdxx"; + name = "powerdevil-5.25.4.tar.xz"; }; }; qqc2-breeze-style = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/qqc2-breeze-style-5.25.3.tar.xz"; - sha256 = "1j714iaysfqkr997q94pv2abj433ps43myy37p8ss0v8pra9hn5c"; - name = "qqc2-breeze-style-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/qqc2-breeze-style-5.25.4.tar.xz"; + sha256 = "0sylffvbfdi44lmz6s78scf2p2iswf6p8g209wbd5fm1dgi6yi2z"; + name = "qqc2-breeze-style-5.25.4.tar.xz"; }; }; sddm-kcm = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/sddm-kcm-5.25.3.tar.xz"; - sha256 = "1mipvf25vjhdrww9cinp4v7g73swk364zfkyk4fypw8bccrbfpsd"; - name = "sddm-kcm-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/sddm-kcm-5.25.4.tar.xz"; + sha256 = "1gqz9j6vha8i6bra63pfqrpl5wsg9a7qz351z5rkj5jwnkw1dxl7"; + name = "sddm-kcm-5.25.4.tar.xz"; }; }; systemsettings = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/systemsettings-5.25.3.tar.xz"; - sha256 = "00n4r51qp03cwfsdrsza2nv5558zs8dyd6fywcycjd1ryqiyrl4r"; - name = "systemsettings-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/systemsettings-5.25.4.tar.xz"; + sha256 = "130739bfxl1jwkn3f4h7dnr7dv2i76g6sd2svmg0qy60cnwvcgcv"; + name = "systemsettings-5.25.4.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/xdg-desktop-portal-kde-5.25.3.tar.xz"; - sha256 = "07pcpxq7j1b62wwds6q2niyh74dc9i2lwvka77g1ii55syybm7n7"; - name = "xdg-desktop-portal-kde-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/xdg-desktop-portal-kde-5.25.4.tar.xz"; + sha256 = "13gva3mci9gawlxpw4ymdma8w6lc2b3y8z36699kmzli4vib214g"; + name = "xdg-desktop-portal-kde-5.25.4.tar.xz"; }; }; } From 4320bb92290e661378dab7e90c108db224ff69a9 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Wed, 3 Aug 2022 11:51:59 +0200 Subject: [PATCH 040/142] maintainers: add panicgh --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8eac070f26c1..71c76f24d42c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9863,6 +9863,12 @@ githubId = 1788628; name = "pandaman"; }; + panicgh = { + email = "nbenes.gh@xandea.de"; + github = "panicgh"; + githubId = 79252025; + name = "Nicolas Benes"; + }; paperdigits = { email = "mica@silentumbrella.com"; github = "paperdigits"; From 8290d2f8b88109379d31fd76456598454db38f2a Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Wed, 3 Aug 2022 13:10:48 +0200 Subject: [PATCH 041/142] perccli: init at 7.1910.00 --- pkgs/tools/misc/perccli/default.nix | 37 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/tools/misc/perccli/default.nix diff --git a/pkgs/tools/misc/perccli/default.nix b/pkgs/tools/misc/perccli/default.nix new file mode 100644 index 000000000000..517fffead533 --- /dev/null +++ b/pkgs/tools/misc/perccli/default.nix @@ -0,0 +1,37 @@ +{ lib +, stdenvNoCC +, fetchurl +, rpmextract +}: +stdenvNoCC.mkDerivation rec { + pname = "perccli"; + version = "7.1910.00"; + + src = fetchurl { + url = "https://dl.dell.com/FOLDER07815522M/1/PERCCLI_${version}_A12_Linux.tar.gz"; + sha256 = "sha256-Gt/kr5schR/IzFmnhXO57gjZpOJ9NSnPX/Sj7zo8Qjk="; + # Dell seems to block "uncommon" user-agents, such as Nixpkgs's custom one. + # Sending no user-agent at all seems to be fine though. + curlOptsList = [ "--user-agent" "" ]; + }; + + nativeBuildInputs = [ rpmextract ]; + + buildCommand = '' + tar xf $src + rpmextract PERCCLI_*_Linux/perccli-*.noarch.rpm + install -D ./opt/MegaRAID/perccli/perccli64 $out/bin/perccli64 + ln -s perccli64 $out/bin/perccli + + # Not needed because the binary is statically linked + #eval fixupPhase + ''; + + meta = with lib; { + description = "Perccli Support for PERC RAID controllers"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + maintainers = with maintainers; [ panicgh ]; + platforms = with platforms; intersectLists x86_64 linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b946c253ce79..20e3bcfcd317 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9531,6 +9531,8 @@ with pkgs; pell = callPackage ../applications/misc/pell { }; + perccli = callPackage ../tools/misc/perccli { }; + perceptualdiff = callPackage ../tools/graphics/perceptualdiff { }; percona-xtrabackup = percona-xtrabackup_8_0; From 574611ad4fc4c47f86d52532bff38601a1bdf500 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Wed, 3 Aug 2022 13:10:59 +0200 Subject: [PATCH 042/142] storcli: init at 7.2106.00 --- pkgs/tools/misc/storcli/default.nix | 35 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/tools/misc/storcli/default.nix diff --git a/pkgs/tools/misc/storcli/default.nix b/pkgs/tools/misc/storcli/default.nix new file mode 100644 index 000000000000..03300f46f8c0 --- /dev/null +++ b/pkgs/tools/misc/storcli/default.nix @@ -0,0 +1,35 @@ +{ lib +, stdenvNoCC +, fetchurl +, rpmextract +, unzip +}: +stdenvNoCC.mkDerivation rec { + pname = "storcli"; + version = "7.2106.00"; + + src = fetchurl { + url = "https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/00${version}00.0000_Unified_StorCLI.zip"; + sha256 = "sha256-sRMpNXCdcysliVQwRE/1yAeU/cp+y0f2F8BPiWyotxQ="; + }; + + nativeBuildInputs = [ rpmextract unzip ]; + + buildCommand = '' + unzip $src + rpmextract Unified_storcli_all_os/Linux/storcli-*.noarch.rpm + install -D ./opt/MegaRAID/storcli/storcli64 $out/bin/storcli64 + ln -s storcli64 $out/bin/storcli + + # Not needed because the binary is statically linked + #eval fixupPhase + ''; + + meta = with lib; { + description = "Storage Command Line Tool"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + maintainers = with maintainers; [ panicgh ]; + platforms = with platforms; intersectLists x86_64 linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20e3bcfcd317..11d8c6ec1e2a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10831,6 +10831,8 @@ with pkgs; stm32loader = with python3Packages; toPythonApplication stm32loader; + storcli = callPackage ../tools/misc/storcli { }; + stremio = qt5.callPackage ../applications/video/stremio { }; sunwait = callPackage ../applications/misc/sunwait { }; From 68a4655811021612549672a67a5afc48d22e04d0 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 3 Aug 2022 16:41:25 +0200 Subject: [PATCH 043/142] ragelStable: unbreak on darwin --- pkgs/development/tools/parsing/ragel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index e4a4ab162fa4..81d7d9f0b35e 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -3,7 +3,7 @@ }: let - generic = { version, sha256, license }: + generic = { version, sha256, broken ? false, license }: stdenv.mkDerivation rec { pname = "ragel"; inherit version; @@ -26,10 +26,9 @@ let doCheck = true; meta = with lib; { - broken = stdenv.isDarwin; homepage = "https://www.colm.net/open-source/ragel/"; description = "State machine compiler"; - inherit license; + inherit broken license; platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; }; @@ -48,5 +47,6 @@ in version = "7.0.0.12"; sha256 = "0x3si355lv6q051lgpg8bpclpiq5brpri5lv3p8kk2qhzfbyz69r"; license = lib.licenses.mit; + broken = stdenv.isDarwin; }; } From 694d5b19d30bf66687b42fb77f43ea7cd1002a62 Mon Sep 17 00:00:00 2001 From: pennae Date: Tue, 2 Aug 2022 17:34:22 +0200 Subject: [PATCH 044/142] nixos/*: replace with double linebreaks our xslt already replaces double line breaks with a paragraph close and reopen. not using explicit para tags lets nix-doc-munge convert more descriptions losslessly. only whitespace changes to generated documents, except for two strongswan options gaining paragraph two breaks they arguably should've had anyway. --- nixos/modules/hardware/logitech.nix | 3 +- nixos/modules/installer/cd-dvd/iso-image.nix | 2 +- nixos/modules/programs/firejail.nix | 3 +- nixos/modules/services/databases/neo4j.nix | 45 ++++------ nixos/modules/services/databases/pgmanage.nix | 4 +- nixos/modules/services/hardware/lcd.nix | 9 +- .../services/matrix/appservice-discord.nix | 6 -- .../services/matrix/mautrix-facebook.nix | 2 - .../services/matrix/mautrix-telegram.nix | 2 - nixos/modules/services/misc/autorandr.nix | 4 +- nixos/modules/services/misc/bees.nix | 9 +- nixos/modules/services/misc/nix-daemon.nix | 6 +- nixos/modules/services/misc/zoneminder.nix | 4 +- nixos/modules/services/monitoring/netdata.nix | 4 +- .../services/networking/networkmanager.nix | 5 +- .../modules/services/networking/ntp/ntpd.nix | 9 +- .../modules/services/networking/ssh/sshd.nix | 9 +- .../strongswan-swanctl/param-constructors.nix | 3 +- .../strongswan-swanctl/swanctl-params.nix | 90 +++++++++---------- .../services/networking/znc/default.nix | 21 ++--- .../services/networking/znc/options.nix | 3 +- .../services/x11/desktop-managers/plasma5.nix | 3 +- nixos/modules/system/activation/top-level.nix | 2 +- .../modules/system/boot/loader/grub/grub.nix | 12 +-- nixos/modules/system/boot/systemd/logind.nix | 2 - .../tasks/scsi-link-power-management.nix | 2 +- 26 files changed, 105 insertions(+), 159 deletions(-) diff --git a/nixos/modules/hardware/logitech.nix b/nixos/modules/hardware/logitech.nix index 2e3a71c04158..1c3556320e39 100644 --- a/nixos/modules/hardware/logitech.nix +++ b/nixos/modules/hardware/logitech.nix @@ -34,8 +34,7 @@ in default = [ "0a07" "c222" "c225" "c227" "c251" ]; description = '' List of USB device ids supported by g15daemon. - - + You most likely do not need to change this. ''; }; diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 9309fe70a861..cefe252e2e9a 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -618,7 +618,7 @@ in This will be directly appended (without whitespace) to the NixOS version string, like for example if it is set to XXX: - NixOS 99.99-pre666XXX + NixOS 99.99-pre666XXX ''; }; diff --git a/nixos/modules/programs/firejail.nix b/nixos/modules/programs/firejail.nix index 76b42168c198..e014aea626c7 100644 --- a/nixos/modules/programs/firejail.nix +++ b/nixos/modules/programs/firejail.nix @@ -71,8 +71,7 @@ in { ''; description = '' Wrap the binaries in firejail and place them in the global path. - - + You will get file collisions if you put the actual application binary in the global environment (such as by adding the application package to environment.systemPackages), and applications started via diff --git a/nixos/modules/services/databases/neo4j.nix b/nixos/modules/services/databases/neo4j.nix index dbbb79f01ebb..ad659ccd82e8 100644 --- a/nixos/modules/services/databases/neo4j.nix +++ b/nixos/modules/services/databases/neo4j.nix @@ -145,8 +145,7 @@ in { . It restricts access to only those files within that directory and its subdirectories. - - + Setting this option to false introduces possible security problems. ''; @@ -158,8 +157,7 @@ in { description = '' Default network interface to listen for incoming connections. To listen for connections on all interfaces, use "0.0.0.0". - - + Specifies the default IP address and address part of connector specific options. To bind specific connectors to a specific network interfaces, specify the entire @@ -229,15 +227,13 @@ in { default = "legacy"; description = '' Neo4j SSL policy for BOLT traffic. - - + The legacy policy is a special policy which is not defined in the policy configuration section, but rather derives from and associated files (by default: neo4j.key and neo4j.cert). Its use will be deprecated. - - + Note: This connector must be configured to support/require SSL/TLS for the legacy policy to actually be utilized. See . @@ -261,13 +257,11 @@ in { description = '' Directory for storing certificates to be used by Neo4j for TLS connections. - - + When setting this directory to something other than its default, ensure the directory's existence, and that read/write permissions are given to the Neo4j daemon user neo4j. - - + Note that changing this directory from its default will prevent the directory structure required for each SSL policy from being automatically generated. A policy's directory structure as defined by @@ -286,8 +280,7 @@ in { description = '' Path of the data directory. You must not configure more than one Neo4j installation to use the same data directory. - - + When setting this directory to something other than its default, ensure the directory's existence, and that read/write permissions are given to the Neo4j daemon user neo4j. @@ -314,8 +307,7 @@ in { LOAD CSV clause. Only meaningful when is set to true. - - + When setting this directory to something other than its default, ensure the directory's existence, and that read permission is given to the Neo4j daemon user neo4j. @@ -330,8 +322,7 @@ in { Path of the database plugin directory. Compiled Java JAR files that contain database procedures will be loaded if they are placed in this directory. - - + When setting this directory to something other than its default, ensure the directory's existence, and that read permission is given to the Neo4j daemon user neo4j. @@ -388,8 +379,7 @@ in { default = "legacy"; description = '' Neo4j SSL policy for HTTPS traffic. - - + The legacy policy is a special policy which is not defined in the policy configuration section, but rather derives from and @@ -422,13 +412,11 @@ in { certificate. Only performed when both objects cannot be found for this policy. It is recommended to turn this off again after keys have been generated. - - + The public certificate is required to be duplicated to the directory holding trusted certificates as defined by the option. - - + Keys should in general be generated and distributed offline by a trusted certificate authority and not by utilizing this mode. ''; @@ -444,8 +432,7 @@ in { option as well as are left at their default. Ensure read/write permissions are given to the Neo4j daemon user neo4j. - - + It is also possible to override each individual configuration with absolute paths. See the and @@ -488,8 +475,7 @@ in { for this policy to be found in the , or the absolute path to the certificate file. It is mandatory that a certificate can be found or generated. - - + The public certificate is required to be duplicated to the directory holding trusted certificates as defined by the option. @@ -545,8 +531,7 @@ in { to something other than their default. Ensure read/write permissions are given to the Neo4j daemon user neo4j. - - + The public certificate as defined by is required to be duplicated to this directory. diff --git a/nixos/modules/services/databases/pgmanage.nix b/nixos/modules/services/databases/pgmanage.nix index f50e7244ee11..79c958b246c7 100644 --- a/nixos/modules/services/databases/pgmanage.nix +++ b/nixos/modules/services/databases/pgmanage.nix @@ -64,10 +64,10 @@ in { }; description = '' pgmanage requires at least one PostgreSQL server be defined. - + Detailed information about PostgreSQL connection strings is available at: - + Note that you should not specify your user name or password. That information will be entered on the login screen. If you specify a username or password, it will be removed by pgmanage before attempting to diff --git a/nixos/modules/services/hardware/lcd.nix b/nixos/modules/services/hardware/lcd.nix index ec4b27bd8482..c817225c1f21 100644 --- a/nixos/modules/services/hardware/lcd.nix +++ b/nixos/modules/services/hardware/lcd.nix @@ -63,8 +63,7 @@ in with lib; { default = false; description = '' Set group-write permissions on a USB device. - - + A USB connected LCD panel will most likely require having its permissions modified for lcdd to write to it. Enabling this option sets group-write permissions on the device identified by @@ -72,13 +71,11 @@ in with lib; { . In order to find the values, you can run the lsusb command. Example output: - - + Bus 005 Device 002: ID 0403:c630 Future Technology Devices International, Ltd lcd2usb interface - - + In this case the vendor id is 0403 and the product id is c630. ''; }; diff --git a/nixos/modules/services/matrix/appservice-discord.nix b/nixos/modules/services/matrix/appservice-discord.nix index fa55b3c5de70..65ad96a3af36 100644 --- a/nixos/modules/services/matrix/appservice-discord.nix +++ b/nixos/modules/services/matrix/appservice-discord.nix @@ -42,20 +42,14 @@ in { ''; description = '' config.yaml configuration as a Nix attribute set. - - Configuration options should match those described in config.sample.yaml. - - and should be set to match the public host name of the Matrix homeserver for webhooks and avatars to work. - - Secret tokens should be specified using instead of this world-readable attribute set. ''; diff --git a/nixos/modules/services/matrix/mautrix-facebook.nix b/nixos/modules/services/matrix/mautrix-facebook.nix index 55067abaa52a..2f91e6e0e521 100644 --- a/nixos/modules/services/matrix/mautrix-facebook.nix +++ b/nixos/modules/services/matrix/mautrix-facebook.nix @@ -80,9 +80,7 @@ in { Configuration options should match those described in example-config.yaml. - - Secret tokens should be specified using instead of this world-readable attribute set. ''; diff --git a/nixos/modules/services/matrix/mautrix-telegram.nix b/nixos/modules/services/matrix/mautrix-telegram.nix index c6527be5263c..1d4061b8a818 100644 --- a/nixos/modules/services/matrix/mautrix-telegram.nix +++ b/nixos/modules/services/matrix/mautrix-telegram.nix @@ -83,9 +83,7 @@ in { Configuration options should match those described in example-config.yaml. - - Secret tokens should be specified using instead of this world-readable attribute set. ''; diff --git a/nixos/modules/services/misc/autorandr.nix b/nixos/modules/services/misc/autorandr.nix index 11dc915c2afa..9a0530866b58 100644 --- a/nixos/modules/services/misc/autorandr.nix +++ b/nixos/modules/services/misc/autorandr.nix @@ -154,7 +154,7 @@ let }); description = '' Output scale configuration. - + Either configure by pixels or a scaling factor. When using pixel method the xrandr @@ -165,7 +165,7 @@ let will be used; when using factor method the option --scale will be used. - + This option is a shortcut version of the transform option and they are mutually exclusive. ''; diff --git a/nixos/modules/services/misc/bees.nix b/nixos/modules/services/misc/bees.nix index 1b4923150266..2adc9f2a1fa6 100644 --- a/nixos/modules/services/misc/bees.nix +++ b/nixos/modules/services/misc/bees.nix @@ -17,8 +17,7 @@ let not configure multiple instances for subvolumes of the same filesystem (or block devices which are part of the same filesystem), but only for completely independent btrfs filesystems. - - + This must be in a format usable by findmnt; that could be a key=value pair, or a bare path to a mount point. Using bare paths will allow systemd to start the beesd service only @@ -31,12 +30,10 @@ let default = 1024; # 1GB; default from upstream beesd script description = '' Hash table size in MB; must be a multiple of 16. - - + A larger ratio of index size to storage size means smaller blocks of duplicate content are recognized. - - + If you have 1TB of data, a 4GB hash table (which is to say, a value of 4096) will permit 4KB extents (the smallest possible size) to be recognized, whereas a value of 1024 -- creating a 1GB hash table -- diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index c76aaaa559bf..93ff5fcfb863 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -636,12 +636,10 @@ in 5 for avalaible options. The value declared here will be translated directly to the key-value pairs Nix expects. - - + You can use nix-instantiate --eval --strict '<nixpkgs/nixos>' -A config.nix.settings to view the current value. By default it is empty. - - + Nix configurations defined under will be translated and applied to this option. In addition, configuration specified in which will be appended verbatim to the resulting config file. diff --git a/nixos/modules/services/misc/zoneminder.nix b/nixos/modules/services/misc/zoneminder.nix index ab24372037e6..ef3f6c1a0fd9 100644 --- a/nixos/modules/services/misc/zoneminder.nix +++ b/nixos/modules/services/misc/zoneminder.nix @@ -68,7 +68,7 @@ in { services.zoneminder = with lib; { enable = lib.mkEnableOption '' ZoneMinder - + If you intend to run the database locally, you should set `config.services.zoneminder.database.createLocally` to true. Otherwise, when set to `false` (the default), you will have to create the database @@ -82,8 +82,6 @@ in { default = "nginx"; description = '' The webserver to configure for the PHP frontend. - - Set it to `none` if you want to configure it yourself. PRs are welcome for support for other web servers. diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix index 4fd07a4ba143..661b38b4c5a2 100644 --- a/nixos/modules/services/monitoring/netdata.nix +++ b/nixos/modules/services/monitoring/netdata.nix @@ -118,10 +118,10 @@ in { Extra paths to add to the netdata global "plugins directory" option. Useful for when you want to include your own collection scripts. - + Details about writing a custom netdata plugin are available at: - + Cannot be combined with configText. ''; }; diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 7abdf16b1534..563892cb3655 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -329,8 +329,7 @@ in { default = "default"; description = '' Set the DNS (resolv.conf) processing mode. - - + A description of these modes can be found in the main section of https://developer.gnome.org/NetworkManager/stable/NetworkManager.conf.html @@ -390,7 +389,7 @@ in { default = false; description = '' Enable the StrongSwan plugin. - + If you enable this option the networkmanager_strongswan plugin will be added to the option diff --git a/nixos/modules/services/networking/ntp/ntpd.nix b/nixos/modules/services/networking/ntp/ntpd.nix index 47922f5e1499..490d1619f118 100644 --- a/nixos/modules/services/networking/ntp/ntpd.nix +++ b/nixos/modules/services/networking/ntp/ntpd.nix @@ -43,8 +43,7 @@ in description = '' Whether to synchronise your machine's time using ntpd, as a peer in the NTP network. - - + Disables systemd.timesyncd if enabled. ''; }; @@ -53,8 +52,7 @@ in type = types.listOf types.str; description = '' The restriction flags to be set by default. - - + The default flags prevent external hosts from using ntpd as a DDoS reflector, setting system time, and querying OS/ntpd version. As recommended in section 6.5.1.1.3, answer "No" of @@ -67,8 +65,7 @@ in type = types.listOf types.str; description = '' The restriction flags to be set on source. - - + The default flags allow peers to be added by ntpd from configured pool(s), but not by other means. ''; diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index c6386ed6823d..e95fe19dede3 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -300,8 +300,7 @@ in ]; description = '' Allowed key exchange algorithms - - + Uses the lower bound recommended in both and @@ -321,8 +320,7 @@ in ]; description = '' Allowed ciphers - - + Defaults to recommended settings from both and @@ -342,8 +340,7 @@ in ]; description = '' Allowed MACs - - + Defaults to recommended settings from both and diff --git a/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix b/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix index dfdfc50d8ae2..d5a8daf98ec6 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix @@ -59,7 +59,8 @@ rec { if strongswanDefault == null then description else description + '' - + + StrongSwan default: ''; diff --git a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix index cca61b9ce930..737d0331f195 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix @@ -15,14 +15,14 @@ let file = mkOptionalStrParam '' Absolute path to the certificate to load. Passed as-is to the daemon, so it must be readable by it. - + Configure either this or , but not both, in one section. ''; handle = mkOptionalHexParam '' Hex-encoded CKA_ID or handle of the certificate on a token or TPM, respectively. - + Configure either this or , but not both, in one section. ''; @@ -40,7 +40,7 @@ in { cacert = mkOptionalStrParam '' The certificates may use a relative path from the swanctl x509ca directory or an absolute path. - + Configure one of , , or per section. @@ -82,11 +82,11 @@ in { local_addrs = mkCommaSepListParam [] '' Local address(es) to use for IKE communication. Takes single IPv4/IPv6 addresses, DNS names, CIDR subnets or IP address ranges. - + As initiator, the first non-range/non-subnet is used to initiate the connection from. As responder, the local destination address must match at least to one of the specified addresses, subnets or ranges. - + If FQDNs are assigned they are resolved every time a configuration lookup is done. If DNS resolution times out, the lookup is delayed for that time. ''; @@ -94,11 +94,11 @@ in { remote_addrs = mkCommaSepListParam [] '' Remote address(es) to use for IKE communication. Takes single IPv4/IPv6 addresses, DNS names, CIDR subnets or IP address ranges. - + As initiator, the first non-range/non-subnet is used to initiate the connection to. As responder, the initiator source address must match at least to one of the specified addresses, subnets or ranges. - + If FQDNs are assigned they are resolved every time a configuration lookup is done. If DNS resolution times out, the lookup is delayed for that time. To initiate a connection, at least one specific address or DNS name must @@ -110,7 +110,7 @@ in { backend is used, which is usually 500. If port 500 is used, automatic IKE port floating to port 4500 is used to work around NAT issues. - + Using a non-default local IKE port requires support from the socket backend in use (socket-dynamic). ''; @@ -126,13 +126,13 @@ in { for IKE an encryption algorithm, an integrity algorithm, a pseudo random function and a Diffie-Hellman group. For AEAD algorithms, instead of encryption and integrity algorithms, a combined algorithm is used. - + In IKEv2, multiple algorithms of the same kind can be specified in a single proposal, from which one gets selected. In IKEv1, only one algorithm per kind is allowed per proposal, more algorithms get implicitly stripped. Use multiple proposals to offer different algorithms combinations in IKEv1. - + Algorithm keywords get separated using dashes. Multiple proposals may be specified in a list. The special value default forms a default proposal of supported algorithms considered safe, and is usually a @@ -159,7 +159,7 @@ in { If the default of yes is used, Mode Config works in pull mode, where the initiator actively requests a virtual IP. With no, push mode is used, where the responder pushes down a virtual IP to the initiating peer. - + Push mode is currently supported for IKEv1, but not in IKEv2. It is used by a few implementations only, pull mode is recommended. ''; @@ -174,7 +174,7 @@ in { To enforce UDP encapsulation of ESP packets, the IKE daemon can fake the NAT detection payloads. This makes the peer believe that NAT takes place on the path, forcing it to encapsulate ESP packets in UDP. - + Usually this is not required, but it can help to work around connectivity issues with too restrictive intermediary firewalls. ''; @@ -183,7 +183,7 @@ in { Enables MOBIKE on IKEv2 connections. MOBIKE is enabled by default on IKEv2 connections, and allows mobility of clients and multi-homing on servers by migrating active IPsec tunnels. - + Usually keeping MOBIKE enabled is unproblematic, as it is not used if the peer does not indicate support for it. However, due to the design of MOBIKE, IKEv2 always floats to port 4500 starting from the second @@ -222,7 +222,7 @@ in { Finally, setting the option to no will disable announcing support for this feature. - + Note that fragmented IKE messages sent by a peer are always processed irrespective of the value of this option (even when set to no). ''; @@ -284,7 +284,7 @@ in { unique = mkEnumParam ["no" "never" "keep" "replace"] "no" '' Connection uniqueness policy to enforce. To avoid multiple connections from the same user, a uniqueness policy can be enforced. - + The value never does never enforce such a policy, even @@ -306,7 +306,7 @@ in { To compare connections for uniqueness, the remote IKE identity is used. If EAP or XAuth authentication is involved, the EAP-Identity or XAuth username is used to enforce the uniqueness policy instead. - + On initiators this setting specifies whether an INITIAL_CONTACT notify is sent during IKE_AUTH if no existing connection is found with the remote peer (determined by the identities of the first authentication @@ -320,7 +320,7 @@ in { possible to actively reauthenticate as responder. The IKEv2 reauthentication lifetime negotiation can instruct the client to perform reauthentication. - + Reauthentication is disabled by default. Enabling it usually may lead to small connection interruptions, as strongSwan uses a break-before-make policy with IKEv2 to avoid any conflicts with associated tunnel resources. @@ -330,7 +330,7 @@ in { IKE rekeying refreshes key material using a Diffie-Hellman exchange, but does not re-check associated credentials. It is supported in IKEv2 only, IKEv1 performs a reauthentication procedure instead. - + With the default value IKE rekeying is scheduled every 4 hours, minus the configured rand_time. If a reauth_time is configured, rekey_time defaults to zero, disabling rekeying; explicitly set both to enforce rekeying and @@ -343,10 +343,10 @@ in { perpetually, a maximum hard lifetime may be specified. If the IKE_SA fails to rekey or reauthenticate within the specified time, the IKE_SA gets closed. - + In contrast to CHILD_SA rekeying, over_time is relative in time to the rekey_time and reauth_time values, as it applies to both. - + The default is 10% of the longer of and . ''; @@ -356,7 +356,7 @@ in { rekey/reauth times. To avoid having both peers initiating the rekey/reauth procedure simultaneously, a random time gets subtracted from the rekey/reauth times. - + The default is equal to the configured . ''; @@ -410,7 +410,7 @@ in { List of certificate candidates to use for authentication. The certificates may use a relative path from the swanctl x509 directory or an absolute path. - + The certificate used for authentication is selected based on the received certificate request payloads. If no appropriate CA can be located, the first certificate is used. @@ -426,7 +426,7 @@ in { List of raw public key candidates to use for authentication. The public keys may use a relative path from the swanctl pubkey directory or an absolute path. - + Even though multiple local public keys could be defined in principle, only the first public key in the list is used for authentication. ''; @@ -504,7 +504,7 @@ in { authentication. This identity may differ from the IKE identity, especially when EAP authentication is delegated from the IKE responder to an AAA backend. - + For EAP-(T)TLS, this defines the identity for which the server must provide a certificate in the TLS exchange. ''; @@ -518,7 +518,7 @@ in { defines the rules how authentication is performed for the local peer. Multiple rounds may be defined to use IKEv2 RFC 4739 Multiple Authentication or IKEv1 XAuth. - + Each round is defined in a section having local as prefix, and an optional unique suffix. To define a single authentication round, the suffix may be omitted. @@ -620,7 +620,7 @@ in { Authentication to expect from remote. See the section's keyword description about the details of supported mechanisms. - + Since 5.4.0, to require a trustchain public key strength for the remote side, specify the key type followed by the minimum strength in bits (for example ecdsa-384 or @@ -641,7 +641,7 @@ in { pubkey or rsa constraints are configured RSASSA-PSS signatures will only be accepted if enabled in strongswan.conf(5). - + To specify trust chain constraints for EAP-(T)TLS, append a colon to the EAP method, followed by the key type/size and hash algorithm as discussed above (e.g. eap-tls:ecdsa-384-sha384). @@ -652,7 +652,7 @@ in { defines the constraints how the peers must authenticate to use this connection. Multiple rounds may be defined to use IKEv2 RFC 4739 Multiple Authentication or IKEv1 XAuth. - + Each round is defined in a section having remote as prefix, and an optional unique suffix. To define a single authentication round, the suffix may be omitted. @@ -665,13 +665,13 @@ in { Diffie-Hellman group. If a DH group is specified, CHILD_SA/Quick Mode rekeying and initial negotiation uses a separate Diffie-Hellman exchange using the specified group (refer to esp_proposals for details). - + In IKEv2, multiple algorithms of the same kind can be specified in a single proposal, from which one gets selected. In IKEv1, only one algorithm per kind is allowed per proposal, more algorithms get implicitly stripped. Use multiple proposals to offer different algorithms combinations in IKEv1. - + Algorithm keywords get separated using dashes. Multiple proposals may be specified in a list. The special value default forms a default proposal of supported algorithms considered safe, and is @@ -686,7 +686,7 @@ in { an optional Extended Sequence Number Mode indicator. For AEAD proposals, a combined mode algorithm is used instead of the separate encryption/integrity algorithms. - + If a DH group is specified, CHILD_SA/Quick Mode rekeying and initial negotiation use a separate Diffie-Hellman exchange using the specified group. However, for IKEv2, the keys of the CHILD_SA created implicitly @@ -695,18 +695,18 @@ in { rekeyed or is created with a separate CREATE_CHILD_SA exchange. A proposal mismatch might, therefore, not immediately be noticed when the SA is established, but may later cause rekeying to fail. - + Extended Sequence Number support may be indicated with the esn and noesn values, both may be included to indicate support for both modes. If omitted, noesn is assumed. - + In IKEv2, multiple algorithms of the same kind can be specified in a single proposal, from which one gets selected. In IKEv1, only one algorithm per kind is allowed per proposal, more algorithms get implicitly stripped. Use multiple proposals to offer different algorithms combinations in IKEv1. - + Algorithm keywords get separated using dashes. Multiple proposals may be specified as a list. The special value default forms a default proposal of supported algorithms considered safe, and is @@ -729,7 +729,7 @@ in { selector. The special value dynamic may be used instead of a subnet definition, which gets replaced by the tunnel outer address or the virtual IP, if negotiated. This is the default. - + A protocol/port selector is surrounded by opening and closing square brackets. Between these brackets, a numeric or getservent(3) protocol name may be specified. After the optional protocol restriction, an @@ -738,7 +738,7 @@ in { special value opaque for RFC 4301 OPAQUE selectors. Port ranges may be specified as well, none of the kernel backends currently support port ranges, though. - + When IKEv1 is used only the first selector is interpreted, except if the Cisco Unity extension plugin is used. This is due to a limitation of the IKEv1 protocol, which only allows a single pair of selectors per @@ -761,7 +761,7 @@ in { specified in the proposal. To avoid rekey collisions initiated by both ends simultaneously, a value in the range of gets subtracted to form the effective soft lifetime. - + By default CHILD_SA rekeying is scheduled every hour, minus . ''; @@ -783,11 +783,11 @@ in { Number of bytes processed before initiating CHILD_SA rekeying. CHILD_SA rekeying refreshes key material, optionally using a Diffie-Hellman exchange if a group is specified in the proposal. - + To avoid rekey collisions initiated by both ends simultaneously, a value in the range of gets subtracted to form the effective soft volume limit. - + Volume based CHILD_SA rekeying is disabled by default. ''; @@ -808,11 +808,11 @@ in { Number of packets processed before initiating CHILD_SA rekeying. CHILD_SA rekeying refreshes key material, optionally using a Diffie-Hellman exchange if a group is specified in the proposal. - + To avoid rekey collisions initiated by both ends simultaneously, a value in the range of gets subtracted to form the effective soft packet count limit. - + Packet count based CHILD_SA rekeying is disabled by default. ''; @@ -821,7 +821,7 @@ in { this hard packets limit is never reached, because the CHILD_SA gets rekeyed before. If that fails for whatever reason, this limit closes the CHILD_SA. - + The default is 10% more than . ''; @@ -936,7 +936,7 @@ in { %unique sets a unique mark on each CHILD_SA instance, beyond that the value %unique-dir assigns a different unique mark for each - + An additional mask may be appended to the mark, separated by /. The default mask if omitted is 0xffffffff. @@ -960,7 +960,7 @@ in { value %unique sets a unique mark on each CHILD_SA instance, beyond that the value %unique-dir assigns a different unique mark for each CHILD_SA direction (in/out). - + An additional mask may be appended to the mark, separated by /. The default mask if omitted is 0xffffffff. @@ -1102,7 +1102,7 @@ in { start tries to re-create the CHILD_SA. - + does not provide any guarantee that the CHILD_SA is kept alive. It acts on explicit close messages only, but not on negotiation failures. Use trap policies to reliably re-create failed diff --git a/nixos/modules/services/networking/znc/default.nix b/nixos/modules/services/networking/znc/default.nix index a98f92d2d710..42a332d6bf03 100644 --- a/nixos/modules/services/networking/znc/default.nix +++ b/nixos/modules/services/networking/znc/default.nix @@ -156,22 +156,18 @@ in format ZNC expects. This is much more flexible than the legacy options under , but also can't do any type checking. - - + You can use nix-instantiate --eval --strict '<nixpkgs/nixos>' -A config.services.znc.config to view the current value. By default it contains a listener for port 5000 with SSL enabled. - - + Nix attributes called extraConfig will be inserted verbatim into the resulting config file. - - + If is turned on, the option values in will be gracefully be applied to this option. - - + If you intend to update the configuration through this option, be sure to enable , otherwise none of the changes here will be applied after the initial deploy. @@ -184,8 +180,7 @@ in description = '' Configuration file for ZNC. It is recommended to use the option instead. - - + Setting this option will override any auto-generated config file through the or options. @@ -208,13 +203,11 @@ in Indicates whether to allow the contents of the dataDir directory to be changed by the user at run-time. - - + If enabled, modifications to the ZNC configuration after its initial creation are not overwritten by a NixOS rebuild. If disabled, the ZNC configuration is rebuilt on every NixOS rebuild. - - + If the user wants to manage the ZNC service using the web admin interface, this option should be enabled. ''; diff --git a/nixos/modules/services/networking/znc/options.nix b/nixos/modules/services/networking/znc/options.nix index 830df809155a..021fea9819a7 100644 --- a/nixos/modules/services/networking/znc/options.nix +++ b/nixos/modules/services/networking/znc/options.nix @@ -106,8 +106,7 @@ in options. You can use nix-instantiate --eval --strict '<nixpkgs/nixos>' -A config.services.znc.config to view the current value of the config. - - + In any case, if you need more flexibility, can be used to override/add to all of the legacy options. diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 0a5999923169..fcc2976cd2c1 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -172,8 +172,7 @@ in default = false; description = '' Support setting monitor brightness via DDC. - - + This is not needed for controlling brightness of the internal monitor of a laptop and as it is considered experimental by upstream, it is disabled by default. diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 84f560691fc4..87ff1d97d8fa 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -335,7 +335,7 @@ in ''; description = '' The name of the system used in the derivation. - + That derivation has the following name: "nixos-system-''${config.system.name}-''${config.system.nixos.label}" ''; diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 00ec3d237d53..1ad7cd810948 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -624,9 +624,9 @@ in type = types.bool; description = '' Whether to invoke grub-install with - --removable. + --removable. - Unless you turn this on, GRUB will install itself somewhere in + Unless you turn this on, GRUB will install itself somewhere in boot.loader.efi.efiSysMountPoint (exactly where depends on other config variables). If you've set boot.loader.efi.canTouchEfiVariables *AND* you @@ -637,14 +637,14 @@ in NVRAM will not be modified, and your system will not find GRUB at boot time. However, GRUB will still return success so you may miss the warning that gets printed ("efibootmgr: EFI variables - are not supported on this system."). + are not supported on this system."). - If you turn this feature on, GRUB will install itself in a + If you turn this feature on, GRUB will install itself in a special location within efiSysMountPoint (namely EFI/boot/boot$arch.efi) which the firmwares - are hardcoded to try first, regardless of NVRAM EFI variables. + are hardcoded to try first, regardless of NVRAM EFI variables. - To summarize, turn this on if: + To summarize, turn this on if: You are installing NixOS and want it to boot in UEFI mode, but you are currently booted in legacy mode diff --git a/nixos/modules/system/boot/systemd/logind.nix b/nixos/modules/system/boot/systemd/logind.nix index cb8fc448a9ef..0df03e976947 100644 --- a/nixos/modules/system/boot/systemd/logind.nix +++ b/nixos/modules/system/boot/systemd/logind.nix @@ -33,9 +33,7 @@ in terminated. If false, the scope is "abandoned" (see systemd.scope(5)), and processes are not killed. - - See logind.conf(5) for more details. ''; diff --git a/nixos/modules/tasks/scsi-link-power-management.nix b/nixos/modules/tasks/scsi-link-power-management.nix index a9d987780ee1..549c35fc5b8d 100644 --- a/nixos/modules/tasks/scsi-link-power-management.nix +++ b/nixos/modules/tasks/scsi-link-power-management.nix @@ -28,7 +28,7 @@ in description = '' SCSI link power management policy. The kernel default is "max_performance". - + "med_power_with_dipm" is supported by kernel versions 4.15 and newer. ''; From 16102dce2fbad670bd47dd75c860a8daa5fe47ad Mon Sep 17 00:00:00 2001 From: pennae Date: Tue, 2 Aug 2022 02:47:05 +0200 Subject: [PATCH 045/142] nixos/*: replace in option docs with markdown can't represent the difference without another extension and both the html manual and the manpage render them the same, so keeping the distinction is not very useful on its own. with the distinction removed we can automatically convert many options that use tags to markdown. the manpage remains unchanged, html manual does not render differently (but class names on code tags do change from "code" to "literal"). --- nixos/modules/config/resolvconf.nix | 4 +- nixos/modules/config/shells-environment.nix | 2 +- nixos/modules/config/system-environment.nix | 4 +- nixos/modules/config/users-groups.nix | 6 +-- nixos/modules/misc/nixpkgs.nix | 44 +++++++++---------- nixos/modules/programs/adb.nix | 2 +- nixos/modules/programs/firejail.nix | 2 +- nixos/modules/programs/gphoto2.nix | 2 +- nixos/modules/programs/kdeconnect.nix | 2 +- nixos/modules/programs/ssh.nix | 2 +- nixos/modules/programs/turbovnc.nix | 2 +- nixos/modules/security/acme/default.nix | 2 +- nixos/modules/security/doas.nix | 32 +++++++------- nixos/modules/security/sudo.nix | 14 +++--- nixos/modules/services/databases/firebird.nix | 4 +- nixos/modules/services/databases/mysql.nix | 2 +- .../modules/services/databases/postgresql.nix | 2 +- nixos/modules/services/mail/nullmailer.nix | 8 ++-- nixos/modules/services/mail/public-inbox.nix | 6 +-- nixos/modules/services/misc/autorandr.nix | 2 +- .../services/misc/sourcehut/default.nix | 10 ++--- nixos/modules/services/networking/bird.nix | 4 +- .../services/networking/ghostunnel.nix | 12 ++--- .../services/networking/nntp-proxy.nix | 2 +- nixos/modules/services/networking/nsd.nix | 2 +- .../services/networking/openconnect.nix | 10 ++--- .../modules/services/networking/yggdrasil.nix | 8 ++-- .../modules/services/torrent/transmission.nix | 6 +-- nixos/modules/services/web-apps/bookstack.nix | 4 +- nixos/modules/services/web-apps/mastodon.nix | 26 +++++------ nixos/modules/services/web-apps/nextcloud.nix | 4 +- nixos/modules/services/web-apps/snipe-it.nix | 4 +- .../modules/virtualisation/podman/default.nix | 2 +- .../virtualisation/podman/network-socket.nix | 2 +- 34 files changed, 120 insertions(+), 120 deletions(-) diff --git a/nixos/modules/config/resolvconf.nix b/nixos/modules/config/resolvconf.nix index cdc40d2c810b..ef291ce5aaf1 100644 --- a/nixos/modules/config/resolvconf.nix +++ b/nixos/modules/config/resolvconf.nix @@ -84,8 +84,8 @@ in type = types.bool; default = true; description = '' - Enable the edns0 option in resolv.conf. With - that option set, glibc supports use of the extension mechanisms for + Enable the edns0 option in resolv.conf. With + that option set, glibc supports use of the extension mechanisms for DNS (EDNS) specified in RFC 2671. The most popular user of that feature is DNSSEC, which does not work without it. ''; diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix index 660b2e1fa4bf..3dc202327c2d 100644 --- a/nixos/modules/config/shells-environment.nix +++ b/nixos/modules/config/shells-environment.nix @@ -113,7 +113,7 @@ in An attribute set that maps aliases (the top level attribute names in this option) to command strings or directly to build outputs. The aliases are added to all users' shells. - Aliases mapped to null are ignored. + Aliases mapped to null are ignored. ''; type = with types; attrsOf (nullOr (either str path)); }; diff --git a/nixos/modules/config/system-environment.nix b/nixos/modules/config/system-environment.nix index d2a66b8d932d..a299fdceaf1c 100644 --- a/nixos/modules/config/system-environment.nix +++ b/nixos/modules/config/system-environment.nix @@ -30,7 +30,7 @@ in Also, these variables are merged into and it is therefore not possible to use PAM style variables such as - @{HOME}. + @{HOME}. ''; type = with types; attrsOf (either str (listOf str)); apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else v); @@ -58,7 +58,7 @@ in Also, these variables are merged into and it is therefore not possible to use PAM style variables such as - @{HOME}. + @{HOME}. ''; }; diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 466e3f6138a5..1b63dc52d6ef 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -154,8 +154,8 @@ let description = '' Attributes for user's entry in pam_mount.conf.xml. - Useful attributes might include path, - options, fstype, and server. + Useful attributes might include path, + options, fstype, and server. See for more information. @@ -172,7 +172,7 @@ let like pkgs.bashInteractive. Don’t forget to enable your shell in programs if necessary, - like programs.zsh.enable = true;. + like programs.zsh.enable = true;. ''; }; diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index e991ff42028d..bb21e31ec979 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -119,11 +119,11 @@ in example = literalExpression "import {}"; description = '' If set, the pkgs argument to all NixOS modules is the value of - this option, extended with nixpkgs.overlays, if - that is also set. Either nixpkgs.crossSystem or - nixpkgs.localSystem will be used in an assertion + this option, extended with nixpkgs.overlays, if + that is also set. Either nixpkgs.crossSystem or + nixpkgs.localSystem will be used in an assertion to check that the NixOS and Nixpkgs architectures match. Any - other options in nixpkgs.*, notably config, + other options in nixpkgs.*, notably config, will be ignored. If unset, the pkgs argument to all NixOS modules is determined @@ -132,18 +132,18 @@ in The default value imports the Nixpkgs source files relative to the location of this NixOS module, because NixOS and Nixpkgs are distributed together for consistency, - so the nixos in the default value is in fact a - relative path. The config, overlays, - localSystem, and crossSystem come + so the nixos in the default value is in fact a + relative path. The config, overlays, + localSystem, and crossSystem come from this option's siblings. This option can be used by applications like NixOps to increase the performance of evaluation, or to create packages that depend on a container that should be built with the exact same evaluation of Nixpkgs, for example. Applications like this should set - their default value using lib.mkDefault, so + their default value using lib.mkDefault, so user-provided configuration can override it without using - lib. + lib. Note that using a distinct version of Nixpkgs with NixOS may be an unexpected source of problems. Use this option with care. @@ -162,7 +162,7 @@ in details, see the Nixpkgs documentation.) It allows you to set package configuration options. - Ignored when nixpkgs.pkgs is set. + Ignored when nixpkgs.pkgs is set. ''; }; @@ -188,9 +188,9 @@ in The first argument should be used for finding dependencies, and the second should be used for overriding recipes. - If nixpkgs.pkgs is set, overlays specified here + If nixpkgs.pkgs is set, overlays specified here will be applied after the overlays that were already present - in nixpkgs.pkgs. + in nixpkgs.pkgs. ''; }; @@ -205,9 +205,9 @@ in description = '' Specifies the platform where the NixOS configuration will run. - To cross-compile, set also nixpkgs.buildPlatform. + To cross-compile, set also nixpkgs.buildPlatform. - Ignored when nixpkgs.pkgs is set. + Ignored when nixpkgs.pkgs is set. ''; }; @@ -230,7 +230,7 @@ in or if you're building machines, you can set this to match your development system and/or build farm. - Ignored when nixpkgs.pkgs is set. + Ignored when nixpkgs.pkgs is set. ''; }; @@ -253,7 +253,7 @@ in use the old options. Specifies the platform on which NixOS should be built. When - nixpkgs.crossSystem is unset, it also specifies + nixpkgs.crossSystem is unset, it also specifies the platform for which NixOS should be built. If this option is unset, it defaults to the platform type of the machine where evaluation happens. Specifying this @@ -261,7 +261,7 @@ in deployment, or when building virtual machines. See its description in the Nixpkgs manual for more details. - Ignored when nixpkgs.pkgs or hostPlatform is set. + Ignored when nixpkgs.pkgs or hostPlatform is set. ''; }; @@ -279,13 +279,13 @@ in Specifies the platform for which NixOS should be built. Specify this only if it is different from - nixpkgs.localSystem, the platform + nixpkgs.localSystem, the platform on which NixOS should be built. In other words, specify this to cross-compile NixOS. Otherwise it should be set as null, the default. See its description in the Nixpkgs manual for more details. - Ignored when nixpkgs.pkgs or hostPlatform is set. + Ignored when nixpkgs.pkgs or hostPlatform is set. ''; }; @@ -316,7 +316,7 @@ in with a recently generated hardware-configuration.nix. Specifies the Nix platform type on which NixOS should be built. - It is better to specify nixpkgs.localSystem instead. + It is better to specify nixpkgs.localSystem instead. { nixpkgs.system = ..; @@ -328,9 +328,9 @@ in nixpkgs.localSystem.system = ..; } - See nixpkgs.localSystem for more information. + See nixpkgs.localSystem for more information. - Ignored when nixpkgs.pkgs, nixpkgs.localSystem or nixpkgs.hostPlatform is set. + Ignored when nixpkgs.pkgs, nixpkgs.localSystem or nixpkgs.hostPlatform is set. ''; }; }; diff --git a/nixos/modules/programs/adb.nix b/nixos/modules/programs/adb.nix index 9e9e37f92a87..634031939207 100644 --- a/nixos/modules/programs/adb.nix +++ b/nixos/modules/programs/adb.nix @@ -14,7 +14,7 @@ with lib; description = '' Whether to configure system to use Android Debug Bridge (adb). To grant access to a user, it must be part of adbusers group: - users.users.alice.extraGroups = ["adbusers"]; + users.users.alice.extraGroups = ["adbusers"]; ''; }; }; diff --git a/nixos/modules/programs/firejail.nix b/nixos/modules/programs/firejail.nix index e014aea626c7..b9a0f9a69113 100644 --- a/nixos/modules/programs/firejail.nix +++ b/nixos/modules/programs/firejail.nix @@ -74,7 +74,7 @@ in { You will get file collisions if you put the actual application binary in the global environment (such as by adding the application package to - environment.systemPackages), and applications started via + environment.systemPackages), and applications started via .desktop files are not wrapped if they specify the absolute path to the binary. ''; diff --git a/nixos/modules/programs/gphoto2.nix b/nixos/modules/programs/gphoto2.nix index 93923ff3133c..373b53495f75 100644 --- a/nixos/modules/programs/gphoto2.nix +++ b/nixos/modules/programs/gphoto2.nix @@ -15,7 +15,7 @@ with lib; Whether to configure system to use gphoto2. To grant digital camera access to a user, the user must be part of the camera group: - users.users.alice.extraGroups = ["camera"]; + users.users.alice.extraGroups = ["camera"]; ''; }; }; diff --git a/nixos/modules/programs/kdeconnect.nix b/nixos/modules/programs/kdeconnect.nix index aa4302404ad4..1f326c9e9219 100644 --- a/nixos/modules/programs/kdeconnect.nix +++ b/nixos/modules/programs/kdeconnect.nix @@ -8,7 +8,7 @@ with lib; Note that it will open the TCP and UDP port from 1714 to 1764 as they are needed for it to function properly. You can use the to use - gnomeExtensions.gsconnect as an alternative + gnomeExtensions.gsconnect as an alternative implementation if you use Gnome. ''; package = mkOption { diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index e0da6ef3b3ad..9c4a95ef22c6 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -95,7 +95,7 @@ in default = ""; description = '' Extra configuration text prepended to ssh_config. Other generated - options will be added after a Host * pattern. + options will be added after a Host * pattern. See ssh_config5 for help. ''; diff --git a/nixos/modules/programs/turbovnc.nix b/nixos/modules/programs/turbovnc.nix index e6f8836aa367..eb09c554290f 100644 --- a/nixos/modules/programs/turbovnc.nix +++ b/nixos/modules/programs/turbovnc.nix @@ -22,7 +22,7 @@ in This will enable so that OpenGL programs can find Mesa's llvmpipe drivers. - Setting this option to false does not mean that software + Setting this option to false does not mean that software OpenGL won't work; it may still work depending on your system configuration. diff --git a/nixos/modules/security/acme/default.nix b/nixos/modules/security/acme/default.nix index 54b44dcab62b..5f4344d451c8 100644 --- a/nixos/modules/security/acme/default.nix +++ b/nixos/modules/security/acme/default.nix @@ -505,7 +505,7 @@ let type = types.listOf types.str; inherit (defaultAndText "reloadServices" []) default defaultText; description = '' - The list of systemd services to call systemctl try-reload-or-restart + The list of systemd services to call systemctl try-reload-or-restart on. ''; }; diff --git a/nixos/modules/security/doas.nix b/nixos/modules/security/doas.nix index d4b51b406e28..2641548221a9 100644 --- a/nixos/modules/security/doas.nix +++ b/nixos/modules/security/doas.nix @@ -63,7 +63,7 @@ in type = with types; bool; default = true; description = '' - Whether users of the wheel group must provide a password to + Whether users of the wheel group must provide a password to run commands as super user via doas. ''; }; @@ -74,7 +74,7 @@ in Define specific rules to be set in the /etc/doas.conf file. More specific rules should come after more general ones in order to yield the expected behavior. - You can use mkBefore and/or mkAfter to ensure + You can use mkBefore and/or mkAfter to ensure this is the case when configuration options are merged. ''; example = literalExpression '' @@ -114,7 +114,7 @@ in type = with types; bool; default = false; description = '' - If true, the user is not required to enter a + If true, the user is not required to enter a password. ''; }; @@ -123,7 +123,7 @@ in type = with types; bool; default = false; description = '' - If true, successful executions will not be logged + If true, successful executions will not be logged to syslogd8. ''; @@ -133,7 +133,7 @@ in type = with types; bool; default = false; description = '' - If true, do not ask for a password again for some + If true, do not ask for a password again for some time after the user successfully authenticates. ''; }; @@ -142,7 +142,7 @@ in type = with types; bool; default = false; description = '' - If true, environment variables other than those + If true, environment variables other than those listed in doas1 are kept when creating the environment for the new process. @@ -155,15 +155,15 @@ in description = '' Keep or set the specified variables. Variables may also be removed with a leading '-' or set using - variable=value. If the first character of - value is a '$', the value to be set is taken from + variable=value. If the first character of + value is a '$', the value to be set is taken from the existing environment variable of the indicated name. This option is processed after the default environment has been created. - NOTE: All rules have setenv { SSH_AUTH_SOCK } by - default. To prevent SSH_AUTH_SOCK from being - inherited, add "-SSH_AUTH_SOCK" anywhere in this + NOTE: All rules have setenv { SSH_AUTH_SOCK } by + default. To prevent SSH_AUTH_SOCK from being + inherited, add "-SSH_AUTH_SOCK" anywhere in this list. ''; }; @@ -185,12 +185,12 @@ in default = null; description = '' Which user or group the specified command is allowed to run as. - When set to null (the default), all users are + When set to null (the default), all users are allowed. A user can be specified using just the username: - "foo". It is also possible to only allow running as - a specific group with ":bar". + "foo". It is also possible to only allow running as + a specific group with ":bar". ''; }; @@ -199,7 +199,7 @@ in default = null; description = '' The command the user is allowed to run. When set to - null (the default), all commands are allowed. + null (the default), all commands are allowed. NOTE: It is best practice to specify absolute paths. If a relative path is specified, only a restricted PATH will be @@ -212,7 +212,7 @@ in default = null; description = '' Arguments that must be provided to the command. When set to - [], the command must be run without any arguments. + [], the command must be run without any arguments. ''; }; }; diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix index 2e30a8915d86..c1a69aedde45 100644 --- a/nixos/modules/security/sudo.nix +++ b/nixos/modules/security/sudo.nix @@ -56,7 +56,7 @@ in default = true; description = '' - Whether users of the wheel group must + Whether users of the wheel group must provide a password to run commands as super user via sudo. ''; }; @@ -65,9 +65,9 @@ in type = types.bool; default = false; description = '' - Only allow members of the wheel group to execute sudo by + Only allow members of the wheel group to execute sudo by setting the executable's permissions accordingly. - This prevents users that are not members of wheel from + This prevents users that are not members of wheel from exploiting vulnerabilities in sudo such as CVE-2021-3156. ''; }; @@ -142,9 +142,9 @@ in description = '' Under which user/group the specified command is allowed to run. - A user can be specified using just the username: "foo". - It is also possible to specify a user/group combination using "foo:bar" - or to only allow running as a specific group with ":bar". + A user can be specified using just the username: "foo". + It is also possible to specify a user/group combination using "foo:bar" + or to only allow running as a specific group with ":bar". ''; }; @@ -159,7 +159,7 @@ in type = with types; str; description = '' A command being either just a path to a binary to allow any arguments, - the full command with arguments pre-set or with "" used as the argument, + the full command with arguments pre-set or with "" used as the argument, not allowing arguments to the command at all. ''; }; diff --git a/nixos/modules/services/databases/firebird.nix b/nixos/modules/services/databases/firebird.nix index 3a7ebd6bbd09..a26f1ff8258f 100644 --- a/nixos/modules/services/databases/firebird.nix +++ b/nixos/modules/services/databases/firebird.nix @@ -48,8 +48,8 @@ in type = types.package; example = literalExpression "pkgs.firebird_3"; description = '' - Which Firebird package to be installed: pkgs.firebird_3 - For SuperServer use override: pkgs.firebird_3.override { superServer = true; }; + Which Firebird package to be installed: pkgs.firebird_3 + For SuperServer use override: pkgs.firebird_3.override { superServer = true; }; ''; }; diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index b7a55900c122..1e6a6b844a37 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -211,7 +211,7 @@ in For more information on how to specify the target and on which privileges exist, see the GRANT syntax. - The attributes are used as GRANT ''${attrName} ON ''${attrValue}. + The attributes are used as GRANT ''${attrName} ON ''${attrValue}. ''; example = literalExpression '' { diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index e27f4518dfad..a054a6d7a12f 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -159,7 +159,7 @@ in For more information on how to specify the target and on which privileges exist, see the GRANT syntax. - The attributes are used as GRANT ''${attrValue} ON ''${attrName}. + The attributes are used as GRANT ''${attrValue} ON ''${attrName}. ''; example = literalExpression '' { diff --git a/nixos/modules/services/mail/nullmailer.nix b/nixos/modules/services/mail/nullmailer.nix index 59329667f7ad..c37001e35bfa 100644 --- a/nixos/modules/services/mail/nullmailer.nix +++ b/nixos/modules/services/mail/nullmailer.nix @@ -39,10 +39,10 @@ with lib; type = types.nullOr types.str; default = null; description = '' - Path to the remotes control file. This file contains a + Path to the remotes control file. This file contains a list of remote servers to which to send each message. - See man 8 nullmailer-send for syntax and available + See man 8 nullmailer-send for syntax and available options. ''; }; @@ -158,12 +158,12 @@ with lib; contains a remote host name or address followed by an optional protocol string, separated by white space. - See man 8 nullmailer-send for syntax and available + See man 8 nullmailer-send for syntax and available options. WARNING: This is stored world-readable in the nix store. If you need to specify any secret credentials here, consider using the - remotesFile option instead. + remotesFile option instead. ''; }; diff --git a/nixos/modules/services/mail/public-inbox.nix b/nixos/modules/services/mail/public-inbox.nix index bb835881ba0a..6f33283b548b 100644 --- a/nixos/modules/services/mail/public-inbox.nix +++ b/nixos/modules/services/mail/public-inbox.nix @@ -26,7 +26,7 @@ let description = '' Listening port. Beware that public-inbox uses well-known ports number to decide whether to enable TLS or not. - Set to null and use systemd.sockets.public-inbox-${proto}d.listenStreams + Set to null and use systemd.sockets.public-inbox-${proto}d.listenStreams if you need a more advanced listening. ''; }; @@ -242,8 +242,8 @@ in description = '' Listening port or systemd's ListenStream= entry to be used as a reverse proxy, eg. in nginx: - locations."/inbox".proxyPass = "http://unix:''${config.services.public-inbox.http.port}:/inbox"; - Set to null and use systemd.sockets.public-inbox-httpd.listenStreams + locations."/inbox".proxyPass = "http://unix:''${config.services.public-inbox.http.port}:/inbox"; + Set to null and use systemd.sockets.public-inbox-httpd.listenStreams if you need a more advanced listening. ''; }; diff --git a/nixos/modules/services/misc/autorandr.nix b/nixos/modules/services/misc/autorandr.nix index 9a0530866b58..a77535cca49e 100644 --- a/nixos/modules/services/misc/autorandr.nix +++ b/nixos/modules/services/misc/autorandr.nix @@ -29,7 +29,7 @@ let type = types.attrsOf types.str; description = '' Output name to EDID mapping. - Use autorandr --fingerprint to get current setup values. + Use autorandr --fingerprint to get current setup values. ''; default = { }; }; diff --git a/nixos/modules/services/misc/sourcehut/default.nix b/nixos/modules/services/misc/sourcehut/default.nix index 3ff2837900ec..de04797a800c 100644 --- a/nixos/modules/services/misc/sourcehut/default.nix +++ b/nixos/modules/services/misc/sourcehut/default.nix @@ -180,7 +180,7 @@ in network-key = mkOption { description = '' An absolute file path (which should be outside the Nix-store) - to a secret key to encrypt internal messages with. Use srht-keygen network to + to a secret key to encrypt internal messages with. Use srht-keygen network to generate this key. It must be consistent between all services and nodes. ''; type = types.path; @@ -209,7 +209,7 @@ in service-key = mkOption { description = '' An absolute file path (which should be outside the Nix-store) - to a key used for encrypting session cookies. Use srht-keygen service to + to a key used for encrypting session cookies. Use srht-keygen service to generate the service key. This must be shared between each node of the same service (e.g. git1.sr.ht and git2.sr.ht), but different services may use different keys. If you configure all of your services with the same @@ -252,8 +252,8 @@ in Your PGP key information (DO NOT mix up pub and priv here) You must remove the password from your secret key, if present. - You can do this with gpg --edit-key [key-id], - then use the passwd command and do not enter a new password. + You can do this with gpg --edit-key [key-id], + then use the passwd command and do not enter a new password. ''; }; pgp-pubkey = mkOption { @@ -294,7 +294,7 @@ in This should be consistent for all *.sr.ht sites, as this key will be used to verify signatures from other sites in your network. - Use the srht-keygen webhook command to generate a key. + Use the srht-keygen webhook command to generate a key. ''; type = types.path; apply = s: "<" + toString s; diff --git a/nixos/modules/services/networking/bird.nix b/nixos/modules/services/networking/bird.nix index d409f0602289..b166209fa969 100644 --- a/nixos/modules/services/networking/bird.nix +++ b/nixos/modules/services/networking/bird.nix @@ -24,7 +24,7 @@ in description = '' Whether the config should be checked at build time. When the config can't be checked during build time, for example when it includes - other files, either disable this option or use preCheckConfig to create + other files, either disable this option or use preCheckConfig to create the included files before checking. ''; }; @@ -36,7 +36,7 @@ in ''; description = '' Commands to execute before the config file check. The file to be checked will be - available as bird2.conf in the current directory. + available as bird2.conf in the current directory. Files created with this option will not be available at service runtime, only during build time checking. diff --git a/nixos/modules/services/networking/ghostunnel.nix b/nixos/modules/services/networking/ghostunnel.nix index 6cac6a69b067..ce5d386edc35 100644 --- a/nixos/modules/services/networking/ghostunnel.nix +++ b/nixos/modules/services/networking/ghostunnel.nix @@ -40,9 +40,9 @@ let description = '' Path to keystore (combined PEM with cert/key, or PKCS12 keystore). - NB: storepass is not supported because it would expose credentials via /proc/*/cmdline. + NB: storepass is not supported because it would expose credentials via /proc/*/cmdline. - Specify this or cert and key. + Specify this or cert and key. ''; type = types.nullOr types.str; default = null; @@ -52,7 +52,7 @@ let description = '' Path to certificate (PEM with certificate chain). - Not required if keystore is set. + Not required if keystore is set. ''; type = types.nullOr types.str; default = null; @@ -62,7 +62,7 @@ let description = '' Path to certificate private key (PEM with private key). - Not required if keystore is set. + Not required if keystore is set. ''; type = types.nullOr types.str; default = null; @@ -70,7 +70,7 @@ let cacert = mkOption { description = '' - Path to CA bundle file (PEM/X509). Uses system trust store if null. + Path to CA bundle file (PEM/X509). Uses system trust store if null. ''; type = types.nullOr types.str; }; @@ -124,7 +124,7 @@ let }; extraArguments = mkOption { - description = "Extra arguments to pass to ghostunnel server"; + description = "Extra arguments to pass to ghostunnel server"; type = types.separatedString " "; default = ""; }; diff --git a/nixos/modules/services/networking/nntp-proxy.nix b/nixos/modules/services/networking/nntp-proxy.nix index 618ed0a93f1d..1a776aae617b 100644 --- a/nixos/modules/services/networking/nntp-proxy.nix +++ b/nixos/modules/services/networking/nntp-proxy.nix @@ -169,7 +169,7 @@ in example = "$6$GtzE7FrpE$wwuVgFYU.TZH4Rz.Snjxk9XGua89IeVwPQ/fEUD8eujr40q5Y021yhn0aNcsQ2Ifw.BLclyzvzgegopgKcneL0"; description = '' SHA-512 password hash (can be generated by - mkpasswd -m sha-512 <password>) + mkpasswd -m sha-512 <password>) ''; }; diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index 1102fc85d40a..a372d3b207c4 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -393,7 +393,7 @@ let type = types.listOf types.str; default = []; description = '' - Format: [AXFR|UDP] <ip-address> <key-name | NOKEY> + Format: [AXFR|UDP] <ip-address> <key-name | NOKEY> ''; }; diff --git a/nixos/modules/services/networking/openconnect.nix b/nixos/modules/services/networking/openconnect.nix index c5313bb305a2..c72941459750 100644 --- a/nixos/modules/services/networking/openconnect.nix +++ b/nixos/modules/services/networking/openconnect.nix @@ -40,8 +40,8 @@ let passwordFile = mkOption { description = '' File containing the password to authenticate with. This - is passed to openconnect via the - --passwd-on-stdin option. + is passed to openconnect via the + --passwd-on-stdin option. ''; default = null; example = "/var/lib/secrets/openconnect-passwd"; @@ -66,10 +66,10 @@ let description = '' Extra config to be appended to the interface config. It should contain long-format options as would be accepted on the command - line by openconnect + line by openconnect (see https://www.infradead.org/openconnect/manual.html). - Non-key-value options like deflate can be used by - declaring them as booleans, i. e. deflate = true;. + Non-key-value options like deflate can be used by + declaring them as booleans, i. e. deflate = true;. ''; default = { }; example = { diff --git a/nixos/modules/services/networking/yggdrasil.nix b/nixos/modules/services/networking/yggdrasil.nix index 07b2e2a2daf2..e99f31b0eaa4 100644 --- a/nixos/modules/services/networking/yggdrasil.nix +++ b/nixos/modules/services/networking/yggdrasil.nix @@ -44,8 +44,8 @@ in { are supplied, they will be combined, with values from taking precedence. - You can use the command nix-shell -p yggdrasil --run - "yggdrasil -genconf" to generate default + You can use the command nix-shell -p yggdrasil --run + "yggdrasil -genconf" to generate default configuration values with documentation. ''; }; @@ -64,7 +64,7 @@ in { type = types.nullOr types.str; default = null; example = "wheel"; - description = "Group to grant access to the Yggdrasil control socket. If null, only root can access the socket."; + description = "Group to grant access to the Yggdrasil control socket. If null, only root can access the socket."; }; openMulticastPort = mkOption { @@ -74,7 +74,7 @@ in { Whether to open the UDP port used for multicast peer discovery. The NixOS firewall blocks link-local communication, so in order to make local peering work you - will also need to set LinkLocalTCPPort in your + will also need to set LinkLocalTCPPort in your yggdrasil configuration ( or ) to a port number other than 0, and then add that port to diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index 9777964386c9..1641f1ad184e 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -175,7 +175,7 @@ in default = null; example = "770"; description = '' - If not null, is used as the permissions + If not null, is used as the permissions set by systemd.activationScripts.transmission-daemon on the directories , . @@ -214,7 +214,7 @@ in description = '' Path to a JSON file to be merged with the settings. Useful to merge a file which is better kept out of the Nix store - to set secret config parameters like rpc-password. + to set secret config parameters like rpc-password. ''; default = "/dev/null"; example = "/var/lib/secrets/transmission/settings.json"; @@ -237,7 +237,7 @@ in to open many more connections at the same time. Note that you may also want to increase - peer-limit-global". + peer-limit-global". And be aware that these settings are quite aggressive and might not suite your regular desktop use. For instance, SSH sessions may time out more easily''; diff --git a/nixos/modules/services/web-apps/bookstack.nix b/nixos/modules/services/web-apps/bookstack.nix index 64a2767fab6e..5d22a3b9a8d6 100644 --- a/nixos/modules/services/web-apps/bookstack.nix +++ b/nixos/modules/services/web-apps/bookstack.nix @@ -52,7 +52,7 @@ in { description = '' A file containing the Laravel APP_KEY - a 32 character long, base64 encoded key used for encryption where needed. Can be - generated with head -c 32 /dev/urandom | base64. + generated with head -c 32 /dev/urandom | base64. ''; example = "/run/keys/bookstack-appkey"; type = types.path; @@ -74,7 +74,7 @@ in { appURL = mkOption { description = '' The root URL that you want to host BookStack on. All URLs in BookStack will be generated using this value. - If you change this in the future you may need to run a command to update stored URLs in the database. Command example: php artisan bookstack:update-url https://old.example.com https://new.example.com + If you change this in the future you may need to run a command to update stored URLs in the database. Command example: php artisan bookstack:update-url https://old.example.com https://new.example.com ''; default = "http${lib.optionalString tlsEnabled "s"}://${cfg.hostname}"; defaultText = ''http''${lib.optionalString tlsEnabled "s"}://''${cfg.hostname}''; diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix index f3f0fb7cb534..00c30d73bb6f 100644 --- a/nixos/modules/services/web-apps/mastodon.nix +++ b/nixos/modules/services/web-apps/mastodon.nix @@ -113,17 +113,17 @@ in { affect other virtualHosts running on your nginx instance, if any. Alternatively you can configure a reverse-proxy of your choice to serve these paths: - / -> $(nix-instantiate --eval '<nixpkgs>' -A mastodon.outPath)/public + / -> $(nix-instantiate --eval '<nixpkgs>' -A mastodon.outPath)/public - / -> 127.0.0.1:{{ webPort }} (If there was no file in the directory above.) + / -> 127.0.0.1:{{ webPort }} (If there was no file in the directory above.) - /system/ -> /var/lib/mastodon/public-system/ + /system/ -> /var/lib/mastodon/public-system/ - /api/v1/streaming/ -> 127.0.0.1:{{ streamingPort }} + /api/v1/streaming/ -> 127.0.0.1:{{ streamingPort }} Make sure that websockets are forwarded properly. You might want to set up caching of some requests. Take a look at mastodon's provided nginx configuration at - https://github.com/mastodon/mastodon/blob/master/dist/nginx.conf. + https://github.com/mastodon/mastodon/blob/master/dist/nginx.conf. ''; type = lib.types.bool; default = false; @@ -135,13 +135,13 @@ in { that user will be created, otherwise it should be set to the name of a user created elsewhere. In both cases, mastodon and a package containing only - the shell script mastodon-env will be added to + the shell script mastodon-env will be added to the user's package set. To run a command from - mastodon such as tootctl + mastodon such as tootctl with the environment configured by this module use - mastodon-env, as in: + mastodon-env, as in: - mastodon-env tootctl accounts create newuser --email newuser@example.com + mastodon-env tootctl accounts create newuser --email newuser@example.com ''; type = lib.types.str; default = "mastodon"; @@ -202,7 +202,7 @@ in { Voluntary Application Server Identification. A new keypair can be generated by running: - nix build -f '<nixpkgs>' mastodon; cd result; bin/rake webpush:generate_keys + nix build -f '<nixpkgs>' mastodon; cd result; bin/rake webpush:generate_keys If does not exist, it and this file will be created with a new keypair. @@ -222,7 +222,7 @@ in { Path to file containing the secret key base. A new secret key base can be generated by running: - nix build -f '<nixpkgs>' mastodon; cd result; bin/rake secret + nix build -f '<nixpkgs>' mastodon; cd result; bin/rake secret If this file does not exist, it will be created with a new secret key base. ''; @@ -235,7 +235,7 @@ in { Path to file containing the OTP secret. A new OTP secret can be generated by running: - nix build -f '<nixpkgs>' mastodon; cd result; bin/rake secret + nix build -f '<nixpkgs>' mastodon; cd result; bin/rake secret If this file does not exist, it will be created with a new OTP secret. ''; @@ -249,7 +249,7 @@ in { Voluntary Application Server Identification. A new keypair can be generated by running: - nix build -f '<nixpkgs>' mastodon; cd result; bin/rake webpush:generate_keys + nix build -f '<nixpkgs>' mastodon; cd result; bin/rake webpush:generate_keys If this file does not exist, it will be created with a new private key. diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 618ad85b8605..08083b7a443f 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -586,8 +586,8 @@ in { type = types.ints.positive; default = 15552000; description = '' - Value for the max-age directive of the HTTP - Strict-Transport-Security header. + Value for the max-age directive of the HTTP + Strict-Transport-Security header. See section 6.1.1 of IETF RFC 6797 for detailed information on this directive and header. diff --git a/nixos/modules/services/web-apps/snipe-it.nix b/nixos/modules/services/web-apps/snipe-it.nix index 842e0715c025..3059e67cb43b 100644 --- a/nixos/modules/services/web-apps/snipe-it.nix +++ b/nixos/modules/services/web-apps/snipe-it.nix @@ -46,7 +46,7 @@ in { description = '' A file containing the Laravel APP_KEY - a 32 character long, base64 encoded key used for encryption where needed. Can be - generated with head -c 32 /dev/urandom | base64. + generated with head -c 32 /dev/urandom | base64. ''; example = "/run/keys/snipe-it/appkey"; type = types.path; @@ -69,7 +69,7 @@ in { description = '' The root URL that you want to host Snipe-IT on. All URLs in Snipe-IT will be generated using this value. If you change this in the future you may need to run a command to update stored URLs in the database. - Command example: snipe-it snipe-it:update-url https://old.example.com https://new.example.com + Command example: snipe-it snipe-it:update-url https://old.example.com https://new.example.com ''; default = "http${lib.optionalString tlsEnabled "s"}://${cfg.hostName}"; defaultText = '' diff --git a/nixos/modules/virtualisation/podman/default.nix b/nixos/modules/virtualisation/podman/default.nix index 361caeff70be..1e2f8a7fae64 100644 --- a/nixos/modules/virtualisation/podman/default.nix +++ b/nixos/modules/virtualisation/podman/default.nix @@ -74,7 +74,7 @@ in Podman implements the Docker API. - Users must be in the podman group in order to connect. As + Users must be in the podman group in order to connect. As with Docker, members of this group can gain root access. ''; }; diff --git a/nixos/modules/virtualisation/podman/network-socket.nix b/nixos/modules/virtualisation/podman/network-socket.nix index 94d8da9d2b61..5f6ce493558b 100644 --- a/nixos/modules/virtualisation/podman/network-socket.nix +++ b/nixos/modules/virtualisation/podman/network-socket.nix @@ -22,7 +22,7 @@ in with TLS client certificate authentication. This allows Docker clients to connect with the equivalents of the Docker - CLI -H and --tls* family of options. + CLI -H and --tls* family of options. For certificate setup, see https://docs.docker.com/engine/security/protect-access/ From 9c8531c8a50936ec65bc0471748237e310ec0c9a Mon Sep 17 00:00:00 2001 From: pennae Date: Wed, 3 Aug 2022 01:57:59 +0200 Subject: [PATCH 046/142] =?UTF-8?q?nixos/*:=20replace=20s=20w?= =?UTF-8?q?ith=20=C2=ABthing=C2=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit we can't embed syntactic annotations of this kind in markdown code blocks without yet another extension. replaceable is rare enough to make this not much worth it, so we'll go with «thing» instead. the module system already uses this format for its placeholder names in attrsOf paths. --- nixos/modules/config/users-groups.nix | 2 +- nixos/modules/hardware/video/uvcvideo/default.nix | 2 +- nixos/modules/programs/neovim.nix | 2 +- nixos/modules/security/dhparams.nix | 2 +- nixos/modules/services/backup/duplicity.nix | 6 +++--- nixos/modules/services/backup/syncoid.nix | 4 ++-- nixos/modules/services/hardware/udev.nix | 8 ++++---- nixos/modules/services/mail/sympa.nix | 2 +- nixos/modules/services/networking/hans.nix | 4 ++-- nixos/modules/services/networking/iodine.nix | 4 ++-- nixos/modules/services/networking/openvpn.nix | 4 ++-- nixos/modules/services/system/dbus.nix | 12 ++++++------ .../web-servers/apache-httpd/vhost-options.nix | 2 +- nixos/modules/system/boot/luksroot.nix | 2 +- nixos/modules/system/boot/stage-1.nix | 2 +- nixos/modules/system/boot/systemd/tmpfiles.nix | 2 +- nixos/modules/virtualisation/nixos-containers.nix | 4 ++-- nixos/modules/virtualisation/qemu-vm.nix | 6 +++--- 18 files changed, 35 insertions(+), 35 deletions(-) diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 1b63dc52d6ef..446cc3698bef 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -105,7 +105,7 @@ let automatically sets to users, to true, to - /home/username, + /home/«username», to true, and to false. diff --git a/nixos/modules/hardware/video/uvcvideo/default.nix b/nixos/modules/hardware/video/uvcvideo/default.nix index bb59e2f2ed2b..5d1699e63955 100644 --- a/nixos/modules/hardware/video/uvcvideo/default.nix +++ b/nixos/modules/hardware/video/uvcvideo/default.nix @@ -37,7 +37,7 @@ in description = '' List of packages containing uvcvideo dynamic controls rules. All files found in - pkg/share/uvcdynctrl/data + «pkg»/share/uvcdynctrl/data will be included. Note that these will serve as input to the libwebcam diff --git a/nixos/modules/programs/neovim.nix b/nixos/modules/programs/neovim.nix index b1dbcd181309..2c39456895f3 100644 --- a/nixos/modules/programs/neovim.nix +++ b/nixos/modules/programs/neovim.nix @@ -74,7 +74,7 @@ in { ''; description = '' Generate your init file from your list of plugins and custom commands. - Neovim will then be wrapped to load nvim -u /nix/store/hash-vimrc + Neovim will then be wrapped to load nvim -u /nix/store/«hash»-vimrc ''; }; diff --git a/nixos/modules/security/dhparams.nix b/nixos/modules/security/dhparams.nix index 720936e68d72..b3fce7e83aff 100644 --- a/nixos/modules/security/dhparams.nix +++ b/nixos/modules/security/dhparams.nix @@ -61,7 +61,7 @@ in { The value is the size (in bits) of the DH params to generate. The generated DH params path can be found in - config.security.dhparams.params.name.path. + config.security.dhparams.params.«name».path. The name of the DH params is taken as being the name of the service it serves and the params will be generated before the diff --git a/nixos/modules/services/backup/duplicity.nix b/nixos/modules/services/backup/duplicity.nix index 8c4105955569..765afd43d638 100644 --- a/nixos/modules/services/backup/duplicity.nix +++ b/nixos/modules/services/backup/duplicity.nix @@ -63,9 +63,9 @@ in systemd.exec 5. For example: - PASSPHRASE=... - AWS_ACCESS_KEY_ID=... - AWS_SECRET_ACCESS_KEY=... + PASSPHRASE=«...» + AWS_ACCESS_KEY_ID=«...» + AWS_SECRET_ACCESS_KEY=«...» ''; }; diff --git a/nixos/modules/services/backup/syncoid.nix b/nixos/modules/services/backup/syncoid.nix index e53528fb66fc..6e71eaa5b9a8 100644 --- a/nixos/modules/services/backup/syncoid.nix +++ b/nixos/modules/services/backup/syncoid.nix @@ -194,8 +194,8 @@ in example = "user@server:pool/dataset"; description = '' Target ZFS dataset. Can be either local - (pool/dataset) or remote - (user@server:pool/dataset). + («pool/dataset») or remote + («user@server:pool/dataset»). ''; }; diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 514763e409a1..f54979832cb3 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -212,8 +212,8 @@ in description = '' List of packages containing udev rules. All files found in - pkg/etc/udev/rules.d and - pkg/lib/udev/rules.d + «pkg»/etc/udev/rules.d and + «pkg»/lib/udev/rules.d will be included. ''; apply = map getBin; @@ -306,8 +306,8 @@ in List of packages containing udev rules that will be copied to stage 1. All files found in - pkg/etc/udev/rules.d and - pkg/lib/udev/rules.d + «pkg»/etc/udev/rules.d and + «pkg»/lib/udev/rules.d will be included. ''; }; diff --git a/nixos/modules/services/mail/sympa.nix b/nixos/modules/services/mail/sympa.nix index 1d46b090cd84..0b72ce97512d 100644 --- a/nixos/modules/services/mail/sympa.nix +++ b/nixos/modules/services/mail/sympa.nix @@ -242,7 +242,7 @@ in description = '' The webserver used for the Sympa web interface. Set it to `none` if you want to configure it yourself. Further nginx configuration can be done by adapting - . + . ''; }; diff --git a/nixos/modules/services/networking/hans.nix b/nixos/modules/services/networking/hans.nix index f74d602be933..bff39a5ab2a8 100644 --- a/nixos/modules/services/networking/hans.nix +++ b/nixos/modules/services/networking/hans.nix @@ -23,8 +23,8 @@ in Each attribute of this option defines a systemd service that runs hans. Many or none may be defined. The name of each service is - hans-name - where name is the name of the + hans-«name» + where «name» is the name of the corresponding attribute name. ''; example = literalExpression '' diff --git a/nixos/modules/services/networking/iodine.nix b/nixos/modules/services/networking/iodine.nix index c24f118ce898..9749c7285132 100644 --- a/nixos/modules/services/networking/iodine.nix +++ b/nixos/modules/services/networking/iodine.nix @@ -32,8 +32,8 @@ in Each attribute of this option defines a systemd service that runs iodine. Many or none may be defined. The name of each service is - iodine-name - where name is the name of the + iodine-«name» + where «name» is the name of the corresponding attribute name. ''; example = literalExpression '' diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix index 752b4d67d47e..ce0f0f90fc91 100644 --- a/nixos/modules/services/networking/openvpn.nix +++ b/nixos/modules/services/networking/openvpn.nix @@ -119,8 +119,8 @@ in Each attribute of this option defines a systemd service that runs an OpenVPN instance. These can be OpenVPN servers or clients. The name of each systemd service is - openvpn-name.service, - where name is the corresponding + openvpn-«name».service, + where «name» is the corresponding attribute name. ''; diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index c02e0905f1cc..65b40c56a3be 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -43,12 +43,12 @@ in the configuration of the D-Bus system-wide or session-wide message bus. Specifically, files in the following directories will be included into their respective DBus configuration paths: - pkg/etc/dbus-1/system.d - pkg/share/dbus-1/system.d - pkg/share/dbus-1/system-services - pkg/etc/dbus-1/session.d - pkg/share/dbus-1/session.d - pkg/share/dbus-1/services + «pkg»/etc/dbus-1/system.d + «pkg»/share/dbus-1/system.d + «pkg»/share/dbus-1/system-services + «pkg»/etc/dbus-1/session.d + «pkg»/share/dbus-1/session.d + «pkg»/share/dbus-1/services ''; }; diff --git a/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix b/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix index c52ab2c596e0..e743eaa6215b 100644 --- a/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix +++ b/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix @@ -233,7 +233,7 @@ in default = false; description = '' Whether to enable serving ~/public_html as - /~username. + /~«username». ''; }; diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 95556710bdef..3b468f00aba8 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -552,7 +552,7 @@ in The encrypted disk that should be opened before the root filesystem is mounted. Both LVM-over-LUKS and LUKS-over-LVM setups are supported. The unencrypted devices can be accessed as - /dev/mapper/name. + /dev/mapper/«name». ''; type = with types; attrsOf (submodule ( diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index f3b9d798f614..ec2f3d18c685 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -480,7 +480,7 @@ in if you want to resume from file. If left empty, the swap partitions are used. Specify here the device where the file resides. You should also use boot.kernelParams to specify - resume_offset. + «resume_offset». ''; }; diff --git a/nixos/modules/system/boot/systemd/tmpfiles.nix b/nixos/modules/system/boot/systemd/tmpfiles.nix index eaa0ddf63878..0d5adf596e18 100644 --- a/nixos/modules/system/boot/systemd/tmpfiles.nix +++ b/nixos/modules/system/boot/systemd/tmpfiles.nix @@ -29,7 +29,7 @@ in List of packages containing systemd-tmpfiles rules. All files ending in .conf found in - pkg/lib/tmpfiles.d + «pkg»/lib/tmpfiles.d will be included. If this folder does not exist or does not contain any files an error will be returned instead. diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix index e2fb28ed6332..1699b0bcea40 100644 --- a/nixos/modules/virtualisation/nixos-containers.nix +++ b/nixos/modules/virtualisation/nixos-containers.nix @@ -583,7 +583,7 @@ in Whether to give the container its own private virtual Ethernet interface. The interface is called eth0, and is hooked up to the interface - ve-container-name + ve-«container-name» on the host. If this option is not set, then the container shares the network interfaces of the host, and can bind to any port on any interface. @@ -731,7 +731,7 @@ in description = '' A set of NixOS system configurations to be run as lightweight containers. Each container appears as a service - container-name + container-«name» on the host system, allowing it to be started and stopped via systemctl. ''; diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 5b2d81eeb68f..98617a397a59 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -516,12 +516,12 @@ in description = '' Virtual networks to which the VM is connected. Each - number N in this list causes + number «N» in this list causes the VM to have a virtual Ethernet interface attached to a separate virtual network on which it will be assigned IP address - 192.168.N.M, - where M is the index of this VM + 192.168.«N».«M», + where «M» is the index of this VM in the list of VMs. ''; }; From 3aebb4a2be8821a6d8a695f0908d8567dc00de31 Mon Sep 17 00:00:00 2001 From: pennae Date: Wed, 3 Aug 2022 03:05:47 +0200 Subject: [PATCH 047/142] nixos/*: normalize link format make (almost) all links appear on only a single line, with no unnecessary whitespace, using double quotes for attributes. this lets us automatically convert them to markdown easily. the few remaining links are extremely long link in a gnome module, we'll come back to those at a later date. --- nixos/modules/config/i18n.nix | 3 +- nixos/modules/config/users-groups.nix | 3 +- nixos/modules/config/xdg/portal.nix | 2 +- nixos/modules/hardware/tuxedo-keyboard.nix | 2 +- nixos/modules/programs/sway.nix | 2 +- nixos/modules/security/acme/default.nix | 4 +-- nixos/modules/security/pam.nix | 29 ++++++------------- nixos/modules/security/pam_mount.nix | 9 ++---- nixos/modules/security/pam_usb.nix | 3 +- nixos/modules/services/backup/zrepl.nix | 3 +- .../continuous-integration/github-runner.nix | 3 +- .../modules/services/databases/postgresql.nix | 3 +- .../services/databases/victoriametrics.nix | 4 +-- nixos/modules/services/development/zammad.nix | 2 +- nixos/modules/services/games/asf.nix | 4 ++- nixos/modules/services/hardware/udev.nix | 5 ++-- nixos/modules/services/logging/filebeat.nix | 3 +- nixos/modules/services/mail/mailman.nix | 2 +- nixos/modules/services/mail/sympa.nix | 6 ++-- .../services/matrix/appservice-discord.nix | 3 +- .../services/matrix/mautrix-facebook.nix | 3 +- .../services/matrix/mautrix-telegram.nix | 3 +- nixos/modules/services/misc/etcd.nix | 2 +- .../modules/services/misc/etebase-server.nix | 4 +-- nixos/modules/services/misc/geoipupdate.nix | 5 ++-- .../services/misc/persistent-evdev.nix | 4 +-- .../modules/services/monitoring/cadvisor.nix | 4 +-- .../monitoring/grafana-image-renderer.nix | 2 +- .../modules/services/monitoring/graphite.nix | 2 +- nixos/modules/services/monitoring/munin.nix | 12 ++++---- nixos/modules/services/monitoring/nagios.nix | 2 +- .../services/monitoring/parsedmarc.nix | 19 +++++------- .../monitoring/prometheus/default.nix | 15 ++++------ .../prometheus/exporters/dovecot.nix | 8 ++--- .../prometheus/exporters/process.nix | 2 +- .../prometheus/exporters/script.nix | 2 +- nixos/modules/services/networking/bird-lg.nix | 12 ++++---- nixos/modules/services/networking/bird.nix | 2 +- nixos/modules/services/networking/coredns.nix | 5 +++- nixos/modules/services/networking/seafile.nix | 2 +- .../modules/services/networking/ssh/sshd.nix | 12 ++++---- .../modules/services/networking/wireguard.nix | 6 ++-- .../services/networking/wpa_supplicant.nix | 2 +- .../modules/services/security/privacyidea.nix | 6 ++-- nixos/modules/services/security/step-ca.nix | 4 +-- nixos/modules/services/security/tor.nix | 10 +++---- .../services/security/vaultwarden/default.nix | 2 +- nixos/modules/services/web-apps/hedgedoc.nix | 3 +- nixos/modules/services/web-apps/keycloak.nix | 19 ++++-------- nixos/modules/services/web-apps/mediawiki.nix | 2 +- nixos/modules/services/web-apps/nextcloud.nix | 12 ++++---- nixos/modules/services/web-apps/node-red.nix | 3 +- nixos/modules/services/web-apps/wiki-js.nix | 5 ++-- nixos/modules/services/web-apps/wordpress.nix | 4 +-- .../apache-httpd/vhost-options.nix | 6 ++-- .../services/web-servers/nginx/default.nix | 8 ++--- nixos/modules/services/web-servers/uwsgi.nix | 3 +- nixos/modules/system/boot/initrd-network.nix | 5 ++-- nixos/modules/system/boot/networkd.nix | 7 ++--- nixos/modules/system/boot/systemd/logind.nix | 3 +- nixos/modules/tasks/network-interfaces.nix | 2 +- 61 files changed, 140 insertions(+), 189 deletions(-) diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix index 80ef515fbfe2..dad06c1b44cd 100644 --- a/nixos/modules/config/i18n.nix +++ b/nixos/modules/config/i18n.nix @@ -75,8 +75,7 @@ with lib; List of locales that the system should support. The value "all" means that all locales supported by Glibc will be installed. A full list of supported locales - can be found at . + can be found at . ''; }; diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 446cc3698bef..2e5984b55cc1 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -156,8 +156,7 @@ let pam_mount.conf.xml. Useful attributes might include path, options, fstype, and server. - See + See for more information. ''; }; diff --git a/nixos/modules/config/xdg/portal.nix b/nixos/modules/config/xdg/portal.nix index 1e6ddd7c4a26..689abf267f09 100644 --- a/nixos/modules/config/xdg/portal.nix +++ b/nixos/modules/config/xdg/portal.nix @@ -33,7 +33,7 @@ in options.xdg.portal = { enable = - mkEnableOption "xdg desktop integration" // { + mkEnableOption ''xdg desktop integration'' // { default = false; }; diff --git a/nixos/modules/hardware/tuxedo-keyboard.nix b/nixos/modules/hardware/tuxedo-keyboard.nix index 97af7c61f3c9..7bcabde48900 100644 --- a/nixos/modules/hardware/tuxedo-keyboard.nix +++ b/nixos/modules/hardware/tuxedo-keyboard.nix @@ -13,7 +13,7 @@ in To configure the driver, pass the options to the configuration. There are several parameters you can change. It's best to check at the source code description which options are supported. - You can find all the supported parameters at: + You can find all the supported parameters at: In order to use the custom lighting with the maximumg brightness and a color of 0xff0a0a one would put pass like this: diff --git a/nixos/modules/programs/sway.nix b/nixos/modules/programs/sway.nix index decae1b4d2da..af2b261d3c5f 100644 --- a/nixos/modules/programs/sway.nix +++ b/nixos/modules/programs/sway.nix @@ -39,7 +39,7 @@ in { Sway, the i3-compatible tiling Wayland compositor. You can manually launch Sway by executing "exec sway" on a TTY. Copy /etc/sway/config to ~/.config/sway/config to modify the default configuration. See - and + and "man 5 sway" for more information''; wrapperFeatures = mkOption { diff --git a/nixos/modules/security/acme/default.nix b/nixos/modules/security/acme/default.nix index 5f4344d451c8..4bc3d8e743d3 100644 --- a/nixos/modules/security/acme/default.nix +++ b/nixos/modules/security/acme/default.nix @@ -581,8 +581,8 @@ let Turns on the OCSP Must-Staple TLS extension. Make sure you know what you're doing! See: - - + + ''; }; diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 7903d333411b..8a70e5f3adbd 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -831,8 +831,7 @@ in If set, users can log in with SSH keys and PKCS#11 tokens. - More information can be found here. + More information can be found here. ''; }; @@ -872,8 +871,7 @@ in username:first_keyHandle,first_public_key: second_keyHandle,second_public_key This file can be generated using pamu2fcfg command. - More information can be found here. + More information can be found here. ''; }; @@ -894,8 +892,7 @@ in username:first_keyHandle,first_public_key: second_keyHandle,second_public_key This file can be generated using pamu2fcfg command. - More information can be found here. + More information can be found here. ''; }; @@ -909,9 +906,7 @@ in When using pamu2fcfg, you can specify your application ID with the -i flag. - More information can be found - here + More information can be found here ''; }; @@ -927,9 +922,7 @@ in When using pamu2fcfg, you can specify your application ID with the -o flag. - More information can be found - here + More information can be found here ''; }; @@ -995,8 +988,7 @@ in Note that this module must both be enabled using this option and on a per-PAM-service level as well (using usshAuth). - More information can be found here. + More information can be found here. ''; }; @@ -1084,8 +1076,7 @@ in The file must have only one line: username:yubikey_token_id1:yubikey_token_id2 - More information can be found here. + More information can be found here. ''; }; control = mkOption { @@ -1130,8 +1121,7 @@ in Challenge-Response configurations. See the man-page ykpamcfg(1) for further details on how to configure offline Challenge-Response validation. - More information can be found here. + More information can be found here. ''; }; challengeResponsePath = mkOption { @@ -1140,8 +1130,7 @@ in description = '' If not null, set the path used by yubico pam module where the challenge expected response is stored. - More information can be found here. + More information can be found here. ''; }; }; diff --git a/nixos/modules/security/pam_mount.nix b/nixos/modules/security/pam_mount.nix index e159a73b66a4..ae314abd86c6 100644 --- a/nixos/modules/security/pam_mount.nix +++ b/nixos/modules/security/pam_mount.nix @@ -33,8 +33,7 @@ in default = []; description = '' List of volume definitions for pam_mount. - For more information, visit . + For more information, visit . ''; }; @@ -67,8 +66,7 @@ in description = '' Sets the Debug-Level. 0 disables debugging, 1 enables pam_mount tracing, and 2 additionally enables tracing in mount.crypt. The default is 0. - For more information, visit . + For more information, visit . ''; }; @@ -78,8 +76,7 @@ in description = '' Amount of microseconds to wait until killing remaining processes after final logout. - For more information, visit . + For more information, visit . ''; }; diff --git a/nixos/modules/security/pam_usb.nix b/nixos/modules/security/pam_usb.nix index 51d81e823f86..71e2af8f3a51 100644 --- a/nixos/modules/security/pam_usb.nix +++ b/nixos/modules/security/pam_usb.nix @@ -19,8 +19,7 @@ in default = false; description = '' Enable USB login for all login systems that support it. For - more information, visit . + more information, visit . ''; }; diff --git a/nixos/modules/services/backup/zrepl.nix b/nixos/modules/services/backup/zrepl.nix index e3a900912645..7b31b0da0369 100644 --- a/nixos/modules/services/backup/zrepl.nix +++ b/nixos/modules/services/backup/zrepl.nix @@ -23,8 +23,7 @@ in settings = mkOption { default = { }; description = '' - Configuration for zrepl. See + Configuration for zrepl. See for more information. ''; type = types.submodule { diff --git a/nixos/modules/services/continuous-integration/github-runner.nix b/nixos/modules/services/continuous-integration/github-runner.nix index 2da18bbdb396..2c753b514c5b 100644 --- a/nixos/modules/services/continuous-integration/github-runner.nix +++ b/nixos/modules/services/continuous-integration/github-runner.nix @@ -22,8 +22,7 @@ in Whether to enable GitHub Actions runner. Note: GitHub recommends using self-hosted runners with private repositories only. Learn more here: - About self-hosted runners. + About self-hosted runners. ''; type = lib.types.bool; }; diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index a054a6d7a12f..8225a9aaba61 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -81,8 +81,7 @@ in default = ""; description = '' Defines how users authenticate themselves to the server. See the - - PostgreSQL documentation for pg_hba.conf + PostgreSQL documentation for pg_hba.conf for details on the expected format of this option. By default, peer based authentication will be used for users connecting via the Unix socket, and md5 password authentication will be diff --git a/nixos/modules/services/databases/victoriametrics.nix b/nixos/modules/services/databases/victoriametrics.nix index 28a6ccfd5e20..4e002b3df7c7 100644 --- a/nixos/modules/services/databases/victoriametrics.nix +++ b/nixos/modules/services/databases/victoriametrics.nix @@ -29,8 +29,8 @@ let cfg = config.services.victoriametrics; in type = types.listOf types.str; default = []; description = '' - Extra options to pass to VictoriaMetrics. See the README: + Extra options to pass to VictoriaMetrics. See the README: + or victoriametrics -help for more information. ''; diff --git a/nixos/modules/services/development/zammad.nix b/nixos/modules/services/development/zammad.nix index 503f54aee2c7..e81eef3c0a51 100644 --- a/nixos/modules/services/development/zammad.nix +++ b/nixos/modules/services/development/zammad.nix @@ -139,7 +139,7 @@ in ''; description = '' The database.yml configuration file as key value set. - See + See for list of configuration parameters. ''; }; diff --git a/nixos/modules/services/games/asf.nix b/nixos/modules/services/games/asf.nix index 37247e195a78..6939e15c207d 100644 --- a/nixos/modules/services/games/asf.nix +++ b/nixos/modules/services/games/asf.nix @@ -136,7 +136,9 @@ in }; settings = mkOption { type = types.attrs; - description = "Additional settings that are documented here."; + description = '' + Additional settings that are documented here. + ''; default = { }; }; }; diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index f54979832cb3..f745e2f7f606 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -282,9 +282,8 @@ in default = true; type = types.bool; description = '' - Whether to assign predictable - names to network interfaces. If enabled, interfaces + Whether to assign predictable names to network interfaces. + If enabled, interfaces are assigned names that contain topology information (e.g. wlp3s0) and thus should be stable across reboots. If disabled, names depend on the order in diff --git a/nixos/modules/services/logging/filebeat.nix b/nixos/modules/services/logging/filebeat.nix index ec8df0a7b87d..045cd1147ead 100644 --- a/nixos/modules/services/logging/filebeat.nix +++ b/nixos/modules/services/logging/filebeat.nix @@ -161,8 +161,7 @@ in internal = true; description = '' Inputs specify how Filebeat locates and processes - input data. Use instead. + input data. Use instead. See . ''; diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index eb24f73c1da8..c3eb61bd20d7 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -114,7 +114,7 @@ in { example = "/run/secrets/ldap-bind"; description = '' Path to the file containing the bind password of the servie account - defined by . + defined by . ''; }; superUserGroup = mkOption { diff --git a/nixos/modules/services/mail/sympa.nix b/nixos/modules/services/mail/sympa.nix index 0b72ce97512d..0a2a885a80f6 100644 --- a/nixos/modules/services/mail/sympa.nix +++ b/nixos/modules/services/mail/sympa.nix @@ -88,7 +88,7 @@ in example = "cs"; description = '' Default Sympa language. - See + See for available options. ''; }; @@ -138,7 +138,7 @@ in }; description = '' The robot.conf configuration file as key value set. - See + See for list of configuration parameters. ''; }; @@ -287,7 +287,7 @@ in ''; description = '' The sympa.conf configuration file as key value set. - See + See for list of configuration parameters. ''; }; diff --git a/nixos/modules/services/matrix/appservice-discord.nix b/nixos/modules/services/matrix/appservice-discord.nix index 65ad96a3af36..87a706ae95ef 100644 --- a/nixos/modules/services/matrix/appservice-discord.nix +++ b/nixos/modules/services/matrix/appservice-discord.nix @@ -44,8 +44,7 @@ in { config.yaml configuration as a Nix attribute set. Configuration options should match those described in - - config.sample.yaml. + config.sample.yaml. and should be set to match the public host name of the Matrix homeserver for webhooks and avatars to work. diff --git a/nixos/modules/services/matrix/mautrix-facebook.nix b/nixos/modules/services/matrix/mautrix-facebook.nix index 2f91e6e0e521..384a4f4a706f 100644 --- a/nixos/modules/services/matrix/mautrix-facebook.nix +++ b/nixos/modules/services/matrix/mautrix-facebook.nix @@ -78,8 +78,7 @@ in { description = '' config.yaml configuration as a Nix attribute set. Configuration options should match those described in - - example-config.yaml. + example-config.yaml. Secret tokens should be specified using instead of this world-readable attribute set. diff --git a/nixos/modules/services/matrix/mautrix-telegram.nix b/nixos/modules/services/matrix/mautrix-telegram.nix index 1d4061b8a818..492ed1b24bce 100644 --- a/nixos/modules/services/matrix/mautrix-telegram.nix +++ b/nixos/modules/services/matrix/mautrix-telegram.nix @@ -81,8 +81,7 @@ in { description = '' config.yaml configuration as a Nix attribute set. Configuration options should match those described in - - example-config.yaml. + example-config.yaml. Secret tokens should be specified using instead of this world-readable attribute set. diff --git a/nixos/modules/services/misc/etcd.nix b/nixos/modules/services/misc/etcd.nix index d589ad780c1b..d0c82d726023 100644 --- a/nixos/modules/services/misc/etcd.nix +++ b/nixos/modules/services/misc/etcd.nix @@ -127,7 +127,7 @@ in { extraConf = mkOption { description = '' Etcd extra configuration. See - + ''; type = types.attrsOf types.str; default = {}; diff --git a/nixos/modules/services/misc/etebase-server.nix b/nixos/modules/services/misc/etebase-server.nix index 24be9e8e2692..1359c265c8f1 100644 --- a/nixos/modules/services/misc/etebase-server.nix +++ b/nixos/modules/services/misc/etebase-server.nix @@ -135,8 +135,8 @@ in default = {}; description = '' Configuration for etebase-server. Refer to - - and + + and for details on supported values. ''; example = { diff --git a/nixos/modules/services/misc/geoipupdate.nix b/nixos/modules/services/misc/geoipupdate.nix index 20bbba0aad9a..98d470412142 100644 --- a/nixos/modules/services/misc/geoipupdate.nix +++ b/nixos/modules/services/misc/geoipupdate.nix @@ -40,7 +40,7 @@ in description = '' geoipupdate configuration options. See - + for a full list of available options. Settings containing secret data should be set to an @@ -92,8 +92,7 @@ in Always handled as a secret whether the value is wrapped in a { _secret = ...; } - attrset or not (refer to for + attrset or not (refer to for details). ''; apply = x: if isAttrs x then x else { _secret = x; }; diff --git a/nixos/modules/services/misc/persistent-evdev.nix b/nixos/modules/services/misc/persistent-evdev.nix index 401d20010b12..fd6e298ef651 100644 --- a/nixos/modules/services/misc/persistent-evdev.nix +++ b/nixos/modules/services/misc/persistent-evdev.nix @@ -22,8 +22,8 @@ in Physical devices should already exist in /dev/input/by-id/. Proxy devices will be automatically given a uinput- prefix. - See the - project page for example configuration of virtual devices with libvirt + See the project page + for example configuration of virtual devices with libvirt and remember to add uinput-* devices to the qemu cgroup_device_acl list (see ). ''; diff --git a/nixos/modules/services/monitoring/cadvisor.nix b/nixos/modules/services/monitoring/cadvisor.nix index c844b1599dd4..7374b1ece495 100644 --- a/nixos/modules/services/monitoring/cadvisor.nix +++ b/nixos/modules/services/monitoring/cadvisor.nix @@ -75,7 +75,7 @@ in { world-readable Nix store that contains the value of . It's recommended to override this with a path not in the Nix store. - Tip: use nixops key management + Tip: use nixops key management ''; }; @@ -91,7 +91,7 @@ in { description = '' Additional cadvisor options. - See for available options. + See for available options. ''; }; }; diff --git a/nixos/modules/services/monitoring/grafana-image-renderer.nix b/nixos/modules/services/monitoring/grafana-image-renderer.nix index 97488f2653a5..4820b1946987 100644 --- a/nixos/modules/services/monitoring/grafana-image-renderer.nix +++ b/nixos/modules/services/monitoring/grafana-image-renderer.nix @@ -92,7 +92,7 @@ in { description = '' Configuration attributes for grafana-image-renderer. - See + See for supported values. ''; }; diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 73b509202df6..0905b4b57fb9 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -253,7 +253,7 @@ in { default = {}; description = '' Extra seyren configuration. See - + ''; type = types.attrsOf types.str; example = literalExpression '' diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index c77ae7b3b6eb..3455d0d3d4a6 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -142,7 +142,7 @@ in Enable Munin Node agent. Munin node listens on 0.0.0.0 and by default accepts connections only from 127.0.0.1 for security reasons. - See . + See . ''; }; @@ -151,7 +151,7 @@ in type = types.lines; description = '' munin-node.conf extra configuration. See - + ''; }; @@ -160,7 +160,7 @@ in type = types.lines; description = '' plugin-conf.d extra plugin configuration. See - + ''; example = '' [fail2ban_*] @@ -268,9 +268,9 @@ in type = types.lines; description = '' munin.conf extra global configuration. - See . + See . Useful to setup notifications, see - + ''; example = '' contact.email.command mail -s "Munin notification for ''${var:host}" someone@example.com @@ -283,7 +283,7 @@ in description = '' Definitions of hosts of nodes to collect data from. Needs at least one host for cron to succeed. See - + ''; example = literalExpression '' ''' diff --git a/nixos/modules/services/monitoring/nagios.nix b/nixos/modules/services/monitoring/nagios.nix index 69173ce4e44e..a17797f682f8 100644 --- a/nixos/modules/services/monitoring/nagios.nix +++ b/nixos/modules/services/monitoring/nagios.nix @@ -88,7 +88,7 @@ in options = { services.nagios = { - enable = mkEnableOption "Nagios to monitor your system or network."; + enable = mkEnableOption ''Nagios to monitor your system or network.''; objectDefs = mkOption { description = " diff --git a/nixos/modules/services/monitoring/parsedmarc.nix b/nixos/modules/services/monitoring/parsedmarc.nix index 736718c25359..60ebbd6f7525 100644 --- a/nixos/modules/services/monitoring/parsedmarc.nix +++ b/nixos/modules/services/monitoring/parsedmarc.nix @@ -69,14 +69,12 @@ in type = lib.types.bool; default = true; description = '' - Whether to enable and configure the geoipupdate + Whether to enable and configure the geoipupdate service to automatically fetch GeoIP databases. Not crucial, but recommended for full functionality. - To finish the setup, you need to manually set the and - + To finish the setup, you need to manually set the and + options. ''; }; @@ -101,7 +99,7 @@ in Whether the automatically provisioned Elasticsearch instance should be added as a grafana datasource. Has no effect unless - + is also enabled. ''; }; @@ -213,8 +211,7 @@ in Always handled as a secret whether the value is wrapped in a { _secret = ...; } - attrset or not (refer to for + attrset or not (refer to for details). ''; apply = x: if isAttrs x || x == null then x else { _secret = x; }; @@ -278,8 +275,7 @@ in Always handled as a secret whether the value is wrapped in a { _secret = ...; } - attrset or not (refer to for + attrset or not (refer to for details). ''; apply = x: if isAttrs x || x == null then x else { _secret = x; }; @@ -332,8 +328,7 @@ in Always handled as a secret whether the value is wrapped in a { _secret = ...; } - attrset or not (refer to for + attrset or not (refer to for details). ''; apply = x: if isAttrs x || x == null then x else { _secret = x; }; diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index db4286b66a5d..3bc61fba158f 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -379,9 +379,8 @@ let gce_sd_configs = mkOpt (types.listOf promTypes.gce_sd_config) '' List of Google Compute Engine service discovery configurations. - See the - relevant Prometheus configuration docs for more detail. + See the relevant Prometheus configuration docs + for more detail. ''; hetzner_sd_configs = mkOpt (types.listOf promTypes.hetzner_sd_config) '' @@ -807,9 +806,7 @@ let filter = mkOpt types.str '' Filter can be used optionally to filter the instance list by other criteria Syntax of this filter string is described here in the filter - query parameter section: . + query parameter section: . ''; refresh_interval = mkDefOpt types.str "60s" '' @@ -825,7 +822,7 @@ let The tag separator used to separate concatenated GCE instance network tags. See the GCP documentation on network tags for more information: - + ''; }; }; @@ -1033,13 +1030,13 @@ let auth_token = mkOpt types.str '' Optional authentication information for token-based authentication: - + It is mutually exclusive with auth_token_file and other authentication mechanisms. ''; auth_token_file = mkOpt types.str '' Optional authentication information for token-based authentication: - + It is mutually exclusive with auth_token and other authentication mechanisms. ''; }; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix b/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix index 092ac6fea7d7..4e7aae0b34b5 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix @@ -33,10 +33,10 @@ in work with this exporter: { - = true; - = "/var/run/dovecot2/old-stats"; - = [ "old_stats" ]; - = ''' + = true; + = "/var/run/dovecot2/old-stats"; + = [ "old_stats" ]; + = ''' service old-stats { unix_listener old-stats { user = dovecot-exporter diff --git a/nixos/modules/services/monitoring/prometheus/exporters/process.nix b/nixos/modules/services/monitoring/prometheus/exporters/process.nix index 1e9c402fb55b..666116991b5a 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/process.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/process.nix @@ -22,7 +22,7 @@ in All settings expressed as an Nix attrset. Check the official documentation for the corresponding YAML - settings that can all be used here: + settings that can all be used here: ''; }; }; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/script.nix b/nixos/modules/services/monitoring/prometheus/exporters/script.nix index a805a0ad335d..2a43fbcab3a1 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/script.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/script.nix @@ -41,7 +41,7 @@ in All settings expressed as an Nix attrset. Check the official documentation for the corresponding YAML - settings that can all be used here: + settings that can all be used here: ''; }; }; diff --git a/nixos/modules/services/networking/bird-lg.nix b/nixos/modules/services/networking/bird-lg.nix index db4a4140dd40..9f06bfcdc51e 100644 --- a/nixos/modules/services/networking/bird-lg.nix +++ b/nixos/modules/services/networking/bird-lg.nix @@ -136,9 +136,9 @@ in extraArgs = mkOption { type = types.lines; default = ""; - description = " - Extra parameters documented here. - "; + description = '' + Extra parameters documented here. + ''; }; }; @@ -183,9 +183,9 @@ in extraArgs = mkOption { type = types.lines; default = ""; - description = " - Extra parameters documented here. - "; + description = '' + Extra parameters documented here. + ''; }; }; }; diff --git a/nixos/modules/services/networking/bird.nix b/nixos/modules/services/networking/bird.nix index b166209fa969..4a738daf9586 100644 --- a/nixos/modules/services/networking/bird.nix +++ b/nixos/modules/services/networking/bird.nix @@ -15,7 +15,7 @@ in type = types.lines; description = '' BIRD Internet Routing Daemon configuration file. - + ''; }; checkConfig = mkOption { diff --git a/nixos/modules/services/networking/coredns.nix b/nixos/modules/services/networking/coredns.nix index 9a4140e9d58a..966957f1a0f7 100644 --- a/nixos/modules/services/networking/coredns.nix +++ b/nixos/modules/services/networking/coredns.nix @@ -17,7 +17,10 @@ in { } ''; type = types.lines; - description = "Verbatim Corefile to use. See for details."; + description = '' + Verbatim Corefile to use. + See for details. + ''; }; package = mkOption { diff --git a/nixos/modules/services/networking/seafile.nix b/nixos/modules/services/networking/seafile.nix index 7cda71458dd1..d9617952ea59 100644 --- a/nixos/modules/services/networking/seafile.nix +++ b/nixos/modules/services/networking/seafile.nix @@ -133,7 +133,7 @@ in { type = types.lines; description = '' Extra config to append to `seahub_settings.py` file. - Refer to + Refer to for all available options. ''; }; diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index e95fe19dede3..cbc4e303b641 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -302,9 +302,9 @@ in Allowed key exchange algorithms Uses the lower bound recommended in both - + and - + ''; }; @@ -322,9 +322,9 @@ in Allowed ciphers Defaults to recommended settings from both - + and - + ''; }; @@ -342,9 +342,9 @@ in Allowed MACs Defaults to recommended settings from both - + and - + ''; }; diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix index 412e9c921f52..994a0cf9ec1e 100644 --- a/nixos/modules/services/networking/wireguard.nix +++ b/nixos/modules/services/networking/wireguard.nix @@ -122,8 +122,7 @@ let WireGuard interface is created, and which retains the socket even if the interface is moved via . When null, the interface is created in the init namespace. - See documentation. + See documentation. ''; }; @@ -135,8 +134,7 @@ let interface is moved to. The special value init means the init namespace. When null, the interface is not moved. - See documentation. + See documentation. ''; }; }; diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index e21c25e2f78f..ac5f597b4752 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -190,7 +190,7 @@ in { description = '' Whether to allow configuring networks "imperatively" (e.g. via wpa_supplicant_gui) and declaratively via - . + . Please note that this adds a custom patch to wpa_supplicant. ''; diff --git a/nixos/modules/services/security/privacyidea.nix b/nixos/modules/services/security/privacyidea.nix index 599ade003c03..4be3a90b649f 100644 --- a/nixos/modules/services/security/privacyidea.nix +++ b/nixos/modules/services/security/privacyidea.nix @@ -78,7 +78,7 @@ in using envsubst which is helpful for specifying secrets: - { = "$SECRET"; } + { = "$SECRET"; } The environment-file can now specify the actual secret key: @@ -207,7 +207,7 @@ in description = '' Attribute-set containing the settings for privacyidea-ldap-proxy. It's possible to pass secrets using env-vars as substitutes and - use the option + use the option to inject them via envsubst. ''; }; @@ -217,7 +217,7 @@ in type = types.nullOr types.str; description = '' Environment file containing secrets to be substituted into - . + . ''; }; }; diff --git a/nixos/modules/services/security/step-ca.nix b/nixos/modules/services/security/step-ca.nix index 9b9b53f13516..1afcf659632e 100644 --- a/nixos/modules/services/security/step-ca.nix +++ b/nixos/modules/services/security/step-ca.nix @@ -36,8 +36,8 @@ in type = with lib.types; attrsOf anything; description = '' Settings that go into ca.json. See - - the step-ca manual for more information. The easiest way to + the step-ca manual + for more information. The easiest way to configure this module would be to run step ca init to generate ca.json and then import it using builtins.fromJSON. diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index f611fee69089..0516d207707a 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -287,7 +287,7 @@ in relay = { enable = mkEnableOption ''relaying of Tor traffic for others. - See + See for details. Setting this to true requires setting @@ -348,7 +348,7 @@ in See - + for more info. @@ -366,7 +366,7 @@ in Using this option will make Tor advertise your bridge to users through various mechanisms like - , though. + , though. @@ -384,7 +384,7 @@ in - See + See for more info. @@ -419,7 +419,7 @@ in - See + See for more info. diff --git a/nixos/modules/services/security/vaultwarden/default.nix b/nixos/modules/services/security/vaultwarden/default.nix index 7e5389d78f4b..1433438ba009 100644 --- a/nixos/modules/services/security/vaultwarden/default.nix +++ b/nixos/modules/services/security/vaultwarden/default.nix @@ -116,7 +116,7 @@ in { The available configuration options can be found in the environment template file. - See for how + See for how to set up access to the Admin UI to invite initial users. ''; }; diff --git a/nixos/modules/services/web-apps/hedgedoc.nix b/nixos/modules/services/web-apps/hedgedoc.nix index b8d83984ca7d..4e1a21259847 100644 --- a/nixos/modules/services/web-apps/hedgedoc.nix +++ b/nixos/modules/services/web-apps/hedgedoc.nix @@ -152,8 +152,7 @@ in ''; description = '' Specify the Content Security Policy which is passed to Helmet. - For configuration details see https://helmetjs.github.io/docs/csp/. + For configuration details see . ''; }; protocolUseSSL = mkOption { diff --git a/nixos/modules/services/web-apps/keycloak.nix b/nixos/modules/services/web-apps/keycloak.nix index de76babbaedd..110df53effda 100644 --- a/nixos/modules/services/web-apps/keycloak.nix +++ b/nixos/modules/services/web-apps/keycloak.nix @@ -215,8 +215,7 @@ in manually provisioned database; has no effect when a local database is automatically provisioned. - To use this with a local database, set to + To use this with a local database, set to false and create the database and user manually. ''; @@ -230,8 +229,7 @@ in provisioned database; has no effect when a local database is automatically provisioned. - To use this with a local database, set to + To use this with a local database, set to false and create the database and user manually. ''; @@ -329,10 +327,8 @@ in want to set this to /auth to keep compatibility with your clients. - See for more information on migrating from Wildfly - to Quarkus. + See + for more information on migrating from Wildfly to Quarkus. ''; @@ -404,9 +400,7 @@ in - See for more information. + See for more information. ''; }; }; @@ -425,8 +419,7 @@ in Configuration options corresponding to parameters set in conf/keycloak.conf. - Most available options are documented at . + Most available options are documented at . Options containing secret data should be set to an attribute set containing the attribute _secret - a diff --git a/nixos/modules/services/web-apps/mediawiki.nix b/nixos/modules/services/web-apps/mediawiki.nix index 977b6f60b230..71154555942e 100644 --- a/nixos/modules/services/web-apps/mediawiki.nix +++ b/nixos/modules/services/web-apps/mediawiki.nix @@ -280,7 +280,7 @@ in one version of MediaWiki, or have other applications that also use the database, you can give the table names a unique prefix to stop any naming conflicts or confusion. - See . + See . ''; }; diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 08083b7a443f..a121401f7584 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -94,7 +94,7 @@ in { default = config.services.nextcloud.home; defaultText = literalExpression "config.services.nextcloud.home"; description = '' - Data storage path of nextcloud. Will be by default. + Data storage path of nextcloud. Will be by default. This folder will be populated with a config.php and data folder which contains the state of the instance (excl the database)."; ''; example = "/mnt/nextcloud-file"; @@ -105,7 +105,7 @@ in { description = '' Extra apps to install. Should be an attrSet of appid to packages generated by fetchNextcloudApp. The appid must be identical to the "id" value in the apps appinfo/info.xml. - Using this will disable the appstore to prevent Nextcloud from updating these apps (see ). + Using this will disable the appstore to prevent Nextcloud from updating these apps (see ). ''; example = literalExpression '' { @@ -128,7 +128,7 @@ in { type = types.bool; default = true; description = '' - Automatically enable the apps in every time nextcloud starts. + Automatically enable the apps in every time nextcloud starts. If set to false, apps need to be enabled in the Nextcloud user interface or with nextcloud-occ app:enable. ''; }; @@ -138,8 +138,8 @@ in { example = true; description = '' Allow the installation of apps and app updates from the store. - Enabled by default unless there are packages in . - Set to true to force enable the store even if is used. + Enabled by default unless there are packages in . + Set to true to force enable the store even if is used. Set to false to disable the installation of apps from the global appstore. App management is always enabled regardless of this setting. ''; }; @@ -467,7 +467,7 @@ in { This is used by the theming app and for generating previews of certain images (e.g. SVG and HEIF). You may want to disable it for increased security. In that case, previews will still be available for some images (e.g. JPEG and PNG). - See . + See . '' // { default = true; }; diff --git a/nixos/modules/services/web-apps/node-red.nix b/nixos/modules/services/web-apps/node-red.nix index 1b9d14ecf4ff..3e6e38c50db5 100644 --- a/nixos/modules/services/web-apps/node-red.nix +++ b/nixos/modules/services/web-apps/node-red.nix @@ -49,8 +49,7 @@ in defaultText = literalExpression ''"''${package}/lib/node_modules/node-red/settings.js"''; description = '' Path to the JavaScript configuration file. - See + See for a configuration example. ''; }; diff --git a/nixos/modules/services/web-apps/wiki-js.nix b/nixos/modules/services/web-apps/wiki-js.nix index 474fbb8f13c3..5dc0bb73259b 100644 --- a/nixos/modules/services/web-apps/wiki-js.nix +++ b/nixos/modules/services/web-apps/wiki-js.nix @@ -95,12 +95,11 @@ in { }; description = '' Settings to configure wiki-js. This directly - corresponds to the upstream - configuration options. + corresponds to the upstream configuration options. Secrets can be injected via the environment by - specifying + specifying to contain secrets and setting sensitive values to $(ENVIRONMENT_VAR) with this value defined in the environment-file. diff --git a/nixos/modules/services/web-apps/wordpress.nix b/nixos/modules/services/web-apps/wordpress.nix index 59471a739cbb..b1ae4deb2761 100644 --- a/nixos/modules/services/web-apps/wordpress.nix +++ b/nixos/modules/services/web-apps/wordpress.nix @@ -192,7 +192,7 @@ let prefix. Typically this is changed if you are installing multiple WordPress blogs in the same database. - See . + See . ''; }; @@ -246,7 +246,7 @@ let description = '' Any additional text to be appended to the wp-config.php configuration file. This is a PHP script. For configuration - settings, see . + settings, see . ''; example = '' define( 'AUTOSAVE_INTERVAL', 60 ); // Seconds diff --git a/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix b/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix index e743eaa6215b..559210a1418c 100644 --- a/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix +++ b/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix @@ -261,8 +261,7 @@ in default = ""; example = "Disallow: /foo/"; description = '' - Specification of pages to be ignored by web crawlers. See for details. + Specification of pages to be ignored by web crawlers. See for details. ''; }; @@ -280,8 +279,7 @@ in }; ''; description = '' - Declarative location config. See for details. + Declarative location config. See for details. ''; }; diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 5ccbaf77481b..166f38f9ea28 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -504,16 +504,16 @@ in This is mutually exclusive to any other config option for nginx.conf except for - + - + - + If additional verbatim config in addition to other options is needed, - should be used instead. + should be used instead. ''; }; diff --git a/nixos/modules/services/web-servers/uwsgi.nix b/nixos/modules/services/web-servers/uwsgi.nix index c76eb795a9ed..af6c6c066124 100644 --- a/nixos/modules/services/web-servers/uwsgi.nix +++ b/nixos/modules/services/web-servers/uwsgi.nix @@ -179,8 +179,7 @@ in { When in Emperor mode, any capability to be inherited by a vassal must be specified again in the vassal configuration using cap. - See the uWSGI docs + See the uWSGI docs for more information. diff --git a/nixos/modules/system/boot/initrd-network.nix b/nixos/modules/system/boot/initrd-network.nix index 43327fdd9da4..eff125971d08 100644 --- a/nixos/modules/system/boot/initrd-network.nix +++ b/nixos/modules/system/boot/initrd-network.nix @@ -53,9 +53,8 @@ in description = '' Add network connectivity support to initrd. The network may be configured using the ip kernel parameter, - as described in the - kernel documentation. Otherwise, if + as described in the kernel documentation. + Otherwise, if is enabled, an IP address is acquired using DHCP. diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index b006ce77454f..1849dcfe1e1e 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -1170,8 +1170,7 @@ let systemd.netdev 5 for details. A detailed explanation about how VRFs work can be found in the - kernel - docs. + kernel docs. ''; }; @@ -1909,9 +1908,7 @@ in Extra command-line arguments to pass to systemd-networkd-wait-online. These also affect per-interface systemd-network-wait-online@ services. - See - systemd-networkd-wait-online.service8 - for all available options. + See systemd-networkd-wait-online.service8 for all available options. ''; type = with types; listOf str; default = []; diff --git a/nixos/modules/system/boot/systemd/logind.nix b/nixos/modules/system/boot/systemd/logind.nix index 0df03e976947..bd05c07e26f2 100644 --- a/nixos/modules/system/boot/systemd/logind.nix +++ b/nixos/modules/system/boot/systemd/logind.nix @@ -31,8 +31,7 @@ in when the user logs out. If true, the scope unit corresponding to the session and all processes inside that scope will be terminated. If false, the scope is "abandoned" (see - - systemd.scope(5)), and processes are not killed. + systemd.scope(5)), and processes are not killed. See logind.conf(5) for more details. diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index e6cb2daaffca..a46203532948 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -1292,7 +1292,7 @@ in description = '' Whether to enable IPv6 Privacy Extensions for interfaces not configured explicitly in - . + . This sets the ipv6.conf.*.use_tempaddr sysctl for all interfaces. Possible values are: From 7a091b2686ff9997cc403bb5cecb4cb93e916c1b Mon Sep 17 00:00:00 2001 From: pennae Date: Wed, 3 Aug 2022 00:44:34 +0200 Subject: [PATCH 048/142] nixos/make-options-doc: reuse markdown instance in mergeJSON this doesn't construct a new (expensive) parser for every option, making rendering about 30x faster. --- nixos/lib/make-options-doc/mergeJSON.py | 256 ++++++++++++------------ 1 file changed, 128 insertions(+), 128 deletions(-) diff --git a/nixos/lib/make-options-doc/mergeJSON.py b/nixos/lib/make-options-doc/mergeJSON.py index e95352f4fe6f..8fb0b65c82d8 100644 --- a/nixos/lib/make-options-doc/mergeJSON.py +++ b/nixos/lib/make-options-doc/mergeJSON.py @@ -3,6 +3,11 @@ import json import sys from typing import Any, Dict, List +# for MD conversion +import mistune +import re +from xml.sax.saxutils import escape, quoteattr + JSON = Dict[str, Any] class Key: @@ -41,137 +46,132 @@ def unpivot(options: Dict[Key, Option]) -> Dict[str, JSON]: result[opt.name] = opt.value return result +admonitions = { + '.warning': 'warning', + '.important': 'important', + '.note': 'note' +} +class Renderer(mistune.renderers.BaseRenderer): + def _get_method(self, name): + try: + return super(Renderer, self)._get_method(name) + except AttributeError: + def not_supported(*args, **kwargs): + raise NotImplementedError("md node not supported yet", name, args, **kwargs) + return not_supported + + def text(self, text): + return escape(text) + def paragraph(self, text): + return text + "\n\n" + def newline(self): + return "\n" + def codespan(self, text): + return f"{escape(text)}" + def block_code(self, text, info=None): + info = f" language={quoteattr(info)}" if info is not None else "" + return f"\n{escape(text)}" + def link(self, link, text=None, title=None): + if link[0:1] == '#': + attr = "linkend" + link = quoteattr(link[1:]) + else: + # try to faithfully reproduce links that were of the form + # in docbook format + if text == link: + text = "" + attr = "xlink:href" + link = quoteattr(link) + return f"{text}" + def list(self, text, ordered, level, start=None): + if ordered: + raise NotImplementedError("ordered lists not supported yet") + return f"\n{text}\n" + def list_item(self, text, level): + return f"{text}\n" + def block_text(self, text): + return text + def emphasis(self, text): + return f"{text}" + def strong(self, text): + return f"{text}" + def admonition(self, text, kind): + if kind not in admonitions: + raise NotImplementedError(f"admonition {kind} not supported yet") + tag = admonitions[kind] + # we don't keep whitespace here because usually we'll contain only + # a single paragraph and the original docbook string is no longer + # available to restore the trailer. + return f"<{tag}>{text.rstrip()}" + def block_quote(self, text): + return f"
{text}
" + def command(self, text): + return f"{escape(text)}" + def option(self, text): + return f"" + def file(self, text): + return f"{escape(text)}" + def manpage(self, page, section): + title = f"{escape(page)}" + vol = f"{escape(section)}" + return f"{title}{vol}" + + def finalize(self, data): + return "".join(data) + +def p_command(md): + COMMAND_PATTERN = r'\{command\}`(.*?)`' + def parse(self, m, state): + return ('command', m.group(1)) + md.inline.register_rule('command', COMMAND_PATTERN, parse) + md.inline.rules.append('command') + +def p_file(md): + FILE_PATTERN = r'\{file\}`(.*?)`' + def parse(self, m, state): + return ('file', m.group(1)) + md.inline.register_rule('file', FILE_PATTERN, parse) + md.inline.rules.append('file') + +def p_option(md): + OPTION_PATTERN = r'\{option\}`(.*?)`' + def parse(self, m, state): + return ('option', m.group(1)) + md.inline.register_rule('option', OPTION_PATTERN, parse) + md.inline.rules.append('option') + +def p_manpage(md): + MANPAGE_PATTERN = r'\{manpage\}`(.*?)\((.+?)\)`' + def parse(self, m, state): + return ('manpage', m.group(1), m.group(2)) + md.inline.register_rule('manpage', MANPAGE_PATTERN, parse) + md.inline.rules.append('manpage') + +def p_admonition(md): + ADMONITION_PATTERN = re.compile(r'^::: \{([^\n]*?)\}\n(.*?)^:::\n', flags=re.MULTILINE|re.DOTALL) + def parse(self, m, state): + return { + 'type': 'admonition', + 'children': self.parse(m.group(2), state), + 'params': [ m.group(1) ], + } + md.block.register_rule('admonition', ADMONITION_PATTERN, parse) + md.block.rules.append('admonition') + +md = mistune.create_markdown(renderer=Renderer(), plugins=[ + p_command, p_file, p_option, p_manpage, p_admonition +]) + # converts in-place! def convertMD(options: Dict[str, Any]) -> str: - import mistune - import re - from xml.sax.saxutils import escape, quoteattr - - admonitions = { - '.warning': 'warning', - '.important': 'important', - '.note': 'note' - } - class Renderer(mistune.renderers.BaseRenderer): - def __init__(self, path): - self.path = path - def _get_method(self, name): - try: - return super(Renderer, self)._get_method(name) - except AttributeError: - def not_supported(*args, **kwargs): - raise NotImplementedError("md node not supported yet", self.path, name, args, **kwargs) - return not_supported - - def text(self, text): - return escape(text) - def paragraph(self, text): - return text + "\n\n" - def newline(self): - return "\n" - def codespan(self, text): - return f"{escape(text)}" - def block_code(self, text, info=None): - info = f" language={quoteattr(info)}" if info is not None else "" - return f"\n{escape(text)}" - def link(self, link, text=None, title=None): - if link[0:1] == '#': - attr = "linkend" - link = quoteattr(link[1:]) - else: - # try to faithfully reproduce links that were of the form - # in docbook format - if text == link: - text = "" - attr = "xlink:href" - link = quoteattr(link) - return f"{text}" - def list(self, text, ordered, level, start=None): - if ordered: - raise NotImplementedError("ordered lists not supported yet") - return f"\n{text}\n" - def list_item(self, text, level): - return f"{text}\n" - def block_text(self, text): - return text - def emphasis(self, text): - return f"{text}" - def strong(self, text): - return f"{text}" - def admonition(self, text, kind): - if kind not in admonitions: - raise NotImplementedError(f"admonition {kind} not supported yet") - tag = admonitions[kind] - # we don't keep whitespace here because usually we'll contain only - # a single paragraph and the original docbook string is no longer - # available to restore the trailer. - return f"<{tag}>{text.rstrip()}" - def block_quote(self, text): - return f"
{text}
" - def command(self, text): - return f"{escape(text)}" - def option(self, text): - return f"" - def file(self, text): - return f"{escape(text)}" - def manpage(self, page, section): - title = f"{escape(page)}" - vol = f"{escape(section)}" - return f"{title}{vol}" - - def finalize(self, data): - return "".join(data) - - plugins = [] - - COMMAND_PATTERN = r'\{command\}`(.*?)`' - def command(md): - def parse(self, m, state): - return ('command', m.group(1)) - md.inline.register_rule('command', COMMAND_PATTERN, parse) - md.inline.rules.append('command') - plugins.append(command) - - FILE_PATTERN = r'\{file\}`(.*?)`' - def file(md): - def parse(self, m, state): - return ('file', m.group(1)) - md.inline.register_rule('file', FILE_PATTERN, parse) - md.inline.rules.append('file') - plugins.append(file) - - OPTION_PATTERN = r'\{option\}`(.*?)`' - def option(md): - def parse(self, m, state): - return ('option', m.group(1)) - md.inline.register_rule('option', OPTION_PATTERN, parse) - md.inline.rules.append('option') - plugins.append(option) - - MANPAGE_PATTERN = r'\{manpage\}`(.*?)\((.+?)\)`' - def manpage(md): - def parse(self, m, state): - return ('manpage', m.group(1), m.group(2)) - md.inline.register_rule('manpage', MANPAGE_PATTERN, parse) - md.inline.rules.append('manpage') - plugins.append(manpage) - - ADMONITION_PATTERN = re.compile(r'^::: \{([^\n]*?)\}\n(.*?)^:::\n', flags=re.MULTILINE|re.DOTALL) - def admonition(md): - def parse(self, m, state): - return { - 'type': 'admonition', - 'children': self.parse(m.group(2), state), - 'params': [ m.group(1) ], - } - md.block.register_rule('admonition', ADMONITION_PATTERN, parse) - md.block.rules.append('admonition') - plugins.append(admonition) - def convertString(path: str, text: str) -> str: - rendered = mistune.markdown(text, renderer=Renderer(path), plugins=plugins) - # keep trailing spaces so we can diff the generated XML to check for conversion bugs. - return rendered.rstrip() + text[len(text.rstrip()):] + try: + rendered = md(text) + # keep trailing spaces so we can diff the generated XML to check for conversion bugs. + return rendered.rstrip() + text[len(text.rstrip()):] + except: + print(f"error in {path}") + raise def optionIs(option: Dict[str, Any], key: str, typ: str) -> bool: if key not in option: return False From 645cfa59ac5690187eac40ef2ac67381668acecc Mon Sep 17 00:00:00 2001 From: pennae Date: Wed, 3 Aug 2022 19:18:33 +0200 Subject: [PATCH 049/142] nixos/make-option-docs: add xref support to markdown conversion --- nixos/lib/make-options-doc/mergeJSON.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/lib/make-options-doc/mergeJSON.py b/nixos/lib/make-options-doc/mergeJSON.py index 8fb0b65c82d8..d7dc6ca30074 100644 --- a/nixos/lib/make-options-doc/mergeJSON.py +++ b/nixos/lib/make-options-doc/mergeJSON.py @@ -72,7 +72,10 @@ class Renderer(mistune.renderers.BaseRenderer): info = f" language={quoteattr(info)}" if info is not None else "" return f"\n{escape(text)}" def link(self, link, text=None, title=None): + tag = "link" if link[0:1] == '#': + if text == "": + tag = "xref" attr = "linkend" link = quoteattr(link[1:]) else: @@ -82,7 +85,7 @@ class Renderer(mistune.renderers.BaseRenderer): text = "" attr = "xlink:href" link = quoteattr(link) - return f"{text}" + return f"<{tag} {attr}={link}>{text}" def list(self, text, ordered, level, start=None): if ordered: raise NotImplementedError("ordered lists not supported yet") From 61e93df1891972bae3e0c97a477bd44e8a477aa0 Mon Sep 17 00:00:00 2001 From: pennae Date: Wed, 3 Aug 2022 22:46:41 +0200 Subject: [PATCH 050/142] nixos/*: automatically convert option docs to MD once again using nix-doc-munge (https://github.com/pennae/nix-doc-munge/commit/69d080323ae27c0d8da3967c62b925a9aedb2828) --- nixos/modules/config/i18n.nix | 6 +- nixos/modules/config/resolvconf.nix | 6 +- nixos/modules/config/shells-environment.nix | 4 +- nixos/modules/config/system-environment.nix | 8 +- nixos/modules/config/users-groups.nix | 38 +++---- nixos/modules/hardware/logitech.nix | 2 +- .../hardware/video/uvcvideo/default.nix | 12 +-- nixos/modules/programs/adb.nix | 4 +- nixos/modules/programs/firejail.nix | 4 +- nixos/modules/programs/gphoto2.nix | 4 +- nixos/modules/programs/neovim.nix | 4 +- nixos/modules/programs/nncp.nix | 18 ++-- nixos/modules/programs/turbovnc.nix | 6 +- nixos/modules/security/acme/default.nix | 4 +- nixos/modules/security/doas.nix | 60 +++++------ nixos/modules/security/misc.nix | 4 +- nixos/modules/security/pam.nix | 100 +++++++++--------- nixos/modules/security/pam_mount.nix | 12 +-- nixos/modules/security/pam_usb.nix | 4 +- nixos/modules/security/sudo.nix | 20 ++-- nixos/modules/services/backup/restic.nix | 2 +- nixos/modules/services/backup/syncoid.nix | 2 +- nixos/modules/services/backup/zrepl.nix | 4 +- .../continuous-integration/github-runner.nix | 4 +- .../continuous-integration/gitlab-runner.nix | 94 ++++++++-------- nixos/modules/services/databases/firebird.nix | 6 +- nixos/modules/services/databases/mysql.nix | 6 +- nixos/modules/services/databases/neo4j.nix | 86 +++++++-------- nixos/modules/services/databases/openldap.nix | 10 +- nixos/modules/services/databases/pgmanage.nix | 4 +- .../modules/services/databases/postgresql.nix | 6 +- .../services/databases/victoriametrics.nix | 6 +- nixos/modules/services/games/asf.nix | 4 +- nixos/modules/services/hardware/kanata.nix | 14 +-- nixos/modules/services/hardware/udev.nix | 16 +-- nixos/modules/services/logging/filebeat.nix | 20 ++-- nixos/modules/services/logging/logrotate.nix | 10 +- nixos/modules/services/mail/mailman.nix | 4 +- nixos/modules/services/mail/nullmailer.nix | 12 +-- nixos/modules/services/mail/postfixadmin.nix | 6 +- nixos/modules/services/mail/public-inbox.nix | 10 +- nixos/modules/services/mail/roundcube.nix | 10 +- nixos/modules/services/mail/sympa.nix | 16 +-- .../services/matrix/appservice-discord.nix | 10 +- .../services/matrix/mautrix-facebook.nix | 8 +- .../services/matrix/mautrix-telegram.nix | 8 +- nixos/modules/services/misc/autorandr.nix | 4 +- nixos/modules/services/misc/bees.nix | 4 +- nixos/modules/services/misc/etcd.nix | 4 +- nixos/modules/services/misc/klipper.nix | 2 +- nixos/modules/services/misc/sssd.nix | 2 +- .../modules/services/monitoring/cadvisor.nix | 14 +-- .../modules/services/monitoring/graphite.nix | 4 +- .../services/monitoring/metricbeat.nix | 10 +- nixos/modules/services/monitoring/munin.nix | 28 ++--- nixos/modules/services/monitoring/netdata.nix | 4 +- .../services/monitoring/parsedmarc.nix | 34 +++--- nixos/modules/services/networking/biboumi.nix | 10 +- nixos/modules/services/networking/bird-lg.nix | 8 +- nixos/modules/services/networking/bird.nix | 12 +-- nixos/modules/services/networking/coredns.nix | 4 +- .../services/networking/ghostunnel.nix | 14 +-- nixos/modules/services/networking/hans.nix | 4 +- nixos/modules/services/networking/iodine.nix | 4 +- nixos/modules/services/networking/kea.nix | 32 +++--- nixos/modules/services/networking/ncdns.nix | 4 +- .../services/networking/networkmanager.nix | 6 +- .../services/networking/nntp-proxy.nix | 4 +- nixos/modules/services/networking/nsd.nix | 4 +- .../modules/services/networking/ntp/ntpd.nix | 8 +- .../services/networking/openconnect.nix | 14 +-- nixos/modules/services/networking/openvpn.nix | 4 +- nixos/modules/services/networking/pleroma.nix | 8 +- .../modules/services/networking/ssh/sshd.nix | 24 ++--- .../modules/services/networking/wireguard.nix | 16 +-- .../modules/services/networking/yggdrasil.nix | 12 +-- .../modules/services/security/privacyidea.nix | 4 +- nixos/modules/services/security/tor.nix | 6 +- nixos/modules/services/security/vault.nix | 4 +- nixos/modules/services/system/dbus.nix | 14 +-- nixos/modules/services/system/earlyoom.nix | 16 +-- .../modules/services/torrent/transmission.nix | 56 +++++----- nixos/modules/services/web-apps/dokuwiki.nix | 10 +- nixos/modules/services/web-apps/hedgedoc.nix | 4 +- nixos/modules/services/web-apps/keycloak.nix | 26 ++--- nixos/modules/services/web-apps/mastodon.nix | 18 ++-- nixos/modules/services/web-apps/nextcloud.nix | 24 ++--- nixos/modules/services/web-apps/node-red.nix | 4 +- nixos/modules/services/web-apps/trilium.nix | 2 +- .../services/x11/desktop-managers/plasma5.nix | 2 +- .../lightdm-greeters/mini.nix | 4 +- .../lightdm-greeters/tiny.nix | 4 +- .../services/x11/window-managers/fvwm2.nix | 2 +- nixos/modules/system/boot/initrd-network.nix | 10 +- nixos/modules/system/boot/luksroot.nix | 4 +- nixos/modules/system/boot/networkd.nix | 6 +- nixos/modules/system/boot/systemd/logind.nix | 6 +- .../modules/system/boot/systemd/tmpfiles.nix | 10 +- nixos/modules/tasks/auto-upgrade.nix | 6 +- .../tasks/scsi-link-power-management.nix | 2 +- .../virtualisation/nixos-containers.nix | 12 +-- 101 files changed, 628 insertions(+), 628 deletions(-) diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix index dad06c1b44cd..f73f10f0f369 100644 --- a/nixos/modules/config/i18n.nix +++ b/nixos/modules/config/i18n.nix @@ -71,11 +71,11 @@ with lib; )) ''; example = ["en_US.UTF-8/UTF-8" "nl_NL.UTF-8/UTF-8" "nl_NL/ISO-8859-1"]; - description = '' + description = lib.mdDoc '' List of locales that the system should support. The value - "all" means that all locales supported by + `"all"` means that all locales supported by Glibc will be installed. A full list of supported locales - can be found at . + can be found at . ''; }; diff --git a/nixos/modules/config/resolvconf.nix b/nixos/modules/config/resolvconf.nix index ef291ce5aaf1..76605a063a47 100644 --- a/nixos/modules/config/resolvconf.nix +++ b/nixos/modules/config/resolvconf.nix @@ -83,9 +83,9 @@ in dnsExtensionMechanism = mkOption { type = types.bool; default = true; - description = '' - Enable the edns0 option in resolv.conf. With - that option set, glibc supports use of the extension mechanisms for + description = lib.mdDoc '' + Enable the `edns0` option in {file}`resolv.conf`. With + that option set, `glibc` supports use of the extension mechanisms for DNS (EDNS) specified in RFC 2671. The most popular user of that feature is DNSSEC, which does not work without it. ''; diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix index 3dc202327c2d..2fda71749c09 100644 --- a/nixos/modules/config/shells-environment.nix +++ b/nixos/modules/config/shells-environment.nix @@ -109,11 +109,11 @@ in environment.shellAliases = mkOption { example = { l = null; ll = "ls -l"; }; - description = '' + description = lib.mdDoc '' An attribute set that maps aliases (the top level attribute names in this option) to command strings or directly to build outputs. The aliases are added to all users' shells. - Aliases mapped to null are ignored. + Aliases mapped to `null` are ignored. ''; type = with types; attrsOf (nullOr (either str path)); }; diff --git a/nixos/modules/config/system-environment.nix b/nixos/modules/config/system-environment.nix index a299fdceaf1c..1e05ab7d0f2b 100644 --- a/nixos/modules/config/system-environment.nix +++ b/nixos/modules/config/system-environment.nix @@ -16,7 +16,7 @@ in environment.sessionVariables = mkOption { default = {}; - description = '' + description = lib.mdDoc '' A set of environment variables used in the global environment. These variables will be set by PAM early in the login process. @@ -25,12 +25,12 @@ in colon characters. Note, due to limitations in the PAM format values may not - contain the " character. + contain the `"` character. Also, these variables are merged into - and it is + [](#opt-environment.variables) and it is therefore not possible to use PAM style variables such as - @{HOME}. + `@{HOME}`. ''; type = with types; attrsOf (either str (listOf str)); apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else v); diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 2e5984b55cc1..915687d1799a 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -100,17 +100,17 @@ let isNormalUser = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Indicates whether this is an account for a “real” user. This - automatically sets to - users, to - true, to - /home/«username», - to true, - and to - false. - Exactly one of isNormalUser and - isSystemUser must be true. + automatically sets {option}`group` to + `users`, {option}`createHome` to + `true`, {option}`home` to + {file}`/home/«username»`, + {option}`useDefaultShell` to `true`, + and {option}`isSystemUser` to + `false`. + Exactly one of `isNormalUser` and + `isSystemUser` must be true. ''; }; @@ -151,12 +151,12 @@ let pamMount = mkOption { type = with types; attrsOf str; default = {}; - description = '' + description = lib.mdDoc '' Attributes for user's entry in - pam_mount.conf.xml. - Useful attributes might include path, - options, fstype, and server. - See + {file}`pam_mount.conf.xml`. + Useful attributes might include `path`, + `options`, `fstype`, and `server`. + See for more information. ''; }; @@ -166,12 +166,12 @@ let default = pkgs.shadow; defaultText = literalExpression "pkgs.shadow"; example = literalExpression "pkgs.bashInteractive"; - description = '' + description = lib.mdDoc '' The path to the user's shell. Can use shell derivations, - like pkgs.bashInteractive. Don’t + like `pkgs.bashInteractive`. Don’t forget to enable your shell in - programs if necessary, - like programs.zsh.enable = true;. + `programs` if necessary, + like `programs.zsh.enable = true;`. ''; }; diff --git a/nixos/modules/hardware/logitech.nix b/nixos/modules/hardware/logitech.nix index 1c3556320e39..70ca59a7dd3f 100644 --- a/nixos/modules/hardware/logitech.nix +++ b/nixos/modules/hardware/logitech.nix @@ -32,7 +32,7 @@ in devices = mkOption { type = types.listOf types.str; default = [ "0a07" "c222" "c225" "c227" "c251" ]; - description = '' + description = lib.mdDoc '' List of USB device ids supported by g15daemon. You most likely do not need to change this. diff --git a/nixos/modules/hardware/video/uvcvideo/default.nix b/nixos/modules/hardware/video/uvcvideo/default.nix index 5d1699e63955..6cfb8cc6ad29 100644 --- a/nixos/modules/hardware/video/uvcvideo/default.nix +++ b/nixos/modules/hardware/video/uvcvideo/default.nix @@ -34,15 +34,15 @@ in packages = mkOption { type = types.listOf types.path; example = literalExpression "[ pkgs.tiscamera ]"; - description = '' - List of packages containing uvcvideo dynamic controls + description = lib.mdDoc '' + List of packages containing {command}`uvcvideo` dynamic controls rules. All files found in - «pkg»/share/uvcdynctrl/data + {file}`«pkg»/share/uvcdynctrl/data` will be included. - Note that these will serve as input to the libwebcam - package which through its own udev rule will register - the dynamic controls from specified packages to the uvcvideo + Note that these will serve as input to the {command}`libwebcam` + package which through its own {command}`udev` rule will register + the dynamic controls from specified packages to the {command}`uvcvideo` driver. ''; apply = map getBin; diff --git a/nixos/modules/programs/adb.nix b/nixos/modules/programs/adb.nix index 634031939207..e5b0abd9fcfe 100644 --- a/nixos/modules/programs/adb.nix +++ b/nixos/modules/programs/adb.nix @@ -11,10 +11,10 @@ with lib; enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to configure system to use Android Debug Bridge (adb). To grant access to a user, it must be part of adbusers group: - users.users.alice.extraGroups = ["adbusers"]; + `users.users.alice.extraGroups = ["adbusers"];` ''; }; }; diff --git a/nixos/modules/programs/firejail.nix b/nixos/modules/programs/firejail.nix index b9a0f9a69113..417eff91d3c7 100644 --- a/nixos/modules/programs/firejail.nix +++ b/nixos/modules/programs/firejail.nix @@ -69,12 +69,12 @@ in { }; } ''; - description = '' + description = lib.mdDoc '' Wrap the binaries in firejail and place them in the global path. You will get file collisions if you put the actual application binary in the global environment (such as by adding the application package to - environment.systemPackages), and applications started via + `environment.systemPackages`), and applications started via .desktop files are not wrapped if they specify the absolute path to the binary. ''; diff --git a/nixos/modules/programs/gphoto2.nix b/nixos/modules/programs/gphoto2.nix index 373b53495f75..f31b1863963d 100644 --- a/nixos/modules/programs/gphoto2.nix +++ b/nixos/modules/programs/gphoto2.nix @@ -11,11 +11,11 @@ with lib; enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to configure system to use gphoto2. To grant digital camera access to a user, the user must be part of the camera group: - users.users.alice.extraGroups = ["camera"]; + `users.users.alice.extraGroups = ["camera"];` ''; }; }; diff --git a/nixos/modules/programs/neovim.nix b/nixos/modules/programs/neovim.nix index 2c39456895f3..85963159a725 100644 --- a/nixos/modules/programs/neovim.nix +++ b/nixos/modules/programs/neovim.nix @@ -72,9 +72,9 @@ in { }; } ''; - description = '' + description = lib.mdDoc '' Generate your init file from your list of plugins and custom commands. - Neovim will then be wrapped to load nvim -u /nix/store/«hash»-vimrc + Neovim will then be wrapped to load {command}`nvim -u /nix/store/«hash»-vimrc` ''; }; diff --git a/nixos/modules/programs/nncp.nix b/nixos/modules/programs/nncp.nix index f40e888dad8c..a58748d2fe62 100644 --- a/nixos/modules/programs/nncp.nix +++ b/nixos/modules/programs/nncp.nix @@ -33,24 +33,24 @@ in { secrets = mkOption { type = with types; listOf str; example = [ "/run/keys/nncp.hjson" ]; - description = '' + description = lib.mdDoc '' A list of paths to NNCP configuration files that should not be in the Nix store. These files are layered on top of the values at - . + [](#opt-programs.nncp.settings). ''; }; settings = mkOption { type = settingsFormat.type; - description = '' + description = lib.mdDoc '' NNCP configuration, see - . + . At runtime these settings will be overlayed by the contents of - into the file - ${nncpCfgFile}. Node keypairs go in - secrets, do not specify them in - settings as they will be leaked into - /nix/store! + [](#opt-programs.nncp.secrets) into the file + `${nncpCfgFile}`. Node keypairs go in + `secrets`, do not specify them in + `settings` as they will be leaked into + `/nix/store`! ''; default = { }; }; diff --git a/nixos/modules/programs/turbovnc.nix b/nixos/modules/programs/turbovnc.nix index eb09c554290f..a0e4a36cfd99 100644 --- a/nixos/modules/programs/turbovnc.nix +++ b/nixos/modules/programs/turbovnc.nix @@ -15,14 +15,14 @@ in ensureHeadlessSoftwareOpenGL = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to set up NixOS such that TurboVNC's built-in software OpenGL implementation works. - This will enable so that OpenGL + This will enable {option}`hardware.opengl.enable` so that OpenGL programs can find Mesa's llvmpipe drivers. - Setting this option to false does not mean that software + Setting this option to `false` does not mean that software OpenGL won't work; it may still work depending on your system configuration. diff --git a/nixos/modules/security/acme/default.nix b/nixos/modules/security/acme/default.nix index 4bc3d8e743d3..a1d8c533304a 100644 --- a/nixos/modules/security/acme/default.nix +++ b/nixos/modules/security/acme/default.nix @@ -504,8 +504,8 @@ let reloadServices = mkOption { type = types.listOf types.str; inherit (defaultAndText "reloadServices" []) default defaultText; - description = '' - The list of systemd services to call systemctl try-reload-or-restart + description = lib.mdDoc '' + The list of systemd services to call `systemctl try-reload-or-restart` on. ''; }; diff --git a/nixos/modules/security/doas.nix b/nixos/modules/security/doas.nix index 2641548221a9..4d15ed9a8025 100644 --- a/nixos/modules/security/doas.nix +++ b/nixos/modules/security/doas.nix @@ -62,19 +62,19 @@ in wheelNeedsPassword = mkOption { type = with types; bool; default = true; - description = '' - Whether users of the wheel group must provide a password to - run commands as super user via doas. + description = lib.mdDoc '' + Whether users of the `wheel` group must provide a password to + run commands as super user via {command}`doas`. ''; }; extraRules = mkOption { default = []; - description = '' + description = lib.mdDoc '' Define specific rules to be set in the - /etc/doas.conf file. More specific rules should + {file}`/etc/doas.conf` file. More specific rules should come after more general ones in order to yield the expected behavior. - You can use mkBefore and/or mkAfter to ensure + You can use `mkBefore` and/or `mkAfter` to ensure this is the case when configuration options are merged. ''; example = literalExpression '' @@ -113,8 +113,8 @@ in noPass = mkOption { type = with types; bool; default = false; - description = '' - If true, the user is not required to enter a + description = lib.mdDoc '' + If `true`, the user is not required to enter a password. ''; }; @@ -122,18 +122,18 @@ in noLog = mkOption { type = with types; bool; default = false; - description = '' - If true, successful executions will not be logged + description = lib.mdDoc '' + If `true`, successful executions will not be logged to - syslogd8. + {manpage}`syslogd(8)`. ''; }; persist = mkOption { type = with types; bool; default = false; - description = '' - If true, do not ask for a password again for some + description = lib.mdDoc '' + If `true`, do not ask for a password again for some time after the user successfully authenticates. ''; }; @@ -141,10 +141,10 @@ in keepEnv = mkOption { type = with types; bool; default = false; - description = '' - If true, environment variables other than those + description = lib.mdDoc '' + If `true`, environment variables other than those listed in - doas1 + {manpage}`doas(1)` are kept when creating the environment for the new process. ''; }; @@ -152,18 +152,18 @@ in setEnv = mkOption { type = with types; listOf str; default = []; - description = '' + description = lib.mdDoc '' Keep or set the specified variables. Variables may also be removed with a leading '-' or set using - variable=value. If the first character of - value is a '$', the value to be set is taken from + `variable=value`. If the first character of + `value` is a '$', the value to be set is taken from the existing environment variable of the indicated name. This option is processed after the default environment has been created. - NOTE: All rules have setenv { SSH_AUTH_SOCK } by - default. To prevent SSH_AUTH_SOCK from being - inherited, add "-SSH_AUTH_SOCK" anywhere in this + NOTE: All rules have `setenv { SSH_AUTH_SOCK }` by + default. To prevent `SSH_AUTH_SOCK` from being + inherited, add `"-SSH_AUTH_SOCK"` anywhere in this list. ''; }; @@ -183,23 +183,23 @@ in runAs = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' Which user or group the specified command is allowed to run as. - When set to null (the default), all users are + When set to `null` (the default), all users are allowed. A user can be specified using just the username: - "foo". It is also possible to only allow running as - a specific group with ":bar". + `"foo"`. It is also possible to only allow running as + a specific group with `":bar"`. ''; }; cmd = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' The command the user is allowed to run. When set to - null (the default), all commands are allowed. + `null` (the default), all commands are allowed. NOTE: It is best practice to specify absolute paths. If a relative path is specified, only a restricted PATH will be @@ -210,9 +210,9 @@ in args = mkOption { type = with types; nullOr (listOf str); default = null; - description = '' + description = lib.mdDoc '' Arguments that must be provided to the command. When set to - [], the command must be run without any arguments. + `[]`, the command must be run without any arguments. ''; }; }; diff --git a/nixos/modules/security/misc.nix b/nixos/modules/security/misc.nix index 3c83ff8d7739..6833452a570e 100644 --- a/nixos/modules/security/misc.nix +++ b/nixos/modules/security/misc.nix @@ -52,7 +52,7 @@ with lib; security.allowSimultaneousMultithreading = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to allow SMT/hyperthreading. Disabling SMT means that only physical CPU cores will be usable at runtime, potentially at significant performance cost. @@ -62,7 +62,7 @@ with lib; e.g., shared caches). This attack vector is unproven. Disabling SMT is a supplement to the L1 data cache flushing mitigation - (see ) + (see [](#opt-security.virtualisation.flushL1DataCache)) versus malicious VM guests (SMT could "bring back" previously flushed data). ''; diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 8a70e5f3adbd..2d0f25689784 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -807,14 +807,14 @@ in default = config.krb5.enable; defaultText = literalExpression "config.krb5.enable"; type = types.bool; - description = '' - Enables Kerberos PAM modules (pam-krb5, - pam-ccreds). + description = lib.mdDoc '' + Enables Kerberos PAM modules (`pam-krb5`, + `pam-ccreds`). If set, users can authenticate with their Kerberos password. This requires a valid Kerberos configuration - (config.krb5.enable should be set to - true). + (`config.krb5.enable` should be set to + `true`). Note that the Kerberos PAM modules are not necessary when using SSS to handle Kerberos authentication. @@ -826,12 +826,12 @@ in enable = mkOption { default = false; type = types.bool; - description = '' - Enables P11 PAM (pam_p11) module. + description = lib.mdDoc '' + Enables P11 PAM (`pam_p11`) module. If set, users can log in with SSH keys and PKCS#11 tokens. - More information can be found here. + More information can be found [here](https://github.com/OpenSC/pam_p11). ''; }; @@ -858,71 +858,71 @@ in enable = mkOption { default = false; type = types.bool; - description = '' - Enables U2F PAM (pam-u2f) module. + description = lib.mdDoc '' + Enables U2F PAM (`pam-u2f`) module. If set, users listed in - $XDG_CONFIG_HOME/Yubico/u2f_keys (or - $HOME/.config/Yubico/u2f_keys if XDG variable is + {file}`$XDG_CONFIG_HOME/Yubico/u2f_keys` (or + {file}`$HOME/.config/Yubico/u2f_keys` if XDG variable is not set) are able to log in with the associated U2F key. The path can - be changed using option. + be changed using {option}`security.pam.u2f.authFile` option. File format is: - username:first_keyHandle,first_public_key: second_keyHandle,second_public_key - This file can be generated using pamu2fcfg command. + `username:first_keyHandle,first_public_key: second_keyHandle,second_public_key` + This file can be generated using {command}`pamu2fcfg` command. - More information can be found here. + More information can be found [here](https://developers.yubico.com/pam-u2f/). ''; }; authFile = mkOption { default = null; type = with types; nullOr path; - description = '' - By default pam-u2f module reads the keys from - $XDG_CONFIG_HOME/Yubico/u2f_keys (or - $HOME/.config/Yubico/u2f_keys if XDG variable is + description = lib.mdDoc '' + By default `pam-u2f` module reads the keys from + {file}`$XDG_CONFIG_HOME/Yubico/u2f_keys` (or + {file}`$HOME/.config/Yubico/u2f_keys` if XDG variable is not set). If you want to change auth file locations or centralize database (for - example use /etc/u2f-mappings) you can set this + example use {file}`/etc/u2f-mappings`) you can set this option. File format is: - username:first_keyHandle,first_public_key: second_keyHandle,second_public_key - This file can be generated using pamu2fcfg command. + `username:first_keyHandle,first_public_key: second_keyHandle,second_public_key` + This file can be generated using {command}`pamu2fcfg` command. - More information can be found here. + More information can be found [here](https://developers.yubico.com/pam-u2f/). ''; }; appId = mkOption { default = null; type = with types; nullOr str; - description = '' - By default pam-u2f module sets the application - ID to pam://$HOSTNAME. + description = lib.mdDoc '' + By default `pam-u2f` module sets the application + ID to `pam://$HOSTNAME`. - When using pamu2fcfg, you can specify your - application ID with the -i flag. + When using {command}`pamu2fcfg`, you can specify your + application ID with the `-i` flag. - More information can be found here + More information can be found [here](https://developers.yubico.com/pam-u2f/Manuals/pam_u2f.8.html) ''; }; origin = mkOption { default = null; type = with types; nullOr str; - description = '' - By default pam-u2f module sets the origin - to pam://$HOSTNAME. + description = lib.mdDoc '' + By default `pam-u2f` module sets the origin + to `pam://$HOSTNAME`. Setting origin to an host independent value will allow you to reuse credentials across machines - When using pamu2fcfg, you can specify your - application ID with the -o flag. + When using {command}`pamu2fcfg`, you can specify your + application ID with the `-o` flag. - More information can be found here + More information can be found [here](https://developers.yubico.com/pam-u2f/Manuals/pam_u2f.8.html) ''; }; @@ -978,17 +978,17 @@ in enable = mkOption { default = false; type = types.bool; - description = '' - Enables Uber's USSH PAM (pam-ussh) module. + description = lib.mdDoc '' + Enables Uber's USSH PAM (`pam-ussh`) module. - This is similar to pam-ssh-agent, except that + This is similar to `pam-ssh-agent`, except that the presence of a CA-signed SSH key with a valid principal is checked instead. Note that this module must both be enabled using this option and on a - per-PAM-service level as well (using usshAuth). + per-PAM-service level as well (using `usshAuth`). - More information can be found here. + More information can be found [here](https://github.com/uber/pam-ussh). ''; }; @@ -1067,16 +1067,16 @@ in enable = mkOption { default = false; type = types.bool; - description = '' - Enables Yubico PAM (yubico-pam) module. + description = lib.mdDoc '' + Enables Yubico PAM (`yubico-pam`) module. If set, users listed in - ~/.yubico/authorized_yubikeys + {file}`~/.yubico/authorized_yubikeys` are able to log in with the associated Yubikey tokens. The file must have only one line: - username:yubikey_token_id1:yubikey_token_id2 - More information can be found here. + `username:yubikey_token_id1:yubikey_token_id2` + More information can be found [here](https://developers.yubico.com/yubico-pam/). ''; }; control = mkOption { @@ -1111,7 +1111,7 @@ in mode = mkOption { default = "client"; type = types.enum [ "client" "challenge-response" ]; - description = '' + description = lib.mdDoc '' Mode of operation. Use "client" for online validation with a YubiKey validation service such as @@ -1121,16 +1121,16 @@ in Challenge-Response configurations. See the man-page ykpamcfg(1) for further details on how to configure offline Challenge-Response validation. - More information can be found here. + More information can be found [here](https://developers.yubico.com/yubico-pam/Authentication_Using_Challenge-Response.html). ''; }; challengeResponsePath = mkOption { default = null; type = types.nullOr types.path; - description = '' + description = lib.mdDoc '' If not null, set the path used by yubico pam module where the challenge expected response is stored. - More information can be found here. + More information can be found [here](https://developers.yubico.com/yubico-pam/Authentication_Using_Challenge-Response.html). ''; }; }; diff --git a/nixos/modules/security/pam_mount.nix b/nixos/modules/security/pam_mount.nix index ae314abd86c6..11cc13a8cbeb 100644 --- a/nixos/modules/security/pam_mount.nix +++ b/nixos/modules/security/pam_mount.nix @@ -31,9 +31,9 @@ in extraVolumes = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' List of volume definitions for pam_mount. - For more information, visit . + For more information, visit . ''; }; @@ -63,20 +63,20 @@ in type = types.int; default = 0; example = 1; - description = '' + description = lib.mdDoc '' Sets the Debug-Level. 0 disables debugging, 1 enables pam_mount tracing, and 2 additionally enables tracing in mount.crypt. The default is 0. - For more information, visit . + For more information, visit . ''; }; logoutWait = mkOption { type = types.int; default = 0; - description = '' + description = lib.mdDoc '' Amount of microseconds to wait until killing remaining processes after final logout. - For more information, visit . + For more information, visit . ''; }; diff --git a/nixos/modules/security/pam_usb.nix b/nixos/modules/security/pam_usb.nix index 71e2af8f3a51..4275c26c6bda 100644 --- a/nixos/modules/security/pam_usb.nix +++ b/nixos/modules/security/pam_usb.nix @@ -17,9 +17,9 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable USB login for all login systems that support it. For - more information, visit . + more information, visit . ''; }; diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix index c1a69aedde45..faa99a31a6d6 100644 --- a/nixos/modules/security/sudo.nix +++ b/nixos/modules/security/sudo.nix @@ -55,19 +55,19 @@ in type = types.bool; default = true; description = - '' - Whether users of the wheel group must - provide a password to run commands as super user via sudo. + lib.mdDoc '' + Whether users of the `wheel` group must + provide a password to run commands as super user via {command}`sudo`. ''; }; security.sudo.execWheelOnly = mkOption { type = types.bool; default = false; - description = '' - Only allow members of the wheel group to execute sudo by + description = lib.mdDoc '' + Only allow members of the `wheel` group to execute sudo by setting the executable's permissions accordingly. - This prevents users that are not members of wheel from + This prevents users that are not members of `wheel` from exploiting vulnerabilities in sudo such as CVE-2021-3156. ''; }; @@ -139,12 +139,12 @@ in runAs = mkOption { type = with types; str; default = "ALL:ALL"; - description = '' + description = lib.mdDoc '' Under which user/group the specified command is allowed to run. - A user can be specified using just the username: "foo". - It is also possible to specify a user/group combination using "foo:bar" - or to only allow running as a specific group with ":bar". + A user can be specified using just the username: `"foo"`. + It is also possible to specify a user/group combination using `"foo:bar"` + or to only allow running as a specific group with `":bar"`. ''; }; diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix index 76d7f093f21c..56958bf949d6 100644 --- a/nixos/modules/services/backup/restic.nix +++ b/nixos/modules/services/backup/restic.nix @@ -227,7 +227,7 @@ in type = types.package; default = pkgs.restic; defaultText = literalExpression "pkgs.restic"; - description = '' + description = lib.mdDoc '' Restic package to use. ''; }; diff --git a/nixos/modules/services/backup/syncoid.nix b/nixos/modules/services/backup/syncoid.nix index 6e71eaa5b9a8..cbfbc59bf5b2 100644 --- a/nixos/modules/services/backup/syncoid.nix +++ b/nixos/modules/services/backup/syncoid.nix @@ -192,7 +192,7 @@ in target = mkOption { type = types.str; example = "user@server:pool/dataset"; - description = '' + description = lib.mdDoc '' Target ZFS dataset. Can be either local («pool/dataset») or remote («user@server:pool/dataset»). diff --git a/nixos/modules/services/backup/zrepl.nix b/nixos/modules/services/backup/zrepl.nix index 7b31b0da0369..ea858a8b77db 100644 --- a/nixos/modules/services/backup/zrepl.nix +++ b/nixos/modules/services/backup/zrepl.nix @@ -22,8 +22,8 @@ in settings = mkOption { default = { }; - description = '' - Configuration for zrepl. See + description = lib.mdDoc '' + Configuration for zrepl. See for more information. ''; type = types.submodule { diff --git a/nixos/modules/services/continuous-integration/github-runner.nix b/nixos/modules/services/continuous-integration/github-runner.nix index 2c753b514c5b..540033823687 100644 --- a/nixos/modules/services/continuous-integration/github-runner.nix +++ b/nixos/modules/services/continuous-integration/github-runner.nix @@ -18,11 +18,11 @@ in enable = mkOption { default = false; example = true; - description = '' + description = lib.mdDoc '' Whether to enable GitHub Actions runner. Note: GitHub recommends using self-hosted runners with private repositories only. Learn more here: - About self-hosted runners. + [About self-hosted runners](https://docs.github.com/en/actions/hosting-your-own-runners/about-self-hosted-runners). ''; type = lib.types.bool; }; diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix index 03d3d2d16e3b..9f076e2d7a23 100644 --- a/nixos/modules/services/continuous-integration/gitlab-runner.nix +++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix @@ -113,15 +113,15 @@ in configFile = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' Configuration file for gitlab-runner. - takes precedence over . - and will be ignored too. + {option}`configFile` takes precedence over {option}`services`. + {option}`checkInterval` and {option}`concurrent` will be ignored too. - This option is deprecated, please use instead. - You can use and - + This option is deprecated, please use {option}`services` instead. + You can use {option}`registrationConfigFile` and + {option}`registrationFlags` for settings not covered by this module. ''; }; @@ -130,16 +130,16 @@ in freeformType = (pkgs.formats.json { }).type; }; default = { }; - description = '' + description = lib.mdDoc '' Global gitlab-runner configuration. See - + for supported values. ''; }; gracefulTermination = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Finish all remaining jobs before stopping. If not set gitlab-runner will stop immediatly without waiting for jobs to finish, which will lead to failed builds. @@ -149,7 +149,7 @@ in type = types.str; default = "infinity"; example = "5min 20s"; - description = '' + description = lib.mdDoc '' Time to wait until a graceful shutdown is turned into a forceful one. ''; }; @@ -158,17 +158,17 @@ in default = pkgs.gitlab-runner; defaultText = literalExpression "pkgs.gitlab-runner"; example = literalExpression "pkgs.gitlab-runner_1_11"; - description = "Gitlab Runner package to use."; + description = lib.mdDoc "Gitlab Runner package to use."; }; extraPackages = mkOption { type = types.listOf types.package; default = [ ]; - description = '' + description = lib.mdDoc '' Extra packages to add to PATH for the gitlab-runner process. ''; }; services = mkOption { - description = "GitLab Runner services."; + description = lib.mdDoc "GitLab Runner services."; default = { }; example = literalExpression '' { @@ -250,17 +250,17 @@ in options = { registrationConfigFile = mkOption { type = types.path; - description = '' + description = lib.mdDoc '' Absolute path to a file with environment variables used for gitlab-runner registration. A list of all supported environment variables can be found in - gitlab-runner register --help. + `gitlab-runner register --help`. Ones that you probably want to set is - CI_SERVER_URL=<CI server URL> + `CI_SERVER_URL=` - REGISTRATION_TOKEN=<registration secret> + `REGISTRATION_TOKEN=` WARNING: make sure to use quoted absolute path, or it is going to be copied to Nix Store. @@ -270,10 +270,10 @@ in type = types.listOf types.str; default = [ ]; example = [ "--docker-helper-image my/gitlab-runner-helper" ]; - description = '' + description = lib.mdDoc '' Extra command-line flags passed to - gitlab-runner register. - Execute gitlab-runner register --help + `gitlab-runner register`. + Execute `gitlab-runner register --help` for a list of supported flags. ''; }; @@ -281,32 +281,32 @@ in type = types.attrsOf types.str; default = { }; example = { NAME = "value"; }; - description = '' + description = lib.mdDoc '' Custom environment variables injected to build environment. - For secrets you can use - with RUNNER_ENV variable set. + For secrets you can use {option}`registrationConfigFile` + with `RUNNER_ENV` variable set. ''; }; description = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Name/description of the runner. ''; }; executor = mkOption { type = types.str; default = "docker"; - description = '' + description = lib.mdDoc '' Select executor, eg. shell, docker, etc. - See runner documentation for more information. + See [runner documentation](https://docs.gitlab.com/runner/executors/README.html) for more information. ''; }; buildsDir = mkOption { type = types.nullOr types.path; default = null; example = "/var/lib/gitlab-runner/builds"; - description = '' + description = lib.mdDoc '' Absolute path to a directory where builds will be stored in context of selected executor (Locally, Docker, SSH). ''; @@ -315,14 +315,14 @@ in type = types.nullOr types.str; default = null; example = "http://gitlab.example.local"; - description = '' + description = lib.mdDoc '' Overwrite the URL for the GitLab instance. Used if the Runner can’t connect to GitLab on the URL GitLab exposes itself. ''; }; dockerImage = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Docker image to be used. ''; }; @@ -330,7 +330,7 @@ in type = types.listOf types.str; default = [ ]; example = [ "/var/run/docker.sock:/var/run/docker.sock" ]; - description = '' + description = lib.mdDoc '' Bind-mount a volume and create it if it doesn't exist prior to mounting. ''; @@ -338,14 +338,14 @@ in dockerDisableCache = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Disable all container caching. ''; }; dockerPrivileged = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Give extended privileges to container. ''; }; @@ -353,7 +353,7 @@ in type = types.listOf types.str; default = [ ]; example = [ "other-host:127.0.0.1" ]; - description = '' + description = lib.mdDoc '' Add a custom host-to-IP mapping. ''; }; @@ -361,7 +361,7 @@ in type = types.listOf types.str; default = [ ]; example = [ "ruby:*" "python:*" "php:*" "my.registry.tld:5000/*:*" ]; - description = '' + description = lib.mdDoc '' Whitelist allowed images. ''; }; @@ -369,21 +369,21 @@ in type = types.listOf types.str; default = [ ]; example = [ "postgres:9" "redis:*" "mysql:*" ]; - description = '' + description = lib.mdDoc '' Whitelist allowed services. ''; }; preCloneScript = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' Runner-specific command script executed before code is pulled. ''; }; preBuildScript = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' Runner-specific command script executed after code is pulled, just before build executes. ''; @@ -391,7 +391,7 @@ in postBuildScript = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' Runner-specific command script executed after code is pulled and just after build executes. ''; @@ -399,22 +399,22 @@ in tagList = mkOption { type = types.listOf types.str; default = [ ]; - description = '' + description = lib.mdDoc '' Tag list. ''; }; runUntagged = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Register to run untagged builds; defaults to - true when is empty. + `true` when {option}`tagList` is empty. ''; }; limit = mkOption { type = types.int; default = 0; - description = '' + description = lib.mdDoc '' Limit how many jobs can be handled concurrently by this service. 0 (default) simply means don't limit. ''; @@ -422,14 +422,14 @@ in requestConcurrency = mkOption { type = types.int; default = 0; - description = '' + description = lib.mdDoc '' Limit number of concurrent requests for new jobs from GitLab. ''; }; maximumTimeout = mkOption { type = types.int; default = 0; - description = '' + description = lib.mdDoc '' What is the maximum timeout (in seconds) that will be set for job when using this Runner. 0 (default) simply means don't limit. ''; @@ -437,7 +437,7 @@ in protected = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' When set to true Runner will only run on pipelines triggered on protected branches. ''; @@ -445,9 +445,9 @@ in debugTraceDisabled = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' When set to true Runner will disable the possibility of - using the CI_DEBUG_TRACE feature. + using the `CI_DEBUG_TRACE` feature. ''; }; }; diff --git a/nixos/modules/services/databases/firebird.nix b/nixos/modules/services/databases/firebird.nix index a26f1ff8258f..4aaf4ca12aa6 100644 --- a/nixos/modules/services/databases/firebird.nix +++ b/nixos/modules/services/databases/firebird.nix @@ -47,9 +47,9 @@ in defaultText = literalExpression "pkgs.firebird"; type = types.package; example = literalExpression "pkgs.firebird_3"; - description = '' - Which Firebird package to be installed: pkgs.firebird_3 - For SuperServer use override: pkgs.firebird_3.override { superServer = true; }; + description = lib.mdDoc '' + Which Firebird package to be installed: `pkgs.firebird_3` + For SuperServer use override: `pkgs.firebird_3.override { superServer = true; };` ''; }; diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 1e6a6b844a37..1a096d2a88a4 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -201,7 +201,7 @@ in ensurePermissions = mkOption { type = types.attrsOf types.str; default = {}; - description = '' + description = lib.mdDoc '' Permissions to ensure for the user, specified as attribute set. The attribute names specify the database and tables to grant the permissions for, separated by a dot. You may use wildcards here. @@ -210,8 +210,8 @@ in For more information on how to specify the target and on which privileges exist, see the - GRANT syntax. - The attributes are used as GRANT ''${attrName} ON ''${attrValue}. + [GRANT syntax](https://mariadb.com/kb/en/library/grant/). + The attributes are used as `GRANT ''${attrName} ON ''${attrValue}`. ''; example = literalExpression '' { diff --git a/nixos/modules/services/databases/neo4j.nix b/nixos/modules/services/databases/neo4j.nix index ad659ccd82e8..d1be4034ddac 100644 --- a/nixos/modules/services/databases/neo4j.nix +++ b/nixos/modules/services/databases/neo4j.nix @@ -139,14 +139,14 @@ in { constrainLoadCsv = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Sets the root directory for file URLs used with the Cypher - LOAD CSV clause to be that defined by - . It restricts + `LOAD CSV` clause to be that defined by + {option}`directories.imports`. It restricts access to only those files within that directory and its subdirectories. - Setting this option to false introduces + Setting this option to `false` introduces possible security problems. ''; }; @@ -154,14 +154,14 @@ in { defaultListenAddress = mkOption { type = types.str; default = "127.0.0.1"; - description = '' + description = lib.mdDoc '' Default network interface to listen for incoming connections. To listen for connections on all interfaces, use "0.0.0.0". Specifies the default IP address and address part of connector - specific options. To bind specific + specific {option}`listenAddress` options. To bind specific connectors to a specific network interfaces, specify the entire - option for that connector. + {option}`listenAddress` option for that connector. ''; }; @@ -225,18 +225,18 @@ in { sslPolicy = mkOption { type = types.str; default = "legacy"; - description = '' + description = lib.mdDoc '' Neo4j SSL policy for BOLT traffic. The legacy policy is a special policy which is not defined in the policy configuration section, but rather derives from - and - associated files (by default: neo4j.key and - neo4j.cert). Its use will be deprecated. + {option}`directories.certificates` and + associated files (by default: {file}`neo4j.key` and + {file}`neo4j.cert`). Its use will be deprecated. Note: This connector must be configured to support/require SSL/TLS for the legacy policy to actually be utilized. See - . + {option}`bolt.tlsLevel`. ''; }; @@ -254,19 +254,19 @@ in { type = types.path; default = "${cfg.directories.home}/certificates"; defaultText = literalExpression ''"''${config.${opt.directories.home}}/certificates"''; - description = '' + description = lib.mdDoc '' Directory for storing certificates to be used by Neo4j for TLS connections. When setting this directory to something other than its default, ensure the directory's existence, and that read/write permissions are - given to the Neo4j daemon user neo4j. + given to the Neo4j daemon user `neo4j`. Note that changing this directory from its default will prevent the directory structure required for each SSL policy from being automatically generated. A policy's directory structure as defined by - its , and - must then be setup manually. The + its {option}`baseDirectory`,{option}`revokedDir` and + {option}`trustedDir` must then be setup manually. The existence of these directories is mandatory, as well as the presence of the certificate file and the private key. Ensure the correct permissions are set on these directories and files. @@ -277,13 +277,13 @@ in { type = types.path; default = "${cfg.directories.home}/data"; defaultText = literalExpression ''"''${config.${opt.directories.home}}/data"''; - description = '' + description = lib.mdDoc '' Path of the data directory. You must not configure more than one Neo4j installation to use the same data directory. When setting this directory to something other than its default, ensure the directory's existence, and that read/write permissions are - given to the Neo4j daemon user neo4j. + given to the Neo4j daemon user `neo4j`. ''; }; @@ -302,15 +302,15 @@ in { type = types.path; default = "${cfg.directories.home}/import"; defaultText = literalExpression ''"''${config.${opt.directories.home}}/import"''; - description = '' + description = lib.mdDoc '' The root directory for file URLs used with the Cypher - LOAD CSV clause. Only meaningful when - is set to - true. + `LOAD CSV` clause. Only meaningful when + {option}`constrainLoadCvs` is set to + `true`. When setting this directory to something other than its default, ensure the directory's existence, and that read permission is - given to the Neo4j daemon user neo4j. + given to the Neo4j daemon user `neo4j`. ''; }; @@ -318,14 +318,14 @@ in { type = types.path; default = "${cfg.directories.home}/plugins"; defaultText = literalExpression ''"''${config.${opt.directories.home}}/plugins"''; - description = '' + description = lib.mdDoc '' Path of the database plugin directory. Compiled Java JAR files that contain database procedures will be loaded if they are placed in this directory. When setting this directory to something other than its default, ensure the directory's existence, and that read permission is - given to the Neo4j daemon user neo4j. + given to the Neo4j daemon user `neo4j`. ''; }; }; @@ -377,14 +377,14 @@ in { sslPolicy = mkOption { type = types.str; default = "legacy"; - description = '' + description = lib.mdDoc '' Neo4j SSL policy for HTTPS traffic. The legacy policy is a special policy which is not defined in the policy configuration section, but rather derives from - and - associated files (by default: neo4j.key and - neo4j.cert). Its use will be deprecated. + {option}`directories.certificates` and + associated files (by default: {file}`neo4j.key` and + {file}`neo4j.cert`). Its use will be deprecated. ''; }; }; @@ -407,7 +407,7 @@ in { allowKeyGeneration = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Allows the generation of a private key and associated self-signed certificate. Only performed when both objects cannot be found for this policy. It is recommended to turn this off again after keys @@ -415,7 +415,7 @@ in { The public certificate is required to be duplicated to the directory holding trusted certificates as defined by the - option. + {option}`trustedDir` option. Keys should in general be generated and distributed offline by a trusted certificate authority and not by utilizing this mode. @@ -426,16 +426,16 @@ in { type = types.path; default = "${cfg.directories.certificates}/${name}"; defaultText = literalExpression ''"''${config.${opt.directories.certificates}}/''${name}"''; - description = '' + description = lib.mdDoc '' The mandatory base directory for cryptographic objects of this policy. This path is only automatically generated when this - option as well as are + option as well as {option}`directories.certificates` are left at their default. Ensure read/write permissions are given - to the Neo4j daemon user neo4j. + to the Neo4j daemon user `neo4j`. It is also possible to override each individual configuration with absolute paths. See the - and + {option}`privateKey` and {option}`publicCertificate` policy options. ''; }; @@ -470,15 +470,15 @@ in { publicCertificate = mkOption { type = types.str; default = "public.crt"; - description = '' + description = lib.mdDoc '' The name of public X.509 certificate (chain) file in PEM format - for this policy to be found in the , + for this policy to be found in the {option}`baseDirectory`, or the absolute path to the certificate file. It is mandatory that a certificate can be found or generated. The public certificate is required to be duplicated to the directory holding trusted certificates as defined by the - option. + {option}`trustedDir` option. ''; }; @@ -522,18 +522,18 @@ in { type = types.path; default = "${config.baseDirectory}/trusted"; defaultText = literalExpression ''"''${config.${options.baseDirectory}}/trusted"''; - description = '' + description = lib.mdDoc '' Path to directory of X.509 certificates in PEM format for trusted parties. Must be an absolute path. The existence of this directory is mandatory and will need to be created manually when: setting this option to something other than its default; setting - either this policy's or - to something other than + either this policy's {option}`baseDirectory` or + {option}`directories.certificates` to something other than their default. Ensure read/write permissions are given to the - Neo4j daemon user neo4j. + Neo4j daemon user `neo4j`. The public certificate as defined by - is required to be duplicated + {option}`publicCertificate` is required to be duplicated to this directory. ''; }; diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index 94fc155000e2..7a59de372f24 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -88,7 +88,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = "Whether to enable the ldap server."; + description = lib.mdDoc "Whether to enable the ldap server."; }; package = mkOption { @@ -173,9 +173,9 @@ in { configDir = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' Use this config directory instead of generating one from the - settings option. Overrides all NixOS settings. + `settings` option. Overrides all NixOS settings. ''; example = "/var/lib/openldap/slapd.d"; }; @@ -183,9 +183,9 @@ in { mutableConfig = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to allow writable on-line configuration. If - true, the NixOS settings will only be used to + `true`, the NixOS settings will only be used to initialize the OpenLDAP configuration if it does not exist, and are subsequently ignored. ''; diff --git a/nixos/modules/services/databases/pgmanage.nix b/nixos/modules/services/databases/pgmanage.nix index 79c958b246c7..9ce2265a4dee 100644 --- a/nixos/modules/services/databases/pgmanage.nix +++ b/nixos/modules/services/databases/pgmanage.nix @@ -62,11 +62,11 @@ in { nuc-server = "hostaddr=192.168.0.100 port=5432 dbname=postgres"; mini-server = "hostaddr=127.0.0.1 port=5432 dbname=postgres sslmode=require"; }; - description = '' + description = lib.mdDoc '' pgmanage requires at least one PostgreSQL server be defined. Detailed information about PostgreSQL connection strings is available at: - + Note that you should not specify your user name or password. That information will be entered on the login screen. If you specify a diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 8225a9aaba61..d0135647d6af 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -149,7 +149,7 @@ in ensurePermissions = mkOption { type = types.attrsOf types.str; default = {}; - description = '' + description = lib.mdDoc '' Permissions to ensure for the user, specified as an attribute set. The attribute names specify the database and tables to grant the permissions for. The attribute values specify the permissions to grant. You may specify one or @@ -157,8 +157,8 @@ in For more information on how to specify the target and on which privileges exist, see the - GRANT syntax. - The attributes are used as GRANT ''${attrValue} ON ''${attrName}. + [GRANT syntax](https://www.postgresql.org/docs/current/sql-grant.html). + The attributes are used as `GRANT ''${attrValue} ON ''${attrName}`. ''; example = literalExpression '' { diff --git a/nixos/modules/services/databases/victoriametrics.nix b/nixos/modules/services/databases/victoriametrics.nix index 4e002b3df7c7..f87a5862f641 100644 --- a/nixos/modules/services/databases/victoriametrics.nix +++ b/nixos/modules/services/databases/victoriametrics.nix @@ -28,10 +28,10 @@ let cfg = config.services.victoriametrics; in extraOptions = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' Extra options to pass to VictoriaMetrics. See the README: - - or victoriametrics -help for more + + or {command}`victoriametrics -help` for more information. ''; }; diff --git a/nixos/modules/services/games/asf.nix b/nixos/modules/services/games/asf.nix index 6939e15c207d..b7892900376f 100644 --- a/nixos/modules/services/games/asf.nix +++ b/nixos/modules/services/games/asf.nix @@ -136,8 +136,8 @@ in }; settings = mkOption { type = types.attrs; - description = '' - Additional settings that are documented here. + description = lib.mdDoc '' + Additional settings that are documented [here](https://github.com/JustArchiNET/ArchiSteamFarm/wiki/Configuration#bot-config). ''; default = { }; }; diff --git a/nixos/modules/services/hardware/kanata.nix b/nixos/modules/services/hardware/kanata.nix index f8250afa4a00..c7cd3c9d2eb9 100644 --- a/nixos/modules/services/hardware/kanata.nix +++ b/nixos/modules/services/hardware/kanata.nix @@ -10,7 +10,7 @@ let device = mkOption { type = types.str; example = "/dev/input/by-id/usb-0000_0000-event-kbd"; - description = "Path to the keyboard device."; + description = lib.mdDoc "Path to the keyboard device."; }; config = mkOption { type = types.lines; @@ -33,18 +33,18 @@ let ;; tap within 100ms for capslk, hold more than 100ms for lctl cap (tap-hold 100 100 caps lctl)) ''; - description = '' + description = lib.mdDoc '' Configuration other than defcfg. - See for more information. + See for more information. ''; }; extraDefCfg = mkOption { type = types.lines; default = ""; example = "danger-enable-cmd yes"; - description = '' + description = lib.mdDoc '' Configuration of defcfg other than linux-dev. - See for more information. + See for more information. ''; }; }; @@ -131,7 +131,7 @@ in default = pkgs.kanata; defaultText = lib.literalExpression "pkgs.kanata"; example = lib.literalExpression "pkgs.kanata-with-cmd"; - description = '' + description = lib.mdDoc '' kanata package to use. If you enable danger-enable-cmd, pkgs.kanata-with-cmd should be used. ''; @@ -139,7 +139,7 @@ in keyboards = mkOption { type = types.attrsOf (types.submodule keyboard); default = { }; - description = "Keyboard configurations."; + description = lib.mdDoc "Keyboard configurations."; }; }; diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index f745e2f7f606..1723cb508485 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -209,11 +209,11 @@ in packages = mkOption { type = types.listOf types.path; default = []; - description = '' - List of packages containing udev rules. + description = lib.mdDoc '' + List of packages containing {command}`udev` rules. All files found in - «pkg»/etc/udev/rules.d and - «pkg»/lib/udev/rules.d + {file}`«pkg»/etc/udev/rules.d` and + {file}`«pkg»/lib/udev/rules.d` will be included. ''; apply = map getBin; @@ -281,15 +281,15 @@ in networking.usePredictableInterfaceNames = mkOption { default = true; type = types.bool; - description = '' - Whether to assign predictable names to network interfaces. + description = lib.mdDoc '' + Whether to assign [predictable names to network interfaces](http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames). If enabled, interfaces are assigned names that contain topology information - (e.g. wlp3s0) and thus should be stable + (e.g. `wlp3s0`) and thus should be stable across reboots. If disabled, names depend on the order in which interfaces are discovered by the kernel, which may change randomly across reboots; for instance, you may find - eth0 and eth1 flipping + `eth0` and `eth1` flipping unpredictably. ''; }; diff --git a/nixos/modules/services/logging/filebeat.nix b/nixos/modules/services/logging/filebeat.nix index 045cd1147ead..3dc9df372ac5 100644 --- a/nixos/modules/services/logging/filebeat.nix +++ b/nixos/modules/services/logging/filebeat.nix @@ -31,20 +31,20 @@ in }; inputs = mkOption { - description = '' + description = lib.mdDoc '' Inputs specify how Filebeat locates and processes input data. - This is like services.filebeat.settings.filebeat.inputs, + This is like `services.filebeat.settings.filebeat.inputs`, but structured as an attribute set. This has the benefit that multiple NixOS modules can contribute settings to a single filebeat input. An input type can be specified multiple times by choosing a - different <name> for each, but setting - + different `` for each, but setting + [](#opt-services.filebeat.inputs._name_.type) to the same value. - See . + See . ''; default = {}; type = types.attrsOf (types.submodule ({ name, ... }: { @@ -77,24 +77,24 @@ in }; modules = mkOption { - description = '' + description = lib.mdDoc '' Filebeat modules provide a quick way to get started processing common log formats. They contain default configurations, Elasticsearch ingest pipeline definitions, and Kibana dashboards to help you implement and deploy a log monitoring solution. - This is like services.filebeat.settings.filebeat.modules, + This is like `services.filebeat.settings.filebeat.modules`, but structured as an attribute set. This has the benefit that multiple NixOS modules can contribute settings to a single filebeat module. A module can be specified multiple times by choosing a - different <name> for each, but setting - + different `` for each, but setting + [](#opt-services.filebeat.modules._name_.module) to the same value. - See . + See . ''; default = {}; type = types.attrsOf (types.submodule ({ name, ... }: { diff --git a/nixos/modules/services/logging/logrotate.nix b/nixos/modules/services/logging/logrotate.nix index a6eb08ac5eac..53230cc51e59 100644 --- a/nixos/modules/services/logging/logrotate.nix +++ b/nixos/modules/services/logging/logrotate.nix @@ -276,9 +276,9 @@ in defaultText = '' A configuration file automatically generated by NixOS. ''; - description = '' + description = lib.mdDoc '' Override the configuration file used by MySQL. By default, - NixOS generates one automatically from . + NixOS generates one automatically from [](#opt-services.logrotate.settings). ''; example = literalExpression '' pkgs.writeText "logrotate.conf" ''' @@ -346,11 +346,11 @@ in extraConfig = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' Extra contents to append to the logrotate configuration file. Refer to - for details. + for details. This setting has been deprecated in favor of - logrotate settings. + [logrotate settings](#opt-services.logrotate.settings). ''; }; }; diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index c3eb61bd20d7..c76d40a68c3c 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -112,9 +112,9 @@ in { bindPasswordFile = mkOption { type = types.str; example = "/run/secrets/ldap-bind"; - description = '' + description = lib.mdDoc '' Path to the file containing the bind password of the servie account - defined by . + defined by [](#opt-services.mailman.ldap.bindDn). ''; }; superUserGroup = mkOption { diff --git a/nixos/modules/services/mail/nullmailer.nix b/nixos/modules/services/mail/nullmailer.nix index c37001e35bfa..336c76c98508 100644 --- a/nixos/modules/services/mail/nullmailer.nix +++ b/nixos/modules/services/mail/nullmailer.nix @@ -38,11 +38,11 @@ with lib; remotesFile = mkOption { type = types.nullOr types.str; default = null; - description = '' - Path to the remotes control file. This file contains a + description = lib.mdDoc '' + Path to the `remotes` control file. This file contains a list of remote servers to which to send each message. - See man 8 nullmailer-send for syntax and available + See `man 8 nullmailer-send` for syntax and available options. ''; }; @@ -153,17 +153,17 @@ with lib; remotes = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' A list of remote servers to which to send each message. Each line contains a remote host name or address followed by an optional protocol string, separated by white space. - See man 8 nullmailer-send for syntax and available + See `man 8 nullmailer-send` for syntax and available options. WARNING: This is stored world-readable in the nix store. If you need to specify any secret credentials here, consider using the - remotesFile option instead. + `remotesFile` option instead. ''; }; diff --git a/nixos/modules/services/mail/postfixadmin.nix b/nixos/modules/services/mail/postfixadmin.nix index 27b5c60ec072..b86428770cb2 100644 --- a/nixos/modules/services/mail/postfixadmin.nix +++ b/nixos/modules/services/mail/postfixadmin.nix @@ -13,12 +13,12 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable postfixadmin. Also enables nginx virtual host management. - Further nginx configuration can be done by adapting services.nginx.virtualHosts.<name>. - See for further information. + Further nginx configuration can be done by adapting `services.nginx.virtualHosts.`. + See [](#opt-services.nginx.virtualHosts) for further information. ''; }; diff --git a/nixos/modules/services/mail/public-inbox.nix b/nixos/modules/services/mail/public-inbox.nix index 6f33283b548b..a81dd1cdb37b 100644 --- a/nixos/modules/services/mail/public-inbox.nix +++ b/nixos/modules/services/mail/public-inbox.nix @@ -23,10 +23,10 @@ let port = mkOption { type = with types; nullOr (either str port); default = defaultPort; - description = '' + description = lib.mdDoc '' Listening port. Beware that public-inbox uses well-known ports number to decide whether to enable TLS or not. - Set to null and use systemd.sockets.public-inbox-${proto}d.listenStreams + Set to null and use `systemd.sockets.public-inbox-${proto}d.listenStreams` if you need a more advanced listening. ''; }; @@ -239,11 +239,11 @@ in type = with types; nullOr (either str port); default = 80; example = "/run/public-inbox-httpd.sock"; - description = '' + description = lib.mdDoc '' Listening port or systemd's ListenStream= entry to be used as a reverse proxy, eg. in nginx: - locations."/inbox".proxyPass = "http://unix:''${config.services.public-inbox.http.port}:/inbox"; - Set to null and use systemd.sockets.public-inbox-httpd.listenStreams + `locations."/inbox".proxyPass = "http://unix:''${config.services.public-inbox.http.port}:/inbox";` + Set to null and use `systemd.sockets.public-inbox-httpd.listenStreams` if you need a more advanced listening. ''; }; diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix index 3b6c06d19e86..d8adf53e48a9 100644 --- a/nixos/modules/services/mail/roundcube.nix +++ b/nixos/modules/services/mail/roundcube.nix @@ -14,12 +14,12 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable roundcube. Also enables nginx virtual host management. - Further nginx configuration can be done by adapting services.nginx.virtualHosts.<name>. - See for further information. + Further nginx configuration can be done by adapting `services.nginx.virtualHosts.`. + See [](#opt-services.nginx.virtualHosts) for further information. ''; }; @@ -99,11 +99,11 @@ in maxAttachmentSize = mkOption { type = types.int; default = 18; - description = '' + description = lib.mdDoc '' The maximum attachment size in MB. Note: Since roundcube only uses 70% of max upload values configured in php - 30% is added automatically to . + 30% is added automatically to [](#opt-services.roundcube.maxAttachmentSize). ''; apply = configuredMaxAttachmentSize: "${toString (configuredMaxAttachmentSize * 1.3)}M"; }; diff --git a/nixos/modules/services/mail/sympa.nix b/nixos/modules/services/mail/sympa.nix index 0a2a885a80f6..0014701d5831 100644 --- a/nixos/modules/services/mail/sympa.nix +++ b/nixos/modules/services/mail/sympa.nix @@ -86,9 +86,9 @@ in type = str; default = "en_US"; example = "cs"; - description = '' + description = lib.mdDoc '' Default Sympa language. - See + See for available options. ''; }; @@ -136,9 +136,9 @@ in example = { default_max_list_members = 3; }; - description = '' - The robot.conf configuration file as key value set. - See + description = lib.mdDoc '' + The {file}`robot.conf` configuration file as key value set. + See for list of configuration parameters. ''; }; @@ -285,9 +285,9 @@ in viewlogs_page_size = 50; } ''; - description = '' - The sympa.conf configuration file as key value set. - See + description = lib.mdDoc '' + The {file}`sympa.conf` configuration file as key value set. + See for list of configuration parameters. ''; }; diff --git a/nixos/modules/services/matrix/appservice-discord.nix b/nixos/modules/services/matrix/appservice-discord.nix index 87a706ae95ef..c72a2123a923 100644 --- a/nixos/modules/services/matrix/appservice-discord.nix +++ b/nixos/modules/services/matrix/appservice-discord.nix @@ -40,16 +40,16 @@ in { }; } ''; - description = '' - config.yaml configuration as a Nix attribute set. + description = lib.mdDoc '' + {file}`config.yaml` configuration as a Nix attribute set. Configuration options should match those described in - config.sample.yaml. + [config.sample.yaml](https://github.com/Half-Shot/matrix-appservice-discord/blob/master/config/config.sample.yaml). - and + {option}`config.bridge.domain` and {option}`config.bridge.homeserverUrl` should be set to match the public host name of the Matrix homeserver for webhooks and avatars to work. - Secret tokens should be specified using + Secret tokens should be specified using {option}`environmentFile` instead of this world-readable attribute set. ''; }; diff --git a/nixos/modules/services/matrix/mautrix-facebook.nix b/nixos/modules/services/matrix/mautrix-facebook.nix index 384a4f4a706f..dfdf6e250215 100644 --- a/nixos/modules/services/matrix/mautrix-facebook.nix +++ b/nixos/modules/services/matrix/mautrix-facebook.nix @@ -75,12 +75,12 @@ in { }; } ''; - description = '' - config.yaml configuration as a Nix attribute set. + description = lib.mdDoc '' + {file}`config.yaml` configuration as a Nix attribute set. Configuration options should match those described in - example-config.yaml. + [example-config.yaml](https://github.com/mautrix/facebook/blob/master/mautrix_facebook/example-config.yaml). - Secret tokens should be specified using + Secret tokens should be specified using {option}`environmentFile` instead of this world-readable attribute set. ''; }; diff --git a/nixos/modules/services/matrix/mautrix-telegram.nix b/nixos/modules/services/matrix/mautrix-telegram.nix index 492ed1b24bce..196100a531ad 100644 --- a/nixos/modules/services/matrix/mautrix-telegram.nix +++ b/nixos/modules/services/matrix/mautrix-telegram.nix @@ -78,12 +78,12 @@ in { }; } ''; - description = '' - config.yaml configuration as a Nix attribute set. + description = lib.mdDoc '' + {file}`config.yaml` configuration as a Nix attribute set. Configuration options should match those described in - example-config.yaml. + [example-config.yaml](https://github.com/tulir/mautrix-telegram/blob/master/example-config.yaml). - Secret tokens should be specified using + Secret tokens should be specified using {option}`environmentFile` instead of this world-readable attribute set. ''; }; diff --git a/nixos/modules/services/misc/autorandr.nix b/nixos/modules/services/misc/autorandr.nix index a77535cca49e..036bb4f41bef 100644 --- a/nixos/modules/services/misc/autorandr.nix +++ b/nixos/modules/services/misc/autorandr.nix @@ -27,9 +27,9 @@ let options = { fingerprint = mkOption { type = types.attrsOf types.str; - description = '' + description = lib.mdDoc '' Output name to EDID mapping. - Use autorandr --fingerprint to get current setup values. + Use `autorandr --fingerprint` to get current setup values. ''; default = { }; }; diff --git a/nixos/modules/services/misc/bees.nix b/nixos/modules/services/misc/bees.nix index 2adc9f2a1fa6..37f90c682221 100644 --- a/nixos/modules/services/misc/bees.nix +++ b/nixos/modules/services/misc/bees.nix @@ -11,7 +11,7 @@ let fsOptions = with types; { options.spec = mkOption { type = str; - description = '' + description = lib.mdDoc '' Description of how to identify the filesystem to be duplicated by this instance of bees. Note that deduplication crosses subvolumes; one must not configure multiple instances for subvolumes of the same filesystem @@ -28,7 +28,7 @@ let options.hashTableSizeMB = mkOption { type = types.addCheck types.int (n: mod n 16 == 0); default = 1024; # 1GB; default from upstream beesd script - description = '' + description = lib.mdDoc '' Hash table size in MB; must be a multiple of 16. A larger ratio of index size to storage size means smaller blocks of diff --git a/nixos/modules/services/misc/etcd.nix b/nixos/modules/services/misc/etcd.nix index d0c82d726023..3343e94778a2 100644 --- a/nixos/modules/services/misc/etcd.nix +++ b/nixos/modules/services/misc/etcd.nix @@ -125,9 +125,9 @@ in { }; extraConf = mkOption { - description = '' + description = lib.mdDoc '' Etcd extra configuration. See - + ''; type = types.attrsOf types.str; default = {}; diff --git a/nixos/modules/services/misc/klipper.nix b/nixos/modules/services/misc/klipper.nix index 52913369bbcd..b34ca6f8c5d2 100644 --- a/nixos/modules/services/misc/klipper.nix +++ b/nixos/modules/services/misc/klipper.nix @@ -71,7 +71,7 @@ in }; firmwares = mkOption { - description = "Firmwares klipper should manage"; + description = lib.mdDoc "Firmwares klipper should manage"; default = { }; type = with types; attrsOf (submodule { diff --git a/nixos/modules/services/misc/sssd.nix b/nixos/modules/services/misc/sssd.nix index 3f6b96258f16..70afbe0433ae 100644 --- a/nixos/modules/services/misc/sssd.nix +++ b/nixos/modules/services/misc/sssd.nix @@ -42,7 +42,7 @@ in { kcm = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to use SSS as a Kerberos Cache Manager (KCM). Kerberos will be configured to cache credentials in SSS. ''; diff --git a/nixos/modules/services/monitoring/cadvisor.nix b/nixos/modules/services/monitoring/cadvisor.nix index 7374b1ece495..d5e440310162 100644 --- a/nixos/modules/services/monitoring/cadvisor.nix +++ b/nixos/modules/services/monitoring/cadvisor.nix @@ -66,16 +66,16 @@ in { storageDriverPasswordFile = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' File that contains the cadvisor storage driver password. - takes precedence over + {option}`storageDriverPasswordFile` takes precedence over {option}`storageDriverPassword` - Warning: when is non-empty this defaults to a file in the - world-readable Nix store that contains the value of . + Warning: when {option}`storageDriverPassword` is non-empty this defaults to a file in the + world-readable Nix store that contains the value of {option}`storageDriverPassword`. It's recommended to override this with a path not in the Nix store. - Tip: use nixops key management + Tip: use [nixops key management](https://nixos.org/nixops/manual/#idm140737318306400) ''; }; @@ -88,10 +88,10 @@ in { extraOptions = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' Additional cadvisor options. - See for available options. + See for available options. ''; }; }; diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 0905b4b57fb9..8edb2ca09974 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -251,9 +251,9 @@ in { extraConfig = mkOption { default = {}; - description = '' + description = lib.mdDoc '' Extra seyren configuration. See - + ''; type = types.attrsOf types.str; example = literalExpression '' diff --git a/nixos/modules/services/monitoring/metricbeat.nix b/nixos/modules/services/monitoring/metricbeat.nix index 0968d25c2ad2..14066da1be81 100644 --- a/nixos/modules/services/monitoring/metricbeat.nix +++ b/nixos/modules/services/monitoring/metricbeat.nix @@ -32,17 +32,17 @@ in }; modules = mkOption { - description = '' + description = lib.mdDoc '' Metricbeat modules are responsible for reading metrics from the various sources. - This is like services.metricbeat.settings.metricbeat.modules, + This is like `services.metricbeat.settings.metricbeat.modules`, but structured as an attribute set. This has the benefit that multiple NixOS modules can contribute settings to a single metricbeat module. - A module can be specified multiple times by choosing a different <name> - for each, but setting to the same value. + A module can be specified multiple times by choosing a different `` + for each, but setting [](#opt-services.metricbeat.modules._name_.module) to the same value. - See . + See . ''; default = {}; type = types.attrsOf (types.submodule ({ name, ... }: { diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index 3455d0d3d4a6..9461bd3f35b8 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -138,29 +138,29 @@ in enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Enable Munin Node agent. Munin node listens on 0.0.0.0 and by default accepts connections only from 127.0.0.1 for security reasons. - See . + See . ''; }; extraConfig = mkOption { default = ""; type = types.lines; - description = '' - munin-node.conf extra configuration. See - + description = lib.mdDoc '' + {file}`munin-node.conf` extra configuration. See + ''; }; extraPluginConfig = mkOption { default = ""; type = types.lines; - description = '' - plugin-conf.d extra plugin configuration. See - + description = lib.mdDoc '' + {file}`plugin-conf.d` extra plugin configuration. See + ''; example = '' [fail2ban_*] @@ -266,11 +266,11 @@ in extraGlobalConfig = mkOption { default = ""; type = types.lines; - description = '' - munin.conf extra global configuration. - See . + description = lib.mdDoc '' + {file}`munin.conf` extra global configuration. + See . Useful to setup notifications, see - + ''; example = '' contact.email.command mail -s "Munin notification for ''${var:host}" someone@example.com @@ -280,10 +280,10 @@ in hosts = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' Definitions of hosts of nodes to collect data from. Needs at least one host for cron to succeed. See - + ''; example = literalExpression '' ''' diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix index 661b38b4c5a2..e20eaf3b1440 100644 --- a/nixos/modules/services/monitoring/netdata.nix +++ b/nixos/modules/services/monitoring/netdata.nix @@ -114,13 +114,13 @@ in { example = literalExpression '' [ "/path/to/plugins.d" ] ''; - description = '' + description = lib.mdDoc '' Extra paths to add to the netdata global "plugins directory" option. Useful for when you want to include your own collection scripts. Details about writing a custom netdata plugin are available at: - + Cannot be combined with configText. ''; diff --git a/nixos/modules/services/monitoring/parsedmarc.nix b/nixos/modules/services/monitoring/parsedmarc.nix index 60ebbd6f7525..b0858184b5fc 100644 --- a/nixos/modules/services/monitoring/parsedmarc.nix +++ b/nixos/modules/services/monitoring/parsedmarc.nix @@ -29,11 +29,11 @@ in enable = lib.mkOption { type = lib.types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether Postfix and Dovecot should be set up to receive mail locally. parsedmarc will be configured to watch the local inbox as the automatically created user specified in - + [](#opt-services.parsedmarc.provision.localMail.recipientName) ''; }; @@ -68,13 +68,13 @@ in geoIp = lib.mkOption { type = lib.types.bool; default = true; - description = '' - Whether to enable and configure the geoipupdate + description = lib.mdDoc '' + Whether to enable and configure the [geoipupdate](#opt-services.geoipupdate.enable) service to automatically fetch GeoIP databases. Not crucial, but recommended for full functionality. - To finish the setup, you need to manually set the and - + To finish the setup, you need to manually set the [](#opt-services.geoipupdate.settings.AccountID) and + [](#opt-services.geoipupdate.settings.LicenseKey) options. ''; }; @@ -95,11 +95,11 @@ in config.${opt.provision.elasticsearch} && config.${options.services.grafana.enable} ''; apply = x: x && cfg.provision.elasticsearch; - description = '' + description = lib.mdDoc '' Whether the automatically provisioned Elasticsearch instance should be added as a grafana datasource. Has no effect unless - + [](#opt-services.parsedmarc.provision.elasticsearch) is also enabled. ''; }; @@ -206,12 +206,12 @@ in password = lib.mkOption { type = with lib.types; nullOr (either path (attrsOf path)); default = null; - description = '' + description = lib.mdDoc '' The IMAP server password. Always handled as a secret whether the value is - wrapped in a { _secret = ...; } - attrset or not (refer to for + wrapped in a `{ _secret = ...; }` + attrset or not (refer to [](#opt-services.parsedmarc.settings) for details). ''; apply = x: if isAttrs x || x == null then x else { _secret = x; }; @@ -270,12 +270,12 @@ in password = lib.mkOption { type = with lib.types; nullOr (either path (attrsOf path)); default = null; - description = '' + description = lib.mdDoc '' The SMTP server password. Always handled as a secret whether the value is - wrapped in a { _secret = ...; } - attrset or not (refer to for + wrapped in a `{ _secret = ...; }` + attrset or not (refer to [](#opt-services.parsedmarc.settings) for details). ''; apply = x: if isAttrs x || x == null then x else { _secret = x; }; @@ -322,13 +322,13 @@ in password = lib.mkOption { type = with lib.types; nullOr (either path (attrsOf path)); default = null; - description = '' + description = lib.mdDoc '' The password to use when connecting to Elasticsearch, if required. Always handled as a secret whether the value is - wrapped in a { _secret = ...; } - attrset or not (refer to for + wrapped in a `{ _secret = ...; }` + attrset or not (refer to [](#opt-services.parsedmarc.settings) for details). ''; apply = x: if isAttrs x || x == null then x else { _secret = x; }; diff --git a/nixos/modules/services/networking/biboumi.nix b/nixos/modules/services/networking/biboumi.nix index 7e6033008832..24e0c0328fe6 100644 --- a/nixos/modules/services/networking/biboumi.nix +++ b/nixos/modules/services/networking/biboumi.nix @@ -83,13 +83,13 @@ in }; options.password = mkOption { type = with types; nullOr str; - description = '' + description = lib.mdDoc '' The password used to authenticate the XMPP component to your XMPP server. This password must be configured in the XMPP server, associated with the external component on - hostname. + [hostname](#opt-services.biboumi.settings.hostname). - Set it to null and use credentialsFile + Set it to null and use [credentialsFile](#opt-services.biboumi.credentialsFile) if you do not want this password to go into the Nix store. ''; }; @@ -155,12 +155,12 @@ in credentialsFile = mkOption { type = types.path; - description = '' + description = lib.mdDoc '' Path to a configuration file to be merged with the settings. Beware not to surround "=" with spaces when setting biboumi's options in this file. Useful to merge a file which is better kept out of the Nix store because it contains sensible data like - password. + [password](#opt-services.biboumi.settings.password). ''; default = "/dev/null"; example = "/run/keys/biboumi.cfg"; diff --git a/nixos/modules/services/networking/bird-lg.nix b/nixos/modules/services/networking/bird-lg.nix index 9f06bfcdc51e..1440deb62b44 100644 --- a/nixos/modules/services/networking/bird-lg.nix +++ b/nixos/modules/services/networking/bird-lg.nix @@ -136,8 +136,8 @@ in extraArgs = mkOption { type = types.lines; default = ""; - description = '' - Extra parameters documented here. + description = lib.mdDoc '' + Extra parameters documented [here](https://github.com/xddxdd/bird-lg-go#frontend). ''; }; }; @@ -183,8 +183,8 @@ in extraArgs = mkOption { type = types.lines; default = ""; - description = '' - Extra parameters documented here. + description = lib.mdDoc '' + Extra parameters documented [here](https://github.com/xddxdd/bird-lg-go#proxy). ''; }; }; diff --git a/nixos/modules/services/networking/bird.nix b/nixos/modules/services/networking/bird.nix index 4a738daf9586..7708aaa476f6 100644 --- a/nixos/modules/services/networking/bird.nix +++ b/nixos/modules/services/networking/bird.nix @@ -13,18 +13,18 @@ in enable = mkEnableOption "BIRD Internet Routing Daemon"; config = mkOption { type = types.lines; - description = '' + description = lib.mdDoc '' BIRD Internet Routing Daemon configuration file. - + ''; }; checkConfig = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether the config should be checked at build time. When the config can't be checked during build time, for example when it includes - other files, either disable this option or use preCheckConfig to create + other files, either disable this option or use `preCheckConfig` to create the included files before checking. ''; }; @@ -34,9 +34,9 @@ in example = '' echo "cost 100;" > include.conf ''; - description = '' + description = lib.mdDoc '' Commands to execute before the config file check. The file to be checked will be - available as bird2.conf in the current directory. + available as `bird2.conf` in the current directory. Files created with this option will not be available at service runtime, only during build time checking. diff --git a/nixos/modules/services/networking/coredns.nix b/nixos/modules/services/networking/coredns.nix index 966957f1a0f7..deaba69e99fa 100644 --- a/nixos/modules/services/networking/coredns.nix +++ b/nixos/modules/services/networking/coredns.nix @@ -17,9 +17,9 @@ in { } ''; type = types.lines; - description = '' + description = lib.mdDoc '' Verbatim Corefile to use. - See for details. + See for details. ''; }; diff --git a/nixos/modules/services/networking/ghostunnel.nix b/nixos/modules/services/networking/ghostunnel.nix index ce5d386edc35..79cf80e57bef 100644 --- a/nixos/modules/services/networking/ghostunnel.nix +++ b/nixos/modules/services/networking/ghostunnel.nix @@ -49,28 +49,28 @@ let }; cert = mkOption { - description = '' + description = lib.mdDoc '' Path to certificate (PEM with certificate chain). - Not required if keystore is set. + Not required if `keystore` is set. ''; type = types.nullOr types.str; default = null; }; key = mkOption { - description = '' + description = lib.mdDoc '' Path to certificate private key (PEM with private key). - Not required if keystore is set. + Not required if `keystore` is set. ''; type = types.nullOr types.str; default = null; }; cacert = mkOption { - description = '' - Path to CA bundle file (PEM/X509). Uses system trust store if null. + description = lib.mdDoc '' + Path to CA bundle file (PEM/X509). Uses system trust store if `null`. ''; type = types.nullOr types.str; }; @@ -124,7 +124,7 @@ let }; extraArguments = mkOption { - description = "Extra arguments to pass to ghostunnel server"; + description = lib.mdDoc "Extra arguments to pass to `ghostunnel server`"; type = types.separatedString " "; default = ""; }; diff --git a/nixos/modules/services/networking/hans.nix b/nixos/modules/services/networking/hans.nix index bff39a5ab2a8..ffb2ee841c64 100644 --- a/nixos/modules/services/networking/hans.nix +++ b/nixos/modules/services/networking/hans.nix @@ -19,11 +19,11 @@ in services.hans = { clients = mkOption { default = {}; - description = '' + description = lib.mdDoc '' Each attribute of this option defines a systemd service that runs hans. Many or none may be defined. The name of each service is - hans-«name» + `hans-«name»` where «name» is the name of the corresponding attribute name. ''; diff --git a/nixos/modules/services/networking/iodine.nix b/nixos/modules/services/networking/iodine.nix index 9749c7285132..ea2fa3ac4be4 100644 --- a/nixos/modules/services/networking/iodine.nix +++ b/nixos/modules/services/networking/iodine.nix @@ -28,11 +28,11 @@ in services.iodine = { clients = mkOption { default = {}; - description = '' + description = lib.mdDoc '' Each attribute of this option defines a systemd service that runs iodine. Many or none may be defined. The name of each service is - iodine-«name» + `iodine-«name»` where «name» is the name of the corresponding attribute name. ''; diff --git a/nixos/modules/services/networking/kea.nix b/nixos/modules/services/networking/kea.nix index d9d6e3f42ceb..d674a97391c9 100644 --- a/nixos/modules/services/networking/kea.nix +++ b/nixos/modules/services/networking/kea.nix @@ -54,11 +54,11 @@ in configFile = mkOption { type = nullOr path; default = null; - description = '' - Kea Control Agent configuration as a path, see . + description = lib.mdDoc '' + Kea Control Agent configuration as a path, see . - Takes preference over settings. - Most users should prefer using settings instead. + Takes preference over [settings](#opt-services.kea.ctrl-agent.settings). + Most users should prefer using [settings](#opt-services.kea.ctrl-agent.settings) instead. ''; }; @@ -93,11 +93,11 @@ in configFile = mkOption { type = nullOr path; default = null; - description = '' - Kea DHCP4 configuration as a path, see . + description = lib.mdDoc '' + Kea DHCP4 configuration as a path, see . - Takes preference over settings. - Most users should prefer using settings instead. + Takes preference over [settings](#opt-services.kea.dhcp4.settings). + Most users should prefer using [settings](#opt-services.kea.dhcp4.settings) instead. ''; }; @@ -153,11 +153,11 @@ in configFile = mkOption { type = nullOr path; default = null; - description = '' - Kea DHCP6 configuration as a path, see . + description = lib.mdDoc '' + Kea DHCP6 configuration as a path, see . - Takes preference over settings. - Most users should prefer using settings instead. + Takes preference over [settings](#opt-services.kea.dhcp6.settings). + Most users should prefer using [settings](#opt-services.kea.dhcp6.settings) instead. ''; }; @@ -214,11 +214,11 @@ in configFile = mkOption { type = nullOr path; default = null; - description = '' - Kea DHCP-DDNS configuration as a path, see . + description = lib.mdDoc '' + Kea DHCP-DDNS configuration as a path, see . - Takes preference over settings. - Most users should prefer using settings instead. + Takes preference over [settings](#opt-services.kea.dhcp-ddns.settings). + Most users should prefer using [settings](#opt-services.kea.dhcp-ddns.settings) instead. ''; }; diff --git a/nixos/modules/services/networking/ncdns.nix b/nixos/modules/services/networking/ncdns.nix index 3527b9e18575..958231963c68 100644 --- a/nixos/modules/services/networking/ncdns.nix +++ b/nixos/modules/services/networking/ncdns.nix @@ -176,10 +176,10 @@ in certstore.nssdbdir = "../../home/alice/.pki/nssdb"; } ''; - description = '' + description = lib.mdDoc '' ncdns settings. Use this option to configure ncds settings not exposed in a NixOS option or to bypass one. - See the example ncdns.conf file at + See the example ncdns.conf file at for the available options. ''; }; diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 563892cb3655..e77fa97d240e 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -387,12 +387,12 @@ in { enableStrongSwan = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable the StrongSwan plugin. If you enable this option the - networkmanager_strongswan plugin will be added to - the option + `networkmanager_strongswan` plugin will be added to + the {option}`networking.networkmanager.plugins` option so you don't need to to that yourself. ''; }; diff --git a/nixos/modules/services/networking/nntp-proxy.nix b/nixos/modules/services/networking/nntp-proxy.nix index 1a776aae617b..4dd2922e83f1 100644 --- a/nixos/modules/services/networking/nntp-proxy.nix +++ b/nixos/modules/services/networking/nntp-proxy.nix @@ -167,9 +167,9 @@ in passwordHash = mkOption { type = types.str; example = "$6$GtzE7FrpE$wwuVgFYU.TZH4Rz.Snjxk9XGua89IeVwPQ/fEUD8eujr40q5Y021yhn0aNcsQ2Ifw.BLclyzvzgegopgKcneL0"; - description = '' + description = lib.mdDoc '' SHA-512 password hash (can be generated by - mkpasswd -m sha-512 <password>) + `mkpasswd -m sha-512 `) ''; }; diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index a372d3b207c4..cf2afcacc528 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -392,8 +392,8 @@ let requestXFR = mkOption { type = types.listOf types.str; default = []; - description = '' - Format: [AXFR|UDP] <ip-address> <key-name | NOKEY> + description = lib.mdDoc '' + Format: `[AXFR|UDP] ` ''; }; diff --git a/nixos/modules/services/networking/ntp/ntpd.nix b/nixos/modules/services/networking/ntp/ntpd.nix index 490d1619f118..a9dae2c8667a 100644 --- a/nixos/modules/services/networking/ntp/ntpd.nix +++ b/nixos/modules/services/networking/ntp/ntpd.nix @@ -40,17 +40,17 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to synchronise your machine's time using ntpd, as a peer in the NTP network. - Disables systemd.timesyncd if enabled. + Disables `systemd.timesyncd` if enabled. ''; }; restrictDefault = mkOption { type = types.listOf types.str; - description = '' + description = lib.mdDoc '' The restriction flags to be set by default. The default flags prevent external hosts from using ntpd as a DDoS @@ -63,7 +63,7 @@ in restrictSource = mkOption { type = types.listOf types.str; - description = '' + description = lib.mdDoc '' The restriction flags to be set on source. The default flags allow peers to be added by ntpd from configured diff --git a/nixos/modules/services/networking/openconnect.nix b/nixos/modules/services/networking/openconnect.nix index c72941459750..469f0a3bc3bb 100644 --- a/nixos/modules/services/networking/openconnect.nix +++ b/nixos/modules/services/networking/openconnect.nix @@ -38,10 +38,10 @@ let # set an authentication cookie, because they have to be requested # for every new connection and would only work once. passwordFile = mkOption { - description = '' + description = lib.mdDoc '' File containing the password to authenticate with. This - is passed to openconnect via the - --passwd-on-stdin option. + is passed to `openconnect` via the + `--passwd-on-stdin` option. ''; default = null; example = "/var/lib/secrets/openconnect-passwd"; @@ -63,13 +63,13 @@ let }; extraOptions = mkOption { - description = '' + description = lib.mdDoc '' Extra config to be appended to the interface config. It should contain long-format options as would be accepted on the command - line by openconnect + line by `openconnect` (see https://www.infradead.org/openconnect/manual.html). - Non-key-value options like deflate can be used by - declaring them as booleans, i. e. deflate = true;. + Non-key-value options like `deflate` can be used by + declaring them as booleans, i. e. `deflate = true;`. ''; default = { }; example = { diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix index ce0f0f90fc91..492a0936fdbb 100644 --- a/nixos/modules/services/networking/openvpn.nix +++ b/nixos/modules/services/networking/openvpn.nix @@ -115,11 +115,11 @@ in } ''; - description = '' + description = lib.mdDoc '' Each attribute of this option defines a systemd service that runs an OpenVPN instance. These can be OpenVPN servers or clients. The name of each systemd service is - openvpn-«name».service, + `openvpn-«name».service`, where «name» is the corresponding attribute name. ''; diff --git a/nixos/modules/services/networking/pleroma.nix b/nixos/modules/services/networking/pleroma.nix index 03868c8cc769..de9d0821c63a 100644 --- a/nixos/modules/services/networking/pleroma.nix +++ b/nixos/modules/services/networking/pleroma.nix @@ -34,7 +34,7 @@ in { configs = mkOption { type = with types; listOf str; - description = '' + description = lib.mdDoc '' Pleroma public configuration. This list gets appended from left to @@ -42,9 +42,9 @@ in { configuration imperatively, meaning you can override a setting by appending a new str to this NixOS option list. - DO NOT STORE ANY PLEROMA SECRET - HERE, use - services.pleroma.secretConfigFile + *DO NOT STORE ANY PLEROMA SECRET + HERE*, use + [services.pleroma.secretConfigFile](#opt-services.pleroma.secretConfigFile) instead. This setting is going to be stored in a file part of diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index cbc4e303b641..6da83eb7de10 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -257,12 +257,12 @@ in authorizedKeysFiles = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' Specify the rules for which files to read on the host. This is an advanced option. If you're looking to configure user - keys, you can generally use - or . + keys, you can generally use [](#opt-users.users._name_.openssh.authorizedKeys.keys) + or [](#opt-users.users._name_.openssh.authorizedKeys.keyFiles). These are paths relative to the host root file system or home directories and they are subject to certain token expansion rules. @@ -298,13 +298,13 @@ in "curve25519-sha256@libssh.org" "diffie-hellman-group-exchange-sha256" ]; - description = '' + description = lib.mdDoc '' Allowed key exchange algorithms Uses the lower bound recommended in both - + and - + ''; }; @@ -318,13 +318,13 @@ in "aes192-ctr" "aes128-ctr" ]; - description = '' + description = lib.mdDoc '' Allowed ciphers Defaults to recommended settings from both - + and - + ''; }; @@ -338,13 +338,13 @@ in "hmac-sha2-256" "umac-128@openssh.com" ]; - description = '' + description = lib.mdDoc '' Allowed MACs Defaults to recommended settings from both - + and - + ''; }; diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix index 994a0cf9ec1e..9017c53f4e56 100644 --- a/nixos/modules/services/networking/wireguard.nix +++ b/nixos/modules/services/networking/wireguard.nix @@ -118,11 +118,11 @@ let default = null; type = with types; nullOr str; example = "container"; - description = ''The pre-existing network namespace in which the + description = lib.mdDoc ''The pre-existing network namespace in which the WireGuard interface is created, and which retains the socket even if the - interface is moved via . When - null, the interface is created in the init namespace. - See documentation. + interface is moved via {option}`interfaceNamespace`. When + `null`, the interface is created in the init namespace. + See [documentation](https://www.wireguard.com/netns/). ''; }; @@ -130,11 +130,11 @@ let default = null; type = with types; nullOr str; example = "init"; - description = ''The pre-existing network namespace the WireGuard - interface is moved to. The special value init means - the init namespace. When null, the interface is not + description = lib.mdDoc ''The pre-existing network namespace the WireGuard + interface is moved to. The special value `init` means + the init namespace. When `null`, the interface is not moved. - See documentation. + See [documentation](https://www.wireguard.com/netns/). ''; }; }; diff --git a/nixos/modules/services/networking/yggdrasil.nix b/nixos/modules/services/networking/yggdrasil.nix index e99f31b0eaa4..266149cf2211 100644 --- a/nixos/modules/services/networking/yggdrasil.nix +++ b/nixos/modules/services/networking/yggdrasil.nix @@ -64,21 +64,21 @@ in { type = types.nullOr types.str; default = null; example = "wheel"; - description = "Group to grant access to the Yggdrasil control socket. If null, only root can access the socket."; + description = lib.mdDoc "Group to grant access to the Yggdrasil control socket. If `null`, only root can access the socket."; }; openMulticastPort = mkOption { type = bool; default = false; - description = '' + description = lib.mdDoc '' Whether to open the UDP port used for multicast peer discovery. The NixOS firewall blocks link-local communication, so in order to make local peering work you - will also need to set LinkLocalTCPPort in your - yggdrasil configuration ( or - ) to a port number other than 0, + will also need to set `LinkLocalTCPPort` in your + yggdrasil configuration ({option}`config` or + {option}`configFile`) to a port number other than 0, and then add that port to - . + {option}`networking.firewall.allowedTCPPorts`. ''; }; diff --git a/nixos/modules/services/security/privacyidea.nix b/nixos/modules/services/security/privacyidea.nix index 4be3a90b649f..29c499e33ab5 100644 --- a/nixos/modules/services/security/privacyidea.nix +++ b/nixos/modules/services/security/privacyidea.nix @@ -215,9 +215,9 @@ in environmentFile = mkOption { default = null; type = types.nullOr types.str; - description = '' + description = lib.mdDoc '' Environment file containing secrets to be substituted into - . + [](#opt-services.privacyidea.ldap-proxy.settings). ''; }; }; diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index 0516d207707a..84f577c3853b 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -476,11 +476,11 @@ in }; clientNames = mkOption { type = with types; nonEmptyListOf (strMatching "[A-Za-z0-9+-_]+"); - description = '' + description = lib.mdDoc '' Only clients that are listed here are authorized to access the hidden service. - Generated authorization data can be found in ${stateDir}/onion/$name/hostname. + Generated authorization data can be found in {file}`${stateDir}/onion/$name/hostname`. Clients need to put this authorization data in their configuration file using - . + [](#opt-services.tor.settings.HidServAuth). ''; }; }; diff --git a/nixos/modules/services/security/vault.nix b/nixos/modules/services/security/vault.nix index e4777910b6d3..ef9829630296 100644 --- a/nixos/modules/services/security/vault.nix +++ b/nixos/modules/services/security/vault.nix @@ -116,13 +116,13 @@ in storageConfig = mkOption { type = types.nullOr types.lines; default = null; - description = '' + description = lib.mdDoc '' HCL configuration to insert in the storageBackend section. Confidential values should not be specified here because this option's value is written to the Nix store, which is publicly readable. Provide credentials and such in a separate file using - . + [](#opt-services.vault.extraSettingsPaths). ''; }; diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index 65b40c56a3be..def04d944f05 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -38,17 +38,17 @@ in packages = mkOption { type = types.listOf types.path; default = [ ]; - description = '' + description = lib.mdDoc '' Packages whose D-Bus configuration files should be included in the configuration of the D-Bus system-wide or session-wide message bus. Specifically, files in the following directories will be included into their respective DBus configuration paths: - «pkg»/etc/dbus-1/system.d - «pkg»/share/dbus-1/system.d - «pkg»/share/dbus-1/system-services - «pkg»/etc/dbus-1/session.d - «pkg»/share/dbus-1/session.d - «pkg»/share/dbus-1/services + {file}`«pkg»/etc/dbus-1/system.d` + {file}`«pkg»/share/dbus-1/system.d` + {file}`«pkg»/share/dbus-1/system-services` + {file}`«pkg»/etc/dbus-1/session.d` + {file}`«pkg»/share/dbus-1/session.d` + {file}`«pkg»/share/dbus-1/services` ''; }; diff --git a/nixos/modules/services/system/earlyoom.nix b/nixos/modules/services/system/earlyoom.nix index 3e361fce00f9..b2e2d21002ce 100644 --- a/nixos/modules/services/system/earlyoom.nix +++ b/nixos/modules/services/system/earlyoom.nix @@ -32,32 +32,32 @@ in freeMemKillThreshold = mkOption { type = types.nullOr (types.ints.between 1 100); default = null; - description = '' + description = lib.mdDoc '' Minimum available memory (in percent) before sending SIGKILL. - If unset, this defaults to half of . + If unset, this defaults to half of {option}`freeMemThreshold`. - See the description of . + See the description of [](#opt-services.earlyoom.freeMemThreshold). ''; }; freeSwapThreshold = mkOption { type = types.ints.between 1 100; default = 10; - description = '' + description = lib.mdDoc '' Minimum free swap space (in percent) before sending SIGTERM. - See the description of . + See the description of [](#opt-services.earlyoom.freeMemThreshold). ''; }; freeSwapKillThreshold = mkOption { type = types.nullOr (types.ints.between 1 100); default = null; - description = '' + description = lib.mdDoc '' Minimum free swap space (in percent) before sending SIGKILL. - If unset, this defaults to half of . + If unset, this defaults to half of {option}`freeSwapThreshold`. - See the description of . + See the description of [](#opt-services.earlyoom.freeMemThreshold). ''; }; diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index 1641f1ad184e..6a038dc0a32c 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -55,13 +55,13 @@ in type = types.path; default = "${cfg.home}/${incompleteDir}"; defaultText = literalExpression ''"''${config.${opt.home}}/${incompleteDir}"''; - description = '' + description = lib.mdDoc '' When enabled with services.transmission.home - , + [](#opt-services.transmission.settings.incomplete-dir-enabled), new torrents will download the files to this directory. When complete, the files will be moved to download-dir - . + [](#opt-services.transmission.settings.download-dir). ''; }; options.incomplete-dir-enabled = mkOption { @@ -82,17 +82,17 @@ in options.peer-port-random-high = mkOption { type = types.port; default = 65535; - description = '' + description = lib.mdDoc '' The maximum peer port to listen to for incoming connections - when is enabled. + when [](#opt-services.transmission.settings.peer-port-random-on-start) is enabled. ''; }; options.peer-port-random-low = mkOption { type = types.port; default = 65535; - description = '' + description = lib.mdDoc '' The minimal peer port to listen to for incoming connections - when is enabled. + when [](#opt-services.transmission.settings.peer-port-random-on-start) is enabled. ''; }; options.peer-port-random-on-start = mkOption { @@ -117,9 +117,9 @@ in options.script-torrent-done-enabled = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to run - + [](#opt-services.transmission.settings.script-torrent-done-filename) at torrent completion. ''; }; @@ -156,15 +156,15 @@ in options.watch-dir-enabled = mkOption { type = types.bool; default = false; - description = ''Whether to enable the - . + description = lib.mdDoc ''Whether to enable the + [](#opt-services.transmission.settings.watch-dir). ''; }; options.trash-original-torrent-files = mkOption { type = types.bool; default = false; - description = ''Whether to delete torrents added from the - . + description = lib.mdDoc ''Whether to delete torrents added from the + [](#opt-services.transmission.settings.watch-dir). ''; }; }; @@ -174,26 +174,26 @@ in type = with types; nullOr str; default = null; example = "770"; - description = '' - If not null, is used as the permissions - set by systemd.activationScripts.transmission-daemon - on the directories , - . - and . + description = lib.mdDoc '' + If not `null`, is used as the permissions + set by `systemd.activationScripts.transmission-daemon` + on the directories [](#opt-services.transmission.settings.download-dir), + [](#opt-services.transmission.settings.incomplete-dir). + and [](#opt-services.transmission.settings.watch-dir). Note that you may also want to change - . + [](#opt-services.transmission.settings.umask). ''; }; home = mkOption { type = types.path; default = "/var/lib/transmission"; - description = '' - The directory where Transmission will create ${settingsDir}. - as well as ${downloadsDir}/ unless - is changed, - and ${incompleteDir}/ unless - is changed. + description = lib.mdDoc '' + The directory where Transmission will create `${settingsDir}`. + as well as `${downloadsDir}/` unless + [](#opt-services.transmission.settings.download-dir) is changed, + and `${incompleteDir}/` unless + [](#opt-services.transmission.settings.incomplete-dir) is changed. ''; }; @@ -211,10 +211,10 @@ in credentialsFile = mkOption { type = types.path; - description = '' + description = lib.mdDoc '' Path to a JSON file to be merged with the settings. Useful to merge a file which is better kept out of the Nix store - to set secret config parameters like rpc-password. + to set secret config parameters like `rpc-password`. ''; default = "/dev/null"; example = "/var/lib/secrets/transmission/settings.json"; diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix index 49865b962d10..a148dec8199a 100644 --- a/nixos/modules/services/web-apps/dokuwiki.nix +++ b/nixos/modules/services/web-apps/dokuwiki.nix @@ -260,14 +260,14 @@ in webserver = mkOption { type = types.enum [ "nginx" "caddy" ]; default = "nginx"; - description = '' + description = lib.mdDoc '' Whether to use nginx or caddy for virtual host management. - Further nginx configuration can be done by adapting services.nginx.virtualHosts.<name>. - See for further information. + Further nginx configuration can be done by adapting `services.nginx.virtualHosts.`. + See [](#opt-services.nginx.virtualHosts) for further information. - Further apache2 configuration can be done by adapting services.httpd.virtualHosts.<name>. - See for further information. + Further apache2 configuration can be done by adapting `services.httpd.virtualHosts.`. + See [](#opt-services.httpd.virtualHosts) for further information. ''; }; diff --git a/nixos/modules/services/web-apps/hedgedoc.nix b/nixos/modules/services/web-apps/hedgedoc.nix index 4e1a21259847..6f579b365cfe 100644 --- a/nixos/modules/services/web-apps/hedgedoc.nix +++ b/nixos/modules/services/web-apps/hedgedoc.nix @@ -150,9 +150,9 @@ in addDefaults = true; } ''; - description = '' + description = lib.mdDoc '' Specify the Content Security Policy which is passed to Helmet. - For configuration details see . + For configuration details see . ''; }; protocolUseSSL = mkOption { diff --git a/nixos/modules/services/web-apps/keycloak.nix b/nixos/modules/services/web-apps/keycloak.nix index 110df53effda..c1091bc09a06 100644 --- a/nixos/modules/services/web-apps/keycloak.nix +++ b/nixos/modules/services/web-apps/keycloak.nix @@ -210,13 +210,13 @@ in name = mkOption { type = str; default = "keycloak"; - description = '' + description = lib.mdDoc '' Database name to use when connecting to an external or manually provisioned database; has no effect when a local database is automatically provisioned. - To use this with a local database, set to - false and create the database and user + To use this with a local database, set [](#opt-services.keycloak.database.createLocally) to + `false` and create the database and user manually. ''; }; @@ -224,13 +224,13 @@ in username = mkOption { type = str; default = "keycloak"; - description = '' + description = lib.mdDoc '' Username to use when connecting to an external or manually provisioned database; has no effect when a local database is automatically provisioned. - To use this with a local database, set to - false and create the database and user + To use this with a local database, set [](#opt-services.keycloak.database.createLocally) to + `false` and create the database and user manually. ''; }; @@ -415,21 +415,21 @@ in } ''; - description = '' + description = lib.mdDoc '' Configuration options corresponding to parameters set in - conf/keycloak.conf. + {file}`conf/keycloak.conf`. - Most available options are documented at . + Most available options are documented at . Options containing secret data should be set to an attribute - set containing the attribute _secret - a + set containing the attribute `_secret` - a string pointing to a file containing the value the option should be set to. See the example to get a better picture of this: in the resulting - conf/keycloak.conf file, the - https-key-store-password key will be set + {file}`conf/keycloak.conf` file, the + `https-key-store-password` key will be set to the contents of the - /run/keys/store_password file. + {file}`/run/keys/store_password` file. ''; }; }; diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix index 00c30d73bb6f..d0594ff74192 100644 --- a/nixos/modules/services/web-apps/mastodon.nix +++ b/nixos/modules/services/web-apps/mastodon.nix @@ -197,14 +197,14 @@ in { }; vapidPublicKeyFile = lib.mkOption { - description = '' + description = lib.mdDoc '' Path to file containing the public key used for Web Push Voluntary Application Server Identification. A new keypair can be generated by running: - nix build -f '<nixpkgs>' mastodon; cd result; bin/rake webpush:generate_keys + `nix build -f '' mastodon; cd result; bin/rake webpush:generate_keys` - If does not + If {option}`mastodon.vapidPrivateKeyFile`does not exist, it and this file will be created with a new keypair. ''; default = "/var/lib/mastodon/secrets/vapid-public-key"; @@ -218,11 +218,11 @@ in { }; secretKeyBaseFile = lib.mkOption { - description = '' + description = lib.mdDoc '' Path to file containing the secret key base. A new secret key base can be generated by running: - nix build -f '<nixpkgs>' mastodon; cd result; bin/rake secret + `nix build -f '' mastodon; cd result; bin/rake secret` If this file does not exist, it will be created with a new secret key base. ''; @@ -231,11 +231,11 @@ in { }; otpSecretFile = lib.mkOption { - description = '' + description = lib.mdDoc '' Path to file containing the OTP secret. A new OTP secret can be generated by running: - nix build -f '<nixpkgs>' mastodon; cd result; bin/rake secret + `nix build -f '' mastodon; cd result; bin/rake secret` If this file does not exist, it will be created with a new OTP secret. ''; @@ -244,12 +244,12 @@ in { }; vapidPrivateKeyFile = lib.mkOption { - description = '' + description = lib.mdDoc '' Path to file containing the private key used for Web Push Voluntary Application Server Identification. A new keypair can be generated by running: - nix build -f '<nixpkgs>' mastodon; cd result; bin/rake webpush:generate_keys + `nix build -f '' mastodon; cd result; bin/rake webpush:generate_keys` If this file does not exist, it will be created with a new private key. diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index a121401f7584..feee7494a71a 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -93,8 +93,8 @@ in { type = types.str; default = config.services.nextcloud.home; defaultText = literalExpression "config.services.nextcloud.home"; - description = '' - Data storage path of nextcloud. Will be by default. + description = lib.mdDoc '' + Data storage path of nextcloud. Will be [](#opt-services.nextcloud.home) by default. This folder will be populated with a config.php and data folder which contains the state of the instance (excl the database)."; ''; example = "/mnt/nextcloud-file"; @@ -102,10 +102,10 @@ in { extraApps = mkOption { type = types.attrsOf types.package; default = { }; - description = '' + description = lib.mdDoc '' Extra apps to install. Should be an attrSet of appid to packages generated by fetchNextcloudApp. The appid must be identical to the "id" value in the apps appinfo/info.xml. - Using this will disable the appstore to prevent Nextcloud from updating these apps (see ). + Using this will disable the appstore to prevent Nextcloud from updating these apps (see [](#opt-services.nextcloud.appstoreEnable)). ''; example = literalExpression '' { @@ -127,8 +127,8 @@ in { extraAppsEnable = mkOption { type = types.bool; default = true; - description = '' - Automatically enable the apps in every time nextcloud starts. + description = lib.mdDoc '' + Automatically enable the apps in [](#opt-services.nextcloud.extraApps) every time nextcloud starts. If set to false, apps need to be enabled in the Nextcloud user interface or with nextcloud-occ app:enable. ''; }; @@ -136,10 +136,10 @@ in { type = types.nullOr types.bool; default = null; example = true; - description = '' + description = lib.mdDoc '' Allow the installation of apps and app updates from the store. - Enabled by default unless there are packages in . - Set to true to force enable the store even if is used. + Enabled by default unless there are packages in [](#opt-services.nextcloud.extraApps). + Set to true to force enable the store even if [](#opt-services.nextcloud.extraApps) is used. Set to false to disable the installation of apps from the global appstore. App management is always enabled regardless of this setting. ''; }; @@ -585,9 +585,9 @@ in { hstsMaxAge = mkOption { type = types.ints.positive; default = 15552000; - description = '' - Value for the max-age directive of the HTTP - Strict-Transport-Security header. + description = lib.mdDoc '' + Value for the `max-age` directive of the HTTP + `Strict-Transport-Security` header. See section 6.1.1 of IETF RFC 6797 for detailed information on this directive and header. diff --git a/nixos/modules/services/web-apps/node-red.nix b/nixos/modules/services/web-apps/node-red.nix index 3e6e38c50db5..e5b0998d3c41 100644 --- a/nixos/modules/services/web-apps/node-red.nix +++ b/nixos/modules/services/web-apps/node-red.nix @@ -47,9 +47,9 @@ in type = types.path; default = "${cfg.package}/lib/node_modules/node-red/settings.js"; defaultText = literalExpression ''"''${package}/lib/node_modules/node-red/settings.js"''; - description = '' + description = lib.mdDoc '' Path to the JavaScript configuration file. - See + See for a configuration example. ''; }; diff --git a/nixos/modules/services/web-apps/trilium.nix b/nixos/modules/services/web-apps/trilium.nix index 75464b21fd41..bb1061cf278e 100644 --- a/nixos/modules/services/web-apps/trilium.nix +++ b/nixos/modules/services/web-apps/trilium.nix @@ -53,7 +53,7 @@ in noAuthentication = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' If set to true, no password is required to access the web frontend. ''; }; diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index fcc2976cd2c1..5c39de0dde74 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -170,7 +170,7 @@ in supportDDC = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Support setting monitor brightness via DDC. This is not needed for controlling brightness of the internal monitor diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix index 00a47e7814f7..f4195c4c2dc3 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix @@ -55,12 +55,12 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable lightdm-mini-greeter as the lightdm greeter. Note that this greeter starts only the default X session. You can configure the default X session using - . + [](#opt-services.xserver.displayManager.defaultSession). ''; }; diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/tiny.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/tiny.nix index e8f799e27295..8d6bfa98a7e4 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/tiny.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/tiny.nix @@ -17,12 +17,12 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable lightdm-tiny-greeter as the lightdm greeter. Note that this greeter starts only the default X session. You can configure the default X session using - . + [](#opt-services.xserver.displayManager.defaultSession). ''; }; diff --git a/nixos/modules/services/x11/window-managers/fvwm2.nix b/nixos/modules/services/x11/window-managers/fvwm2.nix index 909b3a475a9c..b5ef36f58d54 100644 --- a/nixos/modules/services/x11/window-managers/fvwm2.nix +++ b/nixos/modules/services/x11/window-managers/fvwm2.nix @@ -24,7 +24,7 @@ in gestures = mkOption { default = false; type = types.bool; - description = "Whether or not to enable libstroke for gesture support"; + description = lib.mdDoc "Whether or not to enable libstroke for gesture support"; }; }; }; diff --git a/nixos/modules/system/boot/initrd-network.nix b/nixos/modules/system/boot/initrd-network.nix index eff125971d08..a1017c3e2420 100644 --- a/nixos/modules/system/boot/initrd-network.nix +++ b/nixos/modules/system/boot/initrd-network.nix @@ -50,17 +50,17 @@ in boot.initrd.network.enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Add network connectivity support to initrd. The network may be - configured using the ip kernel parameter, - as described in the kernel documentation. + configured using the `ip` kernel parameter, + as described in [the kernel documentation](https://www.kernel.org/doc/Documentation/filesystems/nfs/nfsroot.txt). Otherwise, if - is enabled, an IP address + {option}`networking.useDHCP` is enabled, an IP address is acquired using DHCP. You should add the module(s) required for your network card to boot.initrd.availableKernelModules. - lspci -v | grep -iA8 'network\|ethernet' + `lspci -v | grep -iA8 'network\|ethernet'` will tell you which. ''; }; diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 3b468f00aba8..bffa7010d2fc 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -548,11 +548,11 @@ in boot.initrd.luks.devices = mkOption { default = { }; example = { luksroot.device = "/dev/disk/by-uuid/430e9eff-d852-4f68-aa3b-2fa3599ebe08"; }; - description = '' + description = lib.mdDoc '' The encrypted disk that should be opened before the root filesystem is mounted. Both LVM-over-LUKS and LUKS-over-LVM setups are supported. The unencrypted devices can be accessed as - /dev/mapper/«name». + {file}`/dev/mapper/«name»`. ''; type = with types; attrsOf (submodule ( diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 1849dcfe1e1e..efd6fabd2f3b 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -1904,11 +1904,11 @@ in }; extraArgs = mkOption { - description = '' + description = lib.mdDoc '' Extra command-line arguments to pass to systemd-networkd-wait-online. - These also affect per-interface systemd-network-wait-online@ services. + These also affect per-interface `systemd-network-wait-online@` services. - See systemd-networkd-wait-online.service8 for all available options. + See [{manpage}`systemd-networkd-wait-online.service(8)`](https://www.freedesktop.org/software/systemd/man/systemd-networkd-wait-online.service.html) for all available options. ''; type = with types; listOf str; default = []; diff --git a/nixos/modules/system/boot/systemd/logind.nix b/nixos/modules/system/boot/systemd/logind.nix index bd05c07e26f2..598016032136 100644 --- a/nixos/modules/system/boot/systemd/logind.nix +++ b/nixos/modules/system/boot/systemd/logind.nix @@ -26,14 +26,14 @@ in services.logind.killUserProcesses = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Specifies whether the processes of a user should be killed when the user logs out. If true, the scope unit corresponding to the session and all processes inside that scope will be terminated. If false, the scope is "abandoned" (see - systemd.scope(5)), and processes are not killed. + [systemd.scope(5)](https://www.freedesktop.org/software/systemd/man/systemd.scope.html#)), and processes are not killed. - See logind.conf(5) + See [logind.conf(5)](https://www.freedesktop.org/software/systemd/man/logind.conf.html#KillUserProcesses=) for more details. ''; }; diff --git a/nixos/modules/system/boot/systemd/tmpfiles.nix b/nixos/modules/system/boot/systemd/tmpfiles.nix index 0d5adf596e18..e990e953b057 100644 --- a/nixos/modules/system/boot/systemd/tmpfiles.nix +++ b/nixos/modules/system/boot/systemd/tmpfiles.nix @@ -25,16 +25,16 @@ in default = []; example = literalExpression "[ pkgs.lvm2 ]"; apply = map getLib; - description = '' - List of packages containing systemd-tmpfiles rules. + description = lib.mdDoc '' + List of packages containing {command}`systemd-tmpfiles` rules. All files ending in .conf found in - «pkg»/lib/tmpfiles.d + {file}`«pkg»/lib/tmpfiles.d` will be included. If this folder does not exist or does not contain any files an error will be returned instead. - If a lib output is available, rules are searched there and only there. - If there is no lib output it will fall back to out + If a {file}`lib` output is available, rules are searched there and only there. + If there is no {file}`lib` output it will fall back to {file}`out` and if that does not exist either, the default output will be used. ''; }; diff --git a/nixos/modules/tasks/auto-upgrade.nix b/nixos/modules/tasks/auto-upgrade.nix index 46a30c53ea88..ca2690167830 100644 --- a/nixos/modules/tasks/auto-upgrade.nix +++ b/nixos/modules/tasks/auto-upgrade.nix @@ -25,10 +25,10 @@ in { type = types.enum ["switch" "boot"]; default = "switch"; example = "boot"; - description = '' + description = lib.mdDoc '' Whether to run - nixos-rebuild switch --upgrade or run - nixos-rebuild boot --upgrade + `nixos-rebuild switch --upgrade` or run + `nixos-rebuild boot --upgrade` ''; }; diff --git a/nixos/modules/tasks/scsi-link-power-management.nix b/nixos/modules/tasks/scsi-link-power-management.nix index 549c35fc5b8d..a5395657e992 100644 --- a/nixos/modules/tasks/scsi-link-power-management.nix +++ b/nixos/modules/tasks/scsi-link-power-management.nix @@ -25,7 +25,7 @@ in powerManagement.scsiLinkPolicy = mkOption { default = null; type = types.nullOr (types.enum allowedValues); - description = '' + description = lib.mdDoc '' SCSI link power management policy. The kernel default is "max_performance". diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix index 1699b0bcea40..6b8c21336c6b 100644 --- a/nixos/modules/virtualisation/nixos-containers.nix +++ b/nixos/modules/virtualisation/nixos-containers.nix @@ -579,11 +579,11 @@ in privateNetwork = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to give the container its own private virtual Ethernet interface. The interface is called - eth0, and is hooked up to the interface - ve-«container-name» + `eth0`, and is hooked up to the interface + `ve-«container-name»` on the host. If this option is not set, then the container shares the network interfaces of the host, and can bind to any port on any interface. @@ -728,12 +728,12 @@ in }; } ''; - description = '' + description = lib.mdDoc '' A set of NixOS system configurations to be run as lightweight containers. Each container appears as a service - container-«name» + `container-«name»` on the host system, allowing it to be started and stopped via - systemctl. + {command}`systemctl`. ''; }; From 6237fcac982fc233bd8438863c1a7d121a548188 Mon Sep 17 00:00:00 2001 From: "Yestin L. Harrison" Date: Sat, 30 Jul 2022 07:56:32 -0700 Subject: [PATCH 051/142] vkquake: support darwin --- pkgs/games/quakespasm/vulkan.nix | 10 ++++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix index a6aadef7a576..eedab296ce93 100644 --- a/pkgs/games/quakespasm/vulkan.nix +++ b/pkgs/games/quakespasm/vulkan.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, SDL2, gzip, libvorbis, libmad, vulkan-headers, vulkan-loader }: +{ lib, stdenv, fetchFromGitHub, makeWrapper +, SDL2, gzip, libvorbis, libmad, vulkan-headers, vulkan-loader, moltenvk +}: stdenv.mkDerivation rec { pname = "vkquake"; @@ -24,7 +26,7 @@ stdenv.mkDerivation rec { libvorbis libmad vulkan-loader - ]; + ] ++ lib.optional stdenv.isDarwin moltenvk; buildFlags = [ "DO_USERDIRS=1" ]; @@ -53,7 +55,7 @@ stdenv.mkDerivation rec { specialization constants, CPU/GPU parallelism and memory pooling. ''; - platforms = platforms.linux; - maintainers = with maintainers; [ ]; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ ylh ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f07807ade1d8..b73e4128a1c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32900,7 +32900,9 @@ with pkgs; quakespasm = callPackage ../games/quakespasm { inherit (darwin.apple_sdk.frameworks) Cocoa CoreAudio CoreFoundation IOKit OpenGL; }; - vkquake = callPackage ../games/quakespasm/vulkan.nix { }; + vkquake = callPackage ../games/quakespasm/vulkan.nix { + inherit (darwin) moltenvk; + }; ioquake3 = callPackage ../games/quake3/ioquake { }; quake3e = callPackage ../games/quake3/quake3e { }; From f32f8e2a5703fddc01090ebb306234715eacb46c Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Thu, 4 Aug 2022 00:16:08 +0000 Subject: [PATCH 052/142] python3Packages.jax: fix build Fix https://github.com/NixOS/nixpkgs/issues/183173 --- pkgs/development/python-modules/jax/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index e4e9139216e1..a302341c3141 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -87,6 +87,19 @@ buildPythonPackage rec { "testEigvalsGrad_shape" ]; + # See https://github.com/google/jax/issues/11722. This is a temporary fix in + # order to unblock etils, and upgrading jax/jaxlib to the latest version. See + # https://github.com/NixOS/nixpkgs/issues/183173#issuecomment-1204074993. + disabledTestPaths = [ + "tests/api_test.py" + "tests/core_test.py" + "tests/lax_numpy_indexing_test.py" + "tests/lax_numpy_test.py" + "tests/nn_test.py" + "tests/random_test.py" + "tests/sparse_test.py" + ]; + pythonImportsCheck = [ "jax" ]; From dd6ffc0f5247a739f9730a193929ad3b484cb87c Mon Sep 17 00:00:00 2001 From: nixpkgs-upkeep-bot Date: Thu, 4 Aug 2022 00:59:51 +0000 Subject: [PATCH 053/142] plexamp: 4.2.1 -> 4.3.0 --- pkgs/applications/audio/plexamp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index 91634cdf3fa2..ed20c1d7a731 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -2,12 +2,12 @@ let pname = "plexamp"; - version = "4.2.1"; + version = "4.3.0"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; name="${pname}-${version}.AppImage"; - sha512 = "S2/T+T24X6D0oTbGPMp2BVfWTvzsUCWS1xsigLT/vFr12PlZgPfOWgo987W3YE30WJJDdybLqnkTl+uhNndC+A=="; + sha512 = "c9d2rp7tibb73tZdoFONW7eoy+u+GaUZ0RPhYWCBk5MYwtY81xrsdka64x60xzxOopWZ6JkmGs9AWI1XifqBTQ=="; }; appimageContents = appimageTools.extractType2 { @@ -33,7 +33,7 @@ in appimageTools.wrapType2 { meta = with lib; { description = "A beautiful Plex music player for audiophiles, curators, and hipsters"; homepage = "https://plexamp.com/"; - changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/44"; + changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/45"; license = licenses.unfree; maintainers = with maintainers; [ killercup synthetica ]; platforms = [ "x86_64-linux" ]; From ce39bee9dd61d6ea5c336450915d9601f3a26b9b Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 4 Aug 2022 10:00:35 +0800 Subject: [PATCH 054/142] nixos/stage-1-systemd: fix initrd-fstab generation for bind mounts --- nixos/modules/system/boot/systemd/initrd.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index 59cdc3077b16..f7c4d0c3a3e3 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -103,7 +103,8 @@ let fstab = pkgs.writeText "initrd-fstab" (lib.concatMapStringsSep "\n" ({ fsType, mountPoint, device, options, autoFormat, autoResize, ... }@fs: let opts = options ++ optional autoFormat "x-systemd.makefs" ++ optional autoResize "x-systemd.growfs"; - in "${device} /sysroot${mountPoint} ${fsType} ${lib.concatStringsSep "," opts}") fileSystems); + finalDevice = if (lib.elem "bind" options) then "/sysroot${device}" else device; + in "${finalDevice} /sysroot${mountPoint} ${fsType} ${lib.concatStringsSep "," opts}") fileSystems); needMakefs = lib.any (fs: fs.autoFormat) fileSystems; needGrowfs = lib.any (fs: fs.autoResize) fileSystems; From a78ef8ffc2a7b61422c2820d9cc022539d328daf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Aug 2022 10:06:02 +0200 Subject: [PATCH 055/142] python310Packages.archinfo: 9.2.11 -> 9.2.12 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index bdc0f89e4f34..4b858053bd0b 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.11"; + version = "9.2.12"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-ep0mEOhNe/58l4kYFJIHu/c7wKgnBA0mY0/QAw0EdKM="; + hash = "sha256-cBlc2YtAgjxYZE3Hoh1oW8OUf+nxzVaWtzNidSKlg3k="; }; checkInputs = [ From 932b9e8a164a922872fa859262142c141a4ea64b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Aug 2022 10:06:07 +0200 Subject: [PATCH 056/142] python310Packages.ailment: 9.2.11 -> 9.2.12 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index a483bbd481d5..ca32ec95497c 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.11"; + version = "9.2.12"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-hluPbUxkYlbeOsc5uQMXtFjt3wDHq/olUk2SKHPAlVU="; + hash = "sha256-0D/tVit7UtTLnUalO80v31djN5Tbsb1avIzN678wLmM="; }; propagatedBuildInputs = [ From 9ec455bdabf85320928900c0e20c52fcdca962a4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Aug 2022 10:06:20 +0200 Subject: [PATCH 057/142] python310Packages.pyvex: 9.2.11 -> 9.2.12 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index df881c910ceb..dd201726ea6f 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.11"; + version = "9.2.12"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-l2lKmgv6FXayX297TH5gwv7vPLTXAneDdVb+mgTERxc="; + hash = "sha256-nBtk67Gv4GT85PGcZ/uPMJYgFqnKfZpayB9B09ijaAw="; }; propagatedBuildInputs = [ From 2317534bbc56162e64b0c2f595e2f779d8bf0cef Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Aug 2022 10:06:25 +0200 Subject: [PATCH 058/142] python310Packages.claripy: 9.2.11 -> 9.2.12 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 09fe5715f344..4f2ca0f462bd 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.11"; + version = "9.2.12"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-FNlvmXL4Ko2xnML+h1bVhS/62z6BgJbgyQ2UhcDkB+Y="; + hash = "sha256-ad6tt+cubVBNTd40xuH61/DBclX0/sfHpOV+zqC1ZLY="; }; propagatedBuildInputs = [ From f5a248009617ce49bfa87137d308c8dc7505ee58 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Aug 2022 10:06:30 +0200 Subject: [PATCH 059/142] python310Packages.cle: 9.2.11 -> 9.2.12 --- pkgs/development/python-modules/cle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index de258870b834..030cc65f9e23 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.11"; + version = "9.2.12"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-3brrNU3dPID336SGa2vTMHQOqEcoiCmyr+5ol14yDgc="; + hash = "sha256-davY/xYjbFhVP96BZtZXeoZwElmiEYT4Buy3V9GEmeQ="; }; propagatedBuildInputs = [ From b2c16a24083f9e02919a571519c41f0f0c842352 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Aug 2022 10:06:37 +0200 Subject: [PATCH 060/142] python310Packages.angr: 9.2.11 -> 9.2.12 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 716275840de0..1acc1e25b25b 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -46,7 +46,7 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.2.11"; + version = "9.2.12"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -55,7 +55,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-IUuTiRDkQanzcw4iATw5rScl3hoLN/lbHRyflfPyGUc="; + hash = "sha256-GGTl5zGixGkikBWJ45hg3HkdrUw5Ic40VUuuEQME6ag="; }; propagatedBuildInputs = [ From b2a7d0115877627ed55521bded505df183950025 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Aug 2022 10:20:31 +0200 Subject: [PATCH 061/142] python310Packages.identify: 2.5.2 -> 2.5.3 --- pkgs/development/python-modules/identify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 11e1fa598681..b33d53abd4cc 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.5.2"; + version = "2.5.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EIr+u8tfvMFLc2A4dIsaMk3ZlpIU5c3FBqyv3mRRfac="; + sha256 = "sha256-7Glq1R0GT2rIFdEpvZdzi4yf4t42ryRIeeTbz8znJmg="; }; checkInputs = [ From 3e89a864bd8e953249d3733db7ccd53cd46d6a6b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Aug 2022 10:22:08 +0200 Subject: [PATCH 062/142] python310Packages.hahomematic: 2022.7.14 -> 2022.8.2 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 6a358088b50e..28e81a51d1cb 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2022.7.14"; + version = "2022.8.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-5XgK9vlZswwA48a/tggL78JT1T4NrEiGZ40JnkgX9MM="; + sha256 = "sha256-eFWjzp1WCPZM2BTmPeUgo4QF5c6RU9Z7OQ87t9d3vPI="; }; propagatedBuildInputs = [ From 05f695c2e761d3ae42311467dd100701428a1fb2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Aug 2022 10:33:43 +0200 Subject: [PATCH 063/142] python310Packages.weconnect: 0.45.1 -> 0.46.0 --- pkgs/development/python-modules/weconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index 167a9f8cea58..d83ca0ac4028 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.45.1"; + version = "0.46.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "refs/tags/v${version}"; - hash = "sha256-uvo5fwP2VWW+wTV26M604axcpYrtl7Atq2jB7m0VVsM="; + hash = "sha256-FnTHL3CUBxuHWr90MSQD4nwUFJQwP2nblQP1bo/olrc="; }; propagatedBuildInputs = [ From 0efcd5f16d61f38d0596a4b17e1e2278596463e0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Aug 2022 10:34:04 +0200 Subject: [PATCH 064/142] python310Packages.weconnect-mqtt: 0.38.2 -> 0.38.3 --- pkgs/development/python-modules/weconnect-mqtt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix index 916a62c29e92..4a060f9aa725 100644 --- a/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "weconnect-mqtt"; - version = "0.38.2"; + version = "0.38.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-mqtt"; rev = "refs/tags/v${version}"; - hash = "sha256-oDf/W8EiU9vg64/FDryp8NEMyDT7lI5nlkxiCAg88pY="; + hash = "sha256-9Vdm9C+2HNoUucY66dZkmDIhylgXMQ2ul/644JQtu5o="; }; propagatedBuildInputs = [ From 944a51a7a5cc6a3b7c430cbad7fffa3d785a686d Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 4 Aug 2022 22:55:00 +0200 Subject: [PATCH 065/142] libportal: add darwin support --- pkgs/development/libraries/libportal/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libportal/default.nix b/pkgs/development/libraries/libportal/default.nix index cb0da5c560d2..29080f119cd4 100644 --- a/pkgs/development/libraries/libportal/default.nix +++ b/pkgs/development/libraries/libportal/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , meson , ninja , pkg-config @@ -29,6 +30,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-wDDE43UC6FBgPYLS+WWExeheURCH/3fCKu5oJg7GM+A="; }; + patches = [ + (fetchpatch { + name = "fix-build-on-darwin.patch"; + url = "https://github.com/flatpak/libportal/pull/106/commits/73f63ee57669c4fa604a7772484cd235d4fb612c.patch"; + sha256 = "sha256-c9WUQPhn4IA3X1ie7SwnxuZXdvpPkpGdU4xgDwKN/L0="; + }) + ]; + nativeBuildInputs = [ meson ninja @@ -65,6 +74,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/flatpak/libportal"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 2c6b87b861e18b5492a3c00dce0cc0a612abb4ba Mon Sep 17 00:00:00 2001 From: nixpkgs-upkeep-bot Date: Fri, 5 Aug 2022 00:23:15 +0000 Subject: [PATCH 066/142] vscode: 1.69.2 -> 1.70.0 --- pkgs/applications/editors/vscode/vscode.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index ae5847569509..210761a5c4da 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -15,17 +15,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0djz1gi605f0xwrn2b5f0cvvcdmhh1n00rfcqxp1j1fa4y69lyzq"; - x86_64-darwin = "1n51f0fb6h8kpsn8g0bcp4nav0ilin26c5xp1qhs63hnnif045pn"; - aarch64-linux = "1zjg18f38h682mibws6n4hwa01jkv5dpj45jw17dmk7wgw4gylww"; - aarch64-darwin = "10crlbcpn90498nszillryvr0w2w46ra6g7nbkqkkgzav692nfys"; - armv7l-linux = "1iwp0fax56l23dllfd4p7p4k28bk6msfknq9dagxqhg4i9p2yrq2"; + x86_64-linux = "1ldn2m7mi3sfkcv417a2ci68p8r178kfr9bf1wx6j0r09sn5r4i0"; + x86_64-darwin = "1pkxcj6dz5lcvf0ivzafvwvcyw2098ylxrqqzj9dfgfad29kyszd"; + aarch64-linux = "1q1l7vrf4ifv6y46b4zz9km83wrsq80wx6rb4rnqkgijpbx02f7z"; + aarch64-darwin = "1zhvbn6kmp99a5p0299256fm08y67rfzz03zygif7y20zrmr27ka"; + armv7l-linux = "0jn2li0j1cmk5m61ha6m4lskc80q1j7mfmgidc3x9x9yiv6yacr7"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.69.2"; + version = "1.70.0"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; From 0889899f0476756d7bb380d443169dc224ae24bb Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Fri, 5 Aug 2022 12:26:45 +1000 Subject: [PATCH 067/142] navidrome: fix darwin build, version numbering, enable tests --- pkgs/servers/misc/navidrome/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/misc/navidrome/default.nix b/pkgs/servers/misc/navidrome/default.nix index 8c2a28affbd4..173dd0caa88f 100644 --- a/pkgs/servers/misc/navidrome/default.nix +++ b/pkgs/servers/misc/navidrome/default.nix @@ -41,7 +41,12 @@ buildGoModule { buildInputs = [ taglib zlib ]; - CGO_CFLAGS = [ "-Wno-return-local-addr" ]; + ldflags = [ + "-X github.com/navidrome/navidrome/consts.gitSha=${src.rev}" + "-X github.com/navidrome/navidrome/consts.gitTag=v${version}" + ]; + + CGO_CFLAGS = lib.optionals stdenv.cc.isGNU [ "-Wno-return-local-addr" ]; prePatch = '' cp -r ${ui}/* ui/build @@ -52,8 +57,6 @@ buildGoModule { --prefix PATH : ${lib.makeBinPath [ ffmpeg ]} ''; - doCheck = false; - passthru = { inherit ui; tests.navidrome = nixosTests.navidrome; From 93b3eb81f4236cc0e2413946cf8024bcc4e383a8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 5 Aug 2022 02:02:42 +0000 Subject: [PATCH 068/142] terraform-providers: update 2022-08-05 --- .../terraform-providers/providers.json | 169 +++++++++--------- 1 file changed, 84 insertions(+), 85 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index daa46cee1f81..34ee492b42f1 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -5,10 +5,10 @@ "provider-source-address": "registry.terraform.io/CiscoDevNet/aci", "proxyVendor": true, "repo": "terraform-provider-aci", - "rev": "v2.5.1", - "sha256": "sha256-T+6NCPwLz51aHpvGG1EBrnS9Ee0pbdpanjLACIlZWBw=", + "rev": "v2.5.2", + "sha256": "sha256-Y2cNp2BuPEH5wAEwaMVSBgKoHrcy6d4eOlsGPqAxmoU=", "vendorSha256": "sha256-AB+uj4hQIYMVQHhw1cISB2TotNO8rw1iU0/gP096CoE=", - "version": "2.5.1" + "version": "2.5.2" }, "acme": { "owner": "vancluever", @@ -51,10 +51,10 @@ "owner": "aliyun", "provider-source-address": "registry.terraform.io/aliyun/alicloud", "repo": "terraform-provider-alicloud", - "rev": "v1.178.0", - "sha256": "sha256-U9gii5pHd+PnA9Mf+AA5NTMT1KvxCnOu7svkqwCR0aM=", - "vendorSha256": "sha256-pia256CKguRY+Acedq6QJmgBpiIGwxgn6tchFB6qjwQ=", - "version": "1.178.0" + "rev": "v1.179.0", + "sha256": "sha256-J6DYXGVCQalXuxpOd4Bw9N9UCcunpvX4EMmiM9XzxQ8=", + "vendorSha256": "sha256-g8ZwzgcrHoPcw+cPi2cIW7ZDHy5TLxKUblDqLVlFlSw=", + "version": "1.179.0" }, "ansible": { "owner": "nbering", @@ -96,19 +96,19 @@ "owner": "AviatrixSystems", "provider-source-address": "registry.terraform.io/AviatrixSystems/aviatrix", "repo": "terraform-provider-aviatrix", - "rev": "v2.22.2", - "sha256": "sha256-3IzIeixm63r42s/Bs8EMemxK0u0TSCWgTuPw3FoBSws=", + "rev": "v2.22.3", + "sha256": "sha256-yMzeeS8hpCeoejMYa1YQl6wvhki/BzFtNWgZ951bpLU=", "vendorSha256": null, - "version": "2.22.2" + "version": "2.22.3" }, "aws": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v4.24.0", - "sha256": "sha256-KDVWxTYam4WpEEtJT5rvpsi+mNtHlqZ9Mqj4HVsBAzI=", - "vendorSha256": "sha256-iIqc0PidAzfY8Vvr0eIbx5g4q30HrokNtgRx/gExFEQ=", - "version": "4.24.0" + "rev": "v4.25.0", + "sha256": "sha256-0dRCgNK828aUFBDRBkRFY/1Rnesd3ZQrHtimbNquHO8=", + "vendorSha256": "sha256-b6RrsJnWm5dvmNN/zv04Ct6I28McpXWzw0fySHMRias=", + "version": "4.25.0" }, "azuread": { "owner": "hashicorp", @@ -186,12 +186,11 @@ "checkly": { "owner": "checkly", "provider-source-address": "registry.terraform.io/checkly/checkly", - "proxyVendor": true, "repo": "terraform-provider-checkly", - "rev": "v1.6.1", - "sha256": "sha256-vzYOieW4KdYcaPSSa6j57GsPAAIdwmWu5hIBCCmnstM=", - "vendorSha256": "sha256-XErR45BMWgAzeLU20CDd2j5tsokkoOMQhUar2ZsU5+0=", - "version": "1.6.1" + "rev": "v1.6.2", + "sha256": "sha256-hi6GTToJcKVSpbBBWQN6IREhm8iHFCj+pg71fgZ5rOI=", + "vendorSha256": "sha256-VnYRDBneQ+bUzISJM9DJdBEBmjA1WOXPo+kaYBW4w4U=", + "version": "1.6.2" }, "checkpoint": { "deleteVendor": true, @@ -216,10 +215,10 @@ "owner": "cloudamqp", "provider-source-address": "registry.terraform.io/cloudamqp/cloudamqp", "repo": "terraform-provider-cloudamqp", - "rev": "v1.19.0", - "sha256": "sha256-RwgqJl+W5L/2Qz5Wd0dBPUNhX5Q+7J/y7RfLprOBa3k=", + "rev": "v1.19.1", + "sha256": "sha256-oq7wsraZTKSo2tEaUrQ+uzCEuC3LLP6AVLzmCDWBK3A=", "vendorSha256": "sha256-OnkSfHEbbcnSs+pI5wphObRyIXGtNlpeTe/RqxF/pr4=", - "version": "1.19.0" + "version": "1.19.1" }, "cloudflare": { "owner": "cloudflare", @@ -352,10 +351,10 @@ "owner": "dome9", "provider-source-address": "registry.terraform.io/dome9/dome9", "repo": "terraform-provider-dome9", - "rev": "v1.27.1", - "sha256": "sha256-VmobLWMjHH+GzxUk0bnIr4dWkuH8D00U7VrN9eApF5c=", + "rev": "v1.27.4", + "sha256": "sha256-+3jIq7f21CkuF3UZYV3o+ZIdoQi0hFgO/qXwdhkcaPI=", "vendorSha256": null, - "version": "1.27.1" + "version": "1.27.4" }, "elasticsearch": { "owner": "phillbaker", @@ -370,10 +369,10 @@ "owner": "equinix", "provider-source-address": "registry.terraform.io/equinix/equinix", "repo": "terraform-provider-equinix", - "rev": "v1.7.0", - "sha256": "sha256-H2cvJMtZnJFk3snohEcxS++xzsc45TWBZquWRe3vseM=", - "vendorSha256": "sha256-oANCzm5HSxs5vTiu1kIGJQcwAvNg84G9qXnoBge9fAs=", - "version": "1.7.0" + "rev": "v1.8.0", + "sha256": "sha256-U/6d7cfiYjVZ8VIvIBXoM3rsfySlpWOSxwVTcaR7uKQ=", + "vendorSha256": "sha256-dB0asOYl4JUtsdmcuWhcX2WioqB4DI3MTJf5ynJOMVA=", + "version": "1.8.0" }, "exoscale": { "owner": "exoscale", @@ -452,20 +451,20 @@ "provider-source-address": "registry.terraform.io/hashicorp/google", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.30.0", - "sha256": "sha256-tT+a85+m0w1lIcoP/1ChCewa8bkX1sChd+xhASgbTQE=", - "vendorSha256": "sha256-ix+RUN4PsvLXuHjJa+J8OTPA2jScZFKLfN05N2x49jE=", - "version": "4.30.0" + "rev": "v4.31.0", + "sha256": "sha256-Y9iyWjC+XLkselVIhaM0N7iNelbdlF9jV7AjTYiD8RM=", + "vendorSha256": "sha256-hu1uK1yW07NlV3/DnKQxdGhbrzpq6MADmgkRr4+VQ1w=", + "version": "4.31.0" }, "google-beta": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google-beta", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.30.0", - "sha256": "sha256-7R8zUor72WwvzVhOHQsTiEWGduzyRciTKbNxDArklG8=", - "vendorSha256": "sha256-ix+RUN4PsvLXuHjJa+J8OTPA2jScZFKLfN05N2x49jE=", - "version": "4.30.0" + "rev": "v4.31.0", + "sha256": "sha256-5Ieq8LvhrlFevMgr7JKeGCkWWejjOvKhKfXpPvsNzRU=", + "vendorSha256": "sha256-hu1uK1yW07NlV3/DnKQxdGhbrzpq6MADmgkRr4+VQ1w=", + "version": "4.31.0" }, "googleworkspace": { "owner": "hashicorp", @@ -480,10 +479,10 @@ "owner": "grafana", "provider-source-address": "registry.terraform.io/grafana/grafana", "repo": "terraform-provider-grafana", - "rev": "v1.24.0", - "sha256": "sha256-0E3yWEtt1o+K9/BoawL0Wyt+8yIDADZy6r9Kg7oNYPI=", - "vendorSha256": "sha256-YDWTHiRyY2bzX+ZgYbUTKO3IjsvbIEVWxqGhDNpVnhM=", - "version": "1.24.0" + "rev": "v1.25.0", + "sha256": "sha256-KB2GTz8Sq9H1MVPaU5qaDhP4NytdQocO4AYO7zoihJc=", + "vendorSha256": "sha256-uRsuw2JgKjbCQSodNdufR+vZSD+NI0HgxvWg6p4hUgQ=", + "version": "1.25.0" }, "gridscale": { "owner": "gridscale", @@ -579,10 +578,10 @@ "owner": "IBM-Cloud", "provider-source-address": "registry.terraform.io/IBM-Cloud/ibm", "repo": "terraform-provider-ibm", - "rev": "v1.43.0", - "sha256": "sha256-5oQqWr8s4wMiR58JITDH4e5iMPktmlItPjWwScbYSqo=", - "vendorSha256": "sha256-b1aKgB3iB9+7vCgEYuaaEcxgF8ptZOPOrZcpj+SscvA=", - "version": "1.43.0" + "rev": "v1.44.1", + "sha256": "sha256-DpWxhDHQHGVQ0NliJXfn7o3nR9VVHE8QZs/h/tnclUg=", + "vendorSha256": "sha256-ugdkBCgSDWcC8oC3WYco2rAIhFc2ILBZjq8NmB+3mTM=", + "version": "1.44.1" }, "icinga2": { "owner": "Icinga", @@ -660,10 +659,10 @@ "owner": "launchdarkly", "provider-source-address": "registry.terraform.io/launchdarkly/launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.7.2", - "sha256": "sha256-/YY+X8cKStpYLhaon06YXc7j3UbnCgeXh2fHVtKtYcM=", - "vendorSha256": "sha256-Tz+YEhUgbYkgXjvGAV7taZAtFQfxiyYUENX11PJBXCk=", - "version": "2.7.2" + "rev": "v2.8.0", + "sha256": "sha256-H/oKgylo8LLmx2v0BTj6Vb7JQbf9JCooFmsziog6r4E=", + "vendorSha256": "sha256-Ef07RvkqXR/7qf8gHayxczBJ/ChHDmxR6+/wzaokkzk=", + "version": "2.8.0" }, "libvirt": { "owner": "dmacvicar", @@ -750,10 +749,10 @@ "owner": "aminueza", "provider-source-address": "registry.terraform.io/aminueza/minio", "repo": "terraform-provider-minio", - "rev": "v1.5.2", - "sha256": "sha256-QERV6Q/vYm1DWV91aYFCgZtFfnK9V2ATNsIAbuGzgdY=", - "vendorSha256": "sha256-SB7R466O3CbVwk6JSWXiFK4AD0rf6zijVfQW0rlEsVA=", - "version": "1.5.2" + "rev": "v1.5.3", + "sha256": "sha256-AWVBRrQ90XoJodRsBvqJYjkXSqbQBxWk748na9pTnEk=", + "vendorSha256": "sha256-0c8Pj4Ga6yNX1UcZXIhmDXhdZOTY3h/WdGdYo4Hmltc=", + "version": "1.5.3" }, "mongodbatlas": { "owner": "mongodb", @@ -851,19 +850,19 @@ "owner": "oracle", "provider-source-address": "registry.terraform.io/oracle/oci", "repo": "terraform-provider-oci", - "rev": "v4.86.1", - "sha256": "sha256-Fh7X3qscS0CRsrXh92q+56HiUUyIydVCfe2RsJUu1jw=", + "rev": "v4.87.0", + "sha256": "sha256-Db1CCKEeolVcNwtvRlPi2Tsq5JqHfRhFZlELTRrn0OA=", "vendorSha256": null, - "version": "4.86.1" + "version": "4.87.0" }, "okta": { "owner": "okta", "provider-source-address": "registry.terraform.io/okta/okta", "repo": "terraform-provider-okta", - "rev": "v3.32.0", - "sha256": "sha256-OJVhliFrg2MdszVjqXkVEilEEdRMRvfZm6NgXp9LmAU=", + "rev": "v3.33.0", + "sha256": "sha256-44rbvPfl/DU1wkV/2hPwnpA4R7VSI4TrFpetc52+1gk=", "vendorSha256": "sha256-hOkhJn1Hc3hv8/+L1N3xZWS2bM4FcaFMXVq+F/1+cN8=", - "version": "3.32.0" + "version": "3.33.0" }, "oktaasa": { "owner": "oktadeveloper", @@ -887,19 +886,19 @@ "owner": "terraform-provider-openstack", "provider-source-address": "registry.terraform.io/terraform-provider-openstack/openstack", "repo": "terraform-provider-openstack", - "rev": "v1.47.0", - "sha256": "sha256-Hz5cW9hu/hrL7kO/4Q48rRUe5f1urD6x182lNSYsd0E=", - "vendorSha256": "sha256-xlsTLlf1uCfrP77OgjuZWkYAKe1+Tbrf8XDrct+s+AA=", - "version": "1.47.0" + "rev": "v1.48.0", + "sha256": "sha256-I2Rl/Z6KHEkhaoslqMD+ZQ8vOnIwLDDJIP3P/3sTWcw=", + "vendorSha256": "sha256-XB8odOjqSVg/TJApHCZnlReJYTyD89u7axSilMlIALk=", + "version": "1.48.0" }, "opentelekomcloud": { "owner": "opentelekomcloud", "provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.30.2", - "sha256": "sha256-7OCUOxk2CXPK71arwtXHNTm2M5aUyc+DfJgjGUogvwM=", - "vendorSha256": "sha256-uVH/G1opjNNta4br8qzRTIeUma8K8XDTkjOuEKvpgEU=", - "version": "1.30.2" + "rev": "v1.31.0", + "sha256": "sha256-I3Oku5sNlPlRlYcagz2C4LCZI4N3mwlLK6xAWNn7iVo=", + "vendorSha256": "sha256-mLroGI3X9nLufz4LT4KCbVoPUZimtMaQ3rI108SKURE=", + "version": "1.31.0" }, "opsgenie": { "owner": "opsgenie", @@ -1013,10 +1012,10 @@ "owner": "scaleway", "provider-source-address": "registry.terraform.io/scaleway/scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.2.5", - "sha256": "sha256-SeEExV6g0abKEyrs0pzVX5aKSLALaVDyHb3uW7FxiLQ=", - "vendorSha256": "sha256-pDDk4cGCZEotOfL1OLEVJVQ35lI/fdNh2NNjAkIHTZ0=", - "version": "2.2.5" + "rev": "v2.2.6", + "sha256": "sha256-YrCpZCQGm8yFCxJRClrQJ1axFDBradJireMAW0ViLvc=", + "vendorSha256": "sha256-zswPGl4a/V8tOMMUWCjxY8ubSy5GT9pP6eBpqSrAg/k=", + "version": "2.2.6" }, "secret": { "owner": "numtide", @@ -1094,10 +1093,10 @@ "owner": "spotinst", "provider-source-address": "registry.terraform.io/spotinst/spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.80.0", - "sha256": "sha256-3Wq3jKpSVm3sIUoumd7v26JsSWMdmzdhtUKq/ztrt9M=", - "vendorSha256": "sha256-NeXkvdO6ODAhNdVfP4laTht6oIrx2QYbhTILFXwPCbU=", - "version": "1.80.0" + "rev": "v1.81.0", + "sha256": "sha256-UQgN9FTQCtEUvb0OqeQzYrCF/YOZwbvcNkmuyjfkxco=", + "vendorSha256": "sha256-hs6wvdUv4SUa1qYWSoJBaJntEJTCdTY1UeVOAoBUOg0=", + "version": "1.81.0" }, "stackpath": { "owner": "stackpath", @@ -1130,10 +1129,10 @@ "owner": "tencentcloudstack", "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", - "rev": "v1.76.3", - "sha256": "sha256-Tc6GfFWksxrr61rNFVZrHMHTeo4JsU8Gc1S7roMnj4Y=", + "rev": "v1.76.4", + "sha256": "sha256-N1DkLDaZW/wZ6Vf0OG2sQ+YVGuCNqz37gi/LjEai1uk=", "vendorSha256": null, - "version": "1.76.3" + "version": "1.76.4" }, "tfe": { "owner": "hashicorp", @@ -1212,19 +1211,19 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/vault", "repo": "terraform-provider-vault", - "rev": "v3.8.0", - "sha256": "sha256-8u+r/2xsAXKAfn8Zkh30VBXFUmzUV2LFv6PzlkqoBcU=", + "rev": "v3.8.1", + "sha256": "sha256-7d3oOsDEbKZ6qOoRLslFDMgw8q6sBup3A+cA3ijkfXw=", "vendorSha256": "sha256-D6O8N1WEdDM6sogJym+8dheBKE3eQmGTvbVJeiGreRc=", - "version": "3.8.0" + "version": "3.8.1" }, "vcd": { "owner": "vmware", "provider-source-address": "registry.terraform.io/vmware/vcd", "repo": "terraform-provider-vcd", - "rev": "v3.6.0", - "sha256": "sha256-vtqlT3cfrEsbTmsKY6SVYUgyo+zIiX0cK080H03C1d0=", - "vendorSha256": "sha256-g5qcT4xaXQMih4WN3ysk+xGwd3ux8XjMceXgmw8gYB0=", - "version": "3.6.0" + "rev": "v3.7.0", + "sha256": "sha256-qEElcMl6tCBfOTTTpTFjVYg6E6K9iTXfgmDDozrgNVg=", + "vendorSha256": "sha256-u5W7zeOv53VAr4M5T2AAVFRDF/6PNhSm1A2WFo6pnJU=", + "version": "3.7.0" }, "venafi": { "owner": "Venafi", From d20fae6ff891ea01ed21bd8aac372670b0851ca0 Mon Sep 17 00:00:00 2001 From: Taha Date: Thu, 21 Jul 2022 17:43:06 -0400 Subject: [PATCH 069/142] twitch-tui: init at 1.6.0 --- .../instant-messengers/twitch-tui/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/twitch-tui/default.nix diff --git a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix new file mode 100644 index 000000000000..ec9df5ec10dd --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchFromGitHub, rustPlatform, pkg-config, openssl }: + +rustPlatform.buildRustPackage rec { + pname = "twitch-tui"; + version = "1.6.0"; + + src = fetchFromGitHub { + owner = "Xithrius"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-144yn/QQPIZJOgqKFUWjB7KCmEKfNpj6XjMGhTpQdEQ="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; + + cargoHash = "sha256-zUeI01EyXsuoKzHbpVu3jyA3H2aBk6wMY+GW3h3v8vc="; + + meta = with lib; { + description = "Twitch chat in the terminal"; + homepage = "https://github.com/Xithrius/twitch-tui"; + license = licenses.mit; + maintainers = [ maintainers.taha ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc1ce8c90e5b..16b4c2ee1057 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5029,6 +5029,8 @@ with pkgs; keyd = callPackage ../tools/inputmethods/keyd { }; + twitch-tui = callPackage ../applications/networking/instant-messengers/twitch-tui { }; + gebaar-libinput = callPackage ../tools/inputmethods/gebaar-libinput { stdenv = gcc10StdenvCompat; }; kime = callPackage ../tools/inputmethods/kime { }; From 34d1f6b43c2c79884e3c139ac941cbed40725f86 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Aug 2022 05:54:04 +0000 Subject: [PATCH 070/142] python310Packages.nocasedict: 1.0.3 -> 1.0.4 --- pkgs/development/python-modules/nocasedict/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nocasedict/default.nix b/pkgs/development/python-modules/nocasedict/default.nix index d9140d591c81..bea2d9c2c2f0 100644 --- a/pkgs/development/python-modules/nocasedict/default.nix +++ b/pkgs/development/python-modules/nocasedict/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "nocasedict"; - version = "1.0.3"; + version = "1.0.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-giC5e6BrCOst7e13TEBsd+DKDVNSrnEkn2+dHyoXvXs="; + sha256 = "sha256-fBEdpM79JEQzy2M3ev8IGkD4S92unm83bGfwhsD4Bto="; }; propagatedBuildInputs = [ From 744e802bc3d69cc9a27a45f4c92f78efed1a0d32 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Aug 2022 06:19:14 +0000 Subject: [PATCH 071/142] python310Packages.nocaselist: 1.0.5 -> 1.0.6 --- pkgs/development/python-modules/nocaselist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nocaselist/default.nix b/pkgs/development/python-modules/nocaselist/default.nix index 5fc6bd6f8e66..083174c824dc 100644 --- a/pkgs/development/python-modules/nocaselist/default.nix +++ b/pkgs/development/python-modules/nocaselist/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "nocaselist"; - version = "1.0.5"; + version = "1.0.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4cEsoq6dNFs0lI8sj2DjiUYZ4r4u0otOzF5/HeoRfR0="; + sha256 = "sha256-SPBn+MuEEkXzTQMSC8G6mQDxOxnLUbzGx77gF/fIdNo="; }; checkInputs = [ From cb1d6d69a12bd05099eb87f337cbb8ca7862fcd4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Aug 2022 06:24:44 +0000 Subject: [PATCH 072/142] python310Packages.cock: 0.9.0 -> 0.10.0 --- pkgs/development/python-modules/cock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cock/default.nix b/pkgs/development/python-modules/cock/default.nix index e7428823ad9e..384e2c42fea5 100644 --- a/pkgs/development/python-modules/cock/default.nix +++ b/pkgs/development/python-modules/cock/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cock"; - version = "0.9.0"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "0d9021c2d9ce0dbf495a3c5ef960a9996a0681bb96ff6099f37302a3813a184e"; + sha256 = "sha256-B6r6+b+x5vEp4+yfhV03dfjlVjRbW2W6Pm91PC0Tb+o="; }; propagatedBuildInputs = [ click sortedcontainers pyyaml ]; From 953de37eda9cd72063bbd806736007ebe1d32d81 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Aug 2022 06:30:27 +0000 Subject: [PATCH 073/142] python310Packages.zeroc-ice: 3.7.7 -> 3.7.8 --- pkgs/development/python-modules/zeroc-ice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zeroc-ice/default.nix b/pkgs/development/python-modules/zeroc-ice/default.nix index ba50e19a4d42..1c015d4d75a7 100644 --- a/pkgs/development/python-modules/zeroc-ice/default.nix +++ b/pkgs/development/python-modules/zeroc-ice/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "zeroc-ice"; - version = "3.7.7"; + version = "3.7.8"; src = fetchPypi { inherit version pname; - sha256 = "415f4a673009fe9a5ef67b61c4469ddf14b73857b6d40f02d6b74f02ad935147"; + sha256 = "sha256-kodRHIkMXdFUBGNVRtSyjbVqGQRxPaHqgp6ddFT5ZIY="; }; buildInputs = [ openssl bzip2 ]; From 6abd910e9a330291c457ebd1a2edd1be29a6adb5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Aug 2022 06:58:00 +0000 Subject: [PATCH 074/142] argocd-autopilot: 0.4.2 -> 0.4.3 --- .../networking/cluster/argocd-autopilot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix index 1447288038d6..e5cc13eab2f2 100644 --- a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix +++ b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "argocd-autopilot"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "argoproj-labs"; repo = "argocd-autopilot"; rev = "v${version}"; - sha256 = "sha256-xwcETaeoxnfZqW48IJRpJkONuPNuFR5ngUYAMDKWMtk="; + sha256 = "sha256-24PWSW0qXTUqAmIAb2a/cNs3y5lXnhvzp4y92OlIaxE="; }; vendorSha256 = "sha256-rJj9GFNX9OUMzkdr9D9dzucSZe10iW2LpqybhXD0m6s="; From 1ad5e92e8dffe435de63b68af9fcae1ae5318378 Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Fri, 5 Aug 2022 09:16:59 +0200 Subject: [PATCH 075/142] ungoogled-chromium: 103.0.5060.134 -> 104.0.5112.81 --- .../browsers/chromium/ungoogled-flags.toml | 1 - .../browsers/chromium/upstream-info.json | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml b/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml index f2bf29cda24b..10cd77df21a7 100644 --- a/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml +++ b/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml @@ -7,7 +7,6 @@ enable_js_type_check=false enable_mdns=false enable_mse_mpeg2ts_stream_parser=true enable_nacl=false -enable_one_click_signin=false enable_reading_list=false enable_remoting=false enable_reporting=false diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 98e6fa5243b7..c3d2aa5a2e47 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -45,19 +45,19 @@ } }, "ungoogled-chromium": { - "version": "103.0.5060.134", - "sha256": "0wdmy15602qxrb403p8yyx69k7py85fbawdsgap1l6z4h4j2g2p4", - "sha256bin64": "143jc70cyns2bh5cizy32fdsfl6hq22rphx216vywhncdsd96cnw", + "version": "104.0.5112.81", + "sha256": "0x17jzzvn2aqx3ahqyi6ijyn70sn79kg648r0ks9m5gib1bbgf0y", + "sha256bin64": null, "deps": { "gn": { - "version": "2022-05-11", + "version": "2022-06-08", "url": "https://gn.googlesource.com/gn", - "rev": "578a7fe4c3c6b0bc2ae1fd2e37f14857d09895bf", - "sha256": "03dqfrdpf5xxl64dby3qmbwpzdq2gsa8g7xl438py3a629rgxg63" + "rev": "2ecd43a10266bd091c98e6dcde507c64f6a0dad3", + "sha256": "1q06vsz9b4bb764wy1wy8n177z2pgpm97kq3rl1hmq185mz5fhra" }, "ungoogled-patches": { - "rev": "103.0.5060.134-1", - "sha256": "00mpmyaa8bqxf1f4vhk1waxhjbhcwab8m1x1vf341al64f6bmr1r" + "rev": "104.0.5112.81-1", + "sha256": "0dvwh470h06x5a4p8kw22pi4lvch16knh90i2kh10y0wfggqz78w" } } } From ae36fbe7f946b2cef58c5b26ef602242c80ee654 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Fri, 5 Aug 2022 09:45:54 +0200 Subject: [PATCH 076/142] ferdi: Note CVE-2022-32320 in knownVulnerabilities --- .../networking/instant-messengers/ferdi/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/ferdi/default.nix b/pkgs/applications/networking/instant-messengers/ferdi/default.nix index edd05a83ad63..82f808be3b6e 100644 --- a/pkgs/applications/networking/instant-messengers/ferdi/default.nix +++ b/pkgs/applications/networking/instant-messengers/ferdi/default.nix @@ -31,5 +31,8 @@ mkFranzDerivation' rec { maintainers = with maintainers; [ davidtwco ma27 ]; platforms = [ "x86_64-linux" ]; hydraPlatforms = [ ]; + knownVulnerabilities = [ + "CVE-2022-32320" + ]; }; } From 6230c07a45a5dcede82c30a852e20d95d7c543de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Aug 2022 07:47:15 +0000 Subject: [PATCH 077/142] python310Packages.nclib: 1.0.1 -> 1.0.2 --- pkgs/development/python-modules/nclib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nclib/default.nix b/pkgs/development/python-modules/nclib/default.nix index e28dbefca924..e11f1f8f23ab 100644 --- a/pkgs/development/python-modules/nclib/default.nix +++ b/pkgs/development/python-modules/nclib/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "nclib"; - version = "1.0.1"; + version = "1.0.2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "9d41adb7df01a3fead10bc9698a175936b263d6bd18997078ed17e4fa61734d1"; + sha256 = "sha256-rA8oeYvMhw8HURxPLBRqpMHnAez/xBjyPFoKXIIvBjg="; }; # Project has no tests From 7ab6ab2870d61c6b90c68f3436c883381a74d4ef Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Tue, 2 Aug 2022 21:46:19 +0200 Subject: [PATCH 078/142] czkawka: 4.1.0 -> 5.0.1 --- pkgs/tools/misc/czkawka/default.nix | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/czkawka/default.nix b/pkgs/tools/misc/czkawka/default.nix index 1bbcaf1f34bc..06127a62df02 100644 --- a/pkgs/tools/misc/czkawka/default.nix +++ b/pkgs/tools/misc/czkawka/default.nix @@ -7,26 +7,31 @@ , pango , gdk-pixbuf , atk -, gtk3 +, gtk4 +, wrapGAppsHook +, gobject-introspection +, xvfb-run , testers , czkawka }: rustPlatform.buildRustPackage rec { pname = "czkawka"; - version = "4.1.0"; + version = "5.0.1"; src = fetchFromGitHub { owner = "qarmin"; repo = "czkawka"; rev = version; - sha256 = "sha256-N7fCYcjhYlFVkvWdFpR5cu98Vy+jStlBkR/vz/k1lLY="; + sha256 = "sha256-ochHohwCOKCF9kiiMxMIaJXaHUWNbq7pIh+VNRKQlcg="; }; - cargoSha256 = "sha256-4L7OjJ26Qpl5YuHil7JEYU8xWH65jiyFz0a/ufr7wYQ="; + cargoSha256 = "sha256-ap8OpaLs1jZtEHbXVZyaGj3gvblWtyHmYrHiHvZKhfs="; nativeBuildInputs = [ pkg-config + wrapGAppsHook + gobject-introspection ]; buildInputs = [ @@ -35,9 +40,19 @@ rustPlatform.buildRustPackage rec { pango gdk-pixbuf atk - gtk3 + gtk4 ]; + checkInputs = [ + xvfb-run + ]; + + checkPhase = '' + runHook preCheck + xvfb-run cargo test + runHook postCheck + ''; + passthru.tests.version = testers.testVersion { package = czkawka; command = "czkawka_cli --version"; From a3922768fa673d77f5610c473874bead692ad66c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Aug 2022 07:53:30 +0000 Subject: [PATCH 079/142] cadvisor: 0.44.1 -> 0.45.0 --- pkgs/servers/monitoring/cadvisor/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index 73fe3ed1192d..186b893ac0b4 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "cadvisor"; - version = "0.44.1"; + version = "0.45.0"; src = fetchFromGitHub { owner = "google"; repo = "cadvisor"; rev = "v${version}"; - sha256 = "sha256-OVUKQGP9zzlzoC/25BHNbJuP6ELstBMaRFAzUnDSR0U="; + sha256 = "sha256-hH3unhGRrB8IegVaX+j2idY0woMqzchEEXZB/ppzIf0="; }; modRoot = "./cmd"; - vendorSha256 = "sha256-LGMouB76GT/ZvG3kLoo/jmnHT0CEeND9pObTOKaS9T0="; + vendorSha256 = "sha256-Mcelh/nYFcNTrI1Kq9KqkJeSnbgJhd7HfbexhNYbPFg="; ldflags = [ "-s" "-w" "-X github.com/google/cadvisor/version.Version=${version}" ]; From 79136ca8a639f2709e1e5afbe2894b2275e09fbf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Aug 2022 07:56:48 +0000 Subject: [PATCH 080/142] cargo-llvm-lines: 0.4.16 -> 0.4.17 --- pkgs/development/tools/rust/cargo-llvm-lines/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-llvm-lines/default.nix b/pkgs/development/tools/rust/cargo-llvm-lines/default.nix index 417cdd676183..910971fbddca 100644 --- a/pkgs/development/tools/rust/cargo-llvm-lines/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-lines/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-llvm-lines"; - version = "0.4.16"; + version = "0.4.17"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-MDRVNCfyObEaN0eNnaDBQCYQV2Y1Ck5/8zdpG4eZbaE="; + sha256 = "sha256-Xlzvfic2uuMTMxAwWbWGii1ZdJglYxRI3iY1YQaufNQ="; }; - cargoSha256 = "sha256-oOUidCM3Xex8bqBVJmrigHZHMdjXBNDdKaPiA/+MR7s="; + cargoSha256 = "sha256-3xlKZGRgxOzKtGNQCkZpSKnnczxDNuS4kY1VO/6LxlA="; meta = with lib; { description = "Count the number of lines of LLVM IR across all instantiations of a generic function"; From e1573a9bb30ee50810e00d2a120815f4c75ef7ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Aug 2022 08:01:37 +0000 Subject: [PATCH 081/142] cheat: 4.2.3 -> 4.2.6 --- pkgs/applications/misc/cheat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index bda779dd54f3..c6e19cfd4818 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "cheat"; - version = "4.2.3"; + version = "4.2.6"; src = fetchFromGitHub { owner = "cheat"; repo = "cheat"; rev = version; - sha256 = "sha256-F0p309rY0PeeOU1K9Had6qI6DCHgzauuuTjMfWoZYBQ="; + sha256 = "sha256-Y+lZBJDCSLETMzLwDIht5+vfniFWPL4PehK+vKN65Es="; }; subPackages = [ "cmd/cheat" ]; From cca7deada4055d8ea81d912b20aeecff544bdb57 Mon Sep 17 00:00:00 2001 From: "Ian M. Jones" Date: Tue, 2 Aug 2022 22:40:18 +0100 Subject: [PATCH 082/142] deckmaster: init at 0.8.0 --- pkgs/applications/misc/deckmaster/default.nix | 46 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/applications/misc/deckmaster/default.nix diff --git a/pkgs/applications/misc/deckmaster/default.nix b/pkgs/applications/misc/deckmaster/default.nix new file mode 100644 index 000000000000..34da4fe93945 --- /dev/null +++ b/pkgs/applications/misc/deckmaster/default.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, makeWrapper +, roboto +}: + +buildGoModule rec { + pname = "deckmaster"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "muesli"; + repo = "deckmaster"; + rev = "v${version}"; + sha256 = "sha256-q2rUHfAvTGXBAGrZUtHMuZr6fYWmpha+al2FG8sCC0Y="; + }; + + vendorSha256 = "sha256-kj4lRHuQ9e0TOC4p4Ak3AB3Lx0JN1jqXaVKlee9EtCg="; + + proxyVendor = true; + + nativeBuildInputs = [ + makeWrapper + ]; + + ldflags = [ + "-s" + "-w" + ]; + + # Let the app find Roboto-*.ttf files (hard-coded file names). + postFixup = '' + wrapProgram $out/bin/deckmaster \ + --prefix XDG_DATA_DIRS : "${roboto.out}/share/" \ + ''; + + meta = with lib; { + description = "An application to control your Elgato Stream Deck on Linux"; + homepage = "https://github.com/muesli/deckmaster"; + license = licenses.mit; + maintainers = with maintainers; [ ianmjones ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1766d7bf944..84bbf84d36ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7395,6 +7395,8 @@ with pkgs; bc-decaf = callPackage ../development/libraries/bc-decaf { }; + deckmaster = callPackage ../applications/misc/deckmaster { }; + deco = callPackage ../applications/misc/deco { }; decoder = callPackage ../tools/security/decoder { }; From a101b20b2a0da160bff5460e7cafb8207ca9e745 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Aug 2022 08:04:20 +0000 Subject: [PATCH 083/142] civo: 1.0.30 -> 1.0.31 --- pkgs/applications/networking/cluster/civo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/civo/default.nix b/pkgs/applications/networking/cluster/civo/default.nix index 64f5e57d8da0..4aa795636a55 100644 --- a/pkgs/applications/networking/cluster/civo/default.nix +++ b/pkgs/applications/networking/cluster/civo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "civo"; - version = "1.0.30"; + version = "1.0.31"; src = fetchFromGitHub { owner = "civo"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-7UEnp42IHW7CyfnUr+j8HP9qV1vtIk9j5mDOXOTi4LY="; + sha256 = "sha256-QyGsO8rvc+noAbG2IN4uvTaX1PGW5zHv3YRbYGm2Iq4="; }; - vendorSha256 = "sha256-2vbjYki+i7DfegvdTFo7XNf9droNeLDzAP2skpLDjDU="; + vendorSha256 = "sha256-2D+MJK8vf0AlLUHjR2elaHlIcvmrVovYsBfy0ax0aXg="; CGO_ENABLED = 0; From 366b56447d337497cb340061f038f6858b0324e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Aug 2022 08:04:21 +0000 Subject: [PATCH 084/142] cilium-cli: 0.12.0 -> 0.12.1 --- pkgs/applications/networking/cluster/cilium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix index cfa1f787527b..65f3313bcc7a 100644 --- a/pkgs/applications/networking/cluster/cilium/default.nix +++ b/pkgs/applications/networking/cluster/cilium/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/fVPo9aO2UhX/qsyjFUykFz4am7R2USmdvYqhQcT7q8="; + sha256 = "sha256-WCOZuHJBssRM75+EO9s11t7ASkLxHbsVe+qmb/glFWU="; }; vendorSha256 = null; From aaf37bfa535566db498a25f8496dd5b04fa39667 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Aug 2022 08:41:06 +0000 Subject: [PATCH 085/142] clj-kondo: 2022.06.22 -> 2022.08.03 --- pkgs/development/tools/clj-kondo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index 3fe90a3004c0..174f09e8f741 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "clj-kondo"; - version = "2022.06.22"; + version = "2022.08.03"; src = fetchurl { url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-g+0BYwk9bws+c7CfLGf88r2nfcDBCdDKyqRS285oIQM="; + sha256 = "sha256-tqwAC8qib7XLlHj6YD4pYnV/R5q9fW4bH5fA8Gl8G64="; }; extraNativeImageBuildArgs = [ From ca83a26c350607de1bb7a002d1a242a16785ab6b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Aug 2022 08:46:18 +0000 Subject: [PATCH 086/142] cpp-utilities: 5.17.0 -> 5.18.0 --- pkgs/development/libraries/cpp-utilities/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index 6362eb952af5..6740f458725e 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "cpp-utilities"; - version = "5.17.0"; + version = "5.18.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1NjdVflLapuNeYKgRgO7zJxJN1rXjGjQO1m+xUfTeEI="; + sha256 = "sha256-i/ihEPJHyWzRywzpXhYpauA8lL51yjoiWod8Nc/6gV0="; }; nativeBuildInputs = [ cmake ]; From 901a4af249696c25028ffd6c517681b3d030eb6c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Jul 2022 20:23:30 +0000 Subject: [PATCH 087/142] hd-idle: 1.16 -> 1.17 --- pkgs/os-specific/linux/hd-idle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/hd-idle/default.nix b/pkgs/os-specific/linux/hd-idle/default.nix index a1f355a849c2..b9256158549a 100644 --- a/pkgs/os-specific/linux/hd-idle/default.nix +++ b/pkgs/os-specific/linux/hd-idle/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hd-idle"; - version = "1.16"; + version = "1.17"; src = fetchFromGitHub { owner = "adelolmo"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LZcMwF/BhHiWWXMcrzbk8GyvwXdA3B2olmbOBxQwV5g="; + sha256 = "sha256-BHUjKvhUDeD/Xm0KKbkLH2XWn1W77E7Pm3OSPARF6Xw="; }; vendorSha256 = null; From 16559154a6af6cbaf4dce48e486e98afd8195cbf Mon Sep 17 00:00:00 2001 From: Jan Schmitt Date: Tue, 2 Aug 2022 22:33:57 +0200 Subject: [PATCH 088/142] luaPackages.protobuf: init at 0.4.0 --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 33 +++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 2511f0681865..9129b0282194 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -39,6 +39,7 @@ lua-cmsgpack,,,,,, lua-iconv,,,,,, lua-lsp,,,,,, lua-messagepack,,,,,, +lua-protobuf,,,,,, lua-resty-http,,,,,, lua-resty-jwt,,,,,, lua-resty-openidc,,,,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 60b273f4baec..bbe08a9a77ee 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -1161,6 +1161,39 @@ buildLuarocksPackage { }; }) {}; +lua-protobuf = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua +}: +buildLuarocksPackage { + pname = "lua-protobuf"; + version = "0.4.0-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/lua-protobuf-0.4.0-1.rockspec"; + sha256 = "053r6z37847wm1xaxv5rwplmdqkp507qawgd382z0l7m05f06ls9"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/starwing/lua-protobuf.git", + "rev": "832facd266366cd86ee9bf41d35327255d0033f2", + "date": "2022-07-27T14:34:12+08:00", + "path": "/nix/store/g68x4cbi6ssd5zak14r5cbi7k88d3ml9-lua-protobuf", + "sha256": "0ynfq0va4w8zlr67ld6v9nmi5mnvchfygd8h5jbwk2vzlj9hg2yw", + "fetchLFS": false, + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; + + disabled = with lua; (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = { + homepage = "https://github.com/starwing/lua-protobuf"; + description = "protobuf data support for Lua"; + license.fullName = "MIT"; + }; +}) {}; + lua-resty-http = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast , fetchgit, lua }: From 105b7a814c72d7b4c4a546242e124a182e2a5632 Mon Sep 17 00:00:00 2001 From: Jan Schmitt Date: Tue, 2 Aug 2022 22:36:55 +0200 Subject: [PATCH 089/142] luaPackages.protobuf: add maintainer --- maintainers/scripts/luarocks-packages.csv | 2 +- pkgs/development/lua-modules/generated-packages.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 9129b0282194..691c0edd9bb8 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -39,7 +39,7 @@ lua-cmsgpack,,,,,, lua-iconv,,,,,, lua-lsp,,,,,, lua-messagepack,,,,,, -lua-protobuf,,,,,, +lua-protobuf,,,,,,lockejan lua-resty-http,,,,,, lua-resty-jwt,,,,,, lua-resty-openidc,,,,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index bbe08a9a77ee..40f954a1ff8c 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -1190,6 +1190,7 @@ buildLuarocksPackage { meta = { homepage = "https://github.com/starwing/lua-protobuf"; description = "protobuf data support for Lua"; + maintainers = with lib.maintainers; [ lockejan ]; license.fullName = "MIT"; }; }) {}; From 07af4e3ecee764287a2329d09ab82b77ed70bee2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Aug 2022 09:39:27 +0000 Subject: [PATCH 090/142] python310Packages.num2words: 0.5.10 -> 0.5.11 --- pkgs/development/python-modules/num2words/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/num2words/default.nix b/pkgs/development/python-modules/num2words/default.nix index bce4c0426e40..8679da592cb6 100644 --- a/pkgs/development/python-modules/num2words/default.nix +++ b/pkgs/development/python-modules/num2words/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "0.5.10"; + version = "0.5.11"; pname = "num2words"; src = fetchPypi { inherit pname version; - sha256 = "0myc27k087rhgpwn1a1dffzl32rwz6ngdbf3rm2i0zlgcxh4zk9p"; + sha256 = "sha256-bGhOIiDYrbNhLSyAepdyzDJplj+81395ebaJp39gQ9Q="; }; propagatedBuildInputs = [ docopt ]; From 1e93a026d1f1aa338c524532d7227fa192650801 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 5 Aug 2022 11:41:37 +0200 Subject: [PATCH 091/142] elpa: 2021.11.002 -> 2022.05.001 --- pkgs/development/libraries/elpa/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/elpa/default.nix b/pkgs/development/libraries/elpa/default.nix index 2a71b82af3cb..b3bde19fed02 100644 --- a/pkgs/development/libraries/elpa/default.nix +++ b/pkgs/development/libraries/elpa/default.nix @@ -18,13 +18,13 @@ assert blas.isILP64 == scalapack.isILP64; stdenv.mkDerivation rec { pname = "elpa"; - version = "2021.11.002"; + version = "2022.05.001"; passthru = { inherit (blas) isILP64; }; src = fetchurl { url = "https://elpa.mpcdf.mpg.de/software/tarball-archive/Releases/${version}/elpa-${version}.tar.gz"; - sha256 = "sha256-V28cru14g7gTlmQP2g9QQYOGbPbL1Lxx0Tg7oiCPH5c="; + sha256 = "sha256-IH5vJtZTL7cDc6/D7z04JVITr2He9lnCXa06MOT8o4s="; }; patches = [ @@ -48,6 +48,8 @@ stdenv.mkDerivation rec { preConfigure = '' export FC="mpifort" export CC="mpicc" + export CXX="mpicxx" + export CPP="cpp" # These need to be set for configure to succeed export FCFLAGS="${lib.optionalString stdenv.hostPlatform.isx86_64 "-msse3 " From df89f90c4a93518227e610fbcf7af30473dbbfab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 4 Aug 2022 13:44:04 +0200 Subject: [PATCH 092/142] dvc: remove setuptools_scm_git_archive pin, mark broken --- .../version-management/dvc/default.nix | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/version-management/dvc/default.nix b/pkgs/applications/version-management/dvc/default.nix index 382f08f7afcb..2389cd98d891 100644 --- a/pkgs/applications/version-management/dvc/default.nix +++ b/pkgs/applications/version-management/dvc/default.nix @@ -20,6 +20,17 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-d1Tjqomr8Lcf+X+LZgi0wHlxXBUqHq/nAzDBbrxHAl4="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "grandalf==0.6" "grandalf" \ + --replace "scmrepo==0.0.25" "scmrepo" \ + --replace "dvc-data==0.0.16" "dvc-data" \ + --replace "dvc-render==0.0.6" "dvc-render" \ + --replace "setuptools_scm_git_archive==1.1" "setuptools_scm_git_archive" + substituteInPlace dvc/daemon.py \ + --subst-var-by dvc "$out/bin/dcv" + ''; + nativeBuildInputs = with python3.pkgs; [ setuptools-scm setuptools-scm-git-archive @@ -82,16 +93,6 @@ python3.pkgs.buildPythonApplication rec { importlib-resources ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "grandalf==0.6" "grandalf" \ - --replace "scmrepo==0.0.25" "scmrepo" \ - --replace "dvc-data==0.0.16" "dvc-data" \ - --replace "dvc-render==0.0.6" "dvc-render" - substituteInPlace dvc/daemon.py \ - --subst-var-by dvc "$out/bin/dcv" - ''; - # Tests require access to real cloud services doCheck = false; @@ -100,5 +101,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://dvc.org"; license = licenses.asl20; maintainers = with maintainers; [ cmcdragonkai fab ]; + # ImportError: cannot import name 'GDriveAuthError' from 'dvc_objects.fs.implementations.gdrive' + broken = true; }; } From 9c48ac1b36fd8294657c4a67d71a8fcc2838aeb6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 5 Aug 2022 12:00:57 +0200 Subject: [PATCH 093/142] linuxPackages.dddvb: 0.9.38-pre.4 -> 0.9.38-pre.6 Apply patch to unbreak on 5.18+. --- pkgs/os-specific/linux/dddvb/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/dddvb/default.nix b/pkgs/os-specific/linux/dddvb/default.nix index a69947227562..ea69ecd7513c 100644 --- a/pkgs/os-specific/linux/dddvb/default.nix +++ b/pkgs/os-specific/linux/dddvb/default.nix @@ -1,20 +1,29 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , kernel }: stdenv.mkDerivation rec { pname = "dddvb"; - version = "0.9.38-pre.4"; + version = "0.9.38-pre.6"; src = fetchFromGitHub { owner = "DigitalDevices"; repo = "dddvb"; - rev = "e9ccab3578965234c0ea38c5b30969f33600561d"; - sha256 = "sha256-gOG+dAeQ++kTC5xaEpsr3emz3s6FXiKeCHmA9shYBJk="; + rev = "refs/tags/${version}"; + hash = "sha256-bt/vMnqRWDDChZ6R4JbCr77cz3nlSPkx6siC9KLSEqs="; }; + patches = [ + (fetchpatch { + # pci_*_dma_mask no longer exists in 5.18 + url = "https://github.com/DigitalDevices/dddvb/commit/871821d6a0be147313bb52570591ce3853b3d370.patch"; + hash = "sha256-wY05HrsduvsIdp/KpS9NWfL3hR9IvGjuNCDljFn7dd0="; + }) + ]; + postPatch = '' sed -i '/depmod/d' Makefile ''; @@ -35,6 +44,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = with maintainers; [ hexa ]; platforms = platforms.linux; - broken = kernel.kernelAtLeast "5.18"; }; } From c4447eee1cf077033fd650fa5f858bdba4034966 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Thu, 4 Aug 2022 07:54:40 +0200 Subject: [PATCH 094/142] dwdiff: init at 2.1.4 --- pkgs/applications/misc/dwdiff/default.nix | 32 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/misc/dwdiff/default.nix diff --git a/pkgs/applications/misc/dwdiff/default.nix b/pkgs/applications/misc/dwdiff/default.nix new file mode 100644 index 000000000000..320f8e25bcb7 --- /dev/null +++ b/pkgs/applications/misc/dwdiff/default.nix @@ -0,0 +1,32 @@ +{ lib +, stdenv +, fetchurl +, gettext +, pkg-config +, icu +}: + +stdenv.mkDerivation rec { + pname = "dwdiff"; + version = "2.1.4"; + + src = fetchurl { + url = "https://os.ghalkes.nl/dist/dwdiff-${version}.tar.bz2"; + sha256 = "sha256-3xb+xE3LRn1lpCRqQ2KPk3QZlsF3PpMLkMbd4i3Vjgo="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + gettext + icu + ]; + + meta = with lib; { + description = "Front-end for the diff program that operates at the word level instead of the line level"; + homepage = "https://os.ghalkes.nl/dwdiff.html"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ onny ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 593e6a4504da..01fbd8076ff8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5500,6 +5500,8 @@ with pkgs; tk = tk-8_5; }; + dwdiff = callPackage ../applications/misc/dwdiff { }; + picoscope = callPackage ../applications/science/electronics/picoscope { }; picotts = callPackage ../tools/audio/picotts { }; From f876de84c490f7499dc2271fd64974a410899fdc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Aug 2022 10:22:24 +0000 Subject: [PATCH 095/142] earthly: 0.6.20 -> 0.6.21 --- pkgs/development/tools/earthly/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index 67a732dc1803..4b86be804801 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.6.20"; + version = "0.6.21"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - sha256 = "sha256-2tdmAoHh9sqX3zWrerNqnwluQB79iZHPuE0xsPOB09w="; + sha256 = "sha256-i/iMrIvslxK+iqTKL7vEZc1ir8A9a0WVQ0J/KfSGyxo="; }; - vendorSha256 = "sha256-LHpmzQeonLFLCs2D1gRACZSdAtRkzzQ7Ftq/2D+PI80="; + vendorSha256 = "sha256-oK8fWi7zThzd1TrN6yd08T9QyVCOA4SAKZ2OPJTcgY8="; ldflags = [ "-s" "-w" From d33f4a26a10cc590ad5d8fd9883065ed09ef8309 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Fri, 5 Aug 2022 11:51:15 +0100 Subject: [PATCH 096/142] Revert "neovim: pass the --clean flag to only use wrapped rc" This reverts commit ce49cb7792a7ffd65ef352dda1110a4e4a204eac. --- pkgs/applications/editors/neovim/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 4fa666bc787e..2a0d60ce5a79 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -45,7 +45,7 @@ let finalMakeWrapperArgs = [ "${neovim}/bin/nvim" "${placeholder "out"}/bin/nvim" ] ++ [ "--set" "NVIM_SYSTEM_RPLUGIN_MANIFEST" "${placeholder "out"}/rplugin.vim" ] - ++ optionals wrapRc [ "--add-flags" "--clean" "--add-flags" "-u ${writeText "init.vim" neovimRcContent}" ] + ++ optionals wrapRc [ "--add-flags" "-u ${writeText "init.vim" neovimRcContent}" ] ; in assert withPython2 -> throw "Python2 support has been removed from the neovim wrapper, please remove withPython2 and python2Env."; From ed0ce6d5399273950b12e8260f1272d421e860e4 Mon Sep 17 00:00:00 2001 From: Mostly Void <7rat13@gmail.com> Date: Fri, 5 Aug 2022 16:23:43 +0530 Subject: [PATCH 097/142] zine: init at 0.6.0 --- pkgs/applications/misc/zine/Cargo.lock.patch | 2722 ++++++++++++++++++ pkgs/applications/misc/zine/default.nix | 36 + pkgs/top-level/all-packages.nix | 2 + 3 files changed, 2760 insertions(+) create mode 100644 pkgs/applications/misc/zine/Cargo.lock.patch create mode 100644 pkgs/applications/misc/zine/default.nix diff --git a/pkgs/applications/misc/zine/Cargo.lock.patch b/pkgs/applications/misc/zine/Cargo.lock.patch new file mode 100644 index 000000000000..5f210a818579 --- /dev/null +++ b/pkgs/applications/misc/zine/Cargo.lock.patch @@ -0,0 +1,2722 @@ ++++ a/Cargo.lock 2022-08-05 16:01:20.004065609 +0530 ++++ b/Cargo.lock 2022-08-05 16:01:20.004065609 +0530 +@@ -0,0 +1,2719 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++version = 3 ++ ++[[package]] ++name = "addr2line" ++version = "0.17.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" ++dependencies = [ ++ "gimli", ++] ++ ++[[package]] ++name = "adler" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" ++ ++[[package]] ++name = "ahash" ++version = "0.7.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" ++dependencies = [ ++ "getrandom 0.2.7", ++ "once_cell", ++ "version_check", ++] ++ ++[[package]] ++name = "aho-corasick" ++version = "0.7.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "anyhow" ++version = "1.0.59" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c91f1f46651137be86f3a2b9a8359f9ab421d04d941c62b5982e1ca21113adf9" ++dependencies = [ ++ "backtrace", ++] ++ ++[[package]] ++name = "autocfg" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" ++ ++[[package]] ++name = "backtrace" ++version = "0.3.66" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" ++dependencies = [ ++ "addr2line", ++ "cc", ++ "cfg-if 1.0.0", ++ "libc", ++ "miniz_oxide", ++ "object", ++ "rustc-demangle", ++] ++ ++[[package]] ++name = "base64" ++version = "0.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" ++ ++[[package]] ++name = "bincode" ++version = "1.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" ++dependencies = [ ++ "serde", ++] ++ ++[[package]] ++name = "bit-set" ++version = "0.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" ++dependencies = [ ++ "bit-vec", ++] ++ ++[[package]] ++name = "bit-vec" ++version = "0.6.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" ++ ++[[package]] ++name = "bitflags" ++version = "1.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" ++ ++[[package]] ++name = "block-buffer" ++version = "0.10.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324" ++dependencies = [ ++ "generic-array", ++] ++ ++[[package]] ++name = "bstr" ++version = "0.2.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "bumpalo" ++version = "3.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3" ++ ++[[package]] ++name = "byteorder" ++version = "1.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" ++ ++[[package]] ++name = "bytes" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" ++ ++[[package]] ++name = "cc" ++version = "1.0.73" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" ++ ++[[package]] ++name = "cfg-if" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" ++ ++[[package]] ++name = "cfg-if" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" ++ ++[[package]] ++name = "chrono" ++version = "0.4.20" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6127248204b9aba09a362f6c930ef6a78f2c1b2215f8a7b398c06e1083f17af0" ++dependencies = [ ++ "js-sys", ++ "num-integer", ++ "num-traits", ++ "wasm-bindgen", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "chrono-tz" ++version = "0.6.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "29c39203181991a7dd4343b8005bd804e7a9a37afb8ac070e43771e8c820bbde" ++dependencies = [ ++ "chrono", ++ "chrono-tz-build", ++ "phf 0.11.0", ++] ++ ++[[package]] ++name = "chrono-tz-build" ++version = "0.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6f509c3a87b33437b05e2458750a0700e5bdd6956176773e6c7d6dd15a283a0c" ++dependencies = [ ++ "parse-zoneinfo", ++ "phf 0.11.0", ++ "phf_codegen 0.11.0", ++] ++ ++[[package]] ++name = "clap" ++version = "3.2.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a3dbbb6653e7c55cc8595ad3e1f7be8f32aba4eb7ff7f0fd1163d4f3d137c0a9" ++dependencies = [ ++ "bitflags", ++ "clap_derive", ++ "clap_lex", ++ "indexmap", ++ "once_cell", ++ "textwrap", ++] ++ ++[[package]] ++name = "clap_derive" ++version = "3.2.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9ba52acd3b0a5c33aeada5cdaa3267cdc7c594a98731d4268cdc1532f4264cb4" ++dependencies = [ ++ "heck", ++ "proc-macro-error", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "clap_lex" ++version = "0.2.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" ++dependencies = [ ++ "os_str_bytes", ++] ++ ++[[package]] ++name = "convert_case" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" ++ ++[[package]] ++name = "core-foundation" ++version = "0.9.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" ++dependencies = [ ++ "core-foundation-sys", ++ "libc", ++] ++ ++[[package]] ++name = "core-foundation-sys" ++version = "0.8.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" ++ ++[[package]] ++name = "cpufeatures" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "crc32fast" ++version = "1.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" ++dependencies = [ ++ "cfg-if 1.0.0", ++] ++ ++[[package]] ++name = "crossbeam-channel" ++version = "0.5.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "crossbeam-utils", ++] ++ ++[[package]] ++name = "crossbeam-deque" ++version = "0.8.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "crossbeam-epoch", ++ "crossbeam-utils", ++] ++ ++[[package]] ++name = "crossbeam-epoch" ++version = "0.9.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "045ebe27666471bb549370b4b0b3e51b07f56325befa4284db65fc89c02511b1" ++dependencies = [ ++ "autocfg", ++ "cfg-if 1.0.0", ++ "crossbeam-utils", ++ "memoffset", ++ "once_cell", ++ "scopeguard", ++] ++ ++[[package]] ++name = "crossbeam-utils" ++version = "0.8.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "once_cell", ++] ++ ++[[package]] ++name = "crypto-common" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" ++dependencies = [ ++ "generic-array", ++ "typenum", ++] ++ ++[[package]] ++name = "cssparser" ++version = "0.27.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a" ++dependencies = [ ++ "cssparser-macros", ++ "dtoa-short", ++ "itoa 0.4.8", ++ "matches", ++ "phf 0.8.0", ++ "proc-macro2", ++ "quote", ++ "smallvec", ++ "syn", ++] ++ ++[[package]] ++name = "cssparser-macros" ++version = "0.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e" ++dependencies = [ ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "derive_more" ++version = "0.99.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" ++dependencies = [ ++ "convert_case", ++ "proc-macro2", ++ "quote", ++ "rustc_version", ++ "syn", ++] ++ ++[[package]] ++name = "deunicode" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "850878694b7933ca4c9569d30a34b55031b9b139ee1fc7b94a527c4ef960d690" ++ ++[[package]] ++name = "digest" ++version = "0.10.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" ++dependencies = [ ++ "block-buffer", ++ "crypto-common", ++] ++ ++[[package]] ++name = "dtoa" ++version = "0.4.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" ++ ++[[package]] ++name = "dtoa-short" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bde03329ae10e79ede66c9ce4dc930aa8599043b0743008548680f25b91502d6" ++dependencies = [ ++ "dtoa", ++] ++ ++[[package]] ++name = "either" ++version = "1.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be" ++ ++[[package]] ++name = "encoding_rs" ++version = "0.8.31" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" ++dependencies = [ ++ "cfg-if 1.0.0", ++] ++ ++[[package]] ++name = "fancy-regex" ++version = "0.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9d6b8560a05112eb52f04b00e5d3790c0dd75d9d980eb8a122fb23b92a623ccf" ++dependencies = [ ++ "bit-set", ++ "regex", ++] ++ ++[[package]] ++name = "fastrand" ++version = "1.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" ++dependencies = [ ++ "instant", ++] ++ ++[[package]] ++name = "filetime" ++version = "0.2.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e94a7bbaa59354bc20dd75b67f23e2797b4490e9d6928203fb105c79e448c86c" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "libc", ++ "redox_syscall", ++ "windows-sys", ++] ++ ++[[package]] ++name = "flate2" ++version = "1.0.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" ++dependencies = [ ++ "crc32fast", ++ "miniz_oxide", ++] ++ ++[[package]] ++name = "fluent" ++version = "0.16.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "61f69378194459db76abd2ce3952b790db103ceb003008d3d50d97c41ff847a7" ++dependencies = [ ++ "fluent-bundle", ++ "unic-langid", ++] ++ ++[[package]] ++name = "fluent-bundle" ++version = "0.15.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e242c601dec9711505f6d5bbff5bedd4b61b2469f2e8bb8e57ee7c9747a87ffd" ++dependencies = [ ++ "fluent-langneg", ++ "fluent-syntax", ++ "intl-memoizer", ++ "intl_pluralrules", ++ "rustc-hash", ++ "self_cell", ++ "smallvec", ++ "unic-langid", ++] ++ ++[[package]] ++name = "fluent-langneg" ++version = "0.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2c4ad0989667548f06ccd0e306ed56b61bd4d35458d54df5ec7587c0e8ed5e94" ++dependencies = [ ++ "unic-langid", ++] ++ ++[[package]] ++name = "fluent-syntax" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c0abed97648395c902868fee9026de96483933faa54ea3b40d652f7dfe61ca78" ++dependencies = [ ++ "thiserror", ++] ++ ++[[package]] ++name = "fnv" ++version = "1.0.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" ++ ++[[package]] ++name = "foreign-types" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" ++dependencies = [ ++ "foreign-types-shared", ++] ++ ++[[package]] ++name = "foreign-types-shared" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" ++ ++[[package]] ++name = "fsevent" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6" ++dependencies = [ ++ "bitflags", ++ "fsevent-sys", ++] ++ ++[[package]] ++name = "fsevent-sys" ++version = "2.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f41b048a94555da0f42f1d632e2e19510084fb8e303b0daa2816e733fb3644a0" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "fuchsia-zircon" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" ++dependencies = [ ++ "bitflags", ++ "fuchsia-zircon-sys", ++] ++ ++[[package]] ++name = "fuchsia-zircon-sys" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" ++ ++[[package]] ++name = "futf" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" ++dependencies = [ ++ "mac", ++ "new_debug_unreachable", ++] ++ ++[[package]] ++name = "futures-channel" ++version = "0.3.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" ++dependencies = [ ++ "futures-core", ++] ++ ++[[package]] ++name = "futures-core" ++version = "0.3.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" ++ ++[[package]] ++name = "futures-sink" ++version = "0.3.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" ++ ++[[package]] ++name = "futures-task" ++version = "0.3.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" ++ ++[[package]] ++name = "futures-util" ++version = "0.3.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" ++dependencies = [ ++ "futures-core", ++ "futures-task", ++ "pin-project-lite", ++ "pin-utils", ++] ++ ++[[package]] ++name = "fxhash" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" ++dependencies = [ ++ "byteorder", ++] ++ ++[[package]] ++name = "generic-array" ++version = "0.14.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" ++dependencies = [ ++ "typenum", ++ "version_check", ++] ++ ++[[package]] ++name = "getopts" ++version = "0.2.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" ++dependencies = [ ++ "unicode-width", ++] ++ ++[[package]] ++name = "getrandom" ++version = "0.1.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "libc", ++ "wasi 0.9.0+wasi-snapshot-preview1", ++] ++ ++[[package]] ++name = "getrandom" ++version = "0.2.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "libc", ++ "wasi 0.11.0+wasi-snapshot-preview1", ++] ++ ++[[package]] ++name = "gimli" ++version = "0.26.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" ++ ++[[package]] ++name = "globset" ++version = "0.4.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a" ++dependencies = [ ++ "aho-corasick", ++ "bstr", ++ "fnv", ++ "log", ++ "regex", ++] ++ ++[[package]] ++name = "globwalk" ++version = "0.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc" ++dependencies = [ ++ "bitflags", ++ "ignore", ++ "walkdir", ++] ++ ++[[package]] ++name = "hashbrown" ++version = "0.12.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" ++dependencies = [ ++ "ahash", ++] ++ ++[[package]] ++name = "heck" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" ++ ++[[package]] ++name = "hermit-abi" ++version = "0.1.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "html5ever" ++version = "0.25.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148" ++dependencies = [ ++ "log", ++ "mac", ++ "markup5ever", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "http" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" ++dependencies = [ ++ "bytes", ++ "fnv", ++ "itoa 1.0.3", ++] ++ ++[[package]] ++name = "http-body" ++version = "0.4.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" ++dependencies = [ ++ "bytes", ++ "http", ++ "pin-project-lite", ++] ++ ++[[package]] ++name = "http-range-header" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" ++ ++[[package]] ++name = "httparse" ++version = "1.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c" ++ ++[[package]] ++name = "httpdate" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" ++ ++[[package]] ++name = "humansize" ++version = "1.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "02296996cb8796d7c6e3bc2d9211b7802812d36999a51bb754123ead7d37d026" ++ ++[[package]] ++name = "hyper" ++version = "0.14.20" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac" ++dependencies = [ ++ "bytes", ++ "futures-channel", ++ "futures-core", ++ "futures-util", ++ "http", ++ "http-body", ++ "httparse", ++ "httpdate", ++ "itoa 1.0.3", ++ "pin-project-lite", ++ "socket2", ++ "tokio", ++ "tower-service", ++ "tracing", ++ "want", ++] ++ ++[[package]] ++name = "hyper-tls" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" ++dependencies = [ ++ "bytes", ++ "hyper", ++ "native-tls", ++ "tokio", ++ "tokio-native-tls", ++] ++ ++[[package]] ++name = "ignore" ++version = "0.4.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d" ++dependencies = [ ++ "crossbeam-utils", ++ "globset", ++ "lazy_static", ++ "log", ++ "memchr", ++ "regex", ++ "same-file", ++ "thread_local", ++ "walkdir", ++ "winapi-util", ++] ++ ++[[package]] ++name = "include_dir" ++version = "0.7.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "482a2e29200b7eed25d7fdbd14423326760b7f6658d21a4cf12d55a50713c69f" ++dependencies = [ ++ "include_dir_macros", ++] ++ ++[[package]] ++name = "include_dir_macros" ++version = "0.7.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5e074c19deab2501407c91ba1860fa3d6820bfde307db6d8cb851b55a10be89b" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++] ++ ++[[package]] ++name = "indexmap" ++version = "1.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" ++dependencies = [ ++ "autocfg", ++ "hashbrown", ++] ++ ++[[package]] ++name = "inotify" ++version = "0.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4816c66d2c8ae673df83366c18341538f234a26d65a9ecea5c348b453ac1d02f" ++dependencies = [ ++ "bitflags", ++ "inotify-sys", ++ "libc", ++] ++ ++[[package]] ++name = "inotify-sys" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "instant" ++version = "0.1.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" ++dependencies = [ ++ "cfg-if 1.0.0", ++] ++ ++[[package]] ++name = "intl-memoizer" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c310433e4a310918d6ed9243542a6b83ec1183df95dff8f23f87bb88a264a66f" ++dependencies = [ ++ "type-map", ++ "unic-langid", ++] ++ ++[[package]] ++name = "intl_pluralrules" ++version = "7.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b18f988384267d7066cc2be425e6faf352900652c046b6971d2e228d3b1c5ecf" ++dependencies = [ ++ "tinystr", ++ "unic-langid", ++] ++ ++[[package]] ++name = "iovec" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "itoa" ++version = "0.4.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" ++ ++[[package]] ++name = "itoa" ++version = "1.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" ++ ++[[package]] ++name = "js-sys" ++version = "0.3.59" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2" ++dependencies = [ ++ "wasm-bindgen", ++] ++ ++[[package]] ++name = "kernel32-sys" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" ++dependencies = [ ++ "winapi 0.2.8", ++ "winapi-build", ++] ++ ++[[package]] ++name = "lazy_static" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" ++ ++[[package]] ++name = "lazycell" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" ++ ++[[package]] ++name = "libc" ++version = "0.2.127" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "505e71a4706fa491e9b1b55f51b95d4037d0821ee40131190475f692b35b009b" ++ ++[[package]] ++name = "line-wrap" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" ++dependencies = [ ++ "safemem", ++] ++ ++[[package]] ++name = "linked-hash-map" ++version = "0.5.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" ++ ++[[package]] ++name = "lock_api" ++version = "0.4.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" ++dependencies = [ ++ "autocfg", ++ "scopeguard", ++] ++ ++[[package]] ++name = "log" ++version = "0.4.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" ++dependencies = [ ++ "cfg-if 1.0.0", ++] ++ ++[[package]] ++name = "lol_html" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "09ff2adf9c54f4de7d66a9177ea7d27d5b8108503bb03d5b719869b8f4bc2ab2" ++dependencies = [ ++ "bitflags", ++ "cfg-if 1.0.0", ++ "cssparser", ++ "encoding_rs", ++ "hashbrown", ++ "lazy_static", ++ "lazycell", ++ "memchr", ++ "safemem", ++ "selectors", ++ "thiserror", ++] ++ ++[[package]] ++name = "mac" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" ++ ++[[package]] ++name = "markup5ever" ++version = "0.10.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" ++dependencies = [ ++ "log", ++ "phf 0.8.0", ++ "phf_codegen 0.8.0", ++ "string_cache", ++ "string_cache_codegen", ++ "tendril", ++] ++ ++[[package]] ++name = "markup5ever_rcdom" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f015da43bcd8d4f144559a3423f4591d69b8ce0652c905374da7205df336ae2b" ++dependencies = [ ++ "html5ever", ++ "markup5ever", ++ "tendril", ++ "xml5ever", ++] ++ ++[[package]] ++name = "matches" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" ++ ++[[package]] ++name = "memchr" ++version = "2.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" ++ ++[[package]] ++name = "memoffset" ++version = "0.6.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" ++dependencies = [ ++ "autocfg", ++] ++ ++[[package]] ++name = "mime" ++version = "0.3.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" ++ ++[[package]] ++name = "mime_guess" ++version = "2.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" ++dependencies = [ ++ "mime", ++ "unicase", ++] ++ ++[[package]] ++name = "miniz_oxide" ++version = "0.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc" ++dependencies = [ ++ "adler", ++] ++ ++[[package]] ++name = "mio" ++version = "0.6.23" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" ++dependencies = [ ++ "cfg-if 0.1.10", ++ "fuchsia-zircon", ++ "fuchsia-zircon-sys", ++ "iovec", ++ "kernel32-sys", ++ "libc", ++ "log", ++ "miow", ++ "net2", ++ "slab", ++ "winapi 0.2.8", ++] ++ ++[[package]] ++name = "mio" ++version = "0.8.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" ++dependencies = [ ++ "libc", ++ "log", ++ "wasi 0.11.0+wasi-snapshot-preview1", ++ "windows-sys", ++] ++ ++[[package]] ++name = "mio-extras" ++version = "2.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" ++dependencies = [ ++ "lazycell", ++ "log", ++ "mio 0.6.23", ++ "slab", ++] ++ ++[[package]] ++name = "miow" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" ++dependencies = [ ++ "kernel32-sys", ++ "net2", ++ "winapi 0.2.8", ++ "ws2_32-sys", ++] ++ ++[[package]] ++name = "native-tls" ++version = "0.2.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9" ++dependencies = [ ++ "lazy_static", ++ "libc", ++ "log", ++ "openssl", ++ "openssl-probe", ++ "openssl-sys", ++ "schannel", ++ "security-framework", ++ "security-framework-sys", ++ "tempfile", ++] ++ ++[[package]] ++name = "net2" ++version = "0.2.37" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" ++dependencies = [ ++ "cfg-if 0.1.10", ++ "libc", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "new_debug_unreachable" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" ++ ++[[package]] ++name = "nodrop" ++version = "0.1.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" ++ ++[[package]] ++name = "notify" ++version = "4.0.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ae03c8c853dba7bfd23e571ff0cff7bc9dceb40a4cd684cd1681824183f45257" ++dependencies = [ ++ "bitflags", ++ "filetime", ++ "fsevent", ++ "fsevent-sys", ++ "inotify", ++ "libc", ++ "mio 0.6.23", ++ "mio-extras", ++ "walkdir", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "num-integer" ++version = "0.1.45" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" ++dependencies = [ ++ "autocfg", ++ "num-traits", ++] ++ ++[[package]] ++name = "num-traits" ++version = "0.2.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" ++dependencies = [ ++ "autocfg", ++] ++ ++[[package]] ++name = "num_cpus" ++version = "1.13.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" ++dependencies = [ ++ "hermit-abi", ++ "libc", ++] ++ ++[[package]] ++name = "num_threads" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "object" ++version = "0.29.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "once_cell" ++version = "1.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" ++ ++[[package]] ++name = "openssl" ++version = "0.10.41" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "618febf65336490dfcf20b73f885f5651a0c89c64c2d4a8c3662585a70bf5bd0" ++dependencies = [ ++ "bitflags", ++ "cfg-if 1.0.0", ++ "foreign-types", ++ "libc", ++ "once_cell", ++ "openssl-macros", ++ "openssl-sys", ++] ++ ++[[package]] ++name = "openssl-macros" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "openssl-probe" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" ++ ++[[package]] ++name = "openssl-src" ++version = "111.22.0+1.1.1q" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8f31f0d509d1c1ae9cada2f9539ff8f37933831fd5098879e482aa687d659853" ++dependencies = [ ++ "cc", ++] ++ ++[[package]] ++name = "openssl-sys" ++version = "0.9.75" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e5f9bd0c2710541a3cda73d6f9ac4f1b240de4ae261065d309dbe73d9dceb42f" ++dependencies = [ ++ "autocfg", ++ "cc", ++ "libc", ++ "openssl-src", ++ "pkg-config", ++ "vcpkg", ++] ++ ++[[package]] ++name = "os_str_bytes" ++version = "6.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "648001efe5d5c0102d8cea768e348da85d90af8ba91f0bea908f157951493cd4" ++ ++[[package]] ++name = "parking_lot" ++version = "0.12.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" ++dependencies = [ ++ "lock_api", ++ "parking_lot_core", ++] ++ ++[[package]] ++name = "parking_lot_core" ++version = "0.9.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "libc", ++ "redox_syscall", ++ "smallvec", ++ "windows-sys", ++] ++ ++[[package]] ++name = "parse-zoneinfo" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c705f256449c60da65e11ff6626e0c16a0a0b96aaa348de61376b249bc340f41" ++dependencies = [ ++ "regex", ++] ++ ++[[package]] ++name = "percent-encoding" ++version = "2.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" ++ ++[[package]] ++name = "pest" ++version = "2.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "69486e2b8c2d2aeb9762db7b4e00b0331156393555cff467f4163ff06821eef8" ++dependencies = [ ++ "thiserror", ++ "ucd-trie", ++] ++ ++[[package]] ++name = "pest_derive" ++version = "2.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b13570633aff33c6d22ce47dd566b10a3b9122c2fe9d8e7501895905be532b91" ++dependencies = [ ++ "pest", ++ "pest_generator", ++] ++ ++[[package]] ++name = "pest_generator" ++version = "2.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b3c567e5702efdc79fb18859ea74c3eb36e14c43da7b8c1f098a4ed6514ec7a0" ++dependencies = [ ++ "pest", ++ "pest_meta", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "pest_meta" ++version = "2.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5eb32be5ee3bbdafa8c7a18b0a8a8d962b66cfa2ceee4037f49267a50ee821fe" ++dependencies = [ ++ "once_cell", ++ "pest", ++ "sha-1", ++] ++ ++[[package]] ++name = "phf" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" ++dependencies = [ ++ "phf_macros", ++ "phf_shared 0.8.0", ++ "proc-macro-hack", ++] ++ ++[[package]] ++name = "phf" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4724fa946c8d1e7cd881bd3dbee63ce32fc1e9e191e35786b3dc1320a3f68131" ++dependencies = [ ++ "phf_shared 0.11.0", ++] ++ ++[[package]] ++name = "phf_codegen" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" ++dependencies = [ ++ "phf_generator 0.8.0", ++ "phf_shared 0.8.0", ++] ++ ++[[package]] ++name = "phf_codegen" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "32ba0c43d7a1b6492b2924a62290cfd83987828af037b0743b38e6ab092aee58" ++dependencies = [ ++ "phf_generator 0.11.0", ++ "phf_shared 0.11.0", ++] ++ ++[[package]] ++name = "phf_generator" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" ++dependencies = [ ++ "phf_shared 0.8.0", ++ "rand 0.7.3", ++] ++ ++[[package]] ++name = "phf_generator" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" ++dependencies = [ ++ "phf_shared 0.10.0", ++ "rand 0.8.5", ++] ++ ++[[package]] ++name = "phf_generator" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5b450720b6f75cfbfabc195814bd3765f337a4f9a83186f8537297cac12f6705" ++dependencies = [ ++ "phf_shared 0.11.0", ++ "rand 0.8.5", ++] ++ ++[[package]] ++name = "phf_macros" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c" ++dependencies = [ ++ "phf_generator 0.8.0", ++ "phf_shared 0.8.0", ++ "proc-macro-hack", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "phf_shared" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" ++dependencies = [ ++ "siphasher", ++] ++ ++[[package]] ++name = "phf_shared" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" ++dependencies = [ ++ "siphasher", ++] ++ ++[[package]] ++name = "phf_shared" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9dd5609d4b2df87167f908a32e1b146ce309c16cf35df76bc11f440b756048e4" ++dependencies = [ ++ "siphasher", ++ "uncased", ++] ++ ++[[package]] ++name = "pin-project" ++version = "1.0.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "78203e83c48cffbe01e4a2d35d566ca4de445d79a85372fc64e378bfc812a260" ++dependencies = [ ++ "pin-project-internal", ++] ++ ++[[package]] ++name = "pin-project-internal" ++version = "1.0.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "710faf75e1b33345361201d36d04e98ac1ed8909151a017ed384700836104c74" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "pin-project-lite" ++version = "0.2.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" ++ ++[[package]] ++name = "pin-utils" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" ++ ++[[package]] ++name = "pkg-config" ++version = "0.3.25" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" ++ ++[[package]] ++name = "plist" ++version = "1.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bd39bc6cdc9355ad1dc5eeedefee696bb35c34caf21768741e81826c0bbd7225" ++dependencies = [ ++ "base64", ++ "indexmap", ++ "line-wrap", ++ "serde", ++ "time 0.3.12", ++ "xml-rs", ++] ++ ++[[package]] ++name = "ppv-lite86" ++version = "0.2.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" ++ ++[[package]] ++name = "precomputed-hash" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" ++ ++[[package]] ++name = "proc-macro-error" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" ++dependencies = [ ++ "proc-macro-error-attr", ++ "proc-macro2", ++ "quote", ++ "syn", ++ "version_check", ++] ++ ++[[package]] ++name = "proc-macro-error-attr" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "version_check", ++] ++ ++[[package]] ++name = "proc-macro-hack" ++version = "0.5.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.43" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" ++dependencies = [ ++ "unicode-ident", ++] ++ ++[[package]] ++name = "pulldown-cmark" ++version = "0.9.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2d9cc634bc78768157b5cbfe988ffcd1dcba95cd2b2f03a88316c08c6d00ed63" ++dependencies = [ ++ "bitflags", ++ "getopts", ++ "memchr", ++ "unicase", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" ++dependencies = [ ++ "proc-macro2", ++] ++ ++[[package]] ++name = "rand" ++version = "0.7.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" ++dependencies = [ ++ "getrandom 0.1.16", ++ "libc", ++ "rand_chacha 0.2.2", ++ "rand_core 0.5.1", ++ "rand_hc", ++ "rand_pcg", ++] ++ ++[[package]] ++name = "rand" ++version = "0.8.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" ++dependencies = [ ++ "libc", ++ "rand_chacha 0.3.1", ++ "rand_core 0.6.3", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" ++dependencies = [ ++ "ppv-lite86", ++ "rand_core 0.5.1", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" ++dependencies = [ ++ "ppv-lite86", ++ "rand_core 0.6.3", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" ++dependencies = [ ++ "getrandom 0.1.16", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.6.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" ++dependencies = [ ++ "getrandom 0.2.7", ++] ++ ++[[package]] ++name = "rand_hc" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" ++dependencies = [ ++ "rand_core 0.5.1", ++] ++ ++[[package]] ++name = "rand_pcg" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" ++dependencies = [ ++ "rand_core 0.5.1", ++] ++ ++[[package]] ++name = "rayon" ++version = "1.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" ++dependencies = [ ++ "autocfg", ++ "crossbeam-deque", ++ "either", ++ "rayon-core", ++] ++ ++[[package]] ++name = "rayon-core" ++version = "1.9.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" ++dependencies = [ ++ "crossbeam-channel", ++ "crossbeam-deque", ++ "crossbeam-utils", ++ "num_cpus", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.2.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" ++dependencies = [ ++ "bitflags", ++] ++ ++[[package]] ++name = "regex" ++version = "1.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" ++dependencies = [ ++ "aho-corasick", ++ "memchr", ++ "regex-syntax", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.6.27" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" ++ ++[[package]] ++name = "remove_dir_all" ++version = "0.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" ++dependencies = [ ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "rustc-demangle" ++version = "0.1.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" ++ ++[[package]] ++name = "rustc-hash" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" ++ ++[[package]] ++name = "rustc_version" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" ++dependencies = [ ++ "semver", ++] ++ ++[[package]] ++name = "ryu" ++version = "1.0.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" ++ ++[[package]] ++name = "safemem" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" ++ ++[[package]] ++name = "same-file" ++version = "1.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" ++dependencies = [ ++ "winapi-util", ++] ++ ++[[package]] ++name = "schannel" ++version = "0.1.20" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" ++dependencies = [ ++ "lazy_static", ++ "windows-sys", ++] ++ ++[[package]] ++name = "scopeguard" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" ++ ++[[package]] ++name = "security-framework" ++version = "2.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc" ++dependencies = [ ++ "bitflags", ++ "core-foundation", ++ "core-foundation-sys", ++ "libc", ++ "security-framework-sys", ++] ++ ++[[package]] ++name = "security-framework-sys" ++version = "2.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" ++dependencies = [ ++ "core-foundation-sys", ++ "libc", ++] ++ ++[[package]] ++name = "selectors" ++version = "0.22.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" ++dependencies = [ ++ "bitflags", ++ "cssparser", ++ "derive_more", ++ "fxhash", ++ "log", ++ "matches", ++ "phf 0.8.0", ++ "phf_codegen 0.8.0", ++ "precomputed-hash", ++ "servo_arc", ++ "smallvec", ++ "thin-slice", ++] ++ ++[[package]] ++name = "self_cell" ++version = "0.10.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1ef965a420fe14fdac7dd018862966a4c14094f900e1650bbc71ddd7d580c8af" ++ ++[[package]] ++name = "semver" ++version = "1.0.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "93f6841e709003d68bb2deee8c343572bf446003ec20a583e76f7b15cebf3711" ++ ++[[package]] ++name = "serde" ++version = "1.0.142" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e590c437916fb6b221e1d00df6e3294f3fccd70ca7e92541c475d6ed6ef5fee2" ++dependencies = [ ++ "serde_derive", ++] ++ ++[[package]] ++name = "serde_derive" ++version = "1.0.142" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "34b5b8d809babe02f538c2cfec6f2c1ed10804c0e5a6a041a049a4f5588ccc2e" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "serde_json" ++version = "1.0.83" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "38dd04e3c8279e75b31ef29dbdceebfe5ad89f4d0937213c53f7d49d01b3d5a7" ++dependencies = [ ++ "itoa 1.0.3", ++ "ryu", ++ "serde", ++] ++ ++[[package]] ++name = "servo_arc" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432" ++dependencies = [ ++ "nodrop", ++ "stable_deref_trait", ++] ++ ++[[package]] ++name = "sha-1" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "cpufeatures", ++ "digest", ++] ++ ++[[package]] ++name = "signal-hook-registry" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "siphasher" ++version = "0.3.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" ++ ++[[package]] ++name = "slab" ++version = "0.4.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" ++dependencies = [ ++ "autocfg", ++] ++ ++[[package]] ++name = "slug" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b3bc762e6a4b6c6fcaade73e77f9ebc6991b676f88bb2358bddb56560f073373" ++dependencies = [ ++ "deunicode", ++] ++ ++[[package]] ++name = "smallvec" ++version = "1.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" ++ ++[[package]] ++name = "socket2" ++version = "0.4.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" ++dependencies = [ ++ "libc", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "stable_deref_trait" ++version = "1.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" ++ ++[[package]] ++name = "string_cache" ++version = "0.8.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08" ++dependencies = [ ++ "new_debug_unreachable", ++ "once_cell", ++ "parking_lot", ++ "phf_shared 0.10.0", ++ "precomputed-hash", ++ "serde", ++] ++ ++[[package]] ++name = "string_cache_codegen" ++version = "0.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" ++dependencies = [ ++ "phf_generator 0.10.0", ++ "phf_shared 0.10.0", ++ "proc-macro2", ++ "quote", ++] ++ ++[[package]] ++name = "syn" ++version = "1.0.99" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-ident", ++] ++ ++[[package]] ++name = "syntect" ++version = "4.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8b20815bbe80ee0be06e6957450a841185fcf690fe0178f14d77a05ce2caa031" ++dependencies = [ ++ "bincode", ++ "bitflags", ++ "fancy-regex", ++ "flate2", ++ "fnv", ++ "lazy_static", ++ "lazycell", ++ "plist", ++ "regex-syntax", ++ "serde", ++ "serde_derive", ++ "serde_json", ++ "walkdir", ++ "yaml-rust", ++] ++ ++[[package]] ++name = "tempfile" ++version = "3.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "fastrand", ++ "libc", ++ "redox_syscall", ++ "remove_dir_all", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "tendril" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" ++dependencies = [ ++ "futf", ++ "mac", ++ "utf-8", ++] ++ ++[[package]] ++name = "tera" ++version = "1.16.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7c9783d6ff395ae80cf17ed9a25360e7ba37742a79fa8fddabb073c5c7c8856d" ++dependencies = [ ++ "chrono", ++ "chrono-tz", ++ "globwalk", ++ "humansize", ++ "lazy_static", ++ "percent-encoding", ++ "pest", ++ "pest_derive", ++ "rand 0.8.5", ++ "regex", ++ "serde", ++ "serde_json", ++ "slug", ++ "unic-segment", ++] ++ ++[[package]] ++name = "test-case" ++version = "2.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "07aea929e9488998b64adc414c29fe5620398f01c2e3f58164122b17e567a6d5" ++dependencies = [ ++ "test-case-macros", ++] ++ ++[[package]] ++name = "test-case-macros" ++version = "2.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c95968eedc6fc4f5c21920e0f4264f78ec5e4c56bb394f319becc1a5830b3e54" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "proc-macro-error", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "textwrap" ++version = "0.15.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" ++ ++[[package]] ++name = "thin-slice" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" ++ ++[[package]] ++name = "thiserror" ++version = "1.0.32" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f5f6586b7f764adc0231f4c79be7b920e766bb2f3e51b3661cdb263828f19994" ++dependencies = [ ++ "thiserror-impl", ++] ++ ++[[package]] ++name = "thiserror-impl" ++version = "1.0.32" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "12bafc5b54507e0149cdf1b145a5d80ab80a90bcd9275df43d4fff68460f6c21" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "thread_local" ++version = "1.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" ++dependencies = [ ++ "once_cell", ++] ++ ++[[package]] ++name = "time" ++version = "0.1.44" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" ++dependencies = [ ++ "libc", ++ "wasi 0.10.0+wasi-snapshot-preview1", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "time" ++version = "0.3.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "74b7cc93fc23ba97fde84f7eea56c55d1ba183f495c6715defdfc7b9cb8c870f" ++dependencies = [ ++ "itoa 1.0.3", ++ "js-sys", ++ "libc", ++ "num_threads", ++ "serde", ++] ++ ++[[package]] ++name = "tinystr" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "29738eedb4388d9ea620eeab9384884fc3f06f586a2eddb56bedc5885126c7c1" ++ ++[[package]] ++name = "tokio" ++version = "1.20.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a8325f63a7d4774dd041e363b2409ed1c5cbbd0f867795e661df066b2b0a581" ++dependencies = [ ++ "autocfg", ++ "bytes", ++ "libc", ++ "memchr", ++ "mio 0.8.4", ++ "num_cpus", ++ "once_cell", ++ "pin-project-lite", ++ "signal-hook-registry", ++ "socket2", ++ "tokio-macros", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "tokio-macros" ++version = "1.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "tokio-native-tls" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" ++dependencies = [ ++ "native-tls", ++ "tokio", ++] ++ ++[[package]] ++name = "tokio-util" ++version = "0.7.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45" ++dependencies = [ ++ "bytes", ++ "futures-core", ++ "futures-sink", ++ "pin-project-lite", ++ "tokio", ++] ++ ++[[package]] ++name = "toml" ++version = "0.5.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" ++dependencies = [ ++ "serde", ++] ++ ++[[package]] ++name = "tower" ++version = "0.4.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" ++dependencies = [ ++ "futures-core", ++ "futures-util", ++ "pin-project", ++ "pin-project-lite", ++ "tokio", ++ "tower-layer", ++ "tower-service", ++ "tracing", ++] ++ ++[[package]] ++name = "tower-http" ++version = "0.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aba3f3efabf7fb41fae8534fc20a817013dd1c12cb45441efb6c82e6556b4cd8" ++dependencies = [ ++ "bitflags", ++ "bytes", ++ "futures-core", ++ "futures-util", ++ "http", ++ "http-body", ++ "http-range-header", ++ "httpdate", ++ "mime", ++ "mime_guess", ++ "percent-encoding", ++ "pin-project-lite", ++ "tokio", ++ "tokio-util", ++ "tower-layer", ++ "tower-service", ++] ++ ++[[package]] ++name = "tower-layer" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "343bc9466d3fe6b0f960ef45960509f84480bf4fd96f92901afe7ff3df9d3a62" ++ ++[[package]] ++name = "tower-service" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" ++ ++[[package]] ++name = "tracing" ++version = "0.1.36" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "log", ++ "pin-project-lite", ++ "tracing-core", ++] ++ ++[[package]] ++name = "tracing-core" ++version = "0.1.29" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7" ++dependencies = [ ++ "once_cell", ++] ++ ++[[package]] ++name = "try-lock" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" ++ ++[[package]] ++name = "type-map" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b6d3364c5e96cb2ad1603037ab253ddd34d7fb72a58bdddf4b7350760fc69a46" ++dependencies = [ ++ "rustc-hash", ++] ++ ++[[package]] ++name = "typenum" ++version = "1.15.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" ++ ++[[package]] ++name = "ucd-trie" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "89570599c4fe5585de2b388aab47e99f7fa4e9238a1399f707a02e356058141c" ++ ++[[package]] ++name = "uncased" ++version = "0.9.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "09b01702b0fd0b3fadcf98e098780badda8742d4f4a7676615cad90e8ac73622" ++dependencies = [ ++ "version_check", ++] ++ ++[[package]] ++name = "unic-char-property" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" ++dependencies = [ ++ "unic-char-range", ++] ++ ++[[package]] ++name = "unic-char-range" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" ++ ++[[package]] ++name = "unic-common" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" ++ ++[[package]] ++name = "unic-langid" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "73328fcd730a030bdb19ddf23e192187a6b01cd98be6d3140622a89129459ce5" ++dependencies = [ ++ "unic-langid-impl", ++] ++ ++[[package]] ++name = "unic-langid-impl" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1a4a8eeaf0494862c1404c95ec2f4c33a2acff5076f64314b465e3ddae1b934d" ++dependencies = [ ++ "tinystr", ++] ++ ++[[package]] ++name = "unic-segment" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e4ed5d26be57f84f176157270c112ef57b86debac9cd21daaabbe56db0f88f23" ++dependencies = [ ++ "unic-ucd-segment", ++] ++ ++[[package]] ++name = "unic-ucd-segment" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2079c122a62205b421f499da10f3ee0f7697f012f55b675e002483c73ea34700" ++dependencies = [ ++ "unic-char-property", ++ "unic-char-range", ++ "unic-ucd-version", ++] ++ ++[[package]] ++name = "unic-ucd-version" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" ++dependencies = [ ++ "unic-common", ++] ++ ++[[package]] ++name = "unicase" ++version = "2.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" ++dependencies = [ ++ "version_check", ++] ++ ++[[package]] ++name = "unicode-ident" ++version = "1.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf" ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" ++ ++[[package]] ++name = "utf-8" ++version = "0.7.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" ++ ++[[package]] ++name = "vcpkg" ++version = "0.2.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" ++ ++[[package]] ++name = "version_check" ++version = "0.9.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" ++ ++[[package]] ++name = "walkdir" ++version = "2.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" ++dependencies = [ ++ "same-file", ++ "winapi 0.3.9", ++ "winapi-util", ++] ++ ++[[package]] ++name = "want" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" ++dependencies = [ ++ "log", ++ "try-lock", ++] ++ ++[[package]] ++name = "wasi" ++version = "0.9.0+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" ++ ++[[package]] ++name = "wasi" ++version = "0.10.0+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" ++ ++[[package]] ++name = "wasi" ++version = "0.11.0+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" ++ ++[[package]] ++name = "wasm-bindgen" ++version = "0.2.82" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "wasm-bindgen-macro", ++] ++ ++[[package]] ++name = "wasm-bindgen-backend" ++version = "0.2.82" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f" ++dependencies = [ ++ "bumpalo", ++ "log", ++ "once_cell", ++ "proc-macro2", ++ "quote", ++ "syn", ++ "wasm-bindgen-shared", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro" ++version = "0.2.82" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602" ++dependencies = [ ++ "quote", ++ "wasm-bindgen-macro-support", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro-support" ++version = "0.2.82" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++ "wasm-bindgen-backend", ++ "wasm-bindgen-shared", ++] ++ ++[[package]] ++name = "wasm-bindgen-shared" ++version = "0.2.82" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a" ++ ++[[package]] ++name = "winapi" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" ++ ++[[package]] ++name = "winapi" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", ++] ++ ++[[package]] ++name = "winapi-build" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++ ++[[package]] ++name = "winapi-util" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" ++dependencies = [ ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++ ++[[package]] ++name = "windows-sys" ++version = "0.36.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" ++dependencies = [ ++ "windows_aarch64_msvc", ++ "windows_i686_gnu", ++ "windows_i686_msvc", ++ "windows_x86_64_gnu", ++ "windows_x86_64_msvc", ++] ++ ++[[package]] ++name = "windows_aarch64_msvc" ++version = "0.36.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" ++ ++[[package]] ++name = "windows_i686_gnu" ++version = "0.36.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" ++ ++[[package]] ++name = "windows_i686_msvc" ++version = "0.36.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" ++ ++[[package]] ++name = "windows_x86_64_gnu" ++version = "0.36.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" ++ ++[[package]] ++name = "windows_x86_64_msvc" ++version = "0.36.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" ++ ++[[package]] ++name = "ws2_32-sys" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" ++dependencies = [ ++ "winapi 0.2.8", ++ "winapi-build", ++] ++ ++[[package]] ++name = "xml-rs" ++version = "0.8.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" ++ ++[[package]] ++name = "xml5ever" ++version = "0.16.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9234163818fd8e2418fcde330655e757900d4236acd8cc70fef345ef91f6d865" ++dependencies = [ ++ "log", ++ "mac", ++ "markup5ever", ++ "time 0.1.44", ++] ++ ++[[package]] ++name = "yaml-rust" ++version = "0.4.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" ++dependencies = [ ++ "linked-hash-map", ++] ++ ++[[package]] ++name = "zine" ++version = "0.6.0" ++dependencies = [ ++ "anyhow", ++ "clap", ++ "fluent", ++ "html5ever", ++ "http-body", ++ "hyper", ++ "hyper-tls", ++ "include_dir", ++ "intl-memoizer", ++ "lol_html", ++ "markup5ever_rcdom", ++ "notify", ++ "once_cell", ++ "parking_lot", ++ "pulldown-cmark", ++ "rayon", ++ "regex", ++ "serde", ++ "serde_json", ++ "syntect", ++ "tera", ++ "test-case", ++ "time 0.3.12", ++ "tokio", ++ "toml", ++ "tower", ++ "tower-http", ++ "walkdir", ++] diff --git a/pkgs/applications/misc/zine/default.nix b/pkgs/applications/misc/zine/default.nix new file mode 100644 index 000000000000..28fdaebe35ea --- /dev/null +++ b/pkgs/applications/misc/zine/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, pkg-config +, openssl +}: +rustPlatform.buildRustPackage rec { + pname = "zine"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "zineland"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Pd/UAg6O9bOvrdvbY46Vf8cxFzjonEwcwPaaW59vH6E="; + }; + + cargoPatches = [ ./Cargo.lock.patch ]; # Repo does not provide Cargo.lock + + cargoSha256 = "sha256-qpzBDyNSZblmdimnnL4T/wS+6EXpduJ1U2+bfxM7piM="; + + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ + openssl + ]; + + meta = with lib; { + description = "A simple and opinionated tool to build your own magazine"; + homepage = "https://github.com/zineland/zine"; + license = licenses.asl20; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b3a99113651..3140cb0053e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31807,6 +31807,8 @@ with pkgs; zim = callPackage ../applications/office/zim { }; + zine = callPackage ../applications/misc/zine { }; + zita-ajbridge = callPackage ../applications/audio/zita-ajbridge { }; zita-at1 = callPackage ../applications/audio/zita-at1 { }; From 04f73efbdd766b0bc987be5f6e844cb0950fff49 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Aug 2022 10:54:57 +0000 Subject: [PATCH 098/142] ghorg: 1.8.0 -> 1.8.1 --- .../version-management/git-and-tools/ghorg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix index 32ef0309629f..01f69c9c9808 100644 --- a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ghorg"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "gabrie30"; repo = "ghorg"; rev = "v${version}"; - sha256 = "sha256-0ewiCLBAvK0cLsEFN1W7fQyn66Vu2aLor9+VYuX05Os="; + sha256 = "sha256-rnlSwqZ3Kigfmkt2ws5bmX/ipqxFUPZYDpdnkZZE59Y="; }; doCheck = false; From 5a6853b3bfb741303a956363a4b80cd20332628b Mon Sep 17 00:00:00 2001 From: olaf Date: Thu, 28 Jul 2022 16:56:07 +0200 Subject: [PATCH 099/142] use consistently user alice for examples --- nixos/doc/manual/configuration/gpu-accel.chapter.md | 4 ++-- .../doc/manual/from_md/configuration/gpu-accel.chapter.xml | 4 ++-- nixos/maintainers/scripts/lxd/lxd-image-inner.nix | 2 +- nixos/modules/installer/tools/tools.nix | 2 +- nixos/modules/services/games/crossfire-server.nix | 2 +- nixos/modules/services/games/deliantra-server.nix | 2 +- nixos/tests/docker-tools.nix | 4 ++-- pkgs/build-support/docker/examples.nix | 6 +++--- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/nixos/doc/manual/configuration/gpu-accel.chapter.md b/nixos/doc/manual/configuration/gpu-accel.chapter.md index 08b6af5d98ae..835cbad55485 100644 --- a/nixos/doc/manual/configuration/gpu-accel.chapter.md +++ b/nixos/doc/manual/configuration/gpu-accel.chapter.md @@ -169,7 +169,7 @@ configuration, GPU devices have world-read/write permissions (`/dev/dri/renderD*`) or are tagged as `uaccess` (`/dev/dri/card*`). The access control lists of devices with the `uaccess` tag will be updated automatically when a user logs in through `systemd-logind`. For example, -if the user *jane* is logged in, the access control list should look as +if the user *alice* is logged in, the access control list should look as follows: ```ShellSession @@ -178,7 +178,7 @@ $ getfacl /dev/dri/card0 # owner: root # group: video user::rw- -user:jane:rw- +user:alice:rw- group::rw- mask::rw- other::--- diff --git a/nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xml b/nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xml index 8e780c5dee95..cc559a1933d9 100644 --- a/nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xml +++ b/nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xml @@ -194,7 +194,7 @@ environment.variables.VK_ICD_FILENAMES = devices with the uaccess tag will be updated automatically when a user logs in through systemd-logind. For example, if the user - jane is logged in, the access control list + alice is logged in, the access control list should look as follows: @@ -203,7 +203,7 @@ $ getfacl /dev/dri/card0 # owner: root # group: video user::rw- -user:jane:rw- +user:alice:rw- group::rw- mask::rw- other::--- diff --git a/nixos/maintainers/scripts/lxd/lxd-image-inner.nix b/nixos/maintainers/scripts/lxd/lxd-image-inner.nix index 74634fd1671c..ead3d4e99401 100644 --- a/nixos/maintainers/scripts/lxd/lxd-image-inner.nix +++ b/nixos/maintainers/scripts/lxd/lxd-image-inner.nix @@ -55,7 +55,7 @@ with lib; # services.xserver.libinput.enable = true; # Define a user account. Don't forget to set a password with ‘passwd’. - # users.users.jane = { + # users.users.alice = { # isNormalUser = true; # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. # }; diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 4490ad84e144..e46a2df8fa6a 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -175,7 +175,7 @@ in # services.xserver.libinput.enable = true; # Define a user account. Don't forget to set a password with ‘passwd’. - # users.users.jane = { + # users.users.alice = { # isNormalUser = true; # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. # packages = with pkgs; [ diff --git a/nixos/modules/services/games/crossfire-server.nix b/nixos/modules/services/games/crossfire-server.nix index 4b9813245fb7..a0dc1e6c564c 100644 --- a/nixos/modules/services/games/crossfire-server.nix +++ b/nixos/modules/services/games/crossfire-server.nix @@ -76,7 +76,7 @@ in { { dm_file = ''' admin:secret_password:localhost - jane:xyzzy:* + alice:xyzzy:* '''; ban_file = ''' # Bob is a jerk diff --git a/nixos/modules/services/games/deliantra-server.nix b/nixos/modules/services/games/deliantra-server.nix index 1a0618601240..17bdf2aef776 100644 --- a/nixos/modules/services/games/deliantra-server.nix +++ b/nixos/modules/services/games/deliantra-server.nix @@ -73,7 +73,7 @@ in { { dm_file = ''' admin:secret_password:localhost - jane:xyzzy:* + alice:xyzzy:* '''; motd = "Welcome to Deliantra!"; settings = ''' diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index 99a968f17af2..d76f70b791ce 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -346,7 +346,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { "docker load --input='${examples.layeredImageWithFakeRootCommands}'" ) docker.succeed( - "docker run --rm ${examples.layeredImageWithFakeRootCommands.imageName} sh -c 'stat -c '%u' /home/jane | grep -E ^1000$'" + "docker run --rm ${examples.layeredImageWithFakeRootCommands.imageName} sh -c 'stat -c '%u' /home/alice | grep -E ^1000$'" ) with subtest("Ensure docker load on merged images loads all of the constituent images"): @@ -389,7 +389,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { "docker load --input='${examples.mergedBashFakeRoot}'" ) docker.succeed( - "docker run --rm ${examples.layeredImageWithFakeRootCommands.imageName} sh -c 'stat -c '%u' /home/jane | grep -E ^1000$'" + "docker run --rm ${examples.layeredImageWithFakeRootCommands.imageName} sh -c 'stat -c '%u' /home/alice | grep -E ^1000$'" ) with subtest("The image contains store paths referenced by the fakeRootCommands output"): diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index 16941a726171..ff3934941c7b 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -584,8 +584,8 @@ rec { pkgs.pkgsStatic.busybox ]; fakeRootCommands = '' - mkdir -p ./home/jane - chown 1000 ./home/jane + mkdir -p ./home/alice + chown 1000 ./home/alice ln -s ${pkgs.hello.overrideAttrs (o: { # A unique `hello` to make sure that it isn't included via another mechanism by accident. configureFlags = o.configureFlags or [] ++ [ " --program-prefix=layeredImageWithFakeRootCommands-" ]; @@ -607,7 +607,7 @@ rec { ]; # tarball consisting of bash and layered image with different owner of the - # /home/jane directory + # /home/alice directory mergedBashFakeRoot = pkgs.dockerTools.mergeImages [ bash layeredImageWithFakeRootCommands From 4e13c1f95819c46e929d6c95f2786dbc6f31ac96 Mon Sep 17 00:00:00 2001 From: olaf Date: Fri, 5 Aug 2022 13:01:49 +0200 Subject: [PATCH 100/142] for consistency use bob in tests instead of joe --- nixos/tests/sympa.nix | 2 +- nixos/tests/systemd-nspawn.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/tests/sympa.nix b/nixos/tests/sympa.nix index 76ca17d0a189..80daa4134f75 100644 --- a/nixos/tests/sympa.nix +++ b/nixos/tests/sympa.nix @@ -13,7 +13,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { webHost = "localhost"; }; }; - listMasters = [ "joe@example.org" ]; + listMasters = [ "bob@example.org" ]; web.enable = true; web.https = false; database = { diff --git a/nixos/tests/systemd-nspawn.nix b/nixos/tests/systemd-nspawn.nix index c2cb92d11301..bc77ee2a4d15 100644 --- a/nixos/tests/systemd-nspawn.nix +++ b/nixos/tests/systemd-nspawn.nix @@ -10,8 +10,8 @@ let Key-Length: 1024 Subkey-Type: ELG-E Subkey-Length: 1024 - Name-Real: Joe Tester - Name-Email: joe@foo.bar + Name-Real: Bob Foobar + Name-Email: bob@foo.bar Expire-Date: 0 # Do a commit here, so that we can later print "done" %commit @@ -19,7 +19,7 @@ let EOF gpg --batch --generate-key foo rm $out/S.gpg-agent $out/S.gpg-agent.* - gpg --export joe@foo.bar -a > $out/pubkey.gpg + gpg --export bob@foo.bar -a > $out/pubkey.gpg ''); nspawnImages = (pkgs.runCommand "localhost" { buildInputs = [ pkgs.coreutils pkgs.gnupg ]; } '' From de0c7343004c476611101c1b6447d78fa0041f67 Mon Sep 17 00:00:00 2001 From: olaf Date: Fri, 5 Aug 2022 13:11:35 +0200 Subject: [PATCH 101/142] for consistency use bob in example instead of joe --- nixos/modules/services/networking/smokeping.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix index 217c16c8f37b..7f1abcc6824f 100644 --- a/nixos/modules/services/networking/smokeping.nix +++ b/nixos/modules/services/networking/smokeping.nix @@ -156,7 +156,7 @@ in owner = mkOption { type = types.str; default = "nobody"; - example = "Joe Admin"; + example = "Bob Foobawr"; description = lib.mdDoc "Real name of the owner of the instance"; }; ownerEmail = mkOption { From f5e7b38c82bfd2a45cfb4997557b9cbf39ebfb38 Mon Sep 17 00:00:00 2001 From: olaf Date: Fri, 5 Aug 2022 13:27:03 +0200 Subject: [PATCH 102/142] or consistency use bob in tests instead of john --- nixos/tests/documize.nix | 6 +++--- nixos/tests/xmpp/xmpp-sendmessage.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/tests/documize.nix b/nixos/tests/documize.nix index 528bf5338ce0..fda79b1a0931 100644 --- a/nixos/tests/documize.nix +++ b/nixos/tests/documize.nix @@ -47,9 +47,9 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { " --data 'dbhash={}'" " --data 'title=NixOS'" " --data 'message=Docs'" - " --data 'firstname=John'" - " --data 'lastname=Doe'" - " --data 'email=john.doe@nixos.org'" + " --data 'firstname=Bob'" + " --data 'lastname=Foobar'" + " --data 'email=bob.foobar@nixos.org'" " --data 'password=verysafe'" " -f localhost:3000/api/setup" ).format(dbhash) diff --git a/nixos/tests/xmpp/xmpp-sendmessage.nix b/nixos/tests/xmpp/xmpp-sendmessage.nix index 80dfcff2d0eb..4c009464b704 100644 --- a/nixos/tests/xmpp/xmpp-sendmessage.nix +++ b/nixos/tests/xmpp/xmpp-sendmessage.nix @@ -6,7 +6,7 @@ let Please find this *really* important attachment. Yours truly, - John + Bob ''; in writeScriptBin "send-message" '' #!${(python3.withPackages (ps: [ ps.slixmpp ])).interpreter} From d0cb1b38b5ee047b891b4e388620749f529b95a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Aug 2022 11:29:14 +0000 Subject: [PATCH 103/142] python310Packages.ansible: 6.1.0 -> 6.2.0 --- pkgs/development/python-modules/ansible/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index 0a8ae13204b2..d2f7dba38669 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -20,7 +20,7 @@ let pname = "ansible"; - version = "6.1.0"; + version = "6.2.0"; in buildPythonPackage { inherit pname version; @@ -30,7 +30,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - sha256 = "sha256-keSyOUXxkKqhI8a6T4rMuOf4kFmRvTuxm4mvvcpFaCI="; + sha256 = "sha256-va8rL9km/xifveL+/nI0cz8yw2/EEwM/pdk5RfvcBqY="; }; postPatch = '' From 02e32729c36e095539bbb8003c29b5dcac6dcd6a Mon Sep 17 00:00:00 2001 From: kilianar <105428155+kilianar@users.noreply.github.com> Date: Fri, 5 Aug 2022 13:59:00 +0200 Subject: [PATCH 104/142] nixosTests.prometheus-exporters.smartctl: fix type mismatch The method wait_for_open_port used in the smartctl test expects an int but was given a string. Fix the same issue in the example in the comments. --- nixos/tests/prometheus-exporters.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 0a1ec824986a..d14c737a4bd1 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -35,7 +35,7 @@ let * }; * exporterTest = '' * wait_for_unit("prometheus--exporter.service") - * wait_for_open_port("1234") + * wait_for_open_port(1234) * succeed("curl -sSf 'localhost:1234/metrics'") * ''; * }; @@ -1063,7 +1063,7 @@ let }; exporterTest = '' wait_for_unit("prometheus-smartctl-exporter.service") - wait_for_open_port("9633") + wait_for_open_port(9633) wait_until_succeeds( "curl -sSf 'localhost:9633/metrics'" ) From 70c49766aff96c3c2957bb44a3e16fe84019f5c1 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Fri, 5 Aug 2022 13:37:48 +0200 Subject: [PATCH 105/142] zeroad: apply patch to fix build with gcc 11 and glibc 2.35 0ad defines a variabel M_PIf, which is also included in math.h since gcc 11. This leads to the following build failure: https://hydra.nixos.org/build/186330284 --- pkgs/games/0ad/game.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index 34a2cdddac82..e51aab519a49 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, perl, fetchurl, python3, fmt, libidn +{ stdenv, lib, fetchpatch, perl, fetchurl, python3, fmt, libidn , pkg-config, spidermonkey_78, boost, icu, libxml2, libpng, libsodium , libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc , openal, libGLU, libGL, xorgproto, libX11, libXcursor, nspr, SDL2 @@ -50,7 +50,14 @@ stdenv.mkDerivation rec { "-I${fmt.dev}/include" ]; - patches = [ ./rootdir_env.patch ]; + patches = [ + ./rootdir_env.patch + (fetchpatch { + # fix build with gcc11 and glibc 2.35 + url = "https://github.com/0ad/0ad/commit/7df614338cbd41f5e254ce75f649490b2637e1d0.patch"; + hash = "sha256-QZvcNm8Zni3aJnMPueft0OITf8zeMDXWBjOLYoirJs0="; + }) + ]; configurePhase = '' # Delete shipped libraries which we don't need. From d236188fa6d9308aa222300cca496c7e9d86a444 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Aug 2022 11:12:03 +0000 Subject: [PATCH 106/142] grails: 5.2.1 -> 5.2.2 --- pkgs/development/web/grails/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index 15fc3f1a9ccc..da72db16437f 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { pname = "grails"; - version = "5.2.1"; + version = "5.2.2"; src = fetchurl { url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip"; - sha256 = "sha256-vpElkOK1ZcUBDDP68+PQCMgKglJ2SoYb55Cog23AUhg="; + sha256 = "sha256-ghWWoAySJsiYmpdoFZIQrHSV7kOQe0kDQrONwgqFMzY="; }; nativeBuildInputs = [ unzip ]; From 69045148b1c32367fdf2f37ca9ae8928638dd827 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Aug 2022 12:19:22 +0000 Subject: [PATCH 107/142] k9s: 0.26.1 -> 0.26.3 --- pkgs/applications/networking/cluster/k9s/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index e1e7f9fb2673..75210a0f9885 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.26.1"; + version = "0.26.3"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "sha256-Ta4gKtqYquylSLZ6pALYEnPXQG6jJuaabyr7sepNL5A="; + sha256 = "sha256-Czjx6YTyFKAP8ZuwBpTpRfjDdRdd8GQ0ggbe5LMb8uA="; }; ldflags = [ @@ -20,7 +20,7 @@ buildGoModule rec { tags = [ "netgo" ]; - vendorSha256 = "sha256-17jyQXF8O5iNFR/5L+51W3LcPrSQ6gPf9M6qqV4otn0="; + vendorSha256 = "sha256-rnROcJA4f0YjDGKEncrMmf/43VKrbgpmM3TvV1MMiWU="; # TODO investigate why some config tests are failing doCheck = !(stdenv.isDarwin && stdenv.isAarch64); From 5c85216634915fcc8d57e4db4c2e22be16d4ca05 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Fri, 5 Aug 2022 14:24:55 +0200 Subject: [PATCH 108/142] adguardhome: 0.107.8 - 0.107.9 --- pkgs/servers/adguardhome/bins.nix | 20 ++++++++++---------- pkgs/servers/adguardhome/default.nix | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/adguardhome/bins.nix b/pkgs/servers/adguardhome/bins.nix index e7689ca7972d..35ffe2d5dcf8 100644 --- a/pkgs/servers/adguardhome/bins.nix +++ b/pkgs/servers/adguardhome/bins.nix @@ -1,23 +1,23 @@ { fetchurl, fetchzip }: { x86_64-darwin = fetchzip { - sha256 = "sha256-PYq6AKX3Ifo8vMnPYGjqHwFejOBuQjhfDG5nXnccfvE="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.8/AdGuardHome_darwin_amd64.zip"; + sha256 = "sha256-SLGzciTzzvW0DTG8v6lNb1IovbOjxBFgFVjNY6MEyKY="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.9/AdGuardHome_darwin_amd64.zip"; }; aarch64-darwin = fetchzip { - sha256 = "sha256-ep5/VMO7LmfD6+chG2SGwkc5awoeqACQeP04YpMXI1s="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.8/AdGuardHome_darwin_arm64.zip"; + sha256 = "sha256-d7hnCM7BJuYfSH89jv516uVyKTMueQmVKQxEeTGIDUE="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.9/AdGuardHome_darwin_arm64.zip"; }; i686-linux = fetchurl { - sha256 = "sha256-rD5UDkAMeBfnrEpxfZWgDQEUN+82D6Ul2gjclS8A8CU="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.8/AdGuardHome_linux_386.tar.gz"; + sha256 = "sha256-wTmUF6NHWis4dyw/bPjAjvZ0aQ1l1BCDlm6eLu4m/0o="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.9/AdGuardHome_linux_386.tar.gz"; }; x86_64-linux = fetchurl { - sha256 = "sha256-buBp5WZ1jIzQDbxzVOZC/t3iv1Dw0P/PN3wGBbGaYvU="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.8/AdGuardHome_linux_amd64.tar.gz"; + sha256 = "sha256-Mxe9Gb1ErrZZl3a+0SqC/0ghoeV51X93YxIOs9gM2lY="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.9/AdGuardHome_linux_amd64.tar.gz"; }; aarch64-linux = fetchurl { - sha256 = "sha256-d6Z46L6qeXi5UNPY3/nlTJvVCuQ0lamtR49Z73O87Wc="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.8/AdGuardHome_linux_arm64.tar.gz"; + sha256 = "sha256-SyHuzXAe24Nf0v9Ds3Z+cbXoIVLCJSj243I6B0XWBlM="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.9/AdGuardHome_linux_arm64.tar.gz"; }; } diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix index 66b8b12e09cc..374eaad1bfb4 100644 --- a/pkgs/servers/adguardhome/default.nix +++ b/pkgs/servers/adguardhome/default.nix @@ -7,7 +7,7 @@ in stdenv.mkDerivation rec { pname = "adguardhome"; - version = "0.107.8"; + version = "0.107.9"; src = sources.${system} or (throw "Source for ${pname} is not available for ${system}"); installPhase = '' From a3870b11e863e39881b5c5b3c18e1cdb7ff84f57 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Aug 2022 12:26:29 +0000 Subject: [PATCH 109/142] kubeone: 1.4.5 -> 1.4.6 --- pkgs/applications/networking/cluster/kubeone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubeone/default.nix b/pkgs/applications/networking/cluster/kubeone/default.nix index ee7b3b34dfa8..513e77dfc2d8 100644 --- a/pkgs/applications/networking/cluster/kubeone/default.nix +++ b/pkgs/applications/networking/cluster/kubeone/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "kubeone"; - version = "1.4.5"; + version = "1.4.6"; src = fetchFromGitHub { owner = "kubermatic"; repo = "kubeone"; rev = "v${version}"; - sha256 = "sha256-2+67ctiFkEV4UU7vcF/s+qJWDpdzSRaiy9pa9zt+ccA="; + sha256 = "sha256-2abuKLAqOaRceokmNb7YG0qg/iYbPhSTG75Rs5mwHDU="; }; vendorSha256 = "sha256-kI5i1us3Ooh603HOz9Y+HlfPUy/1J8z89/jvKEenpLw="; From 9f041684de9ff47b731a41c88ed3c7a079c4ecb4 Mon Sep 17 00:00:00 2001 From: olaf Date: Fri, 5 Aug 2022 14:35:10 +0200 Subject: [PATCH 110/142] dont use common names as password in test --- nixos/tests/nginx-auth.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/tests/nginx-auth.nix b/nixos/tests/nginx-auth.nix index c0d24a20ddbc..a85426dda871 100644 --- a/nixos/tests/nginx-auth.nix +++ b/nixos/tests/nginx-auth.nix @@ -13,14 +13,14 @@ import ./make-test-python.nix ({ pkgs, ... }: { virtualHosts.lockedroot = { inherit root; - basicAuth.alice = "jane"; + basicAuth.alice = "pwofa"; }; virtualHosts.lockedsubdir = { inherit root; locations."/sublocation/" = { alias = "${root}/"; - basicAuth.bob = "john"; + basicAuth.bob = "pwofb"; }; }; }; @@ -33,7 +33,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { webserver.fail("curl --fail --resolve lockedroot:80:127.0.0.1 http://lockedroot") webserver.succeed( - "curl --fail --resolve lockedroot:80:127.0.0.1 http://alice:jane@lockedroot" + "curl --fail --resolve lockedroot:80:127.0.0.1 http://alice:pwofa@lockedroot" ) webserver.succeed("curl --fail --resolve lockedsubdir:80:127.0.0.1 http://lockedsubdir") @@ -41,7 +41,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { "curl --fail --resolve lockedsubdir:80:127.0.0.1 http://lockedsubdir/sublocation/index.html" ) webserver.succeed( - "curl --fail --resolve lockedsubdir:80:127.0.0.1 http://bob:john@lockedsubdir/sublocation/index.html" + "curl --fail --resolve lockedsubdir:80:127.0.0.1 http://bob:pwofb@lockedsubdir/sublocation/index.html" ) ''; }) From cfe2bb74708e4d81c3f72e96d309268ec666aace Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 3 Aug 2022 23:19:18 +0200 Subject: [PATCH 111/142] =?UTF-8?q?vikunja-frontend:=200.18.1=20=E2=86=92?= =?UTF-8?q?=200.19.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://vikunja.io/blog/2022/08/whats-new-in-vikunja-0.19.0/ --- pkgs/servers/web-apps/vikunja/frontend.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/vikunja/frontend.nix b/pkgs/servers/web-apps/vikunja/frontend.nix index 161a65fa6634..b46241931c60 100644 --- a/pkgs/servers/web-apps/vikunja/frontend.nix +++ b/pkgs/servers/web-apps/vikunja/frontend.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "vikunja-frontend"; - version = "0.18.1"; + version = "0.19.0"; src = fetchurl { url = "https://dl.vikunja.io/frontend/${pname}-${version}.zip"; - sha256 = "sha256-u4XA6Jqn+p2J0sB2KabwZY/lFwZakZEvUUh/enrhtN4="; + sha256 = "sha256-pdUNPfGgbSMyXcS2HKMekIiIzJ3GutHCs0gFVkHN9yc="; }; nativeBuildInputs = [ unzip ]; From 208b7619727aa7db570a1996c5886d0ee4256288 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 3 Aug 2022 23:21:56 +0200 Subject: [PATCH 112/142] =?UTF-8?q?vikunja-api:=200.18.1=20=E2=86=92=200.1?= =?UTF-8?q?9.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://vikunja.io/blog/2022/08/whats-new-in-vikunja-0.19.0/ --- pkgs/servers/web-apps/vikunja/api.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/web-apps/vikunja/api.nix b/pkgs/servers/web-apps/vikunja/api.nix index 64ea04d1ef90..c78459936c00 100644 --- a/pkgs/servers/web-apps/vikunja/api.nix +++ b/pkgs/servers/web-apps/vikunja/api.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "vikunja-api"; - version = "0.18.1"; + version = "0.19.0"; src = fetchFromGitea { domain = "kolaente.dev"; owner = "vikunja"; repo = "api"; rev = "v${version}"; - sha256 = "sha256-ngdtK8e4mLpbuY9OP1aHk99qPX/cKwnyhb/3ImTwF6M="; + sha256 = "sha256-1BxkQFiAqH+n8yzQn0+5cd/Z6oEBbGuK1pu1qt8CUbk="; }; nativeBuildInputs = @@ -24,7 +24,7 @@ buildGoModule rec { ''; in [ fakeGit mage ]; - vendorSha256 = "sha256-0MP04KpWX17Fa1WhLwF4yzIsDqGAeTUXxv81B+BTNe4="; + vendorSha256 = "fzk22B7KpXfGS+8GF6J3ydmFyvP7oelRuiF+IveYdg4="; # checks need to be disabled because of needed internet for some checks doCheck = false; From c0da0daa080ad5dfcad4b0be13bdcdab07a68433 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Aug 2022 13:20:10 +0000 Subject: [PATCH 113/142] mongodb-compass: 1.32.5 -> 1.32.6 --- pkgs/tools/misc/mongodb-compass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix index 170a2a484345..d9c5c2a04bbe 100644 --- a/pkgs/tools/misc/mongodb-compass/default.nix +++ b/pkgs/tools/misc/mongodb-compass/default.nix @@ -33,7 +33,7 @@ xorg, }: let - version = "1.32.5"; + version = "1.32.6"; rpath = lib.makeLibraryPath [ alsa-lib @@ -82,7 +82,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; - sha256 = "sha256-ANktXRokO0rIkiSj6OQDepB+UfTItBMDkEhD9ia52s4="; + sha256 = "sha256-lrdDy8wtkIBQC/OPdSoKmOFIuajKeu1qtyRHOLZSSVI="; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; From 4ee298daf7108b96fe6538cb6507c6e2e9783297 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Fri, 5 Aug 2022 13:24:37 +0000 Subject: [PATCH 114/142] linuxPackages.bbswitch: 0.8 -> unstable-2021-11-29 (#179644) Co-authored-by: Sandro --- pkgs/os-specific/linux/bbswitch/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix index 4f19c29e1c38..886bf3e6fee8 100644 --- a/pkgs/os-specific/linux/bbswitch/default.nix +++ b/pkgs/os-specific/linux/bbswitch/default.nix @@ -2,7 +2,7 @@ let baseName = "bbswitch"; - version = "0.8"; + version = "unstable-2021-11-29"; name = "${baseName}-${version}-${kernel.version}"; in @@ -13,18 +13,15 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "Bumblebee-Project"; repo = "bbswitch"; - rev = "v${version}"; - hash = "sha256-FHC8myKnouNDERVds2QCJj1ZstjHrOzFpb+FDiSBjL4="; + # https://github.com/Bumblebee-Project/bbswitch/tree/develop + rev = "23891174a80ea79c7720bcc7048a5c2bfcde5cd9"; + hash = "sha256-50v1Jxem5kaI1dHOKmgBbPLxI82QeYxiaRHhrHpWRzU="; }; patches = [ (fetchpatch { - url = "https://github.com/Bumblebee-Project/bbswitch/pull/102.patch"; - sha256 = "1lbr6pyyby4k9rn2ry5qc38kc738d0442jhhq57vmdjb6hxjya7m"; - }) - (fetchpatch { - url = "https://github.com/Bumblebee-Project/bbswitch/pull/196.patch"; - sha256 = "02ihy3piws7783qbm9q0mb9s18ipn5ckdy1iar74xn31qjrsn99n"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-community/0bd986055ba52887b81048de5c61e618eec06eb0/trunk/0003-kernel-5.18.patch"; + sha256 = "sha256-va62/bR1qyBBMPg0lUwCH7slGG0XijxVCsFa4FCoHEQ="; }) ]; @@ -64,6 +61,5 @@ stdenv.mkDerivation { homepage = "https://github.com/Bumblebee-Project/bbswitch"; maintainers = with maintainers; [ abbradar ]; license = licenses.gpl2Plus; - broken = kernel.kernelAtLeast "5.18"; }; } From cdd80e17ef7e57b39f4d66b1e8eb21bfa6650d06 Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Fri, 5 Aug 2022 10:54:40 -0300 Subject: [PATCH 115/142] ddosify: 0.8.0 -> 0.8.1 - add missing ldflags --- pkgs/development/tools/ddosify/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ddosify/default.nix b/pkgs/development/tools/ddosify/default.nix index 43867d13b009..a077c2f1246d 100644 --- a/pkgs/development/tools/ddosify/default.nix +++ b/pkgs/development/tools/ddosify/default.nix @@ -2,20 +2,22 @@ buildGoModule rec { pname = "ddosify"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-ImVNiBXvKKYXuWtOajvLFobk956wNSQHLH7npdYY4SE="; + sha256 = "sha256-cedgJJd1+iWw3sxbKVBpi5XvmZdDcDL0sHhTELbkY9Q="; }; vendorSha256 = "sha256-mq82KNa01gHvW+RUREra+ysaJ1YWIwX0v/uYMxmFN4M="; ldflags = [ - "-s -w" + "-s" "-w" "-X main.GitVersion=${version}" + "-X main.GitCommit=unknown" + "-X main.BuildDate=unknown" ]; # TestCreateHammerMultipartPayload error occurred - Get "https://upload.wikimedia.org/wikipedia/commons/b/bd/Test.svg" From 2ba6470a2b4ca91776cc033c7511c7495699273d Mon Sep 17 00:00:00 2001 From: Bogdan Burlacu Date: Fri, 5 Aug 2022 16:03:37 +0200 Subject: [PATCH 116/142] maintainers: add foolnotion --- maintainers/maintainer-list.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bde4c69930e8..d7859522cd66 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4394,6 +4394,15 @@ githubId = 34962634; name = "Gabriel Arazas"; }; + foolnotion = { + email = "bogdan.burlacu@pm.me"; + github = "foolnotion"; + githubId = 844222; + name = "Bogdan Burlacu"; + keys = [{ + fingerprint = "B722 6464 838F 8BDB 2BEA C8C8 5B0E FDDF BA81 6105"; + }]; + }; forkk = { email = "forkk@forkk.net"; github = "Forkk"; From ffe4e6d924a5bda132a0f74b14619b25cd100dba Mon Sep 17 00:00:00 2001 From: Bogdan Burlacu Date: Fri, 5 Aug 2022 16:04:13 +0200 Subject: [PATCH 117/142] seer: init at 1.7 --- pkgs/development/tools/misc/seer/default.nix | 28 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/tools/misc/seer/default.nix diff --git a/pkgs/development/tools/misc/seer/default.nix b/pkgs/development/tools/misc/seer/default.nix new file mode 100644 index 000000000000..b4263220c22b --- /dev/null +++ b/pkgs/development/tools/misc/seer/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitHub, cmake, qtcharts, qtbase, wrapQtAppsHook }: + +stdenv.mkDerivation rec { + pname = "seer"; + version = "1.7"; + + src = fetchFromGitHub { + owner = "epasveer"; + repo = "seer"; + rev = "v${version}"; + sha256 = "sha256-/EuXit1kHW2cdqa5BJEj29Wu3WafVZb6DpPnIg2tDP0="; + }; + + preConfigure = '' + cd src + ''; + + buildInputs = [ qtbase qtcharts ]; + nativeBuildInputs = [ cmake wrapQtAppsHook ]; + + meta = with lib; { + description = "A Qt gui frontend for GDB"; + homepage = "https://github.com/epasveer/seer"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ foolnotion ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 39618a5187cf..abd1f38faa4b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16610,6 +16610,8 @@ with pkgs; sd-local = callPackage ../development/tools/sd-local { }; + seer = libsForQt5.callPackage ../development/tools/misc/seer { }; + selenium-server-standalone = callPackage ../development/tools/selenium/server { }; selendroid = callPackage ../development/tools/selenium/selendroid { }; From bf069a689eb07789706c22e36ee3182a57141fc7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Aug 2022 14:14:26 +0000 Subject: [PATCH 118/142] opentelemetry-collector: 0.56.0 -> 0.57.2 --- pkgs/tools/misc/opentelemetry-collector/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix index 053ec73bbdc5..03d90509f952 100644 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -12,17 +12,17 @@ let in buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.56.0"; + version = "0.57.2"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "v${version}"; - sha256 = "sha256-iaGtAmbq/pj+xEfwmSIFJHGBOwt5yCsdsXLWxzKmEB4="; + sha256 = "sha256-5Bjo70OcUHRToazCe0nUDI6e9c4ES5ufNO4T0P5ukdU="; }; # there is a nested go.mod sourceRoot = "source/cmd/otelcorecol"; - vendorSha256 = "sha256-cQuA7I+dRKDGhrM/52zGT5zdPYHHSewDDLvuGL4ISz0="; + vendorSha256 = "sha256-ZsKVHmW8kpABzoecNuldxwn8FTMH74b1VDuZcnXhTpY="; preBuild = '' # set the build version, can't be done via ldflags From 09b8c5efc0c26b33b760523c537b695b776a214f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Aug 2022 14:17:02 +0000 Subject: [PATCH 119/142] opentelemetry-collector-contrib: 0.56.0 -> 0.57.2 --- pkgs/tools/misc/opentelemetry-collector/contrib.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/pkgs/tools/misc/opentelemetry-collector/contrib.nix index 31f5cb701c99..19b8681b347c 100644 --- a/pkgs/tools/misc/opentelemetry-collector/contrib.nix +++ b/pkgs/tools/misc/opentelemetry-collector/contrib.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "opentelemetry-collector-contrib"; - version = "0.56.0"; + version = "0.57.2"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector-contrib"; rev = "v${version}"; - sha256 = "sha256-uNUMXtDlnC9HHBw+QJj5p21pWMfr2kGeVghpTLFBlsg="; + sha256 = "sha256-g0NnEo1M3PtQH2n0UcECC7l9laLx3UrduR4X4aZvnuA="; }; # proxy vendor to avoid hash missmatches between linux and macOS proxyVendor = true; - vendorSha256 = "sha256-2VfzdGgzF9A1PGv1Dum0Me10OCKK27h9ZLvb1uWscmk="; + vendorSha256 = "sha256-fq85frUmZxH8ekFuxyTjnY22Sb1Ts7nahcgI6ArGY4A="; subPackages = [ "cmd/otelcontribcol" ]; From af98bacbe014021172b75e608187fa84937a99ce Mon Sep 17 00:00:00 2001 From: pennae Date: Fri, 5 Aug 2022 17:13:47 +0200 Subject: [PATCH 120/142] Revert "nixos/docs: cache mergeJSON md conversion on baseOptionsJSON" This reverts commit 52b0ad17e3727fe0c3ca028787128ede5fb86352. we only needed this because mergeJSON was slow, but in the interim we found a better solution to the slowness. --- nixos/lib/make-options-doc/default.nix | 31 +++++++++----------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/nixos/lib/make-options-doc/default.nix b/nixos/lib/make-options-doc/default.nix index e039bc4a9b73..6649fc41d41a 100644 --- a/nixos/lib/make-options-doc/default.nix +++ b/nixos/lib/make-options-doc/default.nix @@ -99,14 +99,6 @@ let optionsNix = builtins.listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name" "visible" "internal"]; }) optionsList); - pythonMD = - let - self = (pkgs.python3Minimal.override { - inherit self; - includeSiteCustomize = true; - }); - in self.withPackages (p: [ p.mistune_2_0 ]); - in rec { inherit optionsNix; @@ -124,20 +116,17 @@ in rec { optionsJSON = pkgs.runCommand "options.json" { meta.description = "List of NixOS options in JSON format"; - buildInputs = [ pkgs.brotli pythonMD ]; + buildInputs = [ + pkgs.brotli + (let + self = (pkgs.python3Minimal.override { + inherit self; + includeSiteCustomize = true; + }); + in self.withPackages (p: [ p.mistune_2_0 ])) + ]; options = builtins.toFile "options.json" (builtins.unsafeDiscardStringContext (builtins.toJSON optionsNix)); - # convert markdown to docbook in its own derivation to cache the - # conversion results. the conversion is surprisingly expensive. - baseJSON = - if baseOptionsJSON != null - then - pkgs.runCommand "base-json-md-converted" { - buildInputs = [ pythonMD ]; - } '' - python ${./mergeJSON.py} ${baseOptionsJSON} <(echo '{}') > $out - '' - else null; } '' # Export list of options in different format. @@ -154,7 +143,7 @@ in rec { else '' python ${./mergeJSON.py} \ ${lib.optionalString warningsAreErrors "--warnings-are-errors"} \ - $baseJSON $options \ + ${baseOptionsJSON} $options \ > $dst/options.json '' } From 118357114093fb326b2bd116fdcb189db70de3cf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Aug 2022 15:50:16 +0000 Subject: [PATCH 121/142] soft-serve: 0.3.2 -> 0.3.3 --- pkgs/servers/soft-serve/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/soft-serve/default.nix b/pkgs/servers/soft-serve/default.nix index 271a8ae784d1..f5d743bde645 100644 --- a/pkgs/servers/soft-serve/default.nix +++ b/pkgs/servers/soft-serve/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "soft-serve"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "soft-serve"; rev = "v${version}"; - sha256 = "sha256-W/2MNiECzwgRv3jJG0To8vsQjQs8amaEP+dgig6JnOg="; + sha256 = "sha256-LxtVum/yM+G3lyGSsOv3bICQrQC6kZKIMoAA7AnQ8VY="; }; - vendorSha256 = "sha256-98YT0UiVX+ONP+Vgsxf0UWOLF0VV4glEOfHYkGwB3Dg="; + vendorSha256 = "sha256-KUB6w03Dw57baRYhRK1wWVWFvjMLx3KOJnS/YLbE7GE="; doCheck = false; From e8426b10b701c5cb9274a60ce00ce14a6ce17fb0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Aug 2022 15:54:48 +0000 Subject: [PATCH 122/142] ssh-mitm: 2.0.5 -> 2.1.0 --- pkgs/development/python-modules/ssh-mitm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ssh-mitm/default.nix b/pkgs/development/python-modules/ssh-mitm/default.nix index 3e930006289e..ea2aa9531c59 100644 --- a/pkgs/development/python-modules/ssh-mitm/default.nix +++ b/pkgs/development/python-modules/ssh-mitm/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "ssh-mitm"; - version = "2.0.5"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-zLVi+9XvNAfa3fB2GRdNnEPoDY2Wf3XkbQGOT0RNkdQ="; + hash = "sha256-DMXzDgSt1p3ZNGrXnSr79KH33SJNN8U4/94Hoz7Rs+I="; }; propagatedBuildInputs = [ From 40387846db77a78b2a9d02dd3777149c843bdcd6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Aug 2022 15:57:45 +0000 Subject: [PATCH 123/142] subfinder: 2.5.2 -> 2.5.3 --- pkgs/tools/networking/subfinder/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/tools/networking/subfinder/default.nix index 054b396bd9e8..bc05f3d998ec 100644 --- a/pkgs/tools/networking/subfinder/default.nix +++ b/pkgs/tools/networking/subfinder/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "subfinder"; - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-upqNrr4w/j9e1T5Y1wNeZSm/g05c3rby8slLwE27RKU="; + sha256 = "sha256-IAFV8yDgA7ZGGZwdEWxiggIheAN4nH5UFfXQv8IjpwQ="; }; - vendorSha256 = "sha256-QBydwf2ED43r13d0tZeO+c6aafrJqnYb8SxXzp0pddA="; + vendorSha256 = "sha256-mE2yFGRAgi9RAzt08abbeAuAvmwBFMiAJuMZCDChg3Y="; modRoot = "./v2"; From 03119abf6b7de3bb5c36efdeaa18c0fc296dbc87 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Fri, 5 Aug 2022 18:48:57 +0200 Subject: [PATCH 124/142] wasmtime: 0.38.0 -> 0.39.1 https://github.com/bytecodealliance/wasmtime/blob/v0.39.1/RELEASES.md Fixes CVE-2022-31146 and CVE-2022-31169. --- pkgs/development/interpreters/wasmtime/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 508dc2be60b9..9851da2a3cef 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,21 +2,22 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "0.38.0"; + version = "0.39.1"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - sha256 = "sha256-q+6w22MbI3HRpmkybZXXWbkK7jbd6lyxodC3EpSovRI="; + sha256 = "sha256-cU03wm1+V++mV7j7VyMtjAYrPldzTysNzpJ8m0q4Rx8="; fetchSubmodules = true; }; - cargoSha256 = "sha256-uuhGb0/RDz1/3O8WYiyGIUQFh0WZWJgujqtvH+hgbdA="; + cargoSha256 = "sha256-DnThste0SbBdpGAUYhmwbdQFNEB3LozyDf0X8r2A90Q="; doCheck = true; checkFlags = [ "--skip=cli_tests::run_cwasm" + "--skip=commands::compile::test::test_unsupported_flags_compile" "--skip=commands::compile::test::test_aarch64_flags_compile" "--skip=commands::compile::test::test_successful_compile" "--skip=commands::compile::test::test_x64_flags_compile" From 580d97c0854e0854ccf0c45660d7dbcd443f9af1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Aug 2022 16:50:03 +0000 Subject: [PATCH 125/142] tflint: 0.39.1 -> 0.39.2 --- pkgs/development/tools/analysis/tflint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 662e58fba75e..00cc3c1234da 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tflint"; - version = "0.39.1"; + version = "0.39.2"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ELf1keTf/iznOBZNvyliAH/4UQo5w8CNEJNf0Z6eDV8="; + sha256 = "sha256-TOI3rkh6v0Ewo+gPo8N7at1orbSTjQkEZKA6sYDv0u8="; }; vendorSha256 = "sha256-6sk1bFuSCrKt9uMrrwOpX/SBZrjFvtqVPFylbRNHpz4="; From cae262a6e756583bea61e8bdbc6392ec9663c03a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Aug 2022 17:04:04 +0000 Subject: [PATCH 126/142] usql: 0.11.12 -> 0.12.0 --- pkgs/applications/misc/usql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/usql/default.nix b/pkgs/applications/misc/usql/default.nix index 064c20fca338..edd1bd588dc7 100644 --- a/pkgs/applications/misc/usql/default.nix +++ b/pkgs/applications/misc/usql/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "usql"; - version = "0.11.12"; + version = "0.12.0"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; rev = "v${version}"; - sha256 = "sha256-0uXcCwMIhr+8snH3HqQ+ZXtTrYD6ufCTVaZPi1+RwUw="; + sha256 = "sha256-OOu3zWK/ccmaEVriXKl7SZUJLLYaJB3tgF+eR9p+TmM="; }; vendorSha256 = "sha256-9XyG0Fu3idxGG01MoBr5BMoQSz+dyZFEXRNvvb+XWjA="; From 951a9bdfc12be95d87bb8c0cd24f2496a0e7bf06 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 5 Aug 2022 18:12:49 +0100 Subject: [PATCH 127/142] flatbuffers: drop unused fetchpatch --- pkgs/development/libraries/flatbuffers/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix index d5675990cc3a..42e7c665f2b2 100644 --- a/pkgs/development/libraries/flatbuffers/default.nix +++ b/pkgs/development/libraries/flatbuffers/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , python3 }: From 875287b341be6fe862e0160f2beb9507519d1912 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Aug 2022 17:14:47 +0000 Subject: [PATCH 128/142] werf: 1.2.144 -> 1.2.146 --- pkgs/applications/networking/cluster/werf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 20c477515d4c..6ba07278459b 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "werf"; - version = "1.2.144"; + version = "1.2.146"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - sha256 = "sha256-5hfXHoU7hmiuLaS9nS6MAS6tJAmTwxE9VqBZ29hv56A="; + sha256 = "sha256-6OIV9vs0XWlhosWrKX/GL5q2REYzX5UMd1IHEiM1/qA="; }; - vendorSha256 = "sha256-m+qt+pqLzQyzQkKzEbBkzgTlRjpaqJNF8tcirBx4Htc="; + vendorSha256 = "sha256-yWKIaH0KXiJR1EVu/htqeDi7qEGu8IvD6m1GcMUdgJo="; proxyVendor = true; From 0cad4b26331468f42fdbfeb42875fb0cb6af91d7 Mon Sep 17 00:00:00 2001 From: Yaya Date: Fri, 29 Jul 2022 11:04:54 +0000 Subject: [PATCH 129/142] gitlab: resolve deprecation warning in update.py The distutils module has been marked as deprecated since python3.10 and will be removed in python3.12 as announced in [PEP 632](https://peps.python.org/pep-0632/). The PEP suggests to replace `distutils.version` with `packaging.version`. --- pkgs/applications/version-management/gitlab/update.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index bee10e49f4b4..4c6ddcde486f 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -I nixpkgs=../../../.. -i python3 -p bundix bundler nix-update nix nix-universal-prefetch python3 python3Packages.requests python3Packages.click python3Packages.click-log prefetch-yarn-deps +#! nix-shell -I nixpkgs=../../../.. -i python3 -p bundix bundler nix-update nix nix-universal-prefetch python3 python3Packages.requests python3Packages.click python3Packages.click-log python3Packages.packaging prefetch-yarn-deps import click import click_log @@ -10,7 +10,7 @@ import subprocess import json import pathlib import tempfile -from distutils.version import LooseVersion +from packaging.version import Version from typing import Iterable import requests @@ -37,7 +37,7 @@ class GitLabRepo: versions = list(filter(self.version_regex.match, tags)) # sort, but ignore v and -ee for sorting comparisons - versions.sort(key=lambda x: LooseVersion(x.replace("v", "").replace("-ee", "")), reverse=True) + versions.sort(key=lambda x: Version(x.replace("v", "").replace("-ee", "")), reverse=True) return versions def get_git_hash(self, rev: str): From 1d3a33455e7fb51e516fe348c0e926dcb5f3ab33 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Jul 2022 13:35:32 +0000 Subject: [PATCH 130/142] ncnn: 20220721 -> 20220729 --- pkgs/development/libraries/ncnn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ncnn/default.nix b/pkgs/development/libraries/ncnn/default.nix index bf4b74c03649..0b07fab8668c 100644 --- a/pkgs/development/libraries/ncnn/default.nix +++ b/pkgs/development/libraries/ncnn/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ncnn"; - version = "20220721"; + version = "20220729"; src = fetchFromGitHub { owner = "Tencent"; repo = pname; rev = version; - sha256 = "sha256-35OwvYYZtfugvujWl6bL8p8HU+z1kQsvnJ+aQOgO8V8="; + sha256 = "sha256-hZVeW3svuVpwQhQz67uqTPZ7B9pisLCwHhXB2zMLygo="; }; patches = [ From d17ed7bb641a17eb2fb121e0b8c621af6b80a28e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Aug 2022 11:05:54 +0000 Subject: [PATCH 131/142] go-task: 3.14.0 -> 3.14.1 --- pkgs/development/tools/go-task/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index dda47967044d..1e7a6a31402a 100644 --- a/pkgs/development/tools/go-task/default.nix +++ b/pkgs/development/tools/go-task/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-task"; - version = "3.14.0"; + version = "3.14.1"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "v${version}"; - sha256 = "sha256-J/pWx/osqP29GERBdzWwPNeA4Rzo6CYdW7GrmspevwM="; + sha256 = "sha256-GbCrMsMxhSjJOsZX4Gq9ZzBJ+F5vXDMi9vSyFrHNt44="; }; - vendorSha256 = "sha256-NlQ/5ibRgmuGDcuiUdzvuexYGnR/34v9fw1DUe3yXxE="; + vendorSha256 = "sha256-xp1s1aixPyXq9oVD8IZYSlUiL8UkIx5c8gYJRpIRD7I="; doCheck = false; From a7521391b9a944db65e3c0ce561079f12f654666 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 5 Aug 2022 13:59:12 -0700 Subject: [PATCH 132/142] buildah: 1.26.2 -> 1.26.4 (#185295) --- pkgs/development/tools/buildah/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 09ec296bed6c..17780f540404 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.26.2"; + version = "1.26.4"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "sha256-FQ0fYiQBz+Ba8Xe8PWIYpIKyWOYa+NlTNJqzBC64O6M="; + sha256 = "sha256-9cTV1CEf1784oEPns5QULFtcC+w3yU4uafnMCCgpVqQ="; }; outputs = [ "out" "man" ]; From 958dd9a8c7c335f7063bb0f73d02e6adb719683f Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Fri, 5 Aug 2022 09:01:25 +0200 Subject: [PATCH 133/142] cosign: 1.10.0 -> 1.10.1 https://github.com/sigstore/cosign/releases/tag/v1.10.1 Includes a fix for CVE-2022-35929 https://github.com/sigstore/cosign/security/advisories/GHSA-vjxv-45g9-9296 --- pkgs/tools/security/cosign/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix index 4fe0fba4f65d..c698fa4fa9e9 100644 --- a/pkgs/tools/security/cosign/default.nix +++ b/pkgs/tools/security/cosign/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cosign"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EJ1NOaGLLBkEkWLWn8wfyFA6Kgsb9mctkw4G2um9cWE="; + sha256 = "sha256-DMNjzTor22uyTzieWsni9wvscfU7uCFuf3AXOYP4LRo="; }; buildInputs = lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite) @@ -16,7 +16,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config installShellFiles ]; - vendorSha256 = "sha256-JL7bqdLrNwOQPVUhlIktRM1cAPycq0PVpB1xXXiJiKM="; + vendorSha256 = "sha256-onRfo3ZK/+uEa0xR7P9IlEsd2aXy9foJjZl0UBO/cbs="; subPackages = [ "cmd/cosign" From 1bbd74314566048e540c17a7dc5fcf4722b8d349 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Aug 2022 13:39:44 +0000 Subject: [PATCH 134/142] nerdctl: 0.22.1 -> 0.22.2 --- pkgs/applications/networking/cluster/nerdctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index 20cc26f2e3c9..2bba4816d8f3 100644 --- a/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "nerdctl"; - version = "0.22.1"; + version = "0.22.2"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-B9C35uxu/l4hFaSnjvXn7SChsCvXok/LcHkiwcndyts="; + sha256 = "sha256-D5NnCJrQQ2Iam9A5rxuiT6XOf00x/LOiwEC8SjSZdt0="; }; - vendorSha256 = "sha256-cwtjjb0a1VsZbTyz0TintD5Hdc8K0j7EBiE4UwhGU7c="; + vendorSha256 = "sha256-5QcltDNvhfyzUsFNbSjVnh0OMTxj+JU0VnDADSWTD48="; nativeBuildInputs = [ makeWrapper installShellFiles ]; From 99094a220a28f0801b34178e864134efd70495ca Mon Sep 17 00:00:00 2001 From: Mark Sagi-Kazar Date: Fri, 29 Jul 2022 18:37:50 +0200 Subject: [PATCH 135/142] cuelsp: init at 0.3.3 Signed-off-by: Mark Sagi-Kazar --- pkgs/development/tools/cuelsp/default.nix | 28 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/tools/cuelsp/default.nix diff --git a/pkgs/development/tools/cuelsp/default.nix b/pkgs/development/tools/cuelsp/default.nix new file mode 100644 index 000000000000..2a0ece9b0418 --- /dev/null +++ b/pkgs/development/tools/cuelsp/default.nix @@ -0,0 +1,28 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "cuelsp"; + version = "0.3.3"; + + src = fetchFromGitHub { + owner = "dagger"; + repo = "cuelsp"; + rev = "v${version}"; + sha256 = "sha256-78snbfxm6nSNDQRhj7cC4FSkKeOEUw+wfjhJtP/CpwY="; + }; + + vendorSha256 = "sha256-zg4aXPY2InY5VEX1GLJkGhMlfa5EezObAjIuX/bGvlc="; + + doCheck = false; + + subPackages = [ + "cmd/cuelsp" + ]; + + meta = with lib; { + description = "Language Server implementation for CUE, with built-in support for Dagger"; + homepage = "https://github.com/dagger/cuelsp"; + license = licenses.asl20; + maintainers = with maintainers; [ sagikazarmark ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04d9c19d7dac..08b85f5721d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2307,6 +2307,8 @@ with pkgs; cue = callPackage ../development/tools/cue { }; + cuelsp = callPackage ../development/tools/cuelsp {}; + cyclone-scheme = callPackage ../development/interpreters/cyclone { }; cyclonedx-python = callPackage ../tools/misc/cyclonedx-python { }; From 72acae5551045ab46ca3328b515cfa0e52e67b4d Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 5 Aug 2022 08:27:25 +1000 Subject: [PATCH 136/142] containerd: 1.6.6 -> 1.6.7 https://github.com/containerd/containerd/releases/tag/v1.6.7 --- pkgs/applications/virtualization/containerd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 8c4fbce8e1e9..10e1feca7546 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "containerd"; - version = "1.6.6"; + version = "1.6.7"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "sha256-cmarbad6VzcGTCHT/NtApkYsK/oo6WZQ//q8Fvh+ez8="; + sha256 = "sha256-JrpsASeDz6sUpYdBlkTvPdsl4LQ7PcUwFss5uWFEO84="; }; vendorSha256 = null; From 90c505790c63e34a72a86efcd248de6c9da58ac6 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Fri, 5 Aug 2022 15:12:47 -0700 Subject: [PATCH 137/142] Revert "cudatoolkit_11_7: init at 11.7.0" --- .../cudatoolkit/redist/extension.nix | 1 - .../redist/manifests/redistrib_11.7.0.json | 879 ------------------ .../cudatoolkit/redist/overrides.nix | 8 +- .../compilers/cudatoolkit/versions.toml | 6 - .../science/math/cudnn/extension.nix | 19 +- pkgs/test/cuda/cuda-samples/extension.nix | 3 - pkgs/top-level/all-packages.nix | 3 +- 7 files changed, 4 insertions(+), 915 deletions(-) delete mode 100644 pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_11.7.0.json diff --git a/pkgs/development/compilers/cudatoolkit/redist/extension.nix b/pkgs/development/compilers/cudatoolkit/redist/extension.nix index 17327efb4013..65057b90a03c 100644 --- a/pkgs/development/compilers/cudatoolkit/redist/extension.nix +++ b/pkgs/development/compilers/cudatoolkit/redist/extension.nix @@ -11,7 +11,6 @@ final: prev: let "11.4" = ./manifests/redistrib_11.4.4.json; "11.5" = ./manifests/redistrib_11.5.2.json; "11.6" = ./manifests/redistrib_11.6.2.json; - "11.7" = ./manifests/redistrib_11.7.0.json; }; # Function to build a single cudatoolkit redist package diff --git a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_11.7.0.json b/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_11.7.0.json deleted file mode 100644 index 2fc999afd700..000000000000 --- a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_11.7.0.json +++ /dev/null @@ -1,879 +0,0 @@ -{ - "release_date": "2022-05-11", - "cuda_cccl": { - "name": "CXX Core Compute Libraries", - "license": "CUDA Toolkit", - "version": "11.7.58", - "linux-x86_64": { - "relative_path": "cuda_cccl/linux-x86_64/cuda_cccl-linux-x86_64-11.7.58-archive.tar.xz", - "sha256": "a66261d174a3f8fea87e0dc91e5cd084dda89be8bb0a1f5ca0ab5d05a93ade4a", - "md5": "674edc3ec85126c08f78e4e3280789fd", - "size": "1004048" - }, - "linux-ppc64le": { - "relative_path": "cuda_cccl/linux-ppc64le/cuda_cccl-linux-ppc64le-11.7.58-archive.tar.xz", - "sha256": "5482355647143e61b15cb6193f33a317dce94bb2475123d4b08eebbd7a801802", - "md5": "64c9f42b84cb64a7f67645cb74d2153f", - "size": "1004332" - }, - "linux-sbsa": { - "relative_path": "cuda_cccl/linux-sbsa/cuda_cccl-linux-sbsa-11.7.58-archive.tar.xz", - "sha256": "70a8a42135e4ab817cd3c3413dd993bfc7920a42f057838d2a4a2ff0966258bd", - "md5": "f6ac243b4b8d182941025040b0c375c3", - "size": "1003936" - }, - "windows-x86_64": { - "relative_path": "cuda_cccl/windows-x86_64/cuda_cccl-windows-x86_64-11.7.58-archive.zip", - "sha256": "29958e300229c7af43df57bed0519f34f3aa64332c84fb80e481c131e4594938", - "md5": "3a40e674c975fc35376e66b08b93a42c", - "size": "2563581" - } - }, - "cuda_cudart": { - "name": "CUDA Runtime (cudart)", - "license": "CUDA Toolkit", - "version": "11.7.60", - "linux-x86_64": { - "relative_path": "cuda_cudart/linux-x86_64/cuda_cudart-linux-x86_64-11.7.60-archive.tar.xz", - "sha256": "1c079add60a107f6dd9e72a0cc9cde03eb9d833506f355c22b9177c47a977552", - "md5": "1ef515eb31691f2c43fb0de1443893a3", - "size": "854744" - }, - "linux-ppc64le": { - "relative_path": "cuda_cudart/linux-ppc64le/cuda_cudart-linux-ppc64le-11.7.60-archive.tar.xz", - "sha256": "95ea51eb4d60754a080920105aa578cc8da8772295912f198fcaa13fafce6d24", - "md5": "ce9c3ac2d0a25de182e5519354e0e01b", - "size": "795244" - }, - "linux-sbsa": { - "relative_path": "cuda_cudart/linux-sbsa/cuda_cudart-linux-sbsa-11.7.60-archive.tar.xz", - "sha256": "bdfdb8467a0d1a5c6aeb696ec0c203d1da732093b5e5ee0a79b03ef53f5ab622", - "md5": "7d6290b6e7a0086c5dbf5706013dfdda", - "size": "798208" - }, - "windows-x86_64": { - "relative_path": "cuda_cudart/windows-x86_64/cuda_cudart-windows-x86_64-11.7.60-archive.zip", - "sha256": "e1c72413c42e9bda52d1868bb67136d66d03b394b9accdfd9224080bb5a9663e", - "md5": "bbeee57a158e8ce3abce79b19eae7110", - "size": "2884824" - } - }, - "cuda_cuobjdump": { - "name": "cuobjdump", - "license": "CUDA Toolkit", - "version": "11.7.50", - "linux-x86_64": { - "relative_path": "cuda_cuobjdump/linux-x86_64/cuda_cuobjdump-linux-x86_64-11.7.50-archive.tar.xz", - "sha256": "f901085d83f83ae549de45e4410c74c3adddd2d541ba2780c23105df39008820", - "md5": "76a614c84b7221cc9282a3bf009ca401", - "size": "127416" - }, - "linux-ppc64le": { - "relative_path": "cuda_cuobjdump/linux-ppc64le/cuda_cuobjdump-linux-ppc64le-11.7.50-archive.tar.xz", - "sha256": "2fe257ab7027c7598d1351bb473d6a67a8da81fec17f60b389d16ef076c31da7", - "md5": "9ffb04f10fced993411d0601709c80fd", - "size": "140924" - }, - "linux-sbsa": { - "relative_path": "cuda_cuobjdump/linux-sbsa/cuda_cuobjdump-linux-sbsa-11.7.50-archive.tar.xz", - "sha256": "d44352344de0408d175b045401865ab82db4a53f3894e50c01445f42bbebdf8f", - "md5": "0b3bb58d13089bea74b3351cd7ed03d2", - "size": "123968" - }, - "windows-x86_64": { - "relative_path": "cuda_cuobjdump/windows-x86_64/cuda_cuobjdump-windows-x86_64-11.7.50-archive.zip", - "sha256": "3e7072d0a09c021252925ff9644d67294793afc5dc55ff2fac291528711ba0f9", - "md5": "070b5f13066888c471b90868485767ae", - "size": "2523866" - } - }, - "cuda_cupti": { - "name": "CUPTI", - "license": "CUDA Toolkit", - "version": "11.7.50", - "linux-x86_64": { - "relative_path": "cuda_cupti/linux-x86_64/cuda_cupti-linux-x86_64-11.7.50-archive.tar.xz", - "sha256": "441f7da2608d1965f0e3e2e03aeea86b0a3454cbea8e7af8112529c9acef3853", - "md5": "6433be7629030ddbcf37f5286464bb0d", - "size": "16577596" - }, - "linux-ppc64le": { - "relative_path": "cuda_cupti/linux-ppc64le/cuda_cupti-linux-ppc64le-11.7.50-archive.tar.xz", - "sha256": "df70ad634864572b4eff7ebe15b768d48d909aabddf3b54da05cf7e27442bd8f", - "md5": "011ea37fd2f4af0755414c5432ba2649", - "size": "8627816" - }, - "linux-sbsa": { - "relative_path": "cuda_cupti/linux-sbsa/cuda_cupti-linux-sbsa-11.7.50-archive.tar.xz", - "sha256": "4615695d9240a423926238640c69d4b39044acc44d3d513bc08c51f16bea371e", - "md5": "53cefdd716d8c40ff7143822341c09b7", - "size": "8436580" - }, - "windows-x86_64": { - "relative_path": "cuda_cupti/windows-x86_64/cuda_cupti-windows-x86_64-11.7.50-archive.zip", - "sha256": "42a04b9ef71e4d95bc235a68dd4a75d1501a44e9964371435994f7a7c59cd489", - "md5": "4c61155dc79555ef6b389284a4f7b65a", - "size": "11546349" - } - }, - "cuda_cuxxfilt": { - "name": "CUDA cuxxfilt (demangler)", - "license": "CUDA Toolkit", - "version": "11.7.50", - "linux-x86_64": { - "relative_path": "cuda_cuxxfilt/linux-x86_64/cuda_cuxxfilt-linux-x86_64-11.7.50-archive.tar.xz", - "sha256": "8a9cb0af698fe39c1b92d179e9ac22e8acb752eb8c531dbfdd049ddcd3c2caa6", - "md5": "0f7eb48184c16e51ad76574cc112e01c", - "size": "186432" - }, - "linux-ppc64le": { - "relative_path": "cuda_cuxxfilt/linux-ppc64le/cuda_cuxxfilt-linux-ppc64le-11.7.50-archive.tar.xz", - "sha256": "a2a9a5ace0908071f0bcf4fa1e537c8373d7ef6a18d086d85a2c72cb8dc245b7", - "md5": "6be41e32ff0274c1be4cb3b6a6429b21", - "size": "181612" - }, - "linux-sbsa": { - "relative_path": "cuda_cuxxfilt/linux-sbsa/cuda_cuxxfilt-linux-sbsa-11.7.50-archive.tar.xz", - "sha256": "c7c014ec407c77eae16451559a7499c8ff371606abc8e1b40e47eedab8d5a5b8", - "md5": "2a7553a48f6c8048d1667c16fec03035", - "size": "172292" - }, - "windows-x86_64": { - "relative_path": "cuda_cuxxfilt/windows-x86_64/cuda_cuxxfilt-windows-x86_64-11.7.50-archive.zip", - "sha256": "e93e1d37332ad5adf663a712250710d03a718f4d85702aec4e24b5bf98e2fe7a", - "md5": "f34c83f9a81d0fdae3950a9778442345", - "size": "168940" - } - }, - "cuda_demo_suite": { - "name": "CUDA Demo Suite", - "license": "CUDA Toolkit", - "version": "11.7.50", - "linux-x86_64": { - "relative_path": "cuda_demo_suite/linux-x86_64/cuda_demo_suite-linux-x86_64-11.7.50-archive.tar.xz", - "sha256": "10dec9f42f7c60ba8d2e839bedf155addb6a02ebf9a3b2b1c7acbcc47e6e4721", - "md5": "4501fa48dcf450f1de5e7b0352859dfa", - "size": "3985972" - }, - "windows-x86_64": { - "relative_path": "cuda_demo_suite/windows-x86_64/cuda_demo_suite-windows-x86_64-11.7.50-archive.zip", - "sha256": "803bab94b1b4f304ddba4c2adcc013a1aaf5251f962d154287f6d880cb3f16a1", - "md5": "a240da5cbf8ddcbf44ec969a7c57d68d", - "size": "5023822" - } - }, - "cuda_documentation": { - "name": "CUDA Documentation", - "license": "CUDA Toolkit", - "version": "11.7.50", - "linux-x86_64": { - "relative_path": "cuda_documentation/linux-x86_64/cuda_documentation-linux-x86_64-11.7.50-archive.tar.xz", - "sha256": "90a169f4c1c782cdd1b1bf1e13f3e9f4ef57f731d87d8fefae115b166032a084", - "md5": "1d5f61928ed525f7324e1f600719a786", - "size": "67056" - }, - "linux-ppc64le": { - "relative_path": "cuda_documentation/linux-ppc64le/cuda_documentation-linux-ppc64le-11.7.50-archive.tar.xz", - "sha256": "8c799c128afcf870ea63e73b8a33d924d60bc4281ef77c32c92d0081a7d523c8", - "md5": "e5f4d0b477f90698adb4919e1341c407", - "size": "67060" - }, - "linux-sbsa": { - "relative_path": "cuda_documentation/linux-sbsa/cuda_documentation-linux-sbsa-11.7.50-archive.tar.xz", - "sha256": "a2f50b49fe31b0637602743a756df16e6ec3dfc95279d4bb25a9eb1f6de3a80b", - "md5": "9316169eca11c975157e77e3649f8a1f", - "size": "67060" - }, - "windows-x86_64": { - "relative_path": "cuda_documentation/windows-x86_64/cuda_documentation-windows-x86_64-11.7.50-archive.zip", - "sha256": "2c497e6ca5ffb440d0504adef51d4e979273959d42a6a22b20cd702085b71f39", - "md5": "957cde6fd6211919ac4ca823d3cc90e9", - "size": "105283" - } - }, - "cuda_gdb": { - "name": "CUDA GDB", - "license": "CUDA Toolkit", - "version": "11.7.50", - "linux-x86_64": { - "relative_path": "cuda_gdb/linux-x86_64/cuda_gdb-linux-x86_64-11.7.50-archive.tar.xz", - "sha256": "ff44bffb8034a694ba6a2c5e171fc766ddc6d9e328b29eab8dd02177d6914f6c", - "md5": "72b1fa5a914443acc3eeda12da0aa059", - "size": "64209508" - }, - "linux-ppc64le": { - "relative_path": "cuda_gdb/linux-ppc64le/cuda_gdb-linux-ppc64le-11.7.50-archive.tar.xz", - "sha256": "e442ef2eaaa778ffadb6af3ed92316eddff0dff15b69e334338da5f450203f43", - "md5": "6a02488128531898f252163a41c84f93", - "size": "64109072" - }, - "linux-sbsa": { - "relative_path": "cuda_gdb/linux-sbsa/cuda_gdb-linux-sbsa-11.7.50-archive.tar.xz", - "sha256": "f67bae946aaa60a57d7b781a2fe044bde267da58c418067d8be6cbb63959966b", - "md5": "3a654d775d9b1466ca00585adc179744", - "size": "64025944" - } - }, - "cuda_memcheck": { - "name": "CUDA Memcheck", - "license": "CUDA Toolkit", - "version": "11.7.50", - "linux-x86_64": { - "relative_path": "cuda_memcheck/linux-x86_64/cuda_memcheck-linux-x86_64-11.7.50-archive.tar.xz", - "sha256": "12fa99422d9a7ce1714e100cc9faa4c9d37590d79d0af93abc8321217cbf5abd", - "md5": "5b29092a20eb8501651f64af028623aa", - "size": "139652" - }, - "linux-ppc64le": { - "relative_path": "cuda_memcheck/linux-ppc64le/cuda_memcheck-linux-ppc64le-11.7.50-archive.tar.xz", - "sha256": "3bed410c4fcaf106f1411a9373bb0091ee46a29f2e980eba4ee274710d8e4f19", - "md5": "952e68b3e321df1bdc94327ea186603d", - "size": "148036" - }, - "windows-x86_64": { - "relative_path": "cuda_memcheck/windows-x86_64/cuda_memcheck-windows-x86_64-11.7.50-archive.zip", - "sha256": "79294688bdbed786b68873bc02f8a279b6ce7a468486da365642e3c727cedd9e", - "md5": "a6512b0c6fe6aa4f81a6027a64110860", - "size": "172868" - } - }, - "cuda_nsight": { - "name": "Nsight Eclipse Edition Plugin", - "license": "CUDA Toolkit", - "version": "11.7.50", - "linux-x86_64": { - "relative_path": "cuda_nsight/linux-x86_64/cuda_nsight-linux-x86_64-11.7.50-archive.tar.xz", - "sha256": "483a4970a38c9366c2d3bf7d2ea9d2e2486a13ecaa3bd6ed143a4b18a8fe84b9", - "md5": "50eaa0de2047b89aa358682c6937a83a", - "size": "118603148" - }, - "linux-ppc64le": { - "relative_path": "cuda_nsight/linux-ppc64le/cuda_nsight-linux-ppc64le-11.7.50-archive.tar.xz", - "sha256": "93ece42ff578135e10cc7d8bfa4c42449f259d955cf1b71652b7436e2f6854f2", - "md5": "9e2cfb70f748efcc22c611938099ccbf", - "size": "118603136" - } - }, - "cuda_nvcc": { - "name": "CUDA NVCC", - "license": "CUDA Toolkit", - "version": "11.7.64", - "linux-x86_64": { - "relative_path": "cuda_nvcc/linux-x86_64/cuda_nvcc-linux-x86_64-11.7.64-archive.tar.xz", - "sha256": "7721fcfa3eb183ecb1d7fe138ce52d8238f0a6ecf1e9964cf8cfe5d8b7ec3c92", - "md5": "640e1e412e0ff6d7eee95e513f67cadb", - "size": "37056600" - }, - "linux-ppc64le": { - "relative_path": "cuda_nvcc/linux-ppc64le/cuda_nvcc-linux-ppc64le-11.7.64-archive.tar.xz", - "sha256": "59792975fe7ba2cb75977965a1eebfc684d4e301a34c43f5f4295124d21c097c", - "md5": "0f409845cbe3ed70a6abc971024b1d72", - "size": "34873208" - }, - "linux-sbsa": { - "relative_path": "cuda_nvcc/linux-sbsa/cuda_nvcc-linux-sbsa-11.7.64-archive.tar.xz", - "sha256": "4ba91cfcc7b12b997ed2ceced176f6aa1f7c101a65c0ab6faae9a8fee6d107f1", - "md5": "a3ef626196d63f7db7c3c62d80564ab3", - "size": "32632012" - }, - "windows-x86_64": { - "relative_path": "cuda_nvcc/windows-x86_64/cuda_nvcc-windows-x86_64-11.7.64-archive.zip", - "sha256": "dcb47e8c04560a369cc6154242afdb29223e8ceaaf6ea6097e2add09ed64d386", - "md5": "de3eb321caac960358731fb07c26e2a2", - "size": "47659565" - } - }, - "cuda_nvdisasm": { - "name": "CUDA nvdisasm", - "license": "CUDA Toolkit", - "version": "11.7.50", - "linux-x86_64": { - "relative_path": "cuda_nvdisasm/linux-x86_64/cuda_nvdisasm-linux-x86_64-11.7.50-archive.tar.xz", - "sha256": "4e22b735b9553a286390dc76b02e5a7f21dc71234852d7f4f8cf2572fef1a479", - "md5": "471deeab3bc3ce504c75b77670ad5140", - "size": "32776640" - }, - "linux-ppc64le": { - "relative_path": "cuda_nvdisasm/linux-ppc64le/cuda_nvdisasm-linux-ppc64le-11.7.50-archive.tar.xz", - "sha256": "1111d62bd0baefdf86de2dd148e44815d04c53d66dff2a1f5a700dd6ec32cce5", - "md5": "a1ec03d58d37927080425425a820dee8", - "size": "32780884" - }, - "linux-sbsa": { - "relative_path": "cuda_nvdisasm/linux-sbsa/cuda_nvdisasm-linux-sbsa-11.7.50-archive.tar.xz", - "sha256": "3a9ece8dfb6e93c0e9b6da6753c77c9fb815b42ffc91ee710fbc02b421b0d864", - "md5": "3e2cb3ff5390077d97d0d847c423d499", - "size": "32730316" - }, - "windows-x86_64": { - "relative_path": "cuda_nvdisasm/windows-x86_64/cuda_nvdisasm-windows-x86_64-11.7.50-archive.zip", - "sha256": "03403fc8ea81178855e5338623700421c91606e71ef8747568554a0ab5b18355", - "md5": "03ea5bb697502568d5b9fb9577974cf7", - "size": "33004702" - } - }, - "cuda_nvml_dev": { - "name": "CUDA NVML Headers", - "license": "CUDA Toolkit", - "version": "11.7.50", - "linux-x86_64": { - "relative_path": "cuda_nvml_dev/linux-x86_64/cuda_nvml_dev-linux-x86_64-11.7.50-archive.tar.xz", - "sha256": "b6f101106e5ed980bf89b2868cf0b32dd36a28c47e879ee70fca1b85de047fba", - "md5": "f8c3a8033eda7215cf2a7b0b1325b5f1", - "size": "76548" - }, - "linux-ppc64le": { - "relative_path": "cuda_nvml_dev/linux-ppc64le/cuda_nvml_dev-linux-ppc64le-11.7.50-archive.tar.xz", - "sha256": "a3f4dbeeec6d6eb6562fd4c432c70a5071aa3e0bbf008118a1676079b4bf646f", - "md5": "cd92d1a16f3e60e9620320d18c0e5a6a", - "size": "76088" - }, - "linux-sbsa": { - "relative_path": "cuda_nvml_dev/linux-sbsa/cuda_nvml_dev-linux-sbsa-11.7.50-archive.tar.xz", - "sha256": "ddc4d1c7dafa9a05e387048a561ec01cad16e33276358201f8682780e451037d", - "md5": "156e76ed54c7547a11fc6a725d212762", - "size": "76728" - }, - "windows-x86_64": { - "relative_path": "cuda_nvml_dev/windows-x86_64/cuda_nvml_dev-windows-x86_64-11.7.50-archive.zip", - "sha256": "f3cea20a5c75dbe341b11c3fabfbafcc2da6d0d60654cdd46960e941e33dca50", - "md5": "2d92f9c4ef5dac8253f5e73e6f428251", - "size": "106750" - } - }, - "cuda_nvprof": { - "name": "CUDA nvprof", - "license": "CUDA Toolkit", - "version": "11.7.50", - "linux-x86_64": { - "relative_path": "cuda_nvprof/linux-x86_64/cuda_nvprof-linux-x86_64-11.7.50-archive.tar.xz", - "sha256": "8222eebaf3fe6ca1e4df6fda09cbd58f11de6d5b80b5596dcf5c5c45ae246028", - "md5": "1fa983b921821b0d38dfc7c5b8234d88", - "size": "1944796" - }, - "linux-ppc64le": { - "relative_path": "cuda_nvprof/linux-ppc64le/cuda_nvprof-linux-ppc64le-11.7.50-archive.tar.xz", - "sha256": "dbf2f41b1c42fe05c9ce0865dfefe867c91a22394acfb03606a4de9cbf07f236", - "md5": "865a189bcdc7900e55f1a3e545c312da", - "size": "1600116" - }, - "linux-sbsa": { - "relative_path": "cuda_nvprof/linux-sbsa/cuda_nvprof-linux-sbsa-11.7.50-archive.tar.xz", - "sha256": "5894195fdaf1e550601649fdf93aa93fa042bd3e298867cf95007080b10757ac", - "md5": "e3e336dd70f215866864131b889a8261", - "size": "16148" - }, - "windows-x86_64": { - "relative_path": "cuda_nvprof/windows-x86_64/cuda_nvprof-windows-x86_64-11.7.50-archive.zip", - "sha256": "3a115b5bc3bf733cb6fe9d414ae5375928ea75fb1f84112b897015434bc4fc25", - "md5": "7fc781f7e740bb6a7a45b593fe8c70a0", - "size": "1603305" - } - }, - "cuda_nvprune": { - "name": "CUDA nvprune", - "license": "CUDA Toolkit", - "version": "11.7.50", - "linux-x86_64": { - "relative_path": "cuda_nvprune/linux-x86_64/cuda_nvprune-linux-x86_64-11.7.50-archive.tar.xz", - "sha256": "b5c13830f910979be229943cefe70297382ba6c1bddba91174d4837a94c7922d", - "md5": "d57409d45bd27a917b90e05e78941326", - "size": "55220" - }, - "linux-ppc64le": { - "relative_path": "cuda_nvprune/linux-ppc64le/cuda_nvprune-linux-ppc64le-11.7.50-archive.tar.xz", - "sha256": "ecace952b4b4631fa347f77371de485f7611525773bc90587f4c639cd51362e7", - "md5": "5359a59af33523f5d5d58d0bf6cb6b9a", - "size": "55928" - }, - "linux-sbsa": { - "relative_path": "cuda_nvprune/linux-sbsa/cuda_nvprune-linux-sbsa-11.7.50-archive.tar.xz", - "sha256": "dfc069568ca54425a8bb8c674f2d70218546f64a6836fb918d233becff046624", - "md5": "6fdc59145fe540946f9e3ea793f09152", - "size": "47656" - }, - "windows-x86_64": { - "relative_path": "cuda_nvprune/windows-x86_64/cuda_nvprune-windows-x86_64-11.7.50-archive.zip", - "sha256": "605aed14b9832712c81cf36acf389a22023a0737604ff3a1cbdd7338b0780ea4", - "md5": "3f105e39da981703ab5a95bfeaf112b9", - "size": "144827" - } - }, - "cuda_nvrtc": { - "name": "CUDA NVRTC", - "license": "CUDA Toolkit", - "version": "11.7.50", - "linux-x86_64": { - "relative_path": "cuda_nvrtc/linux-x86_64/cuda_nvrtc-linux-x86_64-11.7.50-archive.tar.xz", - "sha256": "a0891b98d5d38f6ae64833c483ccf51417e25b54f0242a5872fabc7c96300f3a", - "md5": "e1e1bdd085b979196fc87d2d7d20d237", - "size": "28103056" - }, - "linux-ppc64le": { - "relative_path": "cuda_nvrtc/linux-ppc64le/cuda_nvrtc-linux-ppc64le-11.7.50-archive.tar.xz", - "sha256": "b801983bd480b6a75eeb3b4db41a840de66d3f764ca89440e135d62ae249144e", - "md5": "f39ef8fbca0ed175a4815b2c4482b676", - "size": "26239068" - }, - "linux-sbsa": { - "relative_path": "cuda_nvrtc/linux-sbsa/cuda_nvrtc-linux-sbsa-11.7.50-archive.tar.xz", - "sha256": "5d4788a5b3c06d88179824976c8e5e7c76683dfe3bd1e5634ac2037de62b385f", - "md5": "609d991b06e17e9f0a85c6e93bbf052b", - "size": "26084572" - }, - "windows-x86_64": { - "relative_path": "cuda_nvrtc/windows-x86_64/cuda_nvrtc-windows-x86_64-11.7.50-archive.zip", - "sha256": "252ae0cd65b1b73208454966f91239d0e8f11232de966c41d8cf3009fe402415", - "md5": "6476681ad45cfd18e7cc3f5b16c9111b", - "size": "93548358" - } - }, - "cuda_nvtx": { - "name": "CUDA NVTX", - "license": "CUDA Toolkit", - "version": "11.7.50", - "linux-x86_64": { - "relative_path": "cuda_nvtx/linux-x86_64/cuda_nvtx-linux-x86_64-11.7.50-archive.tar.xz", - "sha256": "b90454efe80e4fcd328e6250279e4392a01db9035c7317355760c66048899568", - "md5": "b14a508a57f1311321b6cb552fde7a9f", - "size": "48176" - }, - "linux-ppc64le": { - "relative_path": "cuda_nvtx/linux-ppc64le/cuda_nvtx-linux-ppc64le-11.7.50-archive.tar.xz", - "sha256": "3dc37a91b9a7769d4ab329d99d8779b7f6feaae63e8fc69d7d5da284cb82efe9", - "md5": "eae8b204b8af373dc52ec1cad399dce5", - "size": "48156" - }, - "linux-sbsa": { - "relative_path": "cuda_nvtx/linux-sbsa/cuda_nvtx-linux-sbsa-11.7.50-archive.tar.xz", - "sha256": "b803160fe20715c23a6266849d2a23d298fe7c7e427ec77aca9121d667526441", - "md5": "5262caba03904cf79884266f30962f8b", - "size": "48768" - }, - "windows-x86_64": { - "relative_path": "cuda_nvtx/windows-x86_64/cuda_nvtx-windows-x86_64-11.7.50-archive.zip", - "sha256": "cec2aabca78c95a2d6c793372684b060fc695035f568225fd735880331d71e25", - "md5": "27b8357312c82ee327b3ec86cb2cecec", - "size": "65690" - } - }, - "cuda_nvvp": { - "name": "CUDA NVVP", - "license": "CUDA Toolkit", - "version": "11.7.50", - "linux-x86_64": { - "relative_path": "cuda_nvvp/linux-x86_64/cuda_nvvp-linux-x86_64-11.7.50-archive.tar.xz", - "sha256": "6489169df1a4f37cba0c00c3c0e24ac6265bfe06fcca1d4bf3f5824bc937ef9f", - "md5": "94951715e2f099553ddd57f40ab4f06c", - "size": "117571592" - }, - "linux-ppc64le": { - "relative_path": "cuda_nvvp/linux-ppc64le/cuda_nvvp-linux-ppc64le-11.7.50-archive.tar.xz", - "sha256": "b54fa7fc79788f991332139ecf722cc834b544d111f476531a3db82b8c15c2b0", - "md5": "ece4a0e7524037f64cd81a9a6c85db0c", - "size": "117008156" - }, - "windows-x86_64": { - "relative_path": "cuda_nvvp/windows-x86_64/cuda_nvvp-windows-x86_64-11.7.50-archive.zip", - "sha256": "8b8ddaca9958a58a78f7f50f87ecee3ecb148fe99b0cce6ed37e3ba0ecb6d14f", - "md5": "6880ab3d2ae9526e6d5a376fb24dea8e", - "size": "120360546" - } - }, - "cuda_sanitizer_api": { - "name": "CUDA Compute Sanitizer API", - "license": "CUDA Toolkit", - "version": "11.7.50", - "linux-x86_64": { - "relative_path": "cuda_sanitizer_api/linux-x86_64/cuda_sanitizer_api-linux-x86_64-11.7.50-archive.tar.xz", - "sha256": "9555ae397290608c7a64c929fc80186860008cc8c4afb0bd49deece3a5ca2fc4", - "md5": "6b5910c5096decaa4b5c30f3bff3df38", - "size": "8314100" - }, - "linux-ppc64le": { - "relative_path": "cuda_sanitizer_api/linux-ppc64le/cuda_sanitizer_api-linux-ppc64le-11.7.50-archive.tar.xz", - "sha256": "f303a56fd501ce13aa7f12c03137fefd823899b19c26ab53cd314baf47b9b3c7", - "md5": "6dc14023de7354aa6f17b833d3adf89e", - "size": "7739868" - }, - "linux-sbsa": { - "relative_path": "cuda_sanitizer_api/linux-sbsa/cuda_sanitizer_api-linux-sbsa-11.7.50-archive.tar.xz", - "sha256": "14c5ffde6606c97a92b7e72dd0987509c3fe876ad57bfe3a88d2b897125a442e", - "md5": "84fd52cea0512e63d95ebf62038137f0", - "size": "6453516" - }, - "windows-x86_64": { - "relative_path": "cuda_sanitizer_api/windows-x86_64/cuda_sanitizer_api-windows-x86_64-11.7.50-archive.zip", - "sha256": "090f657396b35d749f0f755b684151d274ae3f392790055f3b659daeee068622", - "md5": "685f72ea969afbbebeaba721310618ed", - "size": "13477221" - } - }, - "fabricmanager": { - "name": "NVIDIA Fabric Manager", - "license": "NVIDIA Driver", - "version": "515.43.04", - "linux-x86_64": { - "relative_path": "fabricmanager/linux-x86_64/fabricmanager-linux-x86_64-515.43.04-archive.tar.xz", - "sha256": "2f4bce4620ce69683428d1752464adcaef466fc471d82618e28d554c7591efe6", - "md5": "3dfc3ea1f13a346cfc155c09d80fb48c", - "size": "1470572" - }, - "linux-sbsa": { - "relative_path": "fabricmanager/linux-sbsa/fabricmanager-linux-sbsa-515.43.04-archive.tar.xz", - "sha256": "eb5cda2505cb5fcc3508ab84e8703d9cf318e0df5c2e5b0a832b4fa243b88bea", - "md5": "6fd2d3c94b8ccb826d4986fa970261f1", - "size": "1358156" - } - }, - "libcublas": { - "name": "CUDA cuBLAS", - "license": "CUDA Toolkit", - "version": "11.10.1.25", - "linux-x86_64": { - "relative_path": "libcublas/linux-x86_64/libcublas-linux-x86_64-11.10.1.25-archive.tar.xz", - "sha256": "27f5975b0b373f5fc96ac2f4ec9f28de3eb07f674acc0b0a5262dd2c76ddc5ff", - "md5": "f183769621c14cd447bb50fa51088c7b", - "size": "432986132" - }, - "linux-ppc64le": { - "relative_path": "libcublas/linux-ppc64le/libcublas-linux-ppc64le-11.10.1.25-archive.tar.xz", - "sha256": "85aa62b4c23f42f28bc428e84604b4dcb04960db1926c8c2216d5747f0366ab1", - "md5": "ca6ce43480df02cd6e5b96e416a02e64", - "size": "422295044" - }, - "linux-sbsa": { - "relative_path": "libcublas/linux-sbsa/libcublas-linux-sbsa-11.10.1.25-archive.tar.xz", - "sha256": "76c50490afd19dc5fdab31281380e0d1a7217dfebecb31477e78e452cac4e0a6", - "md5": "748bd159248469f80f67edd4028ac2dd", - "size": "422563144" - }, - "windows-x86_64": { - "relative_path": "libcublas/windows-x86_64/libcublas-windows-x86_64-11.10.1.25-archive.zip", - "sha256": "d1b47527b0fc33f1b185af38590a1d5d7d04c0c71c74c19a488547f9c0a62e7c", - "md5": "989c46ebd961d177f8bc2ba0a03955b7", - "size": "311249638" - } - }, - "libcufft": { - "name": "CUDA cuFFT", - "license": "CUDA Toolkit", - "version": "10.7.2.50", - "linux-x86_64": { - "relative_path": "libcufft/linux-x86_64/libcufft-linux-x86_64-10.7.2.50-archive.tar.xz", - "sha256": "70c4c2abb9d77210a5d2313abfdddf1857d654d1cf925946a645793bc14714c5", - "md5": "fe80583fbf4ce9195db760dc9465da2f", - "size": "213404700" - }, - "linux-ppc64le": { - "relative_path": "libcufft/linux-ppc64le/libcufft-linux-ppc64le-10.7.2.50-archive.tar.xz", - "sha256": "f229818bfee4d90aa4a9022a00d26efa749fdb4f61af1ba47b65a9f8dffd1521", - "md5": "66768c4e73bd0402be32486ef9ff4952", - "size": "213735112" - }, - "linux-sbsa": { - "relative_path": "libcufft/linux-sbsa/libcufft-linux-sbsa-10.7.2.50-archive.tar.xz", - "sha256": "9aaeae3c1a53ee4cc17c05557f2e30b65581d5d590130d5e205193beceed345d", - "md5": "967617dbb350fdd19771bea836e68744", - "size": "212335968" - }, - "windows-x86_64": { - "relative_path": "libcufft/windows-x86_64/libcufft-windows-x86_64-10.7.2.50-archive.zip", - "sha256": "931f380e666dd8dc44b72fb79224c27c720d37310312e9e421e71f16a5e312e1", - "md5": "24eb68afe151ab2d7a2c787aeb382d9a", - "size": "287120306" - } - }, - "libcufile": { - "name": "CUDA cuFile", - "license": "CUDA Toolkit", - "version": "1.3.0.44", - "linux-x86_64": { - "relative_path": "libcufile/linux-x86_64/libcufile-linux-x86_64-1.3.0.44-archive.tar.xz", - "sha256": "2a0a9102596c84afa9afed014fee73630a534ceaef2857c43646f6c9ffba2b95", - "md5": "1bacdbc9a48e4e188dfffe15ab062358", - "size": "46784140" - } - }, - "libcurand": { - "name": "CUDA cuRAND", - "license": "CUDA Toolkit", - "version": "10.2.10.50", - "linux-x86_64": { - "relative_path": "libcurand/linux-x86_64/libcurand-linux-x86_64-10.2.10.50-archive.tar.xz", - "sha256": "a05411f1775d5783800b71f6b43fae660e3baf900ae07efb853e615116ee479b", - "md5": "a9f272f6683a79c7b8fa02ae1149f3ad", - "size": "82110640" - }, - "linux-ppc64le": { - "relative_path": "libcurand/linux-ppc64le/libcurand-linux-ppc64le-10.2.10.50-archive.tar.xz", - "sha256": "4c9bc79ab38c3aca8081ea4fcd05876742657659f640c87f7af2a00f4f968787", - "md5": "6c714d6725554dd57265812c7a721454", - "size": "82156504" - }, - "linux-sbsa": { - "relative_path": "libcurand/linux-sbsa/libcurand-linux-sbsa-10.2.10.50-archive.tar.xz", - "sha256": "78577951e086501bb9222a55a07bd271dceae5fecdce17625bc453db549e96eb", - "md5": "911370c7ba791366d281e4ff62daa2b4", - "size": "82100856" - }, - "windows-x86_64": { - "relative_path": "libcurand/windows-x86_64/libcurand-windows-x86_64-10.2.10.50-archive.zip", - "sha256": "c96a539a76e6062222e66abde64ca19ff6d89729af81a0efc157ba50277edfa9", - "md5": "6afa80c834b57ab398708e735b564592", - "size": "53656547" - } - }, - "libcusolver": { - "name": "CUDA cuSOLVER", - "license": "CUDA Toolkit", - "version": "11.3.5.50", - "linux-x86_64": { - "relative_path": "libcusolver/linux-x86_64/libcusolver-linux-x86_64-11.3.5.50-archive.tar.xz", - "sha256": "7ed168c7fda04a4a640f6225cb76d5251a39e3d35db7630d3646cec58de724f8", - "md5": "cc6b0e4d97d7d73f302095cda1499167", - "size": "80742472" - }, - "linux-ppc64le": { - "relative_path": "libcusolver/linux-ppc64le/libcusolver-linux-ppc64le-11.3.5.50-archive.tar.xz", - "sha256": "341889b3c3107f7e3700693fcf815f816a8ffdfc6f2a1ca0f132ea651cb51739", - "md5": "0f038f45a4d5195d771d812ba47a34fa", - "size": "80769552" - }, - "linux-sbsa": { - "relative_path": "libcusolver/linux-sbsa/libcusolver-linux-sbsa-11.3.5.50-archive.tar.xz", - "sha256": "4832fd6dca50b2b05d07f086eaa44f953e9b1cd0f00b083f780e0ee1c17461db", - "md5": "a7361cc09dc63a6dee54937a12a8004b", - "size": "79972404" - }, - "windows-x86_64": { - "relative_path": "libcusolver/windows-x86_64/libcusolver-windows-x86_64-11.3.5.50-archive.zip", - "sha256": "918a8ed855ef683fa2b4f38e50e8275246b48c266e1066fdcf2bf6db16c9fc6a", - "md5": "68c75bd8d556a24d6d204e8007eb1f38", - "size": "111712983" - } - }, - "libcusparse": { - "name": "CUDA cuSPARSE", - "license": "CUDA Toolkit", - "version": "11.7.3.50", - "linux-x86_64": { - "relative_path": "libcusparse/linux-x86_64/libcusparse-linux-x86_64-11.7.3.50-archive.tar.xz", - "sha256": "c56ddd2d4deebb02bf1e082905f13cac7c685bfa415f1c489dd5fe382cf1f5de", - "md5": "04a62c2f92bc0608989bd82b4034d91f", - "size": "199048536" - }, - "linux-ppc64le": { - "relative_path": "libcusparse/linux-ppc64le/libcusparse-linux-ppc64le-11.7.3.50-archive.tar.xz", - "sha256": "d756707e6c84c9ae4b174467d8afba10883f8f286aba26a9230698b73fd187e3", - "md5": "bf56661d346440de2242530fed4027b9", - "size": "199115552" - }, - "linux-sbsa": { - "relative_path": "libcusparse/linux-sbsa/libcusparse-linux-sbsa-11.7.3.50-archive.tar.xz", - "sha256": "e2f8a0339739c3d7aa163d98452dcf3e6b71b164d7ff5b999dd35af31d950bc4", - "md5": "21ae0da8af1b60bb0e9f658c16730300", - "size": "198793236" - }, - "windows-x86_64": { - "relative_path": "libcusparse/windows-x86_64/libcusparse-windows-x86_64-11.7.3.50-archive.zip", - "sha256": "e7044f4cbce8712f407d041f2116cf61a8831e21d96f28c4c9ca8512847afc28", - "md5": "b20eef48a3a956b8643eb7cf457764b9", - "size": "167174067" - } - }, - "libnpp": { - "name": "CUDA NPP", - "license": "CUDA Toolkit", - "version": "11.7.3.21", - "linux-x86_64": { - "relative_path": "libnpp/linux-x86_64/libnpp-linux-x86_64-11.7.3.21-archive.tar.xz", - "sha256": "4d5f12e756304828cdbbe67dfa94a75432ee07cfe11f034aa4325e59e3c708f7", - "md5": "9c7ba42831e40f15b5b94543c659a74b", - "size": "164601168" - }, - "linux-ppc64le": { - "relative_path": "libnpp/linux-ppc64le/libnpp-linux-ppc64le-11.7.3.21-archive.tar.xz", - "sha256": "e3064176e6e0843e5f2d1bd247512be76ca3018364fd7bf77fec34b0bfae37a2", - "md5": "4106d95423169f59b5af3bbe3a9e38bf", - "size": "164864392" - }, - "linux-sbsa": { - "relative_path": "libnpp/linux-sbsa/libnpp-linux-sbsa-11.7.3.21-archive.tar.xz", - "sha256": "9cb63cd9d79a490a2504dbf8186d35d391d3e69f74353784955d33d550c83010", - "md5": "d5780f7e9a1ba1c3441f810fad68fc32", - "size": "163688528" - }, - "windows-x86_64": { - "relative_path": "libnpp/windows-x86_64/libnpp-windows-x86_64-11.7.3.21-archive.zip", - "sha256": "490a171c6db5e42f67502c0774678166f8018fe464f7e6c8a7b47e10c9fa3861", - "md5": "db863d019ff3029a9a14855ff85f6958", - "size": "125480452" - } - }, - "libnvidia_nscq": { - "name": "NVIDIA NSCQ API", - "license": "NVIDIA Driver", - "version": "515.43.04", - "linux-x86_64": { - "relative_path": "libnvidia_nscq/linux-x86_64/libnvidia_nscq-linux-x86_64-515.43.04-archive.tar.xz", - "sha256": "b0690b271e65cc2096a0de15aa7003c64e336bc5f4c48a7fc87a9b355d240e2a", - "md5": "03edfd4d08b358ec3cc98cef63e5138c", - "size": "334904" - } - }, - "libnvjpeg": { - "name": "CUDA nvJPEG", - "license": "CUDA Toolkit", - "version": "11.7.2.34", - "linux-x86_64": { - "relative_path": "libnvjpeg/linux-x86_64/libnvjpeg-linux-x86_64-11.7.2.34-archive.tar.xz", - "sha256": "0457a11af6903d63aec942e2884e02002c3d579071eacd89f08a25cab339f5eb", - "md5": "d6acf73e518edb33c4b7e7f3cb85aa46", - "size": "2042120" - }, - "linux-ppc64le": { - "relative_path": "libnvjpeg/linux-ppc64le/libnvjpeg-linux-ppc64le-11.7.2.34-archive.tar.xz", - "sha256": "70afb2d27b430dd4c43f1dc342e8725d148701093cdebc68a75d6dbaf6615d3f", - "md5": "acdf6594c58b6178cf0d83948e8c69b5", - "size": "2060012" - }, - "linux-sbsa": { - "relative_path": "libnvjpeg/linux-sbsa/libnvjpeg-linux-sbsa-11.7.2.34-archive.tar.xz", - "sha256": "8638f70021ad0e9006ec78c0b4f88f787e9d7862176447288f84a2b7d68769f2", - "md5": "e3d6b429ab22b4c16476df2f936e46ba", - "size": "1893316" - }, - "windows-x86_64": { - "relative_path": "libnvjpeg/windows-x86_64/libnvjpeg-windows-x86_64-11.7.2.34-archive.zip", - "sha256": "a3594ff7a5431495bc70763c2578ade0a32c74745803b820e49ef52cca2a872b", - "md5": "c4c259d4b7833e6cbe1505bf6b62229d", - "size": "2055730" - } - }, - "nsight_compute": { - "name": "Nsight Compute", - "license": "NVIDIA SLA", - "version": "2022.2.0.13", - "linux-x86_64": { - "relative_path": "nsight_compute/linux-x86_64/nsight_compute-linux-x86_64-2022.2.0.13-archive.tar.xz", - "sha256": "426949d42646164b884ee3025bd5e6b6fef8e904ed69705b7cf3cab9af1fc531", - "md5": "0f5700c465c92210a1eadea199b9e07a", - "size": "420951860" - }, - "linux-ppc64le": { - "relative_path": "nsight_compute/linux-ppc64le/nsight_compute-linux-ppc64le-2022.2.0.13-archive.tar.xz", - "sha256": "42c090ffe500b3a6c54c60a17b4f4856d230c558642841edb2b7bb725438be8c", - "md5": "ee1f8f57b827862c36bc6807e9a38424", - "size": "126737380" - }, - "linux-sbsa": { - "relative_path": "nsight_compute/linux-sbsa/nsight_compute-linux-sbsa-2022.2.0.13-archive.tar.xz", - "sha256": "4a442d5b6d0b599669ae30d342f46a0c8d047b3a7476b4419435dfe7187e23b8", - "md5": "11eec62f941d071b9f7c46855cc75a0b", - "size": "246004808" - }, - "windows-x86_64": { - "relative_path": "nsight_compute/windows-x86_64/nsight_compute-windows-x86_64-2022.2.0.13-archive.zip", - "sha256": "1f06f2d769c9c61c691c59f8c33f214aae6514d41f3eac5073c9310b7b487764", - "md5": "c2eb253d66b9258babc1bf9471033691", - "size": "354364680" - } - }, - "nsight_nvtx": { - "name": "Nsight NVTX", - "license": "CUDA Toolkit", - "version": "1.21018621", - "windows-x86_64": { - "relative_path": "nsight_nvtx/windows-x86_64/nsight_nvtx-windows-x86_64-1.21018621-archive.zip", - "sha256": "d99b015bfb1308206f9d7c16ea401bf426fed3a5a99953b855fe4e68be5ed2d1", - "md5": "34ee04d45cfca1c4e3cbfba0ec8f6f80", - "size": "315692" - } - }, - "nsight_systems": { - "name": "Nsight Systems", - "license": "NVIDIA SLA", - "version": "2022.1.3.3", - "linux-x86_64": { - "relative_path": "nsight_systems/linux-x86_64/nsight_systems-linux-x86_64-2022.1.3.3-archive.tar.xz", - "sha256": "bd95553d573f117be2e3b2bda6e79d14dbb038b136c12c6e5467bbd9a891681d", - "md5": "40d12d33aa2d496817d959a9551418aa", - "size": "166785296" - }, - "linux-ppc64le": { - "relative_path": "nsight_systems/linux-ppc64le/nsight_systems-linux-ppc64le-2022.1.3.3-archive.tar.xz", - "sha256": "4c228bfbd38b80612afeb65a406cba829d2b2e2352ea4a810cd6a386d6190151", - "md5": "0d5da67cb5393a0e961509cd7dab98f1", - "size": "49700384" - }, - "linux-sbsa": { - "relative_path": "nsight_systems/linux-sbsa/nsight_systems-linux-sbsa-2022.1.3.3-archive.tar.xz", - "sha256": "9025f56b9fe70288ee3f2d30477c9cfbe8c17a304b31f7f22caf7f78153d8d23", - "md5": "3559eeb8416d9a984012d2b397560740", - "size": "50415564" - }, - "windows-x86_64": { - "relative_path": "nsight_systems/windows-x86_64/nsight_systems-windows-x86_64-2022.1.3.3-archive.zip", - "sha256": "294738ba0aa0621395740a6d039a490aa0bf5fceec449b1fd4135a97b81eda0f", - "md5": "91e316744714c168c1a75804c9a198c9", - "size": "315748009" - } - }, - "nsight_vse": { - "name": "Nsight Visual Studio Edition (VSE)", - "license": "NVIDIA SLA", - "version": "2022.2.0.22095", - "windows-x86_64": { - "relative_path": "nsight_vse/windows-x86_64/nsight_vse-windows-x86_64-2022.2.0.22095-archive.zip", - "sha256": "b346aadf59d633b114b5e5b3ed437f8eee2bb2b8d532da0ee374ef8af9149cb2", - "md5": "63d3a5f0c9abaa027efbe0f476dc7c21", - "size": "459001482" - } - }, - "nvidia_driver": { - "name": "NVIDIA Linux Driver", - "license": "NVIDIA Driver", - "version": "515.43.04", - "linux-x86_64": { - "relative_path": "nvidia_driver/linux-x86_64/nvidia_driver-linux-x86_64-515.43.04-archive.tar.xz", - "sha256": "933ffd8f73e86e78299daf0b8612f8c24fe4b55cc15c2be353fbfbda3f1d62ea", - "md5": "19cf2b2e3d3f6f7786791db89e3a193a", - "size": "361628336" - }, - "linux-ppc64le": { - "relative_path": "nvidia_driver/linux-ppc64le/nvidia_driver-linux-ppc64le-515.43.04-archive.tar.xz", - "sha256": "369998c33a867945193cc3c1c3c78defa7c0309767d926bc871cc02ad659ed61", - "md5": "486f222d765d7ce5163d257a4b0e5420", - "size": "75667264" - }, - "linux-sbsa": { - "relative_path": "nvidia_driver/linux-sbsa/nvidia_driver-linux-sbsa-515.43.04-archive.tar.xz", - "sha256": "a534d8112bc15deb5f0e1c471382d776f4daebef25244869eaf5c935016b8fb7", - "md5": "5e699844a414a6f40e8c1399dd0f4c9d", - "size": "221246660" - } - }, - "nvidia_fs": { - "name": "NVIDIA filesystem", - "license": "CUDA Toolkit", - "version": "2.12.4", - "linux-x86_64": { - "relative_path": "nvidia_fs/linux-x86_64/nvidia_fs-linux-x86_64-2.12.4-archive.tar.xz", - "sha256": "913010942a7b6781a9e8fb8082654fda7ad0cce703f726e05d571fe6551f450a", - "md5": "48d30f73ec1b6c8df7e70139aefeec4e", - "size": "67152" - } - }, - "visual_studio_integration": { - "name": "CUDA Visual Studio Integration", - "license": "CUDA Toolkit", - "version": "11.7.50", - "windows-x86_64": { - "relative_path": "visual_studio_integration/windows-x86_64/visual_studio_integration-windows-x86_64-11.7.50-archive.zip", - "sha256": "4eb993cfb46ec925b6907f1433102ae00f0141e57bcfd40489eeaf72e67f0eeb", - "md5": "d770d51465dc15345a1ca1307e269832", - "size": "517028" - } - } -} diff --git a/pkgs/development/compilers/cudatoolkit/redist/overrides.nix b/pkgs/development/compilers/cudatoolkit/redist/overrides.nix index 2f0a8c1f0227..588f2f2a0867 100644 --- a/pkgs/development/compilers/cudatoolkit/redist/overrides.nix +++ b/pkgs/development/compilers/cudatoolkit/redist/overrides.nix @@ -37,12 +37,8 @@ in (lib.filterAttrs (attr: _: (prev ? "${attr}")) { ]; nsight_compute = prev.nsight_compute.overrideAttrs (oldAttrs: { - nativeBuildInputs = oldAttrs.nativeBuildInputs - ++ lib.optionals (lib.versionOlder prev.nsight_compute.version "2022.2.0") [ pkgs.qt5.wrapQtAppsHook ] - ++ lib.optionals (lib.versionAtLeast prev.nsight_compute.version "2022.2.0") [ pkgs.qt6.wrapQtAppsHook ]; - buildInputs = oldAttrs.buildInputs - ++ lib.optionals (lib.versionOlder prev.nsight_compute.version "2022.2.0") [ pkgs.qt5.qtwebview ] - ++ lib.optionals (lib.versionAtLeast prev.nsight_compute.version "2022.2.0") [ pkgs.qt6.qtwebview ]; + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ pkgs.qt5.wrapQtAppsHook ]; + buildInputs = oldAttrs.buildInputs ++ [ pkgs.libsForQt5.qt5.qtwebview ]; }); nsight_systems = prev.nsight_systems.overrideAttrs (oldAttrs: { diff --git a/pkgs/development/compilers/cudatoolkit/versions.toml b/pkgs/development/compilers/cudatoolkit/versions.toml index 51b79ca97be6..46173cca12cd 100644 --- a/pkgs/development/compilers/cudatoolkit/versions.toml +++ b/pkgs/development/compilers/cudatoolkit/versions.toml @@ -59,9 +59,3 @@ version = "11.6.1" url = "https://developer.download.nvidia.com/compute/cuda/11.6.1/local_installers/cuda_11.6.1_510.47.03_linux.run" sha256 = "sha256-qyGa/OALdCABEyaYZvv/derQN7z8I1UagzjCaEyYTX4=" gcc = "gcc11" - -["11.7"] -version = "11.7.0" -url = "https://developer.download.nvidia.com/compute/cuda/11.7.0/local_installers/cuda_11.7.0_515.43.04_linux.run" -sha256 = "sha256-CH/fy7ofeVQ7H3jkOo39rF9tskLQQt3oIOFtwYWJLyY=" -gcc = "gcc11" diff --git a/pkgs/development/libraries/science/math/cudnn/extension.nix b/pkgs/development/libraries/science/math/cudnn/extension.nix index cbf468ee4811..265e09f436ab 100644 --- a/pkgs/development/libraries/science/math/cudnn/extension.nix +++ b/pkgs/development/libraries/science/math/cudnn/extension.nix @@ -94,23 +94,7 @@ final: prev: let fullVersion = "8.3.2.44"; hash = "sha256-VQCVPAjF5dHd3P2iNPnvvdzb5DpTsm3AqCxyP6FwxFc="; url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${fileVersion}-archive.tar.xz"; - supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.4" "11.5" "11.6" "11.7" ]; - } - ]; - "8.4.0" = [ - rec { - fileVersion = "10.2"; - fullVersion = "8.4.0.27"; - hash = "sha256-FMXjykJYJxmW0f2VnELRfFgs5Nmv9FH4RSRGnnhP0VQ="; - url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${fileVersion}-archive.tar.xz"; - supportedCudaVersions = [ "10.2" ]; - } - rec { - fileVersion = "11.6"; - fullVersion = "8.4.0.27"; - hash = "sha256-0Zva/ZgAx50p5vb/+p+eLBDREy1sL/ELFZPgV+dN0FA="; - url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${fileVersion}-archive.tar.xz"; - supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.4" "11.5" "11.6" "11.7" ]; + supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.4" "11.5" "11.6" ]; } ]; }; @@ -127,7 +111,6 @@ final: prev: let "11.4" = "8.3.2"; "11.5" = "8.3.2"; "11.6" = "8.3.2"; - "11.7" = "8.4.0"; }.${cudaVersion}; in cuDnnPackages diff --git a/pkgs/test/cuda/cuda-samples/extension.nix b/pkgs/test/cuda/cuda-samples/extension.nix index 167b6483bb78..4c93845d1db6 100644 --- a/pkgs/test/cuda/cuda-samples/extension.nix +++ b/pkgs/test/cuda/cuda-samples/extension.nix @@ -11,9 +11,6 @@ final: prev: let "11.4" = "082dkk5y34wyvjgj2p5j1d00rk8xaxb9z0mhvz16bd469r1bw2qk"; "11.5" = "sha256-AKRZbke0K59lakhTi8dX2cR2aBuWPZkiQxyKaZTvHrI="; "11.6" = "sha256-AsLNmAplfuQbXg9zt09tXAuFJ524EtTYsQuUlV1tPkE="; - # the tag 11.7 does not exists: see https://github.com/NVIDIA/cuda-samples/issues/128 - # maybe fixed by https://github.com/NVIDIA/cuda-samples/pull/133 - "11.7" = prev.lib.fakeSha256; }.${prev.cudaVersion}; in { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4e555060a20b..08b85f5721d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5285,8 +5285,7 @@ with pkgs; cudaPackages_11_4 = callPackage ./cuda-packages.nix { cudaVersion = "11.4"; }; cudaPackages_11_5 = callPackage ./cuda-packages.nix { cudaVersion = "11.5"; }; cudaPackages_11_6 = callPackage ./cuda-packages.nix { cudaVersion = "11.6"; }; - cudaPackages_11_7 = callPackage ./cuda-packages.nix { cudaVersion = "11.7"; }; - cudaPackages_11 = cudaPackages_11_7; + cudaPackages_11 = cudaPackages_11_6; cudaPackages = recurseIntoAttrs cudaPackages_11; # TODO: move to alias From 33ee10c80ec35dabd5296678472f93f216d3ac18 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 6 Aug 2022 00:21:16 +0200 Subject: [PATCH 138/142] python3Packages.django-compressor: rename from django_compressor --- pkgs/applications/networking/seahub/default.nix | 2 +- .../{django_compressor => django-compressor}/default.nix | 2 +- pkgs/development/python-modules/django-mailman3/default.nix | 4 ++-- pkgs/servers/mail/mailman/hyperkitty.nix | 2 +- pkgs/servers/web-apps/healthchecks/default.nix | 2 +- pkgs/top-level/python-packages.nix | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) rename pkgs/development/python-modules/{django_compressor => django-compressor}/default.nix (96%) diff --git a/pkgs/applications/networking/seahub/default.nix b/pkgs/applications/networking/seahub/default.nix index 235b3026a6d2..bf236e179ccd 100644 --- a/pkgs/applications/networking/seahub/default.nix +++ b/pkgs/applications/networking/seahub/default.nix @@ -40,6 +40,7 @@ python.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python.pkgs; [ django future + django-compressor django-statici18n django-webpack-loader django-simple-captcha @@ -48,7 +49,6 @@ python.pkgs.buildPythonApplication rec { mysqlclient pillow python-dateutil - django_compressor djangorestframework openpyxl requests diff --git a/pkgs/development/python-modules/django_compressor/default.nix b/pkgs/development/python-modules/django-compressor/default.nix similarity index 96% rename from pkgs/development/python-modules/django_compressor/default.nix rename to pkgs/development/python-modules/django-compressor/default.nix index f71582418449..f07461f1bdd8 100644 --- a/pkgs/development/python-modules/django_compressor/default.nix +++ b/pkgs/development/python-modules/django-compressor/default.nix @@ -2,7 +2,7 @@ rcssmin, rjsmin, django-appconf }: buildPythonPackage rec { - pname = "django_compressor"; + pname = "django-compressor"; version = "4.0"; src = fetchPypi { diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix index cc04bf0d441f..9486764e2783 100644 --- a/pkgs/development/python-modules/django-mailman3/default.nix +++ b/pkgs/development/python-modules/django-mailman3/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, django-gravatar2, django_compressor +{ lib, buildPythonPackage, fetchPypi, django-gravatar2, django-compressor , django-allauth, mailmanclient, django, mock }: @@ -12,7 +12,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - django-gravatar2 django_compressor django-allauth mailmanclient + django-gravatar2 django-compressor django-allauth mailmanclient ]; checkInputs = [ django mock ]; diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix index 2b8959a8f37b..406e104e881c 100644 --- a/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/pkgs/servers/mail/mailman/hyperkitty.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { django-haystack django-mailman3 django-q - django_compressor + django-compressor django-extensions djangorestframework flufl_lock diff --git a/pkgs/servers/web-apps/healthchecks/default.nix b/pkgs/servers/web-apps/healthchecks/default.nix index aef269907ac1..2f0f3740ca55 100644 --- a/pkgs/servers/web-apps/healthchecks/default.nix +++ b/pkgs/servers/web-apps/healthchecks/default.nix @@ -38,7 +38,7 @@ py.pkgs.buildPythonApplication rec { cronsim cryptography django - django_compressor + django-compressor fido2 minio psycopg2 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5122f35a058e..29dda4426854 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2378,7 +2378,7 @@ in { django_compat = callPackage ../development/python-modules/django-compat { }; - django_compressor = callPackage ../development/python-modules/django_compressor { }; + django-compressor = callPackage ../development/python-modules/django-compressor { }; django-configurations = callPackage ../development/python-modules/django-configurations { }; From 7ddef1b8b884339a449b5aeb4aaaa51a780f631a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 6 Aug 2022 00:22:17 +0200 Subject: [PATCH 139/142] python3Packages.django-compressor: 4.0 -> 4.1 Reindent, reformat, tried to get the tests going, but missing dependency. --- .../django-compressor/default.nix | 70 +++++++++++++------ 1 file changed, 48 insertions(+), 22 deletions(-) diff --git a/pkgs/development/python-modules/django-compressor/default.nix b/pkgs/development/python-modules/django-compressor/default.nix index f07461f1bdd8..05c525c0cc90 100644 --- a/pkgs/development/python-modules/django-compressor/default.nix +++ b/pkgs/development/python-modules/django-compressor/default.nix @@ -1,29 +1,55 @@ -{ lib, buildPythonPackage, fetchPypi, - rcssmin, rjsmin, django-appconf }: +{ lib +, buildPythonPackage +, fetchPypi +, rcssmin +, rjsmin +, django-appconf +, beautifulsoup4 +, brotli +, pytestCheckHook +}: buildPythonPackage rec { - pname = "django-compressor"; - version = "4.0"; + pname = "django-compressor"; + version = "4.1"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-HbkbbQQpNjami9Eyjce7kNY2sClfZ7HMbU+hArn9JfY="; - }; - postPatch = '' - substituteInPlace setup.py \ - --replace 'rcssmin == 1.0.6' 'rcssmin' \ - --replace 'rjsmin == 1.1.0' 'rjsmin' - ''; + src = fetchPypi { + pname = "django_compressor"; + inherit version; + hash = "sha256-js5iHSqY9sZjVIDLizcB24kKmfeT+VyiDLAKvBlNMx0="; + }; - # requires django-sekizai, which we don't have packaged yet - doCheck = false; + postPatch = '' + substituteInPlace setup.py \ + --replace "rcssmin == 1.1.0" "rcssmin>=1.1.0" \ + --replace "rjsmin == 1.2.0" "rjsmin>=1.2.0" + ''; - propagatedBuildInputs = [ rcssmin rjsmin django-appconf ]; + propagatedBuildInputs = [ + rcssmin + rjsmin + django-appconf + ]; - meta = with lib; { - description = "Compresses linked and inline JavaScript or CSS into single cached files"; - homepage = "https://django-compressor.readthedocs.org/en/latest/"; - license = licenses.mit; - maintainers = with maintainers; [ desiderius ]; - }; + pythonImportsCheck = [ + "compressor" + ]; + + doCheck = false; # missing package django-sekizai + + checkInputs = [ + beautifulsoup4 + brotli + pytestCheckHook + ]; + + DJANGO_SETTINGS_MODULE = "compressor.test_settings"; + + meta = with lib; { + description = "Compresses linked and inline JavaScript or CSS into single cached files"; + homepage = "https://django-compressor.readthedocs.org/en/latest/"; + license = licenses.mit; + maintainers = with maintainers; [ desiderius ]; + }; } From 006298e99ee7d49a4e85f935ba1b5ca26c106460 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Wed, 3 Aug 2022 10:22:13 +0200 Subject: [PATCH 140/142] woodpecker-cli: patch out spurious CA certs errors Closes #184875. --- .../tools/continuous-integration/woodpecker/cli.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/continuous-integration/woodpecker/cli.nix b/pkgs/development/tools/continuous-integration/woodpecker/cli.nix index b5eda9efb917..aa83dfb16166 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/cli.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker/cli.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, callPackage, fetchFromGitHub }: +{ lib, buildGoModule, callPackage, fetchFromGitHub, fetchpatch }: let common = callPackage ./common.nix { }; in @@ -7,6 +7,16 @@ buildGoModule { inherit (common) version src ldflags postBuild; vendorSha256 = null; + patches = [ + # Fixes https://github.com/NixOS/nixpkgs/issues/184875, until a new version + # is released. + (fetchpatch { + name = "display-system-ca-error-only-if-there-is-an-error.patch"; + url = "https://github.com/woodpecker-ci/woodpecker/commit/1fb800329488de74c9db7cfc5dc43fb5a4efbad8.patch"; + sha256 = "sha256-wKI/7PhbxsAD/qrl4nnkHyyQhQcvGlySysnxytGJzfU="; + }) + ]; + subPackages = "cmd/cli"; CGO_ENABLED = 0; From 5b51b715027ae711abb9542cdd7662c6e840fccd Mon Sep 17 00:00:00 2001 From: Astro Date: Sat, 6 Aug 2022 00:34:19 +0200 Subject: [PATCH 141/142] sipexer: init at 1.0.3 (#185278) Co-authored-by: Winter --- pkgs/tools/networking/sipexer/default.nix | 26 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/networking/sipexer/default.nix diff --git a/pkgs/tools/networking/sipexer/default.nix b/pkgs/tools/networking/sipexer/default.nix new file mode 100644 index 000000000000..b8646270f8ac --- /dev/null +++ b/pkgs/tools/networking/sipexer/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "sipexer"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "miconda"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-cM40hxHMBH0wT1prSRipAZscSBxkZX7riwCrnLQUT0k="; + }; + + vendorSha256 = "sha256-q2uNqKZc6Zye7YimPDrg40o68Fo4ux4fygjVjJdhqQU="; + + meta = with lib; { + description = "Modern and flexible SIP CLI tool"; + homepage = "https://github.com/miconda/sipexer"; + changelog = "https://github.com/miconda/sipexer/releases/tag/v${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ astro ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 08b85f5721d1..21979f95ba29 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10669,6 +10669,8 @@ with pkgs; simplescreenrecorder = libsForQt5.callPackage ../applications/video/simplescreenrecorder { }; + sipexer = callPackage ../tools/networking/sipexer { }; + sipsak = callPackage ../tools/networking/sipsak { }; sipvicious = python3Packages.callPackage ../tools/security/sipvicious { }; From 2a4041b58659ad9c1d4f1b49ee05c0ee383b9c9b Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Fri, 5 Aug 2022 22:47:07 +0200 Subject: [PATCH 142/142] pokete: 0.8.0 -> 0.8.2 --- pkgs/games/pokete/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/pokete/default.nix b/pkgs/games/pokete/default.nix index 90aa3cdbe213..391faaa52b76 100644 --- a/pkgs/games/pokete/default.nix +++ b/pkgs/games/pokete/default.nix @@ -7,15 +7,15 @@ python3.pkgs.buildPythonApplication rec { pname = "pokete"; - version = "0.8.0"; + version = "0.8.2"; format = "other"; src = fetchFromGitHub { owner = "lxgr-linux"; repo = "pokete"; - rev = version; - sha256 = "sha256-DDKqxscXtl/i+YKiXAoFHXsGBQpcUvyHfOqwpe0hSgg="; + rev = "v${version}"; + sha256 = "sha256-carQ/m7akdXLO4h5o0cE0EiQmsAyarMAV4AtG3KATYQ="; }; pythonPath = with python3.pkgs; [