From 7e79c2ff7585bef771449f895488d792cc6b435c Mon Sep 17 00:00:00 2001 From: Sergey Kazenyuk Date: Sun, 4 Dec 2022 12:50:24 +0300 Subject: [PATCH 01/52] maintainers: add kazenyuk --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2475f634a3ee..837d15e0864b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7248,6 +7248,12 @@ githubId = 1047859; name = "Kaz Wesley"; }; + kazenyuk = { + email = "kazenyuk@pm.me"; + github = "nvmd"; + githubId = 524492; + name = "Sergey Kazenyuk"; + }; kcalvinalvin = { email = "calvin@kcalvinalvin.info"; github = "kcalvinalvin"; From 265bb9ebd0ca3365632ed5e0b645b4017d2d6256 Mon Sep 17 00:00:00 2001 From: Sergey Kazenyuk Date: Sun, 4 Dec 2022 12:53:16 +0300 Subject: [PATCH 02/52] hyperion-ng: 2.0.12 -> 2.0.14, unbreak --- .../video/hyperion-ng/default.nix | 56 +++++++++++++------ 1 file changed, 39 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/video/hyperion-ng/default.nix b/pkgs/applications/video/hyperion-ng/default.nix index d9a1e251e4d0..a1eb4086e89c 100644 --- a/pkgs/applications/video/hyperion-ng/default.nix +++ b/pkgs/applications/video/hyperion-ng/default.nix @@ -1,51 +1,73 @@ -{ stdenv, avahi-compat, cmake, fetchFromGitHub, flatbuffers, hidapi, lib, libcec -, libusb1, libX11, libxcb, libXrandr, mbedtls, mkDerivation, protobuf, python3 -, qtbase, qtserialport, qtsvg, qtx11extras, wrapQtAppsHook }: +{ stdenv, lib, fetchFromGitHub +, cmake, wrapQtAppsHook, perl +, flatbuffers, protobuf, mbedtls +, hidapi, libcec, libusb1 +, libX11, libxcb, libXrandr, python3 +, qtbase, qtserialport, qtsvg, qtx11extras +, withRPiDispmanx ? false, libraspberrypi +}: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "hyperion.ng"; - version = "2.0.12"; + version = "2.0.14"; src = fetchFromGitHub { owner = "hyperion-project"; repo = pname; rev = version; - sha256 = "sha256-J31QaWwGNhIpnZmWN9lZEI6fC0VheY5X8fGchQqtAlQ="; + sha256 = "sha256-Y1PZ+YyPMZEX4fBpMG6IVT1gtXR9ZHlavJMCQ4KAenc="; + # needed for `dependencies/external/`: + # * rpi_ws281x` - not possible to use as a "system" lib + # * qmdnsengine - not in nixpkgs yet + fetchSubmodules = true; }; buildInputs = [ - avahi-compat - flatbuffers hidapi - libcec libusb1 libX11 libxcb libXrandr - mbedtls + flatbuffers protobuf + mbedtls python3 qtbase qtserialport qtsvg qtx11extras - ]; + ] ++ lib.optional stdenv.isLinux libcec + ++ lib.optional withRPiDispmanx libraspberrypi; - nativeBuildInputs = [ cmake wrapQtAppsHook ]; + nativeBuildInputs = [ + cmake wrapQtAppsHook + ] ++ lib.optional stdenv.isDarwin perl; # for macos bundle + + patchPhase = '' + patchShebangs test/testrunner.sh + patchShebangs src/hyperiond/CMakeLists.txt + '' ; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" - "-DUSE_SYSTEM_MBEDTLS_LIBS=ON" + "-DENABLE_DEPLOY_DEPENDENCIES=OFF" "-DUSE_SYSTEM_FLATBUFFERS_LIBS=ON" "-DUSE_SYSTEM_PROTO_LIBS=ON" - ]; + "-DUSE_SYSTEM_MBEDTLS_LIBS=ON" + # "-DUSE_SYSTEM_QMDNS_LIBS=ON" # qmdnsengine not in nixpkgs yet + "-DENABLE_TESTS=ON" + ] ++ lib.optional (withRPiDispmanx == false) "-DENABLE_DISPMANX=OFF"; + + doCheck = true; + checkPhase = '' + cd ../ && ./test/testrunner.sh && cd - + ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); - description = "Open Source Ambilight solution"; + description = "An opensource Bias or Ambient Lighting implementation"; homepage = "https://github.com/hyperion-project/hyperion.ng"; license = licenses.mit; - maintainers = with maintainers; [ algram ]; + maintainers = with maintainers; [ algram kazenyuk ]; platforms = platforms.unix; }; } From cfde0671b9d7e52e4bd286f3e60f9d1bd8c696ca Mon Sep 17 00:00:00 2001 From: clerie Date: Mon, 19 Dec 2022 19:59:11 +0100 Subject: [PATCH 03/52] nsnake: init at 3.0.1 --- pkgs/games/nsnake/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/games/nsnake/default.nix diff --git a/pkgs/games/nsnake/default.nix b/pkgs/games/nsnake/default.nix new file mode 100644 index 000000000000..aa3f568ec009 --- /dev/null +++ b/pkgs/games/nsnake/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, lib, ncurses }: + +stdenv.mkDerivation rec { + pname = "nsnake"; + version = "3.0.1"; + + src = fetchFromGitHub { + owner = "alexdantas"; + repo = "nSnake"; + rev = "v${version}"; + sha256 = "sha256-MixwIhyymruruV8G8PjmR9EoZBpaDVBCKBccSFL0lS8="; + }; + + buildInputs = [ ncurses ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = { + description = "ncurses based snake game for the terminal"; + homepage = "https://github.com/alexdantas/nSnake"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ clerie ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8a6af28a25f..766fa716ce5f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35302,6 +35302,8 @@ with pkgs; newtonwars = callPackage ../games/newtonwars { }; + nsnake = callPackage ../games/nsnake { }; + nudoku = callPackage ../games/nudoku { }; nxengine-evo = callPackage ../games/nxengine-evo { }; From 39fb426da55f30b021844f0e8bddd5f2ffb76b8e Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 22 Mar 2023 13:56:07 -0400 Subject: [PATCH 04/52] itk: enable SimpleITKFilters; minor refactor This is needed for the SimpleITK Python package to import successfully rather than throw an error due to missing symbols. --- pkgs/development/libraries/itk/generic.nix | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/itk/generic.nix b/pkgs/development/libraries/itk/generic.nix index 78f4d56bfac6..3a6b2afee0d9 100644 --- a/pkgs/development/libraries/itk/generic.nix +++ b/pkgs/development/libraries/itk/generic.nix @@ -3,10 +3,7 @@ { lib, stdenv, fetchFromGitHub, cmake, makeWrapper , pkg-config, libX11, libuuid, xz, vtk, Cocoa }: -stdenv.mkDerivation rec { - pname = "itk"; - inherit version; - +let itkGenericLabelInterpolatorSrc = fetchFromGitHub { owner = "InsightSoftwareConsortium"; repo = "ITKGenericLabelInterpolator"; @@ -21,6 +18,18 @@ stdenv.mkDerivation rec { hash = "sha256-deJbza36c0Ohf9oKpO2T4po37pkyI+2wCSeGL4r17Go="; }; + itkSimpleITKFiltersSrc = fetchFromGitHub { + owner = "InsightSoftwareConsortium"; + repo = "ITKSimpleITKFilters"; + rev = "bb896868fc6480835495d0da4356d5db009592a6"; + hash = "sha256-MfaIA0xxA/pzUBSwnAevr17iR23Bo5iQO2cSyknS3o4="; + }; +in + +stdenv.mkDerivation { + pname = "itk"; + inherit version; + src = fetchFromGitHub { owner = "InsightSoftwareConsortium"; repo = "ITK"; @@ -36,6 +45,7 @@ stdenv.mkDerivation rec { --replace "@OPENJPEG_INSTALL_LIB_DIR@" "@OPENJPEG_INSTALL_FULL_LIB_DIR@" ln -sr ${itkGenericLabelInterpolatorSrc} Modules/External/ITKGenericLabelInterpolator ln -sr ${itkAdaptiveDenoisingSrc} Modules/External/ITKAdaptiveDenoising + ln -sr ${itkSimpleITKFiltersSrc} Modules/External/ITKSimpleITKFilters ''; cmakeFlags = [ @@ -45,6 +55,7 @@ stdenv.mkDerivation rec { "-DModule_ITKMINC=ON" "-DModule_ITKIOMINC=ON" "-DModule_ITKIOTransformMINC=ON" + "-DModule_SimpleITKFilters=ON" "-DModule_ITKVtkGlue=ON" "-DModule_ITKReview=ON" "-DModule_MGHIO=ON" @@ -69,7 +80,7 @@ stdenv.mkDerivation rec { meta = { description = "Insight Segmentation and Registration Toolkit"; - homepage = "https://www.itk.org/"; + homepage = "https://www.itk.org"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [viric]; }; From 9e182deb290b2602dc86630810818d5e0e4ae9dd Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 22 Mar 2023 13:57:46 -0400 Subject: [PATCH 05/52] simpleitk: collapse `out` and `dev` outputs Splitting the outputs confuses downstream CMake configure. --- pkgs/development/libraries/simpleitk/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix index a09ac168ba46..88b1d1ade174 100644 --- a/pkgs/development/libraries/simpleitk/default.nix +++ b/pkgs/development/libraries/simpleitk/default.nix @@ -4,12 +4,10 @@ stdenv.mkDerivation rec { pname = "simpleitk"; version = "2.2.1"; - outputs = [ "out" "dev" ]; - src = fetchFromGitHub { owner = "SimpleITK"; repo = "SimpleITK"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-0YxmixUTXpjegZQv7DDCNTWFTH8QEWqQQszee7aQ5EI="; }; From 157285ffee5174defc6302288afe8210b1479f2d Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 22 Mar 2023 14:04:46 -0400 Subject: [PATCH 06/52] python310Packages.simpleitk: init at 2.2.1 --- .../python-modules/simpleitk/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 +++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/simpleitk/default.nix diff --git a/pkgs/development/python-modules/simpleitk/default.nix b/pkgs/development/python-modules/simpleitk/default.nix new file mode 100644 index 000000000000..cc138695e3fd --- /dev/null +++ b/pkgs/development/python-modules/simpleitk/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, cmake +, swig4 +, itk +, numpy +, simpleitk +, scikit-build +}: + +buildPythonPackage rec { + inherit (simpleitk) pname version src meta; + format = "pyproject"; + disabled = pythonOlder "3.8"; + + sourceRoot = "source/Wrapping/Python"; + preBuild = '' + make + ''; + + nativeBuildInputs = [ cmake swig4 scikit-build ]; + propagatedBuildInputs = [ itk simpleitk numpy ]; + + pythonImportsCheck = [ "SimpleITK" ]; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f24f353537b6..d8c188c61cf1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10742,6 +10742,10 @@ self: super: with self; { simplehound = callPackage ../development/python-modules/simplehound { }; + simpleitk = callPackage ../development/python-modules/simpleitk { + inherit (pkgs) simpleitk; + }; + simplejson = callPackage ../development/python-modules/simplejson { }; simplekml = callPackage ../development/python-modules/simplekml { }; From deb1d7ac1ed8475d8dd1d1accf045203bfb4ee58 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 24 Mar 2023 14:27:12 +0100 Subject: [PATCH 07/52] ceph: 16.2.10 -> 17.2.5 Updates Ceph from the Pacific to the Quincy release tree. Upgrade to boost179 and python310, cleans up the python environment, builds with more system libraries. Disables parquet support for the radosgw, because I couldn't get it to build. Also properly enable the testsuite on ceph-common and generally unroll and sort lists for a better overview and history. Co-Authored-By: name_snrl --- .../ceph/0000-fix-SPDK-build-env.patch | 11 - pkgs/tools/filesystems/ceph/default.nix | 317 ++++++++++++------ 2 files changed, 214 insertions(+), 114 deletions(-) delete mode 100644 pkgs/tools/filesystems/ceph/0000-fix-SPDK-build-env.patch diff --git a/pkgs/tools/filesystems/ceph/0000-fix-SPDK-build-env.patch b/pkgs/tools/filesystems/ceph/0000-fix-SPDK-build-env.patch deleted file mode 100644 index a117408b000f..000000000000 --- a/pkgs/tools/filesystems/ceph/0000-fix-SPDK-build-env.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/cmake/modules/BuildSPDK.cmake -+++ b/cmake/modules/BuildSPDK.cmake -@@ -35,7 +35,7 @@ macro(build_spdk) - # unset $CFLAGS, otherwise it will interfere with how SPDK sets - # its include directory. - # unset $LDFLAGS, otherwise SPDK will fail to mock some functions. -- BUILD_COMMAND env -i PATH=$ENV{PATH} CC=${CMAKE_C_COMPILER} ${make_cmd} EXTRA_CFLAGS="${spdk_CFLAGS}" -+ BUILD_COMMAND env -i PATH=$ENV{PATH} CC=${CMAKE_C_COMPILER} ${make_cmd} EXTRA_CFLAGS="${spdk_CFLAGS}" C_OPT="-mssse3" - BUILD_IN_SOURCE 1 - INSTALL_COMMAND "true") - unset(make_cmd) diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 15e5071f963a..34befedf18b7 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -1,44 +1,82 @@ -{ lib, stdenv, runCommand, fetchurl, fetchpatch +{ lib +, stdenv +, runCommand +, fetchurl +, fetchFromGitHub + +# Build time +, cmake , ensureNewerSourcesHook -, cmake, pkg-config -, which, git -, boost175, xz -, libxml2, zlib, lz4 -, openldap, lttng-ust -, babeltrace, gperf -, gtest -, cunit, snappy -, makeWrapper -, leveldb, oath-toolkit -, libnl, libcap_ng -, rdkafka -, nixosTests -, cryptsetup -, sqlite -, lua -, icu -, bzip2 -, doxygen -, graphviz , fmt -, python39 +, git +, makeWrapper +, pkg-config +, which + +# Tests +, nixosTests + +# Runtime dependencies +, arrow-cpp +, babeltrace +, boost179 +, bzip2 +, cryptsetup +, cimg +, cunit +, doxygen +, gperf +, graphviz +, gtest +, icu +, jsoncpp +, libcap_ng +, libnl +, libxml2 +, lttng-ust +, lua +, lz4 +, oath-toolkit +, openldap +, python310 +, rdkafka +, rocksdb +, snappy +, sqlite +, utf8proc +, zlib +, zstd # Optional Dependencies -, yasm ? null, fcgi ? null, expat ? null -, curl ? null, fuse ? null -, libedit ? null, libatomic_ops ? null +, curl ? null +, expat ? null +, fuse ? null +, libatomic_ops ? null +, libedit ? null , libs3 ? null +, yasm ? null # Mallocs -, jemalloc ? null, gperftools ? null +, gperftools ? null +, jemalloc ? null # Crypto Dependencies , cryptopp ? null -, nss ? null, nspr ? null +, nspr ? null +, nss ? null # Linux Only Dependencies -, linuxHeaders, util-linux, libuuid, udev, keyutils, rdma-core, rabbitmq-c -, libaio ? null, libxfs ? null, zfs ? null, liburing ? null +, linuxHeaders +, util-linux +, libuuid +, udev +, keyutils +, rdma-core +, rabbitmq-c +, libaio ? null +, libxfs ? null +, liburing ? null +, zfs ? null , ... }: @@ -49,7 +87,6 @@ let shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null; optYasm = shouldUsePkg yasm; - optFcgi = shouldUsePkg fcgi; optExpat = shouldUsePkg expat; optCurl = shouldUsePkg curl; optFuse = shouldUsePkg fuse; @@ -68,8 +105,18 @@ let optLibxfs = shouldUsePkg libxfs; optZfs = shouldUsePkg zfs; - hasRadosgw = optFcgi != null && optExpat != null && optCurl != null && optLibedit != null; + # Downgrade rocksdb, 7.10 breaks ceph + rocksdb' = rocksdb.overrideAttrs (oldAttrs: { + version = "7.9.2"; + src = fetchFromGitHub { + owner = "facebook"; + repo = "rocksdb"; + rev = "refs/tags/v7.9.2"; + hash = "sha256-5P7IqJ14EZzDkbjaBvbix04ceGGdlWBuVFH/5dpD5VM="; + }; + }); + hasRadosgw = optExpat != null && optCurl != null && optLibedit != null; # Malloc implementation (can be jemalloc, tcmalloc or null) malloc = if optJemalloc != null then optJemalloc else optGperftools; @@ -92,20 +139,30 @@ let platforms = [ "x86_64-linux" "aarch64-linux" ]; }; - ceph-common = python.pkgs.buildPythonPackage rec{ + ceph-common = with python.pkgs; buildPythonPackage { pname = "ceph-common"; inherit src version; sourceRoot = "ceph-${version}/src/python-common"; - nativeCheckInputs = [ python.pkgs.pytest ]; - propagatedBuildInputs = with python.pkgs; [ pyyaml six ]; + propagatedBuildInputs = [ + pyyaml + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # requires network access + "test_valid_addr" + ]; meta = getMeta "Ceph common module for code shared by manager modules"; }; - # Boost 1.75 is not compatible with Python 3.10 - python = python39.override { + # Watch out for python <> boost compatibility + python = python310.override { packageOverrides = self: super: { sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { version = "1.4.46"; @@ -125,91 +182,128 @@ let }; }; - boost = boost175.override { + boost = boost179.override { enablePython = true; inherit python; }; - ceph-python-env = python.withPackages (ps: [ - # Check .requires files below https://github.com/ceph/ceph/tree/main/debian for dependencies - ps.sphinx - ps.flask - ps.routes - ps.cython - ps.setuptools - ps.virtualenv - # Libraries needed by the python tools - ps.mako + # TODO: split this off in build and runtime environment + ceph-python-env = python.withPackages (ps: with ps; [ ceph-common - ps.cherrypy - ps.cmd2 - ps.colorama - ps.python-dateutil - ps.jsonpatch - ps.pecan - ps.prettytable - ps.pyopenssl - ps.pyjwt - ps.webob - ps.bcrypt - ps.scipy - ps.six - ps.pyyaml + + # build time + cython + + # debian/control + bcrypt + cherrypy + influxdb + jinja2 + kubernetes + natsort + numpy + pecan + prettytable + pyjwt + pyopenssl + python-dateutil + pyyaml + requests + routes + scikit-learn + scipy + setuptools + sphinx + virtualenv + werkzeug + + # src/pybind/mgr/requirements-required.txt + cryptography + jsonpatch + + # src/tools/cephfs/shell/setup.py + cmd2 + colorama ]); sitePackages = ceph-python-env.python.sitePackages; - version = "16.2.10"; + version = "17.2.5"; src = fetchurl { url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz"; - sha256 = "sha256-342+nUV3mCX7QJfZSnKEfnQFCJwJmVQeYnefJwW/AtU="; + hash = "sha256-NiJpwUeROvh0siSaRoRrDm+C0s61CvRiIrbd7JmRspo="; }; in rec { ceph = stdenv.mkDerivation { pname = "ceph"; inherit src version; - patches = [ - ./0000-fix-SPDK-build-env.patch - # pacific: include/buffer: include - # fixes build with gcc 12 - # https://github.com/ceph/ceph/pull/47295 - (fetchpatch { - url = "https://github.com/ceph/ceph/pull/47295/commits/df88789a38c053513d3b2a9b7d12a952fc0c9042.patch"; - hash = "sha256-je65kBfa5hR0ZKo6ZI10XmD5ZUbKj5rxlGxxI9ZJVfo="; - }) - (fetchpatch { - url = "https://github.com/ceph/ceph/pull/47295/commits/2abcbe4e47705e6e0fcc7d9d9b75625f563199af.patch"; - hash = "sha256-8sWQKoZNHuGuhzX/F+3fY4+kjsrwsfoMdVpfVSj2x5w="; - }) - (fetchpatch { - url = "https://github.com/ceph/ceph/pull/47295/commits/13dc077cf6c65a3b8c4f13d896847b9964b3fcbb.patch"; - hash = "sha256-byfiZh9OJrux/y5m3QCPg0LET6q33ZDXmp/CN+yOSQQ="; - }) - ]; - nativeBuildInputs = [ cmake - pkg-config which git python.pkgs.wrapPython makeWrapper - python.pkgs.python # for the toPythonPath function - (ensureNewerSourcesHook { year = "1980"; }) - python fmt + git + makeWrapper + pkg-config + python + python.pkgs.python # for the toPythonPath function + python.pkgs.wrapPython + which + (ensureNewerSourcesHook { year = "1980"; }) # for building docs/man-pages presumably doxygen graphviz ]; + enableParallelBuilding = true; + buildInputs = cryptoLibsMap.${cryptoStr} ++ [ - boost xz ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3 - malloc zlib openldap lttng-ust babeltrace gperf gtest cunit - snappy lz4 oath-toolkit leveldb libnl libcap_ng rdkafka - cryptsetup sqlite lua icu bzip2 + arrow-cpp + babeltrace + boost + bzip2 + ceph-python-env + cimg + cryptsetup + cunit + gperf + gtest + jsoncpp + icu + libcap_ng + libnl + libxml2 + lttng-ust + lua + lz4 + malloc + oath-toolkit + openldap + optLibatomic_ops + optLibs3 + optYasm + rdkafka + rocksdb' + snappy + sqlite + utf8proc + zlib + zstd ] ++ lib.optionals stdenv.isLinux [ - linuxHeaders util-linux libuuid udev keyutils liburing optLibaio optLibxfs optZfs - # ceph 14 - rdma-core rabbitmq-c + keyutils + liburing + libuuid + linuxHeaders + optLibaio + optLibxfs + optZfs + rabbitmq-c + rdma-core + udev + util-linux ] ++ lib.optionals hasRadosgw [ - optFcgi optExpat optCurl optFuse optLibedit + optCurl + optExpat + optFuse + optLibedit ]; pythonPath = [ ceph-python-env "${placeholder "out"}/${ceph-python-env.sitePackages}" ]; @@ -226,17 +320,27 @@ in rec { ''; cmakeFlags = [ - "-DWITH_SYSTEM_ROCKSDB=OFF" # breaks Bluestore "-DCMAKE_INSTALL_DATADIR=${placeholder "lib"}/lib" - "-DWITH_SYSTEM_BOOST=ON" - "-DWITH_SYSTEM_GTEST=ON" "-DMGR_PYTHON_VERSION=${ceph-python-env.python.pythonVersion}" - "-DWITH_SYSTEMD=OFF" - "-DWITH_TESTS=OFF" - "-DWITH_CEPHFS_SHELL=ON" + "-DWITH_CEPHFS_SHELL:BOOL=ON" + "-DWITH_SYSTEMD:BOOL=OFF" + "-DWITH_TESTS:BOOL=OFF" + + # Use our own libraries, where possible + "-DWITH_SYSTEM_ARROW:BOOL=ON" + "-DWITH_SYSTEM_BOOST:BOOL=ON" + "-DWITH_SYSTEM_CIMG:BOOL=ON" + "-DWITH_SYSTEM_JSONCPP:BOOL=ON" + "-DWITH_SYSTEM_GTEST:BOOL=ON" + "-DWITH_SYSTEM_ROCKSDB:BOOL=ON" + "-DWITH_SYSTEM_UTF8PROC:BOOL=ON" + "-DWITH_SYSTEM_ZSTD:BOOL=ON" + # TODO breaks with sandbox, tries to download stuff with npm - "-DWITH_MGR_DASHBOARD_FRONTEND=OFF" + "-DWITH_MGR_DASHBOARD_FRONTEND:BOOL=OFF" + # no matching function for call to 'parquet::PageReader::Open(std::shared_ptr&, int64_t, arrow::Compression::type, parquet::MemoryPool*, parquet::CryptoContext*)' + "-DWITH_RADOSGW_SELECT_PARQUET:BOOL=OFF" # WITH_XFS has been set default ON from Ceph 16, keeping it optional in nixpkgs for now ''-DWITH_XFS=${if optLibxfs != null then "ON" else "OFF"}'' ] ++ lib.optional stdenv.isLinux "-DWITH_SYSTEM_LIBURING=ON"; @@ -259,8 +363,15 @@ in rec { meta = getMeta "Distributed storage system"; - passthru.version = version; - passthru.tests = { inherit (nixosTests) ceph-single-node ceph-multi-node ceph-single-node-bluestore; }; + passthru = { + inherit version; + tests = { + inherit (nixosTests) + ceph-multi-node + ceph-single-node + ceph-single-node-bluestore; + }; + }; }; ceph-client = runCommand "ceph-client-${version}" { From adb0c3560b93e5390825a03147a44383dd54050e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 24 Mar 2023 14:29:07 +0100 Subject: [PATCH 08/52] nixos/tests/ceph*: Enable on aarch64-linux --- nixos/tests/all-tests.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 625eddf97bdc..8d6e64d32630 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -121,9 +121,9 @@ in { cassandra_3_0 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_0; }; cassandra_3_11 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_11; }; cassandra_4 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_4; }; - ceph-multi-node = handleTestOn ["x86_64-linux"] ./ceph-multi-node.nix {}; - ceph-single-node = handleTestOn ["x86_64-linux"] ./ceph-single-node.nix {}; - ceph-single-node-bluestore = handleTestOn ["x86_64-linux"] ./ceph-single-node-bluestore.nix {}; + ceph-multi-node = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./ceph-multi-node.nix {}; + ceph-single-node = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./ceph-single-node.nix {}; + ceph-single-node-bluestore = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./ceph-single-node-bluestore.nix {}; certmgr = handleTest ./certmgr.nix {}; cfssl = handleTestOn ["aarch64-linux" "x86_64-linux"] ./cfssl.nix {}; cgit = handleTest ./cgit.nix {}; From de09232a2e2c596ae147b952d2f72567e4160eea Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 27 Mar 2023 13:33:40 +0200 Subject: [PATCH 09/52] python3.pkgs.expiring-dict: init at 1.1.0 --- .../python-modules/expiring-dict/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/expiring-dict/default.nix diff --git a/pkgs/development/python-modules/expiring-dict/default.nix b/pkgs/development/python-modules/expiring-dict/default.nix new file mode 100644 index 000000000000..cd3d92508848 --- /dev/null +++ b/pkgs/development/python-modules/expiring-dict/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, sortedcontainers +}: + +buildPythonPackage rec { + pname = "expiring-dict"; + version = "1.1.0"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-PEBK2x5DaUaMt+Ub+8nEcNfi6GPv4qHHXU7XBtDc4aY="; + }; + + propagatedBuildInputs = [ + sortedcontainers + ]; + + pythonImportsCheck = [ + "expiring_dict" + ]; + + meta = with lib; { + description = "Python dict with TTL support for auto-expiring caches"; + homepage = "https://github.com/dparker2/py-expiring-dict"; + license = licenses.mit; + maintainers = with maintainers; [ ajs124 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7b04f6296d33..9bbb77265a30 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3235,6 +3235,8 @@ self: super: with self; { expecttest = callPackage ../development/python-modules/expecttest { }; + expiring-dict = callPackage ../development/python-modules/expiring-dict { }; + expiringdict = callPackage ../development/python-modules/expiringdict { }; explorerscript = callPackage ../development/python-modules/explorerscript { }; From 86bc7e3b93b5524132206826725dd855668e692e Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 27 Mar 2023 13:27:05 +0200 Subject: [PATCH 10/52] unifi-protect-backup: 0.8.8 -> 0.9.0 https://github.com/ep1cman/unifi-protect-backup/releases/tag/v0.9.0 --- .../backup/unifi-protect-backup/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/backup/unifi-protect-backup/default.nix b/pkgs/applications/backup/unifi-protect-backup/default.nix index 36f554761f08..c0c39fc38543 100644 --- a/pkgs/applications/backup/unifi-protect-backup/default.nix +++ b/pkgs/applications/backup/unifi-protect-backup/default.nix @@ -5,7 +5,7 @@ python3.pkgs.buildPythonApplication rec { pname = "unifi-protect-backup"; - version = "0.8.8"; + version = "0.9.0"; format = "pyproject"; @@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec { owner = "ep1cman"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Z8qK7LprMyXl5irx9Xrs/RgqvNcFVBqLBSljovr6oiE="; + hash = "sha256-yPYzFZ4eI1wvBZgSP4Z90zyS+0vrDtf0uRz60byE5XA="; }; pythonRelaxDeps = [ @@ -23,10 +23,6 @@ python3.pkgs.buildPythonApplication rec { "pyunifiprotect" ]; - pythonRemoveDeps = [ - "pylint" - ]; - nativeBuildInputs = with python3.pkgs; [ poetry-core pythonRelaxDepsHook @@ -36,7 +32,10 @@ python3.pkgs.buildPythonApplication rec { aiocron aiorun aiosqlite + apprise click + expiring-dict + python-dateutil pyunifiprotect ]; From 7c0d0c1aaaeb3cdd8813af2b3ebb766fd6d50404 Mon Sep 17 00:00:00 2001 From: Kiskae Date: Sat, 11 Mar 2023 18:50:23 +0100 Subject: [PATCH 11/52] linuxPackages.nvidia_x11_vulkan_beta: 525.47.11 -> 525.47.18 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 15a3c9e6c18b..e083ccfbb899 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -51,11 +51,11 @@ rec { # Vulkan developer beta driver # See here for more information: https://developer.nvidia.com/vulkan-driver vulkan_beta = generic rec { - version = "525.47.11"; + version = "525.47.18"; persistencedVersion = "525.85.05"; settingsVersion = "525.85.05"; - sha256_64bit = "sha256-R3W0Nn9HDluzF316kWDlBnmCgS/O3Atic4poJnjAdPU="; - openSha256 = "sha256-tZXzYQBx/3PzmHYrxmUD6iwxqwbi5/uVlN/7DU82oig="; + sha256_64bit = "sha256-L0H7o7zkN1pHHadaIC8nH+JMGt1IzuubEH6KgViU2Ic="; + openSha256 = "sha256-xlRTE+QdAxSomIdvLb5dxklSeu/JVjI8IeYDzSloOo4="; settingsSha256 = "sha256-ck6ra8y8nn5kA3L9/VcRR2W2RaWvfVbgBiOh2dRJr/8="; persistencedSha256 = "sha256-dt/Tqxp7ZfnbLel9BavjWDoEdLJvdJRwFjTFOBYYKLI="; url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux"; From 4f2152215a66ff7764ada6da0de3fd174ba1f654 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 3 Apr 2023 13:14:37 +0200 Subject: [PATCH 12/52] nixos/gitit: remove has not been evaluated (in module-list) since 122d5e497e6df55f4b2e5c353bb2224b79cfd7b0 Closes #167034 --- nixos/modules/misc/ids.nix | 2 +- nixos/modules/module-list.nix | 1 - nixos/modules/services/misc/gitit.nix | 725 -------------------------- 3 files changed, 1 insertion(+), 727 deletions(-) delete mode 100644 nixos/modules/services/misc/gitit.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index bed50b81604d..5b278b5e8062 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -233,7 +233,7 @@ in # nix-serve = 199; # unused, removed 2020-12-12 #tvheadend = 200; # dynamically allocated as of 2021-09-18 uwsgi = 201; - gitit = 202; + # gitit = 202; # unused, module was removed 2023-04-03 riemanntools = 203; subsonic = 204; # riak = 205; # unused, remove 2022-07-22 diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e10eea501140..7f82016e0ae2 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -612,7 +612,6 @@ ./services/misc/gammu-smsd.nix ./services/misc/geoipupdate.nix ./services/misc/gitea.nix - # ./services/misc/gitit.nix ./services/misc/gitlab.nix ./services/misc/gitolite.nix ./services/misc/gitweb.nix diff --git a/nixos/modules/services/misc/gitit.nix b/nixos/modules/services/misc/gitit.nix deleted file mode 100644 index 0fafa76b5487..000000000000 --- a/nixos/modules/services/misc/gitit.nix +++ /dev/null @@ -1,725 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.services.gitit; - - homeDir = "/var/lib/gitit"; - - toYesNo = b: if b then "yes" else "no"; - - gititShared = with cfg.haskellPackages; gitit + "/share/" + ghc.targetPrefix + ghc.haskellCompilerName + "/" + gitit.pname + "-" + gitit.version; - - gititWithPkgs = hsPkgs: extras: hsPkgs.ghcWithPackages (self: with self; [ gitit ] ++ (extras self)); - - gititSh = hsPkgs: extras: with pkgs; let - env = gititWithPkgs hsPkgs extras; - in writeScript "gitit" '' - #!${runtimeShell} - cd $HOME - export NIX_GHC="${env}/bin/ghc" - export NIX_GHCPKG="${env}/bin/ghc-pkg" - export NIX_GHC_DOCDIR="${env}/share/doc/ghc/html" - export NIX_GHC_LIBDIR=$( $NIX_GHC --print-libdir ) - ${env}/bin/gitit -f ${configFile} - ''; - - gititOptions = { - - enable = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc "Enable the gitit service."; - }; - - haskellPackages = mkOption { - default = pkgs.haskellPackages; - defaultText = literalExpression "pkgs.haskellPackages"; - example = literalExpression "pkgs.haskell.packages.ghc784"; - description = lib.mdDoc "haskellPackages used to build gitit and plugins."; - }; - - extraPackages = mkOption { - type = types.functionTo (types.listOf types.package); - default = self: []; - example = literalExpression '' - haskellPackages: [ - haskellPackages.wreq - ] - ''; - description = lib.mdDoc '' - Extra packages available to ghc when running gitit. The - value must be a function which receives the attrset defined - in {var}`haskellPackages` as the sole argument. - ''; - }; - - address = mkOption { - type = types.str; - default = "0.0.0.0"; - description = lib.mdDoc "IP address on which the web server will listen."; - }; - - port = mkOption { - type = types.int; - default = 5001; - description = lib.mdDoc "Port on which the web server will run."; - }; - - wikiTitle = mkOption { - type = types.str; - default = "Gitit!"; - description = lib.mdDoc "The wiki title."; - }; - - repositoryType = mkOption { - type = types.enum ["git" "darcs" "mercurial"]; - default = "git"; - description = lib.mdDoc "Specifies the type of repository used for wiki content."; - }; - - repositoryPath = mkOption { - type = types.path; - default = homeDir + "/wiki"; - description = lib.mdDoc '' - Specifies the path of the repository directory. If it does not - exist, gitit will create it on startup. - ''; - }; - - requireAuthentication = mkOption { - type = types.enum [ "none" "modify" "read" ]; - default = "modify"; - description = lib.mdDoc '' - If 'none', login is never required, and pages can be edited - anonymously. If 'modify', login is required to modify the wiki - (edit, add, delete pages, upload files). If 'read', login is - required to see any wiki pages. - ''; - }; - - authenticationMethod = mkOption { - type = types.enum [ "form" "http" "generic" "github" ]; - default = "form"; - description = lib.mdDoc '' - 'form' means that users will be logged in and registered using forms - in the gitit web interface. 'http' means that gitit will assume that - HTTP authentication is in place and take the logged in username from - the "Authorization" field of the HTTP request header (in addition, - the login/logout and registration links will be suppressed). - 'generic' means that gitit will assume that some form of - authentication is in place that directly sets REMOTE_USER to the name - of the authenticated user (e.g. mod_auth_cas on apache). 'rpx' means - that gitit will attempt to log in through https://rpxnow.com. This - requires that 'rpx-domain', 'rpx-key', and 'base-url' be set below, - and that 'curl' be in the system path. - ''; - }; - - userFile = mkOption { - type = types.path; - default = homeDir + "/gitit-users"; - description = lib.mdDoc '' - Specifies the path of the file containing user login information. If - it does not exist, gitit will create it (with an empty user list). - This file is not used if 'http' is selected for - authentication-method. - ''; - }; - - sessionTimeout = mkOption { - type = types.int; - default = 60; - description = lib.mdDoc '' - Number of minutes of inactivity before a session expires. - ''; - }; - - staticDir = mkOption { - type = types.path; - default = gititShared + "/data/static"; - description = lib.mdDoc '' - Specifies the path of the static directory (containing javascript, - css, and images). If it does not exist, gitit will create it and - populate it with required scripts, stylesheets, and images. - ''; - }; - - defaultPageType = mkOption { - type = types.enum [ "markdown" "rst" "latex" "html" "markdown+lhs" "rst+lhs" "latex+lhs" ]; - default = "markdown"; - description = lib.mdDoc '' - Specifies the type of markup used to interpret pages in the wiki. - Possible values are markdown, rst, latex, html, markdown+lhs, - rst+lhs, and latex+lhs. (the +lhs variants treat the input as - literate Haskell. See pandoc's documentation for more details.) If - Markdown is selected, pandoc's syntax extensions (for footnotes, - delimited code blocks, etc.) will be enabled. Note that pandoc's - restructuredtext parser is not complete, so some pages may not be - rendered correctly if rst is selected. The same goes for latex and - html. - ''; - }; - - math = mkOption { - type = types.enum [ "mathml" "raw" "mathjax" "jsmath" "google" ]; - default = "mathml"; - description = lib.mdDoc '' - Specifies how LaTeX math is to be displayed. Possible values are - mathml, raw, mathjax, jsmath, and google. If mathml is selected, - gitit will convert LaTeX math to MathML and link in a script, - MathMLinHTML.js, that allows the MathML to be seen in Gecko browsers, - IE + mathplayer, and Opera. In other browsers you may get a jumble of - characters. If raw is selected, the LaTeX math will be displayed as - raw LaTeX math. If mathjax is selected, gitit will link to the - remote mathjax script. If jsMath is selected, gitit will link to the - script /js/jsMath/easy/load.js, and will assume that jsMath has been - installed into the js/jsMath directory. This is the most portable - solution. If google is selected, the google chart API is called to - render the formula as an image. This requires a connection to google, - and might raise a technical or a privacy problem. - ''; - }; - - mathJaxScript = mkOption { - type = types.str; - default = "https://d3eoax9i5htok0.cloudfront.net/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"; - description = lib.mdDoc '' - Specifies the path to MathJax rendering script. You might want to - use your own MathJax script to render formulas without Internet - connection or if you want to use some special LaTeX packages. Note: - path specified there cannot be an absolute path to a script on your - hdd, instead you should run your (local if you wish) HTTP server - which will serve the MathJax.js script. You can easily (in four lines - of code) serve MathJax.js using - http://happstack.com/docs/crashcourse/FileServing.html Do not forget - the "http://" prefix (e.g. http://localhost:1234/MathJax.js). - ''; - }; - - showLhsBirdTracks = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Specifies whether to show Haskell code blocks in "bird style", with - "> " at the beginning of each line. - ''; - }; - - templatesDir = mkOption { - type = types.path; - default = gititShared + "/data/templates"; - description = lib.mdDoc '' - Specifies the path of the directory containing page templates. If it - does not exist, gitit will create it with default templates. Users - may wish to edit the templates to customize the appearance of their - wiki. The template files are HStringTemplate templates. Variables to - be interpolated appear between $\'s. Literal $\'s must be - backslash-escaped. - ''; - }; - - logFile = mkOption { - type = types.path; - default = homeDir + "/gitit.log"; - description = lib.mdDoc '' - Specifies the path of gitit's log file. If it does not exist, gitit - will create it. The log is in Apache combined log format. - ''; - }; - - logLevel = mkOption { - type = types.enum [ "DEBUG" "INFO" "NOTICE" "WARNING" "ERROR" "CRITICAL" "ALERT" "EMERGENCY" ]; - default = "ERROR"; - description = lib.mdDoc '' - Determines how much information is logged. Possible values (from - most to least verbose) are DEBUG, INFO, NOTICE, WARNING, ERROR, - CRITICAL, ALERT, EMERGENCY. - ''; - }; - - frontPage = mkOption { - type = types.str; - default = "Front Page"; - description = lib.mdDoc '' - Specifies which wiki page is to be used as the wiki's front page. - Gitit creates a default front page on startup, if one does not exist - already. - ''; - }; - - noDelete = mkOption { - type = types.str; - default = "Front Page, Help"; - description = lib.mdDoc '' - Specifies pages that cannot be deleted through the web interface. - (They can still be deleted directly using git or darcs.) A - comma-separated list of page names. Leave blank to allow every page - to be deleted. - ''; - }; - - noEdit = mkOption { - type = types.str; - default = "Help"; - description = lib.mdDoc '' - Specifies pages that cannot be edited through the web interface. - Leave blank to allow every page to be edited. - ''; - }; - - defaultSummary = mkOption { - type = types.str; - default = ""; - description = lib.mdDoc '' - Specifies text to be used in the change description if the author - leaves the "description" field blank. If default-summary is blank - (the default), the author will be required to fill in the description - field. - ''; - }; - - tableOfContents = mkOption { - type = types.bool; - default = true; - description = lib.mdDoc '' - Specifies whether to print a tables of contents (with links to - sections) on each wiki page. - ''; - }; - - plugins = mkOption { - type = with types; listOf str; - default = [ (gititShared + "/plugins/Dot.hs") ]; - description = lib.mdDoc '' - Specifies a list of plugins to load. Plugins may be specified either - by their path or by their module name. If the plugin name starts - with Gitit.Plugin., gitit will assume that the plugin is an installed - module and will not try to find a source file. - ''; - }; - - useCache = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Specifies whether to cache rendered pages. Note that if use-feed is - selected, feeds will be cached regardless of the value of use-cache. - ''; - }; - - cacheDir = mkOption { - type = types.path; - default = homeDir + "/cache"; - description = lib.mdDoc "Path where rendered pages will be cached."; - }; - - maxUploadSize = mkOption { - type = types.str; - default = "1000K"; - description = lib.mdDoc '' - Specifies an upper limit on the size (in bytes) of files uploaded - through the wiki's web interface. To disable uploads, set this to - 0K. This will result in the uploads link disappearing and the - _upload url becoming inactive. - ''; - }; - - maxPageSize = mkOption { - type = types.str; - default = "1000K"; - description = lib.mdDoc "Specifies an upper limit on the size (in bytes) of pages."; - }; - - debugMode = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc "Causes debug information to be logged while gitit is running."; - }; - - compressResponses = mkOption { - type = types.bool; - default = true; - description = lib.mdDoc "Specifies whether HTTP responses should be compressed."; - }; - - mimeTypesFile = mkOption { - type = types.path; - default = "/etc/mime/types.info"; - description = lib.mdDoc '' - Specifies the path of a file containing mime type mappings. Each - line of the file should contain two fields, separated by whitespace. - The first field is the mime type, the second is a file extension. - For example: - ``` - video/x-ms-wmx wmx - ``` - If the file is not found, some simple defaults will be used. - ''; - }; - - useReCaptcha = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - If true, causes gitit to use the reCAPTCHA service - (http://recaptcha.net) to prevent bots from creating accounts. - ''; - }; - - reCaptchaPrivateKey = mkOption { - type = with types; nullOr str; - default = null; - description = lib.mdDoc '' - Specifies the private key for the reCAPTCHA service. To get - these, you need to create an account at http://recaptcha.net. - ''; - }; - - reCaptchaPublicKey = mkOption { - type = with types; nullOr str; - default = null; - description = lib.mdDoc '' - Specifies the public key for the reCAPTCHA service. To get - these, you need to create an account at http://recaptcha.net. - ''; - }; - - accessQuestion = mkOption { - type = types.str; - default = "What is the code given to you by Ms. X?"; - description = lib.mdDoc '' - Specifies a question that users must answer when they attempt to - create an account - ''; - }; - - accessQuestionAnswers = mkOption { - type = types.str; - default = "RED DOG, red dog"; - description = lib.mdDoc '' - Specifies a question that users must answer when they attempt to - create an account, along with a comma-separated list of acceptable - answers. This can be used to institute a rudimentary password for - signing up as a user on the wiki, or as an alternative to reCAPTCHA. - Example: - access-question: What is the code given to you by Ms. X? - access-question-answers: RED DOG, red dog - ''; - }; - - rpxDomain = mkOption { - type = with types; nullOr str; - default = null; - description = lib.mdDoc '' - Specifies the domain and key of your RPX account. The domain is just - the prefix of the complete RPX domain, so if your full domain is - 'https://foo.rpxnow.com/', use 'foo' as the value of rpx-domain. - ''; - }; - - rpxKey = mkOption { - type = with types; nullOr str; - default = null; - description = lib.mdDoc "RPX account access key."; - }; - - mailCommand = mkOption { - type = types.str; - default = "sendmail %s"; - description = lib.mdDoc '' - Specifies the command to use to send notification emails. '%s' will - be replaced by the destination email address. The body of the - message will be read from stdin. If this field is left blank, - password reset will not be offered. - ''; - }; - - resetPasswordMessage = mkOption { - type = types.lines; - default = '' - > From: gitit@$hostname$ - > To: $useremail$ - > Subject: Wiki password reset - > - > Hello $username$, - > - > To reset your password, please follow the link below: - > http://$hostname$:$port$$resetlink$ - > - > Regards - ''; - description = lib.mdDoc '' - Gives the text of the message that will be sent to the user should - she want to reset her password, or change other registration info. - The lines must be indented, and must begin with '>'. The initial - spaces and '> ' will be stripped off. $username$ will be replaced by - the user's username, $useremail$ by her email address, $hostname$ by - the hostname on which the wiki is running (as returned by the - hostname system call), $port$ by the port on which the wiki is - running, and $resetlink$ by the relative path of a reset link derived - from the user's existing hashed password. If your gitit wiki is being - proxied to a location other than the root path of $port$, you should - change the link to reflect this: for example, to - http://$hostname$/path/to/wiki$resetlink$ or - http://gitit.$hostname$$resetlink$ - ''; - }; - - useFeed = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Specifies whether an ATOM feed should be enabled (for the site and - for individual pages). - ''; - }; - - baseUrl = mkOption { - type = with types; nullOr str; - default = null; - description = lib.mdDoc '' - The base URL of the wiki, to be used in constructing feed IDs and RPX - token_urls. Set this if useFeed is false or authentication-method - is 'rpx'. - ''; - }; - - absoluteUrls = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Make wikilinks absolute with respect to the base-url. So, for - example, in a wiki served at the base URL '/wiki', on a page - Sub/Page, the wikilink `[Cactus]()` will produce a link to - '/wiki/Cactus' if absoluteUrls is true, and a relative link to - 'Cactus' (referring to '/wiki/Sub/Cactus') if absolute-urls is 'no'. - ''; - }; - - feedDays = mkOption { - type = types.int; - default = 14; - description = lib.mdDoc "Number of days to be included in feeds."; - }; - - feedRefreshTime = mkOption { - type = types.int; - default = 60; - description = lib.mdDoc "Number of minutes to cache feeds before refreshing."; - }; - - pdfExport = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - If true, PDF will appear in export options. PDF will be created using - pdflatex, which must be installed and in the path. Note that PDF - exports create significant additional server load. - ''; - }; - - pandocUserData = mkOption { - type = with types; nullOr path; - default = null; - description = lib.mdDoc '' - If a directory is specified, this will be searched for pandoc - customizations. These can include a templates/ directory for custom - templates for various export formats, an S5 directory for custom S5 - styles, and a reference.odt for ODT exports. If no directory is - specified, $HOME/.pandoc will be searched. See pandoc's README for - more information. - ''; - }; - - xssSanitize = mkOption { - type = types.bool; - default = true; - description = lib.mdDoc '' - If true, all HTML (including that produced by pandoc) is filtered - through xss-sanitize. Set to no only if you trust all of your users. - ''; - }; - - oauthClientId = mkOption { - type = with types; nullOr str; - default = null; - description = lib.mdDoc "OAuth client ID"; - }; - - oauthClientSecret = mkOption { - type = with types; nullOr str; - default = null; - description = lib.mdDoc "OAuth client secret"; - }; - - oauthCallback = mkOption { - type = with types; nullOr str; - default = null; - description = lib.mdDoc "OAuth callback URL"; - }; - - oauthAuthorizeEndpoint = mkOption { - type = with types; nullOr str; - default = null; - description = lib.mdDoc "OAuth authorize endpoint"; - }; - - oauthAccessTokenEndpoint = mkOption { - type = with types; nullOr str; - default = null; - description = lib.mdDoc "OAuth access token endpoint"; - }; - - githubOrg = mkOption { - type = with types; nullOr str; - default = null; - description = lib.mdDoc "Github organization"; - }; - }; - - configFile = pkgs.writeText "gitit.conf" '' - address: ${cfg.address} - port: ${toString cfg.port} - wiki-title: ${cfg.wikiTitle} - repository-type: ${cfg.repositoryType} - repository-path: ${cfg.repositoryPath} - require-authentication: ${cfg.requireAuthentication} - authentication-method: ${cfg.authenticationMethod} - user-file: ${cfg.userFile} - session-timeout: ${toString cfg.sessionTimeout} - static-dir: ${cfg.staticDir} - default-page-type: ${cfg.defaultPageType} - math: ${cfg.math} - mathjax-script: ${cfg.mathJaxScript} - show-lhs-bird-tracks: ${toYesNo cfg.showLhsBirdTracks} - templates-dir: ${cfg.templatesDir} - log-file: ${cfg.logFile} - log-level: ${cfg.logLevel} - front-page: ${cfg.frontPage} - no-delete: ${cfg.noDelete} - no-edit: ${cfg.noEdit} - default-summary: ${cfg.defaultSummary} - table-of-contents: ${toYesNo cfg.tableOfContents} - plugins: ${concatStringsSep "," cfg.plugins} - use-cache: ${toYesNo cfg.useCache} - cache-dir: ${cfg.cacheDir} - max-upload-size: ${cfg.maxUploadSize} - max-page-size: ${cfg.maxPageSize} - debug-mode: ${toYesNo cfg.debugMode} - compress-responses: ${toYesNo cfg.compressResponses} - mime-types-file: ${cfg.mimeTypesFile} - use-recaptcha: ${toYesNo cfg.useReCaptcha} - recaptcha-private-key: ${toString cfg.reCaptchaPrivateKey} - recaptcha-public-key: ${toString cfg.reCaptchaPublicKey} - access-question: ${cfg.accessQuestion} - access-question-answers: ${cfg.accessQuestionAnswers} - rpx-domain: ${toString cfg.rpxDomain} - rpx-key: ${toString cfg.rpxKey} - mail-command: ${cfg.mailCommand} - reset-password-message: ${cfg.resetPasswordMessage} - use-feed: ${toYesNo cfg.useFeed} - base-url: ${toString cfg.baseUrl} - absolute-urls: ${toYesNo cfg.absoluteUrls} - feed-days: ${toString cfg.feedDays} - feed-refresh-time: ${toString cfg.feedRefreshTime} - pdf-export: ${toYesNo cfg.pdfExport} - pandoc-user-data: ${toString cfg.pandocUserData} - xss-sanitize: ${toYesNo cfg.xssSanitize} - - [Github] - oauthclientid: ${toString cfg.oauthClientId} - oauthclientsecret: ${toString cfg.oauthClientSecret} - oauthcallback: ${toString cfg.oauthCallback} - oauthauthorizeendpoint: ${toString cfg.oauthAuthorizeEndpoint} - oauthaccesstokenendpoint: ${toString cfg.oauthAccessTokenEndpoint} - github-org: ${toString cfg.githubOrg} - ''; - -in - -{ - - options.services.gitit = gititOptions; - - config = mkIf cfg.enable { - - users.users.gitit = { - group = config.users.groups.gitit.name; - description = "Gitit user"; - home = homeDir; - createHome = true; - uid = config.ids.uids.gitit; - }; - - users.groups.gitit.gid = config.ids.gids.gitit; - - systemd.services.gitit = let - uid = toString config.ids.uids.gitit; - gid = toString config.ids.gids.gitit; - in { - description = "Git and Pandoc Powered Wiki"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - path = with pkgs; [ curl ] - ++ optional cfg.pdfExport texlive.combined.scheme-basic - ++ optional (cfg.repositoryType == "darcs") darcs - ++ optional (cfg.repositoryType == "mercurial") mercurial - ++ optional (cfg.repositoryType == "git") git; - - preStart = let - gm = "gitit@${config.networking.hostName}"; - in - with cfg; '' - chown ${uid}:${gid} -R ${homeDir} - for dir in ${repositoryPath} ${staticDir} ${templatesDir} ${cacheDir} - do - if [ ! -d $dir ] - then - mkdir -p $dir - find $dir -type d -exec chmod 0750 {} + - find $dir -type f -exec chmod 0640 {} + - fi - done - cd ${repositoryPath} - ${ - if repositoryType == "darcs" then - '' - if [ ! -d _darcs ] - then - darcs initialize - echo "${gm}" > _darcs/prefs/email - '' - else if repositoryType == "mercurial" then - '' - if [ ! -d .hg ] - then - hg init - cat >> .hg/hgrc < Date: Fri, 7 Apr 2023 13:02:42 +0200 Subject: [PATCH 13/52] grafana-loki,promtail: remove unnecessary go 1.19 pin since v2.7.4 Seems to have slipped through #219885 (a119b197e068a518dc6f4d048b9166b520c94b6f) See https://github.com/grafana/loki/releases/tag/v2.7.4 --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5fefc525beaa..272cbe003c2a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24831,9 +24831,7 @@ with pkgs; buildGoModule = buildGo119Module; # nixosTests.grafana-agent go 1.20 failure }; - grafana-loki = callPackage ../servers/monitoring/loki { - buildGoModule = buildGo119Module; # nixosTests.loki go 1.20 failure - }; + grafana-loki = callPackage ../servers/monitoring/loki { }; promtail = callPackage ../servers/monitoring/loki/promtail.nix { }; mimir = callPackage ../servers/monitoring/mimir { }; From d3763a6f2cddca53348463341d3dbb7ad3420dcd Mon Sep 17 00:00:00 2001 From: IndeedNotJames Date: Fri, 7 Apr 2023 13:02:42 +0200 Subject: [PATCH 14/52] grafana-loki,promtail: 2.7.4 -> 2.8.0 https://github.com/grafana/loki/releases/tag/v2.8.0 https://github.com/grafana/loki/releases/tag/v2.7.5 https://github.com/grafana/loki/blob/4ff61d4a1b70c1f64fa7fd367295eaee336cf070/CHANGELOG.md#280-2023-04-04 diff: https://github.com/grafana/loki/compare/v2.7.4...v2.8.0 --- pkgs/servers/monitoring/loki/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index 8179d5bfca65..7672b2ef8ade 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -8,17 +8,17 @@ }: buildGoModule rec { - version = "2.7.4"; + version = "2.8.0"; pname = "grafana-loki"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "loki"; - sha256 = "sha256-afa4uInoNyEgNDJ7nB1yr+YYoOsU+S7XWhKvkeApgRQ="; + hash = "sha256-RPa3G1zrWzunyQOdNUQ/dZGJ/7sh2OGvoEqeYaT7Qv0="; }; - vendorSha256 = null; + vendorHash = null; subPackages = [ # TODO split every executable into its own package From 3a4bdd17dd9a5b56a7d22d1cd16d2688441ea1cd Mon Sep 17 00:00:00 2001 From: IndeedNotJames Date: Fri, 7 Apr 2023 13:02:42 +0200 Subject: [PATCH 15/52] grafana-loki,promtail: add indeednotjames as maintainer --- pkgs/servers/monitoring/loki/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index 7672b2ef8ade..4f2b41a2d0e3 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -54,7 +54,7 @@ buildGoModule rec { description = "Like Prometheus, but for logs"; license = with licenses; [ agpl3Only asl20 ]; homepage = "https://grafana.com/oss/loki/"; - maintainers = with maintainers; [ willibutz globin mmahut ]; + maintainers = with maintainers; [ willibutz globin mmahut indeednotjames ]; platforms = platforms.unix; }; } From b121f98160340a5b4cd6332cf32491d50de7df38 Mon Sep 17 00:00:00 2001 From: yvt Date: Fri, 7 Apr 2023 23:04:07 +0900 Subject: [PATCH 16/52] fuse-7z-ng: add patch to zero-init `struct fuse_operations` Fixes segfault when reading archive files. `struct fuse_operations` contains function pointers specifying a filesystem's behavior for each operation. For unimplemented operations, they must be set to null so that libfuse can fall back to a default implementation or return an error. In fuse-7z-ng, however, they were left uninitialized, causing segfault due to garbage values stored in them. --- pkgs/tools/filesystems/fuse-7z-ng/default.nix | 3 +++ .../fuse-7z-ng/zero-init-fuse-operations.patch | 12 ++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/tools/filesystems/fuse-7z-ng/zero-init-fuse-operations.patch diff --git a/pkgs/tools/filesystems/fuse-7z-ng/default.nix b/pkgs/tools/filesystems/fuse-7z-ng/default.nix index d400891a2054..e7749f63a99e 100644 --- a/pkgs/tools/filesystems/fuse-7z-ng/default.nix +++ b/pkgs/tools/filesystems/fuse-7z-ng/default.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation rec { # Drop unused pthread library. pthread_yield() # fails the configure. ./no-pthread.patch + # Zero-initialize unset fields of `struct fuse_operations` so that + # garbage values don't cause segfault. + ./zero-init-fuse-operations.patch ]; nativeBuildInputs = [ pkg-config makeWrapper autoconf automake ]; diff --git a/pkgs/tools/filesystems/fuse-7z-ng/zero-init-fuse-operations.patch b/pkgs/tools/filesystems/fuse-7z-ng/zero-init-fuse-operations.patch new file mode 100644 index 000000000000..c2d50308f248 --- /dev/null +++ b/pkgs/tools/filesystems/fuse-7z-ng/zero-init-fuse-operations.patch @@ -0,0 +1,12 @@ +Zero-initialize unset fields of `struct fuse_operations`. +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -195,7 +195,7 @@ main (int argc, char **argv) + mkdir(param.mountpoint, 0750); + } + +- struct fuse_operations fuse7z_oper; ++ struct fuse_operations fuse7z_oper = {0}; + fuse7z_oper.init = fuse7z_init; + fuse7z_oper.destroy = fuse7z_destroy; + fuse7z_oper.readdir = fuse7z_readdir; From 35f9a33e94c68b1f3ca45aa16cf8bc177246e4b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20van=20Br=C3=BCgge?= Date: Sat, 8 Apr 2023 15:26:46 +0100 Subject: [PATCH 17/52] tone: 0.1.3 -> 0.1.5 --- pkgs/applications/audio/tone/default.nix | 4 ++-- pkgs/applications/audio/tone/nuget-deps.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/tone/default.nix b/pkgs/applications/audio/tone/default.nix index 4f02d4bd642f..c235fff4b724 100644 --- a/pkgs/applications/audio/tone/default.nix +++ b/pkgs/applications/audio/tone/default.nix @@ -7,13 +7,13 @@ let in buildDotnetModule rec { pname = "tone"; - version = "0.1.3"; + version = "0.1.5"; src = fetchFromGitHub { owner = "sandreas"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Z3cumXAIJhUB3/EbzB08MfBCrga1JHtDKr44TmRQuno="; + sha256 = "sha256-HhXyOPoDtraT7ef0kpE7SCQbvGFLrTddzS6Kdu0LxW4="; }; projectFile = "tone/tone.csproj"; diff --git a/pkgs/applications/audio/tone/nuget-deps.nix b/pkgs/applications/audio/tone/nuget-deps.nix index 3e9fa83c3540..4b372fe51244 100644 --- a/pkgs/applications/audio/tone/nuget-deps.nix +++ b/pkgs/applications/audio/tone/nuget-deps.nix @@ -28,7 +28,7 @@ (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "7.0.0"; sha256 = "1liyprh0zha2vgmqh92n8kkjz61zwhr7g16f0gmr297z2rg1j5pj"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "7.0.0"; sha256 = "1b4km9fszid9vp2zb3gya5ni9fn8bq62bzaas2ck2r7gs0sdys80"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.13"; sha256 = "0sjd1npl37mky8gqi4bir2fgp0bm6y3jy641asfxa0k0cidbfzwl"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.15"; sha256 = "0lcz7dniv3arkdzlmjgr9168rjb0an9xf3v3m3pdwjmy8yaipfba"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.2"; sha256 = "1p9splg1min274dpz7xdfgzrwkyfd3xlkygwpr1xgjvvyjvs6b0i"; }) (fetchNuGet { pname = "Sandreas.AudioMetadata"; version = "0.1.1"; sha256 = "11ibv23h7qj5qshibmlsqmjca51dqbhib9p1gz66c5kqhk7ci38j"; }) (fetchNuGet { pname = "Sandreas.Files"; version = "1.1.2"; sha256 = "08qk229q2y1dpdxdnp8xi9mgk8fgpjxrxm4z6ak8n09npp67nhn0"; }) @@ -51,5 +51,5 @@ (fetchNuGet { pname = "TestableIO.System.IO.Abstractions"; version = "19.0.1"; sha256 = "01v2wgb6y2z7df4b2dsy0jb4hnhpv5kgyxypzyqdk7h6plad2axd"; }) (fetchNuGet { pname = "TestableIO.System.IO.Abstractions.Wrappers"; version = "19.0.1"; sha256 = "1ms8wqar5w3z2y2qgxii9pqnsb4f1aikji2vaw01zxvnh2wry42n"; }) (fetchNuGet { pname = "Ude.NetStandard"; version = "1.2.0"; sha256 = "074yff6g272zpkhk0zvmbfiaaxyp3b05fl24i7ffp2jf9r8bnfpl"; }) - (fetchNuGet { pname = "z440.atl.core"; version = "4.18.0"; sha256 = "0wwqhpl3xw9vf6c5idz1kwpd72kbg7b9fcmj6gmccxa99kcgljzk"; }) + (fetchNuGet { pname = "z440.atl.core"; version = "4.19.0"; sha256 = "16290hcf42yhs69ymjrg2znk7s56nnp4hj8rqwi1i8rdajmfr2v1"; }) ] From f69209255c4f0c6357d08830f0a7b3d1183a2c5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20van=20Br=C3=BCgge?= Date: Sat, 8 Apr 2023 15:27:28 +0100 Subject: [PATCH 18/52] audiobookshelf: 2.2.15 -> 2.2.18 --- pkgs/servers/audiobookshelf/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/audiobookshelf/default.nix b/pkgs/servers/audiobookshelf/default.nix index fb569fc54bec..dbb067b1922f 100644 --- a/pkgs/servers/audiobookshelf/default.nix +++ b/pkgs/servers/audiobookshelf/default.nix @@ -4,13 +4,13 @@ let nodejs = nodejs-16_x; pname = "audiobookshelf"; - version = "2.2.15"; + version = "2.2.18"; src = fetchFromGitHub { owner = "advplyr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BrIXbembbcfSPOPknoY2Vn9I85eHyOQLDCMsFOMORgM="; + sha256 = "sha256-Ar+OK6HiKf2/47HE+1iTw8MVz9A6qZg1hpZQdZ/40UM="; }; client = buildNpmPackage { @@ -24,7 +24,7 @@ let NODE_OPTIONS = "--openssl-legacy-provider"; npmBuildScript = "generate"; - npmDepsHash = "sha256-eyZdeBsZ5XBoO/4djXZzOOr/h9kDSUULbqgdOZJNNCg="; + npmDepsHash = "sha256-Hsa7ZauUTtYQcCxw1cpuxQ/RfdRvBIh3PO1DXDUbELk="; }; wrapper = import ./wrapper.nix { @@ -38,7 +38,7 @@ in buildNpmPackage { dontNpmBuild = true; npmInstallFlags = "--only-production"; - npmDepsHash = "sha256-KbewULna+0mftIcdO5Z4A5rOrheBndpgzjkE1Jytfr4="; + npmDepsHash = "sha256-0PFeXiS8RSffhrocrHODNpb6d9+nbpulCW5qYIrytDI="; installPhase = '' mkdir -p $out/opt/client From 32ac1fb6ae50036c110b30fe27fe208b675812b8 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 8 Apr 2023 22:50:24 +0300 Subject: [PATCH 19/52] timeline: fix crash on file dialog env -i HOME="$HOME" DISPLAY="$DISPLAY" WAYLAND_DISPLAY="$WAYLAND_DISPLAY" XDG_RUNTIME_DIR="$XDG_RUNTIME_DIR" ./result/bin/timeline --- pkgs/applications/office/timeline/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/office/timeline/default.nix b/pkgs/applications/office/timeline/default.nix index f3f404cda89f..70776bb391bf 100644 --- a/pkgs/applications/office/timeline/default.nix +++ b/pkgs/applications/office/timeline/default.nix @@ -4,6 +4,7 @@ , gettext , makeDesktopItem , copyDesktopItems +, wrapGAppsHook }: python3.pkgs.buildPythonApplication rec { @@ -16,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { sha256 = "sha256-qwH2mt3Va62QJKJGOpt5WV3QksqQaRGEif4CcPC5F2E="; }; - nativeBuildInputs = [ python3.pkgs.wrapPython copyDesktopItems ]; + nativeBuildInputs = [ python3.pkgs.wrapPython copyDesktopItems wrapGAppsHook ]; pythonPath = with python3.pkgs; [ wxPython_4_2 @@ -76,6 +77,12 @@ python3.pkgs.buildPythonApplication rec { runHook postCheck ''; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { homepage = "https://thetimelineproj.sourceforge.net/"; changelog = "https://thetimelineproj.sourceforge.net/changelog.html"; From cf0f78a24961461369fb32b2d0b92c593dd1e18b Mon Sep 17 00:00:00 2001 From: IndeedNotJames Date: Sun, 9 Apr 2023 00:16:26 +0200 Subject: [PATCH 20/52] grafana-loki,promtail: remove redundant `meta.platforms` and `doCheck` already set by `buildGoModule` --- pkgs/servers/monitoring/loki/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index 4f2b41a2d0e3..4249a1e179b5 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -12,9 +12,9 @@ buildGoModule rec { pname = "grafana-loki"; src = fetchFromGitHub { - rev = "v${version}"; owner = "grafana"; repo = "loki"; + rev = "v${version}"; hash = "sha256-RPa3G1zrWzunyQOdNUQ/dZGJ/7sh2OGvoEqeYaT7Qv0="; }; @@ -48,13 +48,10 @@ buildGoModule rec { "-X ${t}.Revision=unknown" ]; - doCheck = true; - meta = with lib; { description = "Like Prometheus, but for logs"; license = with licenses; [ agpl3Only asl20 ]; homepage = "https://grafana.com/oss/loki/"; maintainers = with maintainers; [ willibutz globin mmahut indeednotjames ]; - platforms = platforms.unix; }; } From 7398d5fc7901c6198e14e6f76249620a18fe29f6 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 9 Apr 2023 19:50:02 +0200 Subject: [PATCH 21/52] buildFHSEnvBubblewrap: support pname + version --- .../buildFHSEnv.nix | 73 ++++++++++--------- .../build-fhs-userenv-bubblewrap/default.nix | 42 +++++++---- 2 files changed, 65 insertions(+), 50 deletions(-) diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/buildFHSEnv.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/buildFHSEnv.nix index 0d98c0a2bc64..1d8f194d1b03 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/buildFHSEnv.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/buildFHSEnv.nix @@ -1,11 +1,22 @@ -{ stdenv, lib, buildEnv, writeText, writeShellScriptBin, pkgs, pkgsi686Linux }: - -args@{ name, profile ? "" -, targetPkgs ? pkgs: [], multiPkgs ? pkgs: [] -, extraBuildCommands ? "", extraBuildCommandsMulti ? "" -, extraOutputsToInstall ? [] +{ lib +, stdenv +, runCommandLocal +, buildEnv +, writeText +, writeShellScriptBin +, pkgs +, pkgsi686Linux }: +{ name ? null +, profile ? "" +, targetPkgs ? pkgs: [] +, multiPkgs ? pkgs: [] +, extraBuildCommands ? "" +, extraBuildCommandsMulti ? "" +, extraOutputsToInstall ? [] +} @ args: + # HOWTO: # All packages (most likely programs) returned from targetPkgs will only be # installed once--matching the host's architecture (64bit on x86_64 and 32bit on @@ -78,19 +89,17 @@ let ''; # Compose /etc for the chroot environment - etcPkg = stdenv.mkDerivation { - name = "${name}-chrootenv-etc"; - buildCommand = '' - mkdir -p $out/etc - cd $out/etc + etcPkg = runCommandLocal "${name}-chrootenv-etc" { + } '' + mkdir -p $out/etc + cd $out/etc - # environment variables - ln -s ${etcProfile} profile + # environment variables + ln -s ${etcProfile} profile - # symlink /etc/mtab -> /proc/mounts (compat for old userspace progs) - ln -s /proc/mounts mtab - ''; - }; + # symlink /etc/mtab -> /proc/mounts (compat for old userspace progs) + ln -s /proc/mounts mtab + ''; # Composes a /usr-like directory structure staticUsrProfileTarget = buildEnv { @@ -163,8 +172,9 @@ let ln -Ls ${staticUsrProfileTarget}/lib/32/ld-linux.so.2 lib/ ''; - setupLibDirs = if isTargetBuild then setupLibDirsTarget - else setupLibDirsMulti; + setupLibDirs = if isTargetBuild + then setupLibDirsTarget + else setupLibDirsMulti; # the target profile is the actual profile that will be used for the chroot setupTargetProfile = '' @@ -203,21 +213,16 @@ let done ''; -in stdenv.mkDerivation { - name = "${name}-fhs"; - buildCommand = '' - mkdir -p $out - cd $out - ${setupTargetProfile} - cd $out - ${extraBuildCommands} - cd $out - ${lib.optionalString isMultiBuild extraBuildCommandsMulti} - ''; - preferLocalBuild = true; - allowSubstitutes = false; - +in runCommandLocal "${name}-fhs" { passthru = { inherit args multiPaths targetPaths; }; -} +} '' + mkdir -p $out + cd $out + ${setupTargetProfile} + cd $out + ${extraBuildCommands} + cd $out + ${lib.optionalString isMultiBuild extraBuildCommandsMulti} +'' diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix index ce807b932a19..5d94c309fe08 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix @@ -1,7 +1,15 @@ -{ lib, callPackage, runCommandLocal, writeShellScriptBin, glibc, pkgsi686Linux, coreutils, bubblewrap }: +{ lib +, callPackage +, runCommandLocal +, writeShellScript +, glibc +, pkgsi686Linux +, coreutils +, bubblewrap +}: -args @ { - name +{ name ? null +, pname ? null , version ? null , runScript ? "bash" , extraInstallCommands ? "" @@ -16,16 +24,22 @@ args @ { , unshareCgroup ? true , dieWithParent ? true , ... -}: +} @ args: + +assert (pname != null || version != null) -> (name == null && pname != null); # You must declare either a name or pname + version (preferred). with builtins; let + pname = if args.name != null then args.name else args.pname; + versionStr = lib.optionalString (version != null) ("-" + version); + name = pname + versionStr; + buildFHSEnv = callPackage ./buildFHSEnv.nix { }; - fhsenv = buildFHSEnv (removeAttrs args [ + fhsenv = buildFHSEnv (removeAttrs (args // { inherit name; }) [ "runScript" "extraInstallCommands" "meta" "passthru" "extraBwrapArgs" "dieWithParent" "unshareUser" "unshareCgroup" "unshareUts" "unshareNet" "unsharePid" "unshareIpc" - "version" + "pname" "version" ]); etcBindEntries = let @@ -93,7 +107,7 @@ let EOF ldconfig &> /dev/null ''; - init = run: writeShellScriptBin "${name}-init" '' + init = run: writeShellScript "${name}-init" '' source /etc/profile ${createLdConfCache} exec ${run} "$@" @@ -198,18 +212,13 @@ let "''${auto_mounts[@]}" "''${x11_args[@]}" ${concatStringsSep "\n " extraBwrapArgs} - ${init runScript}/bin/${name}-init ${initArgs} + ${init runScript} ${initArgs} ) exec "''${cmd[@]}" ''; - bin = writeShellScriptBin name (bwrapCmd { initArgs = ''"$@"''; }); - - versionStr = lib.optionalString (version != null) ("-" + version); - - nameAndVersion = name + versionStr; - -in runCommandLocal nameAndVersion { + bin = writeShellScript "${name}-bwrap" (bwrapCmd { initArgs = ''"$@"''; }); +in runCommandLocal name { inherit meta; passthru = passthru // { @@ -225,6 +234,7 @@ in runCommandLocal nameAndVersion { }; } '' mkdir -p $out/bin - ln -s ${bin}/bin/${name} $out/bin/${name} + ln -s ${bin} $out/bin/${pname} + ${extraInstallCommands} '' From 7ab959a4c3b45771d8ac59c28469944bde95ecd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Mon, 10 Apr 2023 08:29:00 -0300 Subject: [PATCH 22/52] linux-lqx: 6.2.9-lqx1 -> 6.2.10-lqx1 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index c3c149aea117..cee38c518967 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -11,9 +11,9 @@ let }; # ./update-zen.py lqx lqxVariant = { - version = "6.2.9"; #lqx + version = "6.2.10"; #lqx suffix = "lqx1"; #lqx - sha256 = "1rw85gallk7r15adrvi8597zwkib2qsq9ir2lg7v2ivk85mivbq9"; #lqx + sha256 = "0lrpwn1s0mlh03wlx1gxqy68v84c2yaswd0fxwh28dqiy0sk8zgj"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { From cd4ba7172bcc3a458c0410e1006fb10f8bac533e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 10 Apr 2023 14:35:00 -0500 Subject: [PATCH 23/52] mujs: fix build on darwin MuJS 1.3.3 made the Darwin patch obsolete, and seems that it can build on Darwin without it. --- pkgs/development/interpreters/mujs/default.nix | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix index 319e039f5c59..881d0bbf1b46 100644 --- a/pkgs/development/interpreters/mujs/default.nix +++ b/pkgs/development/interpreters/mujs/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , readline , gitUpdater }: @@ -15,16 +14,6 @@ stdenv.mkDerivation rec { hash = "sha256-4sXuVBbf2iIwx6DLeJXfmpstWyBluxjn5k3sKnlqvhs="; }; - patches = lib.optionals stdenv.isDarwin [ - (fetchpatch { - # ld: library not found for -l:libmujs.a - name = "darwin-failures.patch"; - url = "https://git.ghostscript.com/?p=mujs.git;a=patch;h=d592c785c0b2f9fea982ac3fe7b88fdd7c4817fc"; - sha256 = "sha256-/57A7S65LWZFyQIGe+LtqDMu85K1N/hbztXB+/nCDJk="; - revert = true; - }) - ]; - buildInputs = [ readline ]; makeFlags = [ "prefix=$(out)" ]; From 8cc2589d3e2337f88087fe223a7b33ee082ba072 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 10 Apr 2023 22:15:56 +0200 Subject: [PATCH 24/52] python310Packages.pdm-backend: 2.0.5 -> 2.0.6 https://github.com/pdm-project/pdm-backend/releases/tag/2.0.6 --- pkgs/development/python-modules/pdm-backend/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pdm-backend/default.nix b/pkgs/development/python-modules/pdm-backend/default.nix index 715a4b528b31..1eb371be0630 100644 --- a/pkgs/development/python-modules/pdm-backend/default.nix +++ b/pkgs/development/python-modules/pdm-backend/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pdm-backend"; - version = "2.0.5"; + version = "2.0.6"; format = "pyproject"; src = fetchFromGitHub { owner = "pdm-project"; repo = "pdm-backend"; rev = "refs/tags/${version}"; - hash = "sha256-d5kr5pr9tBc6So0wTy3/ASgk8KTOf2AV8Vfsmml5Qh0="; + hash = "sha256-NMnb9DiW5xvfsI1nHFNIwvA/yH2boqe+WeD5re/ojAM="; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ From 6cc0b5f0a64fa83c162f4aaf900ec39e418f9e76 Mon Sep 17 00:00:00 2001 From: Chris Pattison Date: Mon, 10 Apr 2023 20:37:06 -0700 Subject: [PATCH 25/52] python310Packages.galois: fix broken dep constraints --- pkgs/development/python-modules/galois/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/galois/default.nix b/pkgs/development/python-modules/galois/default.nix index 1e3b5e0fd915..bb22de1597b3 100644 --- a/pkgs/development/python-modules/galois/default.nix +++ b/pkgs/development/python-modules/galois/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , setuptools-scm , pythonOlder +, pythonRelaxDepsHook , fetchFromGitHub , pytestCheckHook , pytest-xdist @@ -28,6 +29,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm + pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -41,11 +43,7 @@ buildPythonPackage rec { pytest-xdist ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "numpy >= 1.18.4, < 1.24" "numpy >= 1.18.4" \ - --replace "numba >= 0.53, < 0.57" "numba >= 0.53" \ - ''; + pythonRelaxDeps = [ "numpy" "numba" ]; pythonImportsCheck = [ "galois" ]; From 1bcb788a92890918da4fa8b05e558d0f372499f0 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Tue, 11 Apr 2023 05:36:51 +0000 Subject: [PATCH 26/52] starship: 1.13.1 -> 1.14.0 Diff: https://github.com/starship/starship/compare/v1.13.1...v1.14.0 --- pkgs/tools/misc/starship/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index e9257bd35963..5ab338506b2f 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -14,13 +14,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "1.13.1"; + version = "1.14.0"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - hash = "sha256-MgCYlcJoNJ3eChH7WLKgvgblmz9Wy6JplULjeGGiEXY="; + hash = "sha256-4so6WVtGskFIUR3V3nuPsY11w/AHaSVkFKy8WFKmBGM="; }; nativeBuildInputs = [ installShellFiles cmake ]; @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { --zsh <($out/bin/starship completions zsh) ''; - cargoHash = "sha256-sdETcvmz9mWTXEt9h7vP+FKolhnamkwtbkYiJE/HVX0="; + cargoHash = "sha256-eaiiDOyuKX7+u9Bhq0PUgtyZFHifEHOeu1Zombyg+Ek="; nativeCheckInputs = [ git ]; From b63db43781eb744c8fa87ccbfbbb9fe7b8bc20f4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 11 Apr 2023 08:19:15 +0200 Subject: [PATCH 27/52] python310Packages.galois: update meta --- pkgs/development/python-modules/galois/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/galois/default.nix b/pkgs/development/python-modules/galois/default.nix index bb22de1597b3..1f5ef06ea1c4 100644 --- a/pkgs/development/python-modules/galois/default.nix +++ b/pkgs/development/python-modules/galois/default.nix @@ -47,11 +47,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "galois" ]; - meta = { - description = "A Python 3 package that extends NumPy arrays to operate over finite fields"; + meta = with lib; { + description = "Python package that extends NumPy arrays to operate over finite fields"; homepage = "https://github.com/mhostetter/galois"; - downloadPage = "https://github.com/mhostetter/galois/releases"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ chrispattison ]; + downloadPage = "https://github.com/mhostetter/galois/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ chrispattison ]; }; } From 1d391acf5f496f3e8e0b5f693445f53101bfc2be Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 11 Apr 2023 08:39:05 +0200 Subject: [PATCH 28/52] tockloader: add changelog to meta --- pkgs/development/tools/misc/tockloader/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/tockloader/default.nix b/pkgs/development/tools/misc/tockloader/default.nix index 8924cbf2fae5..b3d042cf64d1 100644 --- a/pkgs/development/tools/misc/tockloader/default.nix +++ b/pkgs/development/tools/misc/tockloader/default.nix @@ -28,9 +28,10 @@ python3Packages.buildPythonApplication rec { ''; meta = with lib; { - homepage = "https://github.com/tock/tockloader"; - license = licenses.mit; description = "Tool for programming Tock onto hardware boards"; + homepage = "https://github.com/tock/tockloader"; + changelog = "https://github.com/tock/tockloader/releases/tag/v${version}"; + license = licenses.mit; maintainers = with maintainers; [ ]; }; } From 51d99c194f916a7b07aff73bba1bc9a8a39a3a3f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 11 Apr 2023 08:43:07 +0200 Subject: [PATCH 29/52] tockloader: 1.6.0 -> 1.9.0 Changelog: https://github.com/tock/tockloader/releases/tag/v1.9.0 --- .../tools/misc/tockloader/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/misc/tockloader/default.nix b/pkgs/development/tools/misc/tockloader/default.nix index b3d042cf64d1..931edf0cf23c 100644 --- a/pkgs/development/tools/misc/tockloader/default.nix +++ b/pkgs/development/tools/misc/tockloader/default.nix @@ -1,26 +1,28 @@ { lib -, python3Packages +, python3 }: -python3Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "tockloader"; - version = "1.6.0"; + version = "1.9.0"; - src = python3Packages.fetchPypi { + src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "1aqkj1nplcw3gmklrhq6vxy6v9ad5mqiw4y1svasak2zkqdk1wyc"; + hash = "sha256-7W55jugVtamFUL8N3dD1LFLJP2UDQb74V6o96rd/tEg="; }; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python3.pkgs; [ argcomplete colorama crcmod + pycryptodome pyserial - pytoml + questionary + toml tqdm ]; - # has no test suite + # Project has no test suite checkPhase = '' runHook preCheck $out/bin/tockloader --version | grep -q ${version} From 68652847ede92d63c9cf999be600e8f42d2017c7 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Tue, 11 Apr 2023 08:34:23 +0000 Subject: [PATCH 30/52] starship: 1.14.0 -> 1.14.1 Diff: https://github.com/starship/starship/compare/v1.14.0...v1.14.1 --- pkgs/tools/misc/starship/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 5ab338506b2f..1835f9102597 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -14,13 +14,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "1.14.0"; + version = "1.14.1"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - hash = "sha256-4so6WVtGskFIUR3V3nuPsY11w/AHaSVkFKy8WFKmBGM="; + hash = "sha256-KhuAgC58oEdUiCWZjUShfDpNe0m0ENfn2QJVOlzpIyo="; }; nativeBuildInputs = [ installShellFiles cmake ]; @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { --zsh <($out/bin/starship completions zsh) ''; - cargoHash = "sha256-eaiiDOyuKX7+u9Bhq0PUgtyZFHifEHOeu1Zombyg+Ek="; + cargoHash = "sha256-gdJzH2/gJDg3sNR28Daq4B+KEn565jXhkxZFsrVx/uI="; nativeCheckInputs = [ git ]; From 065b3501289fefb3a0ce924cabe17120b4070a9c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Apr 2023 08:39:29 +0000 Subject: [PATCH 31/52] lefthook: 1.3.8 -> 1.3.9 --- pkgs/applications/version-management/lefthook/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/lefthook/default.nix b/pkgs/applications/version-management/lefthook/default.nix index cd8c2482dd4a..7f4affc34fe9 100644 --- a/pkgs/applications/version-management/lefthook/default.nix +++ b/pkgs/applications/version-management/lefthook/default.nix @@ -6,7 +6,7 @@ let pname = "lefthook"; - version = "1.3.8"; + version = "1.3.9"; in buildGoModule rec { inherit pname version; @@ -15,7 +15,7 @@ buildGoModule rec { owner = "evilmartians"; repo = "lefthook"; rev = "v${version}"; - hash = "sha256-AtqCRGl+xvFA3mW9hYZALSrknUbuJ83LOKgOvLDLIPU="; + hash = "sha256-6XsSnFrYRsVNzp5Kr1+GghbNh2uOOyT4BQm9yBw3jRU="; }; vendorHash = "sha256-cMRl+TqSLlfoAja+JNaNKfHDR9fkvMTWdB1FT3XxPd4="; From ffa1bc28337aa5032584aa4c3bdc3a30446d9c41 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 11 Apr 2023 11:18:51 +0200 Subject: [PATCH 32/52] python310Packages.httpx-ntlm: fix version specifiers --- pkgs/development/python-modules/httpx-ntlm/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/httpx-ntlm/default.nix b/pkgs/development/python-modules/httpx-ntlm/default.nix index c23f928d20d7..83d427c73ef1 100644 --- a/pkgs/development/python-modules/httpx-ntlm/default.nix +++ b/pkgs/development/python-modules/httpx-ntlm/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , httpx , pyspnego , pythonOlder @@ -19,6 +20,15 @@ buildPythonPackage rec { hash = "sha256-a1a5laZ4tNOtpVDFCK1t2IXWbyJytZMhuad2JtmA52I="; }; + patches = [ + # Update version specifiers, https://github.com/ulodciv/httpx-ntlm/pull/15 + (fetchpatch { + name = "update-version-specifiers.patch"; + url = "https://github.com/ulodciv/httpx-ntlm/commit/dac67a957c5c23df29d4790ddbc7cc4bccfc0e35.patch"; + hash = "sha256-YtgRrgGG/x7jvNg+NuQIrkOUdyD6Bk53fRaiXBwiV+o="; + }) + ]; + propagatedBuildInputs = [ httpx pyspnego From 19fe29df6804efadc7e90f25261a681b086381d9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 11 Apr 2023 11:24:43 +0200 Subject: [PATCH 33/52] python310Packages.frigidaire: add changelog to meta --- pkgs/development/python-modules/frigidaire/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/frigidaire/default.nix b/pkgs/development/python-modules/frigidaire/default.nix index 92ce118638c7..3887df4664d7 100644 --- a/pkgs/development/python-modules/frigidaire/default.nix +++ b/pkgs/development/python-modules/frigidaire/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bm1549"; repo = pname; - rev = version; + rev = "regs/tags/${version}"; hash = "sha256-U2ixBtigY15RzMNIeUK71uNOndUepK2kE/CTFwl855w="; }; @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for the Frigidaire devices"; homepage = "https://github.com/bm1549/frigidaire"; + changelog = "https://github.com/bm1549/frigidaire/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From ba1e506c2506632da0ca9b59819920c7ad533bd0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 11 Apr 2023 11:34:57 +0200 Subject: [PATCH 34/52] python310Packages.frigidaire: fix version identifiers --- pkgs/development/python-modules/frigidaire/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/frigidaire/default.nix b/pkgs/development/python-modules/frigidaire/default.nix index 3887df4664d7..16d871ccd09a 100644 --- a/pkgs/development/python-modules/frigidaire/default.nix +++ b/pkgs/development/python-modules/frigidaire/default.nix @@ -23,6 +23,13 @@ buildPythonPackage rec { hash = "sha256-U2ixBtigY15RzMNIeUK71uNOndUepK2kE/CTFwl855w="; }; + postPatch = '' + # https://github.com/bm1549/frigidaire/pull/13 + substituteInPlace setup.py \ + --replace "urllib3>==1.26.42" "urllib3" \ + --replace 'version = "SNAPSHOT"' 'version = "${version}"' + ''; + propagatedBuildInputs = [ certifi chardet From 2e0b3b9162630f4b1d9ef62858d6623beb85a527 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Tue, 11 Apr 2023 12:20:04 +0200 Subject: [PATCH 35/52] woob: 3.4->3.5 --- pkgs/development/python-modules/woob/default.nix | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/woob/default.nix b/pkgs/development/python-modules/woob/default.nix index fb9f9f930d19..a1d006fb15ee 100644 --- a/pkgs/development/python-modules/woob/default.nix +++ b/pkgs/development/python-modules/woob/default.nix @@ -9,9 +9,9 @@ , lxml , nose , packaging -, pdm-pep517 , pillow , prettytable +, pycountry , python-dateutil , pythonOlder , pyyaml @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "woob"; - version = "3.4"; + version = "3.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -33,12 +33,11 @@ buildPythonPackage rec { owner = "woob"; repo = pname; rev = version; - hash = "sha256-qVE1FQK3+jBKIHW+s1iNZwy8Srb2kQhWNTlZyzc1/jE="; + hash = "sha256-Yb3AgUSqr9r2TIymiEUIhKThNC7yjQEkhi8GSI9fqNA="; }; nativeBuildInputs = [ packaging - pdm-pep517 ]; propagatedBuildInputs = [ @@ -51,19 +50,13 @@ buildPythonPackage rec { packaging pillow prettytable + pycountry pyyaml requests termcolor unidecode ]; - patches = [ - (fetchpatch { - url = "https://gitlab.com/woob/woob/-/commit/861b1bb92be53998d8174dcca6fa643d1c7cde12.patch"; - sha256 = "sha256-IXcE59pMFtPLTOYa2inIvuA14USQvck6Q4hrKZTC0DE="; - }) - ]; - nativeCheckInputs = [ nose ]; From 279a7f71230f58ff8bcba958202c9c5b88a73b59 Mon Sep 17 00:00:00 2001 From: zah Date: Tue, 11 Apr 2023 13:46:19 +0300 Subject: [PATCH 36/52] skypeforlinux: 8.87.0.406 -> 8.96.0.207 The upgrade is required for enabling the new Bing (GPT4) integration in Skype --- .../networking/instant-messengers/skypeforlinux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index d9fcbc26380e..c29df0221b6d 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -7,7 +7,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.87.0.406"; + version = "8.96.0.207"; rpath = lib.makeLibraryPath [ alsa-lib @@ -68,7 +68,7 @@ let "https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" ]; - sha256 = "sha256-lWnQIdMmfz90h3tOWkQv0vo3HnRi3z6W27vK28+Ksjo="; + sha256 = "sha256-tkOPYFkmc4nzO8Rgat9/VNuzzIW10qSEzbXhjkZV83k="; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; From 7a1de48994dadc3ce94f06f9a3a0f41775751f81 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 9 Apr 2023 19:50:23 +0200 Subject: [PATCH 37/52] anki-bin: use pname + version instead of hacky override --- .../build-fhs-userenv-bubblewrap/buildFHSEnv.nix | 3 +-- pkgs/games/anki/bin.nix | 15 +++++---------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/buildFHSEnv.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/buildFHSEnv.nix index 1d8f194d1b03..78da74c82849 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/buildFHSEnv.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/buildFHSEnv.nix @@ -89,8 +89,7 @@ let ''; # Compose /etc for the chroot environment - etcPkg = runCommandLocal "${name}-chrootenv-etc" { - } '' + etcPkg = runCommandLocal "${name}-chrootenv-etc" { } '' mkdir -p $out/etc cd $out/etc diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix index 552581a80842..39b10bcb15c1 100644 --- a/pkgs/games/anki/bin.nix +++ b/pkgs/games/anki/bin.nix @@ -51,7 +51,8 @@ let passthru = { inherit sources; }; fhsUserEnvAnki = buildFHSUserEnv (appimageTools.defaultFhsEnvArgs // { - name = "anki"; + inherit pname version; + name = null; # Appimage sets it to "appimage-env" # Dependencies of anki targetPkgs = pkgs: (with pkgs; [ xorg.libxkbfile krb5 ]); @@ -61,6 +62,8 @@ let ''; extraInstallCommands = '' + ln -s ${pname} $out/bin/anki + mkdir -p $out/share cp -R ${unpacked}/share/applications \ ${unpacked}/share/man \ @@ -70,17 +73,9 @@ let inherit meta passthru; }); - - fhsUserEnvAnkiWithVersion = fhsUserEnvAnki.overrideAttrs (oldAttrs: { - # buildFHSUserEnv doesn't have an easy way to set the version of the - # resulting derivation, so we manually override it here. This makes - # it clear to end users the version of anki-bin. Without this, users - # might assume anki-bin is an old version of Anki. - name = "${pname}-${version}"; - }); in -if stdenv.isLinux then fhsUserEnvAnkiWithVersion +if stdenv.isLinux then fhsUserEnvAnki else stdenv.mkDerivation { inherit pname version passthru; From fdb1739028a504698afe268e06b755deb55e0f7b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 11 Apr 2023 13:51:51 +0200 Subject: [PATCH 38/52] python310Packages.aioesphomeapi: 13.6.1 -> 13.7.0 https://github.com/esphome/aioesphomeapi/releases/tag/v13.7.0 --- pkgs/development/python-modules/aioesphomeapi/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index d0add0b62eba..4502f4985020 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, async-timeout , mock , noiseprotocol , protobuf @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "13.6.1"; + version = "13.7.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,10 +22,11 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-S2a5v4OeE0DC9J2JAHFQ6YyhWt6RXp3cP+zkONp+Bzc="; + hash = "sha256-05UT9CsfO8onEHqnJlXNfzf1acfwiIC07ewCWBE8HPA="; }; propagatedBuildInputs = [ + async-timeout noiseprotocol protobuf zeroconf From 853a90c2d7fd88fe3d1c740df87f7397cef96cfb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 11 Apr 2023 13:57:10 +0200 Subject: [PATCH 39/52] fabs: Don't use alias for python-dateutil It breaks evaluation without aliases enabled. --- pkgs/tools/backup/fabs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/backup/fabs/default.nix b/pkgs/tools/backup/fabs/default.nix index 9a2a6045c142..47e36b2139fa 100644 --- a/pkgs/tools/backup/fabs/default.nix +++ b/pkgs/tools/backup/fabs/default.nix @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ alembic - dateutil + python-dateutil pyyaml setuptools sqlalchemy From 317909bd6dbf5faeaab390682ef2abe920785e57 Mon Sep 17 00:00:00 2001 From: Niols Date: Tue, 11 Apr 2023 12:57:26 +0000 Subject: [PATCH 40/52] checkmake: 0.2.1 -> 0.2.2 --- pkgs/development/tools/checkmake/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/checkmake/default.nix b/pkgs/development/tools/checkmake/default.nix index b5554e250fda..25da89281d77 100644 --- a/pkgs/development/tools/checkmake/default.nix +++ b/pkgs/development/tools/checkmake/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "checkmake"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "mrtazz"; repo = pname; rev = version; - sha256 = "sha256-Zkrr1BrP8ktRGf6EYhDpz3oTnX6msrSpfFqkqi9pmlc="; + sha256 = "sha256-Ql8XSQA/w7wT9GbmYOM2vG15GVqj9LxOGIu8Wqp9Wao="; }; vendorSha256 = null; @@ -41,7 +41,6 @@ buildGoModule rec { homepage = "https://github.com/mrtazz/checkmake"; license = licenses.mit; maintainers = with maintainers; [ vidbina ]; - platforms = platforms.linux; longDescription = '' checkmake is an experimental tool for linting and checking Makefiles. It may not do what you want it to. From c3a88e466ee2fb350d3aaf7ad1c0d7ea3e39298d Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 11 Apr 2023 16:10:21 +0300 Subject: [PATCH 41/52] libvirt: fix build on darwin --- pkgs/development/libraries/libvirt/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 7d5305fe62da..261143b8d99c 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -158,6 +158,7 @@ stdenv.mkDerivation rec { sed -i '/domaincapstest/d' tests/meson.build sed -i '/qemufirmwaretest/d' tests/meson.build sed -i '/qemuvhostusertest/d' tests/meson.build + sed -i '/qemuxml2xmltest/d' tests/meson.build '' + lib.optionalString (isDarwin && isx86_64) '' sed -i '/qemucaps2xmltest/d' tests/meson.build sed -i '/qemuhotplugtest/d' tests/meson.build From ffbea7a3d96351e7af4f3fa6e0896659b3de5c46 Mon Sep 17 00:00:00 2001 From: Bryn Edwards Date: Wed, 30 Nov 2022 22:43:47 +0000 Subject: [PATCH 42/52] logseq: add NIXOS_OZONE_WL check --- pkgs/applications/misc/logseq/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index bb879bce1572..d9b0ccc9c34e 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -44,7 +44,8 @@ stdenv.mkDerivation rec { # set the env "LOCAL_GIT_DIRECTORY" for dugite so that we can use the git in nixpkgs makeWrapper ${electron}/bin/electron $out/bin/${pname} \ --set "LOCAL_GIT_DIRECTORY" ${git} \ - --add-flags $out/share/${pname}/resources/app + --add-flags $out/share/${pname}/resources/app \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" ''; passthru.updateScript = ./update.sh; From b24aacfd01a51cd7eb7fba0f91979e5f6484b99f Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 11 Apr 2023 18:42:24 +0300 Subject: [PATCH 43/52] playwright: fix darwin tests --- .../python-modules/playwright/default.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/playwright/default.nix b/pkgs/development/python-modules/playwright/default.nix index 71d50c67f7ca..39e3b08acd54 100644 --- a/pkgs/development/python-modules/playwright/default.nix +++ b/pkgs/development/python-modules/playwright/default.nix @@ -83,22 +83,19 @@ let pname = "playwright-browsers"; version = driverVersion; - src = runCommand "playwright-browsers-base" { - outputHashMode = "recursive"; - outputHashAlgo = "sha256"; - outputHash = { - x86_64-darwin = "0z2kww4iby1izkwn6z2ai94y87bkjvwak8awdmjm8sgg00pa9l1a"; - }.${system} or throwSystem; - } '' + dontUnpack = true; + + installPhase = '' + runHook preInstall + export PLAYWRIGHT_BROWSERS_PATH=$out ${driver}/bin/playwright install rm -r $out/.links + + runHook postInstall ''; - installPhase = '' - mkdir $out - cp -r * $out/ - ''; + meta.platforms = lib.platforms.darwin; }; browsers-linux = { withFirefox ? true, withChromium ? true }: let From 74269d8fa8222a4ce546161840e6cbcbb817ff91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 11 Apr 2023 17:08:50 +0100 Subject: [PATCH 44/52] pkgsStatic.cachix: make it build Fixes #188401 --- pkgs/top-level/all-packages.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 205dd6a92086..6c2d696b90ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19443,13 +19443,7 @@ with pkgs; c-blosc = callPackage ../development/libraries/c-blosc { }; # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990 - cachix = (haskell.lib.compose.justStaticExecutables haskell.packages.ghc94.cachix).overrideAttrs(o: { - passthru = o.passthru or {} // { - tests = o.passthru.tests or {} // { - inherit hci; - }; - }; - }); + cachix = haskell.lib.justStaticExecutables haskellPackages.cachix; calcium = callPackage ../development/libraries/calcium { }; From f9e3da25591135c1b6166a13aa9941c7b58865dc Mon Sep 17 00:00:00 2001 From: "\"Bernardo Meurer\"" <"bernardo@meurer.org"> Date: Tue, 11 Apr 2023 12:14:43 -0400 Subject: [PATCH 45/52] vimPlugins: update --- .../editors/vim/plugins/generated.nix | 404 +++++++++--------- 1 file changed, 202 insertions(+), 202 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 45a2fdd9baab..343e04ac31c6 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -29,12 +29,12 @@ final: prev: ChatGPT-nvim = buildVimPluginFrom2Nix { pname = "ChatGPT.nvim"; - version = "2023-04-06"; + version = "2023-04-11"; src = fetchFromGitHub { owner = "jackMort"; repo = "ChatGPT.nvim"; - rev = "3ea19ba666e226ac33c8e00c7bf99e81931d7c86"; - sha256 = "0jfa9z7iq32i8ydyxb2d6psmcgifhyhkigpa99n216j4m5m8azmy"; + rev = "3ff8403136e3298f45ff9d11456f922da5b9fc50"; + sha256 = "057y17xqs29w06rmiyjnacj3v4pix3a0a088khg3kxv6lnazsyd4"; }; meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/"; }; @@ -667,12 +667,12 @@ final: prev: asyncomplete-vim = buildVimPluginFrom2Nix { pname = "asyncomplete.vim"; - version = "2021-12-06"; + version = "2023-04-11"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "asyncomplete.vim"; - rev = "9c7651894c2c6d656c0dc71e87cfabbbb71b9c78"; - sha256 = "1vjai1v9nnn7vbckclz85bhl6mx4d5d3155pg2vv1d2s4lzqplhv"; + rev = "b3fbac1930be2c9cdf956f4a0346c1dd0e9abd44"; + sha256 = "0jm2bqsqk0jjdm69lpxgnsms7c12pfkrn1lljpqqf2cx1xjql19r"; }; meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/"; }; @@ -775,12 +775,12 @@ final: prev: auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2023-03-10"; + version = "2023-04-09"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "1d3dd70a2d48e0f3441128eb4fb0b437a0bf2cc4"; - sha256 = "1wrb5bn4dg4ava7mknil5dhkr5nn0m60l78y5q6zqdlrxfsskzhy"; + rev = "f391aba10ee61927a1cceb9ea3a9dde501e87e9e"; + sha256 = "00bhp8bnlml5qm4yk49155l70lw7wlyy3ljnwqgrqxs1a40i04gy"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -859,24 +859,24 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2023-04-09"; + version = "2023-04-10"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "5c359a9915937ba798a38a56059685d53bc00ed5"; - sha256 = "039q2i6imd5bwjgybpa18lmlwjslm4z9war04xsm4hc8pcallj4q"; + rev = "0a21988ddfe4e63ef4d89332b2a6914dbdbf16ac"; + sha256 = "1iy8pizpx1j6lqhnkfp3iijy9y6c2ja3dqvkmp68wryiffr1bvgh"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; barbecue-nvim = buildVimPluginFrom2Nix { pname = "barbecue.nvim"; - version = "2023-04-08"; + version = "2023-04-09"; src = fetchFromGitHub { owner = "utilyre"; repo = "barbecue.nvim"; - rev = "5975a2da9240ad7642e4dc88f0647aca3c1bd5b8"; - sha256 = "1r6zkprwvdh5phcnwf5b47wfi5gfg0w3y60pz8kakp7k7hh8yiz0"; + rev = "0859f1264310e8b5f75e2da1d5254c586fc7e3c8"; + sha256 = "0h391fy61il5xvdm48h73ddckf27x5x4vqr1x6fbv7zll9qi1q1l"; }; meta.homepage = "https://github.com/utilyre/barbecue.nvim/"; }; @@ -1927,12 +1927,12 @@ final: prev: comment-nvim = buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2023-03-10"; + version = "2023-04-11"; src = fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "8d3aa5c22c2d45e788c7a5fe13ad77368b783c20"; - sha256 = "0qxzy4dr9cr5q59yi7mw883id51zpb3mnrv6r0aqh9flswkljllr"; + rev = "ab62084fa992ed7ee3c19bbb5227ce2c4234612b"; + sha256 = "02hsh3addjmdinhh3irh0hsbyqvl4mhkd5msa6c4ddaxf6zbwclq"; }; meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; @@ -2083,12 +2083,12 @@ final: prev: conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2023-03-26"; + version = "2023-04-10"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "51936288d182a677fcb808e660081ad7e9ecd4ec"; - sha256 = "0j6amy2jc7jgxgsski4za5fhc4wgxh22lqz3k01ag40845gfndqb"; + rev = "7625ed9afc689888a743492547b0f1ebbe367faf"; + sha256 = "1d1cihbyaq00fvnia394xlw2g1byv5iwc2az1kmanc51kzwmcg52"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -2131,12 +2131,12 @@ final: prev: copilot-lua = buildVimPluginFrom2Nix { pname = "copilot.lua"; - version = "2023-03-28"; + version = "2023-04-11"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "f0b41fb89ef2ed7ab4e8cd5208a30755aa638fc4"; - sha256 = "0x78a8s20pf93aip87j9dhrjpm4330faz3lqlwk6x6qi6dmvdvyy"; + rev = "a4a37dda9e48986e5d2a90d6a3cbc88fca241dbb"; + sha256 = "1f5jzjih3bq7nlhvlrw8ndzvknmaaih4z10m0hzsjd4gdqnpvldn"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; }; @@ -2337,12 +2337,12 @@ final: prev: pname = "dashboard-nvim"; version = "2023-04-07"; src = fetchFromGitHub { - owner = "glepnir"; + owner = "nvimdev"; repo = "dashboard-nvim"; rev = "6f65affd9904ed96a7c7a3edc55486f7f517931d"; sha256 = "1jqxl2hsygmsq4bm3461qmancszh6ddr713g3zlzb1a17fyrivpk"; }; - meta.homepage = "https://github.com/glepnir/dashboard-nvim/"; + meta.homepage = "https://github.com/nvimdev/dashboard-nvim/"; }; defx-git = buildVimPluginFrom2Nix { @@ -2431,12 +2431,12 @@ final: prev: deol-nvim = buildVimPluginFrom2Nix { pname = "deol.nvim"; - version = "2023-03-23"; + version = "2023-04-11"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "99644305ccaa49feacc1c44f6e579ba49da8d72f"; - sha256 = "06473gh7jb9y2xyhsd4x75h0imkylxxcgbxjv4sigdbcg0gk6qm9"; + rev = "1eea36d874485399fe1af9cd9b92f20c85d24a0f"; + sha256 = "0c60yp58adnlz7qk5kzihwvs6lyw3b3kl0p3h88q1zx38pa0zyl7"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -2709,12 +2709,12 @@ final: prev: dial-nvim = buildVimPluginFrom2Nix { pname = "dial.nvim"; - version = "2023-04-05"; + version = "2023-04-10"; src = fetchFromGitHub { owner = "monaqa"; repo = "dial.nvim"; - rev = "f4a5fe6424d3951607952d03c7d6595c7f721232"; - sha256 = "04j3rsrfcl7vbnkdjnhmcznw57l0b4v7mjpx2hfpz5xg1ck7v5y6"; + rev = "747d6fd009dbc1904627868125e16cfa7c524b0d"; + sha256 = "19xn6bjhj6w1c8jaf65f0qrypmpx938dib8ig2md8xxz69hfyc44"; }; meta.homepage = "https://github.com/monaqa/dial.nvim/"; }; @@ -2769,12 +2769,12 @@ final: prev: dracula-nvim = buildVimPluginFrom2Nix { pname = "dracula.nvim"; - version = "2023-03-30"; + version = "2023-04-11"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "dracula.nvim"; - rev = "8653e7699810b63bda8ef267055cb4d4237670ef"; - sha256 = "17r785dbnn87qg35k3dbvlaszfb29nrv5l0703c1i69armdf1k3z"; + rev = "ce99c0b68edca27caa1701c0e79cf461b484d501"; + sha256 = "00rnxjz7cvlcbs1zld04fxnk8y5vjvikcz078bs7ap3l4pg1zy5p"; }; meta.homepage = "https://github.com/Mofiqul/dracula.nvim/"; }; @@ -2805,12 +2805,12 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2023-04-05"; + version = "2023-04-11"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "bdebafb8229403a1e138344802b6817b1cf660e8"; - sha256 = "0lm032db2f4kppdlpbn2w8gshbfp42y52y76py42r4y0xvls413n"; + rev = "cda4ae057cc6c0f6e15865772b64d2474f4dd5c2"; + sha256 = "0skrfnq6ch41blb2v8pw7pi6mkjkv6kjgfi9nkx29zgfqs0lv12d"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -2891,12 +2891,12 @@ final: prev: everforest = buildVimPluginFrom2Nix { pname = "everforest"; - version = "2023-04-05"; + version = "2023-04-11"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "3e259a9a606778cd9181ecb65301ec92af8a1681"; - sha256 = "0y49w7h0ng7xf5lgns218477xl71an9zllrkfnmjh105dapgbadk"; + rev = "8ab6ce701e2d042eabded36f5d8cf7072b896b46"; + sha256 = "0j6x3iiv9lkrm8prkax7pvk3kr71a7xwzfwcldl15y56jn01va57"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; }; @@ -3120,24 +3120,24 @@ final: prev: flutter-tools-nvim = buildVimPluginFrom2Nix { pname = "flutter-tools.nvim"; - version = "2023-04-02"; + version = "2023-04-11"; src = fetchFromGitHub { owner = "akinsho"; repo = "flutter-tools.nvim"; - rev = "0a7e6b40aebd874e957ed630420a267e6cac0967"; - sha256 = "0sdmdayidwcbj5lrnv7aqpz0q81s1scyaa39zdv0ywaajrhapm2l"; + rev = "b64892ec95b4454f1080b62fef170338f92fc414"; + sha256 = "194dmji38vdkykmr8a2mn4zjzq6k9g8bn1mdsnblapcbwk02b0za"; }; meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; }; formatter-nvim = buildVimPluginFrom2Nix { pname = "formatter.nvim"; - version = "2023-02-26"; + version = "2023-04-10"; src = fetchFromGitHub { owner = "mhartington"; repo = "formatter.nvim"; - rev = "ed949c13e1a942db29ababa35e8c7864ced90eb6"; - sha256 = "06cvpzfhbhsxvkwp05v776jj675g02w3zbc5n2gz0acy7rb37cqx"; + rev = "b09b4573b0b6f4bc9e0ae599f7fab7dab34a6acf"; + sha256 = "17igcjbj51568zz7lnhzfby9xx3i78yv6yw0gnpjng1w97i1n4j2"; }; meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; @@ -3264,12 +3264,12 @@ final: prev: fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2023-04-08"; + version = "2023-04-11"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "04d5a528a4159901607c11d46a398f45db2ed43f"; - sha256 = "0livhcb4mq4smkq3sqpsm96zdj0d25yx36gb3fv7mvyqlmfs45h1"; + rev = "061a4df40f5238782fdd7b380fe55650fadd9384"; + sha256 = "0p928iyia6bpzrc4g6926xxagvfw30830air5lfbw492vp4rh2j5"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -3600,24 +3600,24 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2023-04-05"; + version = "2023-04-11"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "a6c5f652788b36c6ff2a0fdbefa271cb46f8f5e7"; - sha256 = "0cmwrjwn3kvkhg7w8hls3sl5zzh5s9i62870ddrs59mmnxk83q08"; + rev = "b12f46903867939b963c8c20abb27dd507d77054"; + sha256 = "08plsqi71ijp746ni941l2w18n1r3bqiwyziffyfh7nrjwhk21w8"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2023-04-08"; + version = "2023-04-10"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "046bd22cc704fef4f19d6a9320fc27bf4527479f"; - sha256 = "00snp6i8gqia9l1lv4j5qb85mvh1ckm4r6fkhm3im0g71pih2nj7"; + rev = "de4e3380575acc1bc9a349d32f028301dea54dcd"; + sha256 = "10r0vvici824894aj51979vyszwdzw2g2dyfzfr5d57365sc8bgb"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -3683,12 +3683,12 @@ final: prev: haskell-tools-nvim = buildNeovimPluginFrom2Nix { pname = "haskell-tools.nvim"; - version = "2023-04-06"; + version = "2023-04-09"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "fd369e6b501bd87712ff713e911273b95ddfb9cc"; - sha256 = "12db9kyjyhpyc3cd5gifi3d425q5aplmzs3s74ahn19w4ni14vpk"; + rev = "bf43d7ba6f27be7dcbdb8df8d79de07e3112a244"; + sha256 = "0gnzsbbj16p7ckbc19wvdllx4z0bnqw6wlgkyk3wgxg2g1gn389n"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -3731,12 +3731,12 @@ final: prev: heirline-nvim = buildVimPluginFrom2Nix { pname = "heirline.nvim"; - version = "2023-04-08"; + version = "2023-04-10"; src = fetchFromGitHub { owner = "rebelot"; repo = "heirline.nvim"; - rev = "64d57ac5dcfd24a998ff38a76bf3204810273988"; - sha256 = "1q1yv1i5ynfwrxkiinlrhgjd6cc6c7pzvcv7f5ziadk7fvikpdlf"; + rev = "d860874eef6088109b5cb102871d76307280f052"; + sha256 = "0gh4jc45zvgmgx3bg4iyqa4smjl2bqalkwylpq74izzn4bxjd4yz"; }; meta.homepage = "https://github.com/rebelot/heirline.nvim/"; }; @@ -4102,12 +4102,12 @@ final: prev: jedi-vim = buildVimPluginFrom2Nix { pname = "jedi-vim"; - version = "2022-12-28"; + version = "2023-04-11"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "be483a2dcb63e992b02c5a0faff5d555720246fc"; - sha256 = "0ir2n9prdi50lvxrc23ya6pzmdp6fw1rdlls41zh0qbah0681yc3"; + rev = "42c2af1812bc12831a2904811835082904c3cc1e"; + sha256 = "0f6889lzxfgpjzk78pzh6450r3aqgkc521mv4v1fq9li8hvdqlxx"; fetchSubmodules = true; }; meta.homepage = "https://github.com/davidhalter/jedi-vim/"; @@ -4175,12 +4175,12 @@ final: prev: kanagawa-nvim = buildVimPluginFrom2Nix { pname = "kanagawa.nvim"; - version = "2023-04-08"; + version = "2023-04-11"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "3c87bfacd5f51033bbeeb04f837c88f94861f6af"; - sha256 = "0qs72s1m415fn37cjl6mbn07ivyk1x3q63clypb1rk7frswyz1bz"; + rev = "22adef57f08a3cd07978b65966ce68da42501f68"; + sha256 = "15v5p1kj97nhnibnki03a1y0lm2v6k5r2s0fwxz6ynij4sz6bshn"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; @@ -4259,12 +4259,12 @@ final: prev: lazy-lsp-nvim = buildVimPluginFrom2Nix { pname = "lazy-lsp.nvim"; - version = "2023-03-06"; + version = "2023-04-11"; src = fetchFromGitHub { owner = "dundalek"; repo = "lazy-lsp.nvim"; - rev = "f0d8f0ddf34bd7e1eb9d5ee6ed65a67138769d22"; - sha256 = "0dpgfansqili9prnp1fdnhjg6gmq5snaalh6q18gsk6c9lrw0laf"; + rev = "1e9aa30df98d5bef804e252b2afde2a4f5fc50e1"; + sha256 = "19m1zfdqx4vym345fljqd59s1chdnhb6hyqz7hl4hjwz9wyd86b1"; }; meta.homepage = "https://github.com/dundalek/lazy-lsp.nvim/"; }; @@ -4331,24 +4331,24 @@ final: prev: leap-nvim = buildVimPluginFrom2Nix { pname = "leap.nvim"; - version = "2023-03-14"; + version = "2023-04-09"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "f74473d23ebf60957e0db3ff8172349a82e5a442"; - sha256 = "1fjc3b4czlndd1nfn5n2zwlx51xhxcxiysjipfhnbbqhpy4sqfbg"; + rev = "98a72ad93c629c49bd7127d342960cc1b159b620"; + sha256 = "1zb0k6d57z8pp4nzmqvk041gqhpsswxz642jj8398hf44r05lcq8"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; legendary-nvim = buildVimPluginFrom2Nix { pname = "legendary.nvim"; - version = "2023-04-07"; + version = "2023-04-10"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "b8cb553dff63a1ded1be1f258cf8e0e4c443e302"; - sha256 = "1q7gg1v70qx2sd7vzixj0q8hl8d4aa9n81hhsnl72zld36qx7h4k"; + rev = "69e7b9b56e6507760049c78a15116e1c0540423c"; + sha256 = "0m5ngwaz9hw79gwv7mpbc3i63m3i18sykvmm67gr9182k505xqpc"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -4643,12 +4643,12 @@ final: prev: lsp-overloads-nvim = buildVimPluginFrom2Nix { pname = "lsp-overloads.nvim"; - version = "2023-02-26"; + version = "2023-04-10"; src = fetchFromGitHub { owner = "Issafalcon"; repo = "lsp-overloads.nvim"; - rev = "1423a6114f5540681a694330c22c36b0ca21f1d4"; - sha256 = "1rwrhn32izidzzhs0vjanqr5id5b9jszk03xzxxmkmk4f34lhchb"; + rev = "c63692f0b31ca0114bf2573d8d99fed5fd47dad9"; + sha256 = "1yh1k1px4lxfqcdirpdwammc9rjf8bpk2qs6vvkiixx2wkh4xsdf"; }; meta.homepage = "https://github.com/Issafalcon/lsp-overloads.nvim/"; }; @@ -4679,12 +4679,12 @@ final: prev: lsp-zero-nvim = buildVimPluginFrom2Nix { pname = "lsp-zero.nvim"; - version = "2023-04-07"; + version = "2023-04-10"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "2f242f4a910bcc5157ba3d9f1ff646d4e5a83a2f"; - sha256 = "06q5ws45fj4rgbdybgqnia57rj50xlyr1yrzxgp9b16qby7a3bqz"; + rev = "48d5f891b57291550a7e32792abae4d0774942e3"; + sha256 = "16lw176flzpgdm209q5gxaqdhk4jqyk2jbkqk22s6y29g2lzv16w"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; @@ -4786,12 +4786,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2023-04-09"; + version = "2023-04-11"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "8fdb06d4601c019a9ee880473646364bdbed3206"; - sha256 = "1avzmyvvfffy9fh3kw58ag63kvm3aj0zld1mi1z0m7ihyza5v5aq"; + rev = "dc2e307287e9a9eabc18f0e3984c7e8cb164bb38"; + sha256 = "10gyij1glisb1zqqdrb2wy772kz3nwf0mjn9npzzfcyrpvvwfra4"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -4907,12 +4907,12 @@ final: prev: mason-nvim = buildVimPluginFrom2Nix { pname = "mason.nvim"; - version = "2023-04-08"; + version = "2023-04-11"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "2311d9d883eb709ad9979a726a38c5ce1343b63c"; - sha256 = "1w51kzsadw7wkddxs9alz0vy6y8c3bv1x77km6xk8jf068bi36l9"; + rev = "3fb2be48864b7850a26c54c04cedb54e95dcdf3f"; + sha256 = "11i931xsxbsw7arbglv8k4gl53klw2jv0r69a00m0fddyiz4avq8"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -4979,24 +4979,24 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2023-04-02"; + version = "2023-04-10"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "a7c375312edba618d7abc7c6129c53c512cca9d7"; - sha256 = "188ycy7816jnw2srfydvmnwh0l2pxbj63mlyjlqw4j51a5r64snn"; + rev = "d42d1e5b5394f1a34763dc630f70dffe2470ef84"; + sha256 = "01hp2aqz0fj84s0b9kysy22mx8ms9v4pwng9b4xi5skbdli2vcsb"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; minimap-vim = buildVimPluginFrom2Nix { pname = "minimap.vim"; - version = "2023-03-31"; + version = "2023-04-11"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "15dce1b667d4df0eec715798ab94c0850316e8a3"; - sha256 = "17kxkky4g3fxgxs840flhyp9c2cxh8hzq2kzfdqaz7am6mas9cn6"; + rev = "868a809302f9f5d4c408ef8aef7eb9bd5893f801"; + sha256 = "1j7p33did6c0xnxq96541fw07fq25ss9784sf33ak6by8xhmpqdw"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; @@ -5459,12 +5459,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2023-04-01"; + version = "2023-04-11"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "d38a22940aaa55351cd4dc106540fa302fad4f0d"; - sha256 = "1iykm9p4p8kji04zx69fv91rd1a2yzf712y413pzgz5saqaracs5"; + rev = "32c03d5a320235469050757ec890d8eb11c3135c"; + sha256 = "0fk3b6kpbjd59v3smbvmfn1lcx3aac30v25mc5ni4sq3328cwlvq"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -5519,12 +5519,12 @@ final: prev: neotest = buildVimPluginFrom2Nix { pname = "neotest"; - version = "2023-04-02"; + version = "2023-04-10"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "734efe8a2682b6415712933efd19c484c2f8d942"; - sha256 = "0jr1amq42kbvmq0wfdmdbajch9brfs29mp159vs31y14ddz40vqj"; + rev = "28724010861dbf294f09b9ee1948d2da2823604b"; + sha256 = "0n4g735i9kndnv5790bkggsl3dm0jckwxa0n83j4mikrrfg0zi66"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; @@ -5555,12 +5555,12 @@ final: prev: neotest-dotnet = buildVimPluginFrom2Nix { pname = "neotest-dotnet"; - version = "2023-02-05"; + version = "2023-04-10"; src = fetchFromGitHub { owner = "Issafalcon"; repo = "neotest-dotnet"; - rev = "b7d3b848454180760a3ef8c98c6b0f01b7ad3466"; - sha256 = "1r5advhhj64ck6brxngwq57b65h9q6fzf2yiffznz6xnyqgilimh"; + rev = "cb0e6f580e4877034a76a02c3e8aed75dcbc8c48"; + sha256 = "0x0msjris2mpfgadkrgk1gqb00cck26lqlazjqqdf1516lvyvlm2"; }; meta.homepage = "https://github.com/Issafalcon/neotest-dotnet/"; }; @@ -5627,12 +5627,12 @@ final: prev: neotest-phpunit = buildVimPluginFrom2Nix { pname = "neotest-phpunit"; - version = "2022-10-09"; + version = "2023-04-10"; src = fetchFromGitHub { owner = "olimorris"; repo = "neotest-phpunit"; - rev = "0e5c306434ebea413585c3d0d39c97f6a33ef977"; - sha256 = "1kbydwj6af7s945chh6bmykza7vnzs94cw55gs19324a1yd9ky7j"; + rev = "bf414a6dd2ddbe69f6c7b96e345cfe28afd577db"; + sha256 = "0ss6qlh6cs1bidn7j2m7565pnx2sfclqik1x123dw6ibmasc9zrb"; }; meta.homepage = "https://github.com/olimorris/neotest-phpunit/"; }; @@ -5663,12 +5663,12 @@ final: prev: neotest-rspec = buildVimPluginFrom2Nix { pname = "neotest-rspec"; - version = "2023-04-05"; + version = "2023-04-10"; src = fetchFromGitHub { owner = "olimorris"; repo = "neotest-rspec"; - rev = "7243a4cdc27fa1a857653b862e10b7f93c28aebf"; - sha256 = "0j6aahy5zk5g2afphikbzqnhpf8z5xz0k0g1x0cwwi22qziaq84f"; + rev = "0843dbd82f953c2d7a4a50160c07c3cb6600879c"; + sha256 = "1aky5dhhflilvsazzh6ix75fl3618zyss1dyy3dpws3mk16fn5cf"; }; meta.homepage = "https://github.com/olimorris/neotest-rspec/"; }; @@ -5723,12 +5723,12 @@ final: prev: neovim-ayu = buildVimPluginFrom2Nix { pname = "neovim-ayu"; - version = "2023-02-10"; + version = "2023-04-11"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "0eb91afe11f1763a477655965684269a545012e1"; - sha256 = "1nhayyl8lr22j0qrf64h1sjq9z650sxwgcqi8an1b6g6nhqwc329"; + rev = "7ee99986e4a478ce0fa78c35e4afddd00476e551"; + sha256 = "05mfrlj8cw32z0xnp3mhqz3li30rfg2zv2b1lp0akkl1csgbivf8"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -5855,12 +5855,12 @@ final: prev: nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2023-04-05"; + version = "2023-04-11"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "b9a3385d4814d7c8aa6a9a68f42c6a8bc05282f4"; - sha256 = "18659nz8l24ip16gw3zji0cmhjjzvnhhparbgajw5m6bdq9jahwh"; + rev = "fbc610f3d3771e330b0dbefc8aab3112679554a6"; + sha256 = "1a5mmjhiq3dpbillrmyh0f2j4p2cki6707j0qdbak1swrk30hwqp"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -5891,12 +5891,12 @@ final: prev: nlsp-settings-nvim = buildVimPluginFrom2Nix { pname = "nlsp-settings.nvim"; - version = "2023-04-09"; + version = "2023-04-11"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "c4b2773bcb0939d3123ff8e8006611b190b98b51"; - sha256 = "1vxrmwr1fd75wm97snk2ckflqsg5aixv2f1wa47jym4brnlcag4y"; + rev = "fd5ca6e4c2b01f97309e6b515b9957e7454587e1"; + sha256 = "047911rgg1a9vrg1f6yaifsc54wgg6xjpgv198iaz80dhn5mr913"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -5987,24 +5987,24 @@ final: prev: nui-nvim = buildVimPluginFrom2Nix { pname = "nui.nvim"; - version = "2023-04-02"; + version = "2023-04-10"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "1f43b13d133eb4b4f53a4485379d9afa58808389"; - sha256 = "03vvpqdg88vz3amq62bfdzslsykbm7nafvq6cf6ggazd01rc1zsj"; + rev = "bf5900f1b60bf6499755ac92315181a24a87a577"; + sha256 = "0rs8i095ppkllvk6hacgvwsbmmiwaj2m57xwg5jd7mxyvy40zr4j"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2023-04-05"; + version = "2023-04-11"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "5855128178fa78293acdfb5b4e41ef046779240b"; - sha256 = "0v2dd4yyh9949ig7kj3ra65xxldzwdppkg6y48n3qbn6x8f1v9vn"; + rev = "f8ffcd7cb8fb3325c711d459152ef132b5b65aed"; + sha256 = "0cbc4ic7q6mlr7cg4km8z7zy0znjj7d1vshafi2xg219fq5sfy1g"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -6491,12 +6491,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2023-04-09"; + version = "2023-04-10"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "27e9e1d2638ffd133b06f314a49ac55825cb1017"; - sha256 = "0fbq9gwrgr5gaz5k3aq5c7fw0gg5qkzw86qqff1ghz8b5jkjkkp5"; + rev = "10fa01d553ce10646350461ac5ddc71f189e9d1a"; + sha256 = "1v5zqf5z9fl23f62cgchsyhg54wpw364k6bpn9gi6py5mfpig49c"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -6755,24 +6755,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2023-04-09"; + version = "2023-04-11"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "086bf310bd19a7103ee7d761eb59f89f3dd23e21"; - sha256 = "135d1dfgbfjh9sc5j2bgrkl6123pbn279fhs22p76i6jnn0fnyaz"; + rev = "48d53a5934fbd51b655d03db7dad35551838f2c9"; + sha256 = "0wxkbjbbx6j2fs3bxc69vdppp4n46s13ykilrq4sd4vkcj1msr5m"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-04-08"; + version = "2023-04-11"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "a57d2a599b57a619f58a5c91c89d9bf12f8977b2"; - sha256 = "16bqwc60k9s38zrqrhwci4jwkq2c97k6irgb0i9mqgqddm9f7dn4"; + rev = "ac4020c70722337c326bf65b645b162ee6e1796b"; + sha256 = "0i993nj2yazzq5maiyqn0x1n0iilx6jz1a5wi079f0whhz5jaggi"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -6803,12 +6803,12 @@ final: prev: nvim-treesitter-pyfold = buildVimPluginFrom2Nix { pname = "nvim-treesitter-pyfold"; - version = "2023-03-15"; + version = "2023-04-11"; src = fetchFromGitHub { owner = "eddiebergman"; repo = "nvim-treesitter-pyfold"; - rev = "77ee666a066bf1b77d2c727da85bd7868e6775e7"; - sha256 = "19bci2kd0k0dcj9vvflf029zhgz4ib95xxacc9hhsfgv6ap4bf5a"; + rev = "f0d31fc70e8f8fed43ef745814317eab653454de"; + sha256 = "0jzk6xax1fb6vzbdd2p7f06r1s4mbw1srlykvfi7031y7b6n4ccj"; }; meta.homepage = "https://github.com/eddiebergman/nvim-treesitter-pyfold/"; }; @@ -6827,24 +6827,24 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2023-03-27"; + version = "2023-04-10"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "b55fe6175f0001347a433c9df358c8cbf8a4e90f"; - sha256 = "1kip55hxkg6lgbqj37hx5fsph5j4c69r7n6c7ypqynhn7qg6flqx"; + rev = "8673926519ea61069f9c1366d1ad1949316d250e"; + sha256 = "0qgx7f1jkd62dxw8a0f4h01dbixzqmj18nmyh50baang671xzlzl"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; nvim-ts-autotag = buildVimPluginFrom2Nix { pname = "nvim-ts-autotag"; - version = "2023-04-08"; + version = "2023-04-10"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-ts-autotag"; - rev = "7a1c677985b8fc4cdfdb87dd55fbc16dadd86bbe"; - sha256 = "0yqxg4hmdjs2bn7hg5al012kf8ykhrjsg1ca22vnnaqz4j98il0k"; + rev = "b525525b6aba20763e19011a73454845170850d7"; + sha256 = "0j8vgqq3408y1b6vsv5rppp5aqly1cf8yn37chh526r42aikzbkd"; }; meta.homepage = "https://github.com/windwp/nvim-ts-autotag/"; }; @@ -6898,12 +6898,12 @@ final: prev: nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2023-04-08"; + version = "2023-04-11"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "f16ec8f6e5d23e4349501dae46e0a661918e086e"; - sha256 = "08c76ps667wkyh8lzkjszpfhjr22cdxz7p30bkps42i71vq12d4n"; + rev = "defb7da4d3d313bf31982c52fd78e414f02840c9"; + sha256 = "1qwcr82yd2jdfds6r6s0pfkixpk0dydnl1l9vqg092l6vkx6v30v"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -6994,12 +6994,12 @@ final: prev: oil-nvim = buildVimPluginFrom2Nix { pname = "oil.nvim"; - version = "2023-04-07"; + version = "2023-04-11"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "5edf9784a5ab536dcdcdae5cc8d75a307863d529"; - sha256 = "1y41z4n4k20zqqgvjxjz9zrxh3if8snm2pxys7ma0rd0vfylgiwm"; + rev = "fb8b101d7cb4727d8719ab6ed141330eca997d3f"; + sha256 = "1vhrmiws4k65v5mzvxy2f93f5y8dxcpchsxwrqfmp9imzkcm081z"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -7307,12 +7307,12 @@ final: prev: plenary-nvim = buildNeovimPluginFrom2Nix { pname = "plenary.nvim"; - version = "2023-02-19"; + version = "2023-04-10"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "253d34830709d690f013daf2853a9d21ad7accab"; - sha256 = "17vvl06jc5vrfrv7gljflkqykshhg84wnhbl9br4pm050ywlg4ng"; + rev = "9ac3e9541bbabd9d73663d757e4fe48a675bb054"; + sha256 = "0d3h8kjid7mkqzdhakbf9wiyj1vxrcw4n8dp678bxm0452n82vxl"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -7958,12 +7958,12 @@ final: prev: smart-splits-nvim = buildVimPluginFrom2Nix { pname = "smart-splits.nvim"; - version = "2023-04-08"; + version = "2023-04-11"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "68a7fedd4032d230fea11dfe4f2e7409b3a01345"; - sha256 = "063sk1x4vzkxdyxbrqq42ip2kjdzc5ydgkqkgmnhm9dhl92zbnb6"; + rev = "a2d3c590c250298f34674c19a87aa9e4c01af788"; + sha256 = "18028fx4f88v34227mdzqj77x9k6zja69dj0shsl14pyagxallng"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; @@ -8030,12 +8030,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2023-04-05"; + version = "2023-04-11"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "a4d96b68fb1ba00fb2e91d2f46705de9cddbb348"; - sha256 = "0qn5mryiay1ka0inhqivnq8fkn9cyz5gdyv3pfpkjb7s19kmkf36"; + rev = "5eeceab6e905c1b93ba3a49dfbaa1200071990f9"; + sha256 = "0d32v5qr5irbaznq1r654b8ffqyryqxs0cxmav65hp09y3m27lmx"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -8380,12 +8380,12 @@ final: prev: tabby-nvim = buildVimPluginFrom2Nix { pname = "tabby.nvim"; - version = "2023-01-30"; + version = "2023-04-10"; src = fetchFromGitHub { owner = "nanozuki"; repo = "tabby.nvim"; - rev = "9065c65138b59ea8182024216a5bbcf0d77baebb"; - sha256 = "0jfgg02l2872ickl3bwsm6xyh5nl5sqgn3yfk9kn45aba3kd7nvm"; + rev = "ca5109cc26aa45ddd3270010d41bcd68fb59c773"; + sha256 = "0imp646bdx97gs1dw0izfq544c53qkdy7s4jaa7zlwdsszfq0rnb"; }; meta.homepage = "https://github.com/nanozuki/tabby.nvim/"; }; @@ -8597,12 +8597,12 @@ final: prev: telescope-frecency-nvim = buildVimPluginFrom2Nix { pname = "telescope-frecency.nvim"; - version = "2023-02-15"; + version = "2023-04-11"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "e5696afabd8753d772987ea48434d9c0d8b0aa6b"; - sha256 = "1zcw5lm97kil8jk722xfcnxy9vqlffbrsfhk2f53hwxnabbkl3qq"; + rev = "0a4a521471141ae3c94ff0ebcffcaff3c3aad147"; + sha256 = "14n6fvkaa5f4k989a51ib3r7czy1q6ggym17g7rrd2vx4bk0n1vd"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; @@ -8815,12 +8815,12 @@ final: prev: telescope-nvim = buildNeovimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2023-04-09"; + version = "2023-04-10"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "2ea61f1952f0ad10e4fcc282468a06d3e69674c2"; - sha256 = "0f4agdsy3fl53glm8fv9nqliijd16a5imlan3i8v6pk09339k61a"; + rev = "6258d50b09f9ae087317e392efe7c05a7323492d"; + sha256 = "0p4wz6gvs7952gbzlaz8sdjb92s1nwwry8mkxywi37pn8z6rvj2h"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -9056,12 +9056,12 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2023-03-31"; + version = "2023-04-09"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "b86982429325112d2b20c6d0cc7a5c4b182ab705"; - sha256 = "1md3j9865lq4xc3ai0k8h8jdwpmqk82d7j33zrqlpak83ys8mbgk"; + rev = "2e477f7ee8ee8229ff3158e3018a067797b9cd38"; + sha256 = "1d7qqgviimgmzz1g7ykv688pyhr0m9kv6h9lrczxmdq7xwymmbbq"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; @@ -9248,12 +9248,12 @@ final: prev: unison = buildVimPluginFrom2Nix { pname = "unison"; - version = "2023-04-06"; + version = "2023-04-11"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "3525b4d70508b7587b3ea3b4df5f1ffae18928b8"; - sha256 = "05bkv361layal7bbj76h8zkzbf5ar41nzvzb3xmw3gsmm0h6nngn"; + rev = "b9c391ea148795d50071565d8abea635f59dc68f"; + sha256 = "0xh52mc6kp58w2frjmncc0p132y3287hc92dxih62maaagaham9l"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -9272,12 +9272,12 @@ final: prev: urlview-nvim = buildVimPluginFrom2Nix { pname = "urlview.nvim"; - version = "2023-03-19"; + version = "2023-04-10"; src = fetchFromGitHub { owner = "axieax"; repo = "urlview.nvim"; - rev = "e92d99f062685f9d3ab84238e1cdde6399dc64ce"; - sha256 = "0ahs5sgs95wkpr11s93r08w0xagiqrfw5zrgqyhhjqg2dfpqzxp9"; + rev = "cef8de1ea2f2faf3964f2d017cd88a35e93c9fe3"; + sha256 = "0x4l1lypyrcj2w5nx6khjpw7myp225gd0y9wfb2x98d1ymln5j83"; }; meta.homepage = "https://github.com/axieax/urlview.nvim/"; }; @@ -9428,12 +9428,12 @@ final: prev: vim-abolish = buildVimPluginFrom2Nix { pname = "vim-abolish"; - version = "2023-04-08"; + version = "2023-04-10"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-abolish"; - rev = "e5f0c592bc54bb8e3d6acc964a9db9f4037cbbf9"; - sha256 = "1h3k14nkgp0jjvhwfi9pvx7kkfc74whwisja14mykpbwzcdwhdiq"; + rev = "cb3dcb220262777082f63972298d57ef9e9455ec"; + sha256 = "0xriiima13cv84jlv37qd6ab4l6fjapqd8a8xsr5c87k0kkyyg13"; }; meta.homepage = "https://github.com/tpope/vim-abolish/"; }; @@ -10076,12 +10076,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2023-04-02"; + version = "2023-04-06"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "5a3667644ca1beada1c6add865b3f8329b4727bc"; - sha256 = "1066xdimc4vpqar95hnbwl1f2wijr3yss6z1s16k07ymvi02dgxs"; + rev = "4aea08196fb9d3dcf365192f4bf7da7d3813a23d"; + sha256 = "19pkhqrn7hdyqwh034kgiq0kl8h3i10x6lp4cpfy9jd44445k02a"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -11746,12 +11746,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2023-04-06"; + version = "2023-04-10"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "6703edafe62dcb94b2757828b9b7435227c3e3ff"; - sha256 = "03srmixrpvyia3386n2kwkg9byrzh6lcdb4dd9j21ah212ll6nfy"; + rev = "06bf1b35ef4717a10a00ec4f8387ebf3ec983194"; + sha256 = "1wmxjlhhb3za2giza5hphr4sp4x763czajviv6vndfpibi4cgy5s"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -11855,12 +11855,12 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2023-03-25"; + version = "2023-04-10"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "156367e4cbd123bc9a70eeabeaa16f7cf9239e12"; - sha256 = "19jh4s9fv40q9vy1lykh0zv5qv225zs48wgskd7b0xq0gh2c9vcz"; + rev = "03ebc3b7dbf8f17f2d45d9b5619b48a030e1bf88"; + sha256 = "18bgw4gv9xd8msh7ly4lz8x631a3bprn5lcdl114g3h6ybs8ldix"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -13368,12 +13368,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2023-03-28"; + version = "2023-04-11"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "739024ba3264cf153d54ab8da5cdaaa978f7628c"; - sha256 = "1549qrgpyi87rmm14n182zns8kgvfk2yg5cl8sz7vvnzyh3s2gvz"; + rev = "8183037eccad54deb2100a9665157e4405fa4702"; + sha256 = "10mj43mm366h91nfp4cnkw61kvdx0pm0kzac0yc41bar91mmpbg6"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -14486,12 +14486,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2023-03-27"; + version = "2023-04-11"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "73587f9c454da81679202f1668c30fea6cdafd5e"; - sha256 = "0775rqp1367rivqxilpqmrjh5k900j3idid2lg7h5h2q4h8yicaj"; + rev = "f078aa49bef4cb9e7b86f07b607c6e98c95b9fb5"; + sha256 = "0w87h5vdrwn3ch8fyyfxkpz16r150910wmbb5y6wr4ad3scndjsk"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -14558,14 +14558,14 @@ final: prev: lspsaga-nvim-original = buildVimPluginFrom2Nix { pname = "lspsaga-nvim-original"; - version = "2023-04-09"; + version = "2023-04-11"; src = fetchFromGitHub { - owner = "glepnir"; + owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "1fbb3e4721354d0d0a20a28bb77b3f83fe68538b"; - sha256 = "07h7rdqxbz4vy3hqyl15am2bkv89h8afysby2jlqdcfn0y5wa5h1"; + rev = "1ead4ce8a20a8ac7e96aca038d54ceaa185be4e0"; + sha256 = "14k02srgqdzglzbn6yvr12qgpkmngaamlpb97p4h27d6di9zpkkm"; }; - meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; + meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; }; mattn-calendar-vim = buildVimPluginFrom2Nix { @@ -14582,12 +14582,12 @@ final: prev: nord-vim = buildVimPluginFrom2Nix { pname = "nord-vim"; - version = "2023-03-07"; + version = "2023-04-10"; src = fetchFromGitHub { owner = "nordtheme"; repo = "vim"; - rev = "684c345b8a8bf5e37919c38be6edaaa9356dbf4b"; - sha256 = "1c6mbi0j5r1s0765jj513h5yxzp59n1brar2jsa398ig3508cv9b"; + rev = "f725ac643afce04021c9abcbb57711fcb9fa71e9"; + sha256 = "0pbgcpqfzwari78v5yypidcy5rlxdsklg77fkjgzxgkjikmbil8s"; }; meta.homepage = "https://github.com/nordtheme/vim/"; }; From 828c205e72c05f29e02053806f15deedef25ffe4 Mon Sep 17 00:00:00 2001 From: "\"Bernardo Meurer\"" <"bernardo@meurer.org"> Date: Tue, 11 Apr 2023 12:16:31 -0400 Subject: [PATCH 46/52] vimPlugins.tmux-nvim: init at 2023-03-11 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 343e04ac31c6..d7e7be9a3150 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -9005,6 +9005,18 @@ final: prev: meta.homepage = "https://github.com/wellle/tmux-complete.vim/"; }; + tmux-nvim = buildVimPluginFrom2Nix { + pname = "tmux.nvim"; + version = "2023-03-11"; + src = fetchFromGitHub { + owner = "aserowy"; + repo = "tmux.nvim"; + rev = "9ba03cc5dfb30f1dc9eb50d0796dfdd52c5f454e"; + sha256 = "0xkdihg0f9b0wc37zml7n3wsmy8ppy08zynv8f2j90xwlwad06b4"; + }; + meta.homepage = "https://github.com/aserowy/tmux.nvim/"; + }; + tmuxline-vim = buildVimPluginFrom2Nix { pname = "tmuxline.vim"; version = "2021-07-20"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index d75e6eaaa421..d4da228ac450 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -755,6 +755,7 @@ https://github.com/vim-scripts/timestamp.vim/,, https://github.com/levouh/tint.nvim/,HEAD, https://github.com/tomtom/tlib_vim/,, https://github.com/wellle/tmux-complete.vim/,, +https://github.com/aserowy/tmux.nvim/,HEAD, https://github.com/edkolev/tmuxline.vim/,, https://github.com/folke/todo-comments.nvim/,, https://github.com/AmeerTaweel/todo.nvim/,, From 0a961e6b2af09bd9404e252c276e502a1c2e6751 Mon Sep 17 00:00:00 2001 From: "\"Bernardo Meurer\"" <"bernardo@meurer.org"> Date: Tue, 11 Apr 2023 12:17:24 -0400 Subject: [PATCH 47/52] vimPlugins.ltex_extra-nvim: init at 2023-01-29 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index d7e7be9a3150..89980bb88e17 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -4760,6 +4760,18 @@ final: prev: meta.homepage = "https://github.com/kkharji/lspsaga.nvim/"; }; + ltex_extra-nvim = buildVimPluginFrom2Nix { + pname = "ltex_extra.nvim"; + version = "2023-01-29"; + src = fetchFromGitHub { + owner = "barreiroleo"; + repo = "ltex_extra.nvim"; + rev = "1d2f288ceedc70d5a9c00f55c0d0cc788b5164f2"; + sha256 = "1vknp3y3s1pavk9f4n4kb6nnymvcs7pbrnb8ckw18jyk02mfnjfs"; + }; + meta.homepage = "https://github.com/barreiroleo/ltex_extra.nvim/"; + }; + lualine-lsp-progress = buildVimPluginFrom2Nix { pname = "lualine-lsp-progress"; version = "2021-10-23"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index d4da228ac450..e7c31f9219a8 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -399,6 +399,7 @@ https://github.com/lspcontainers/lspcontainers.nvim/,, https://github.com/onsails/lspkind-nvim/,, https://github.com/tami5/lspsaga.nvim/,, https://github.com/glepnir/lspsaga.nvim/,main,lspsaga-nvim-original +https://github.com/barreiroleo/ltex_extra.nvim/,HEAD, https://github.com/arkav/lualine-lsp-progress/,, https://github.com/nvim-lualine/lualine.nvim/,, https://github.com/l3mon4d3/luasnip/,, From 3a0d22f1303368b8d7c5273813eb22b06b44d0ed Mon Sep 17 00:00:00 2001 From: "\"Bernardo Meurer\"" <"bernardo@meurer.org"> Date: Tue, 11 Apr 2023 12:18:19 -0400 Subject: [PATCH 48/52] vimPlugins.whitespace-nvim: init at 2023-02-13 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 89980bb88e17..63146479eb0e 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -14243,6 +14243,18 @@ final: prev: meta.homepage = "https://github.com/folke/which-key.nvim/"; }; + whitespace-nvim = buildVimPluginFrom2Nix { + pname = "whitespace.nvim"; + version = "2023-02-13"; + src = fetchFromGitHub { + owner = "johnfrankmorgan"; + repo = "whitespace.nvim"; + rev = "525f67b3f01910c73f07f0848839aab0b7ab9f42"; + sha256 = "0kv2b099jc9592g0b381rdgzv5wvryy3v95bfk1sdjr9bmzdyjn9"; + }; + meta.homepage = "https://github.com/johnfrankmorgan/whitespace.nvim/"; + }; + wilder-nvim = buildVimPluginFrom2Nix { pname = "wilder.nvim"; version = "2022-08-13"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index e7c31f9219a8..82d5760973fd 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1196,6 +1196,7 @@ https://github.com/liuchengxu/vista.vim/,, https://github.com/dylanaraps/wal.vim/,, https://github.com/mattn/webapi-vim/,, https://github.com/folke/which-key.nvim/,, +https://github.com/johnfrankmorgan/whitespace.nvim/,HEAD, https://github.com/gelguy/wilder.nvim/,, https://github.com/gcmt/wildfire.vim/,, https://github.com/fgheng/winbar.nvim/,main, From 170d143fc7b7c3841cb813991048a22dab1bdc2b Mon Sep 17 00:00:00 2001 From: "\"Bernardo Meurer\"" <"bernardo@meurer.org"> Date: Tue, 11 Apr 2023 12:18:44 -0400 Subject: [PATCH 49/52] vimPlugins.nvim-treesitter: update grammars --- .../vim/plugins/nvim-treesitter/generated.nix | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index a537b0289306..257f01b1aec0 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -303,12 +303,12 @@ }; devicetree = buildGrammar { language = "devicetree"; - version = "0.0.0+rev=ea30a05"; + version = "0.0.0+rev=6428cee"; src = fetchFromGitHub { owner = "joelspadin"; repo = "tree-sitter-devicetree"; - rev = "ea30a05d0f0446a96d8b096ad11828ad4f8ad849"; - hash = "sha256-ZiUMIsjVMxpchxmJQ3g2yXIn+/kAWPwTzMzx3IlW93o="; + rev = "6428cee0e9d76fac3291796ced56ac14ecd036ee"; + hash = "sha256-QU5lCnTe00Mj5IfrBBnGwvU5S3Gz9VL2FRTNy0FPnIo="; }; meta.homepage = "https://github.com/joelspadin/tree-sitter-devicetree"; }; @@ -733,12 +733,12 @@ }; hcl = buildGrammar { language = "hcl"; - version = "0.0.0+rev=0ff887f"; + version = "0.0.0+rev=becebeb"; src = fetchFromGitHub { owner = "MichaHoffmann"; repo = "tree-sitter-hcl"; - rev = "0ff887f2a60a147452d52db060de6b42f42f1441"; - hash = "sha256-L4B2qtGqrtyLHyUMx1p0t4aKncm72dUE+e19Fv5iqUA="; + rev = "becebebd3509c02e871c99be55556269be1def1b"; + hash = "sha256-GR2a+VuhZVMGmLW9Mg7bSALNsy0SyfG+YVaRz1qY6a0="; }; meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl"; }; @@ -1743,12 +1743,12 @@ }; terraform = buildGrammar { language = "terraform"; - version = "0.0.0+rev=0ff887f"; + version = "0.0.0+rev=becebeb"; src = fetchFromGitHub { owner = "MichaHoffmann"; repo = "tree-sitter-hcl"; - rev = "0ff887f2a60a147452d52db060de6b42f42f1441"; - hash = "sha256-L4B2qtGqrtyLHyUMx1p0t4aKncm72dUE+e19Fv5iqUA="; + rev = "becebebd3509c02e871c99be55556269be1def1b"; + hash = "sha256-GR2a+VuhZVMGmLW9Mg7bSALNsy0SyfG+YVaRz1qY6a0="; }; location = "dialects/terraform"; meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl"; @@ -1923,12 +1923,12 @@ }; vim = buildGrammar { language = "vim"; - version = "0.0.0+rev=2886b52"; + version = "0.0.0+rev=cd63bd2"; src = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vim"; - rev = "2886b52143d570d81f97c98be7a1e204ce9d3bcd"; - hash = "sha256-w8yHo5rtqqD80gbSChaHhSzt3ljPBKWYZ+pxaWFM35s="; + rev = "cd63bd20644a419d209b625d21258617580273d2"; + hash = "sha256-9u9sMBFIrLviF60WTOoiA7bpJfqsD5iWE5OSRdrOz0E="; }; meta.homepage = "https://github.com/neovim/tree-sitter-vim"; }; @@ -2011,12 +2011,12 @@ }; zig = buildGrammar { language = "zig"; - version = "0.0.0+rev=f3bc9ff"; + version = "0.0.0+rev=2c7b630"; src = fetchFromGitHub { owner = "maxxnino"; repo = "tree-sitter-zig"; - rev = "f3bc9ffe9ca10f52dee01999b5b6ce9a4074b0ac"; - hash = "sha256-/Bk7UGdPOHmGc01eCNPHsXFMF4pAxE/gkhVxvRItZZ8="; + rev = "2c7b6308d906d7aec4b3e1fafaaeca447a8a2c2f"; + hash = "sha256-uN/B4YasWdgAWV8IAwKd4MP/L73+RiQJGQD00ZA8d6E="; }; meta.homepage = "https://github.com/maxxnino/tree-sitter-zig"; }; From d9f35038102e24d3baebb71ac3c1e508fcd87276 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 11 Apr 2023 12:35:00 -0400 Subject: [PATCH 50/52] vimPlugins.vim-clap: revert update --- pkgs/applications/editors/vim/plugins/generated.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 63146479eb0e..35e13d23f20f 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -10100,12 +10100,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2023-04-06"; + version = "2023-04-02"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "4aea08196fb9d3dcf365192f4bf7da7d3813a23d"; - sha256 = "19pkhqrn7hdyqwh034kgiq0kl8h3i10x6lp4cpfy9jd44445k02a"; + rev = "5a3667644ca1beada1c6add865b3f8329b4727bc"; + sha256 = "1066xdimc4vpqar95hnbwl1f2wijr3yss6z1s16k07ymvi02dgxs"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; From e9cb831ee1bd1cb76281cff739da265b7c597ab6 Mon Sep 17 00:00:00 2001 From: yvt Date: Wed, 12 Apr 2023 01:24:15 +0900 Subject: [PATCH 51/52] fuse-7z-ng: link to The patch file added in the last commit was based on this linked PR (authored by me). --- pkgs/tools/filesystems/fuse-7z-ng/default.nix | 1 + .../tools/filesystems/fuse-7z-ng/zero-init-fuse-operations.patch | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/tools/filesystems/fuse-7z-ng/default.nix b/pkgs/tools/filesystems/fuse-7z-ng/default.nix index e7749f63a99e..f5d9b4191e3f 100644 --- a/pkgs/tools/filesystems/fuse-7z-ng/default.nix +++ b/pkgs/tools/filesystems/fuse-7z-ng/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { ./no-pthread.patch # Zero-initialize unset fields of `struct fuse_operations` so that # garbage values don't cause segfault. + # ./zero-init-fuse-operations.patch ]; diff --git a/pkgs/tools/filesystems/fuse-7z-ng/zero-init-fuse-operations.patch b/pkgs/tools/filesystems/fuse-7z-ng/zero-init-fuse-operations.patch index c2d50308f248..35acdaa04542 100644 --- a/pkgs/tools/filesystems/fuse-7z-ng/zero-init-fuse-operations.patch +++ b/pkgs/tools/filesystems/fuse-7z-ng/zero-init-fuse-operations.patch @@ -1,4 +1,5 @@ Zero-initialize unset fields of `struct fuse_operations`. + --- a/src/main.cpp +++ b/src/main.cpp @@ -195,7 +195,7 @@ main (int argc, char **argv) From 309b8ce82deac47a92fb69fc334a28434b0427b2 Mon Sep 17 00:00:00 2001 From: Yureka Date: Tue, 11 Apr 2023 19:15:42 +0200 Subject: [PATCH 52/52] gitlab: 15.10.1 -> 15.10.2 (#225716) https://about.gitlab.com/releases/2023/04/05/gitlab-15-10-2-released/ --- .../version-management/gitlab/data.json | 12 ++--- .../gitlab/gitaly/default.nix | 4 +- .../gitlab/gitlab-pages/default.nix | 4 +- .../gitlab/gitlab-workhorse/default.nix | 2 +- .../version-management/gitlab/rubyEnv/Gemfile | 12 ++--- .../gitlab/rubyEnv/Gemfile.lock | 15 +++++- .../gitlab/rubyEnv/gemset.nix | 49 +++++++++++++++++-- 7 files changed, 74 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 172975314a57..675e1ab61983 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "15.10.1", - "repo_hash": "sha256-BETTehy2GxZDGWLgdao1I0cqm4cNaL9lhXe+JmCNi10=", + "version": "15.10.2", + "repo_hash": "sha256-XjL1D2DschFn64D2KcTQP6pppecIN26LrWMJPUfYvgI=", "yarn_hash": "1il8dnjb7591ss6w14zibdihg3bylw866jjjclv1qm8cihp8k3y8", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v15.10.1-ee", + "rev": "v15.10.2-ee", "passthru": { - "GITALY_SERVER_VERSION": "15.10.1", - "GITLAB_PAGES_VERSION": "15.10.1", + "GITALY_SERVER_VERSION": "15.10.2", + "GITLAB_PAGES_VERSION": "15.10.2", "GITLAB_SHELL_VERSION": "14.18.0", - "GITLAB_WORKHORSE_VERSION": "15.10.1" + "GITLAB_WORKHORSE_VERSION": "15.10.2" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 0a325a28e3d0..dbd5e9bf8a80 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -11,7 +11,7 @@ let gemdir = ./.; }; - version = "15.10.1"; + version = "15.10.2"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -22,7 +22,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-iGYmBMRno2qCvdklyztGTV48m0UMeozuyX7ZZdS7K/c="; + sha256 = "sha256-18BmECQqzwwxl7nY5+Bi4oyA2EPd5HqzJdgVPV8J1OM="; }; vendorSha256 = "sha256-knuUyJGz5JvYyKeDQ66cMQQSh2YKkkDB54iCir1QpEY="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index ca56a575e287..a23599a7c489 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "15.10.1"; + version = "15.10.2"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - sha256 = "sha256-FZ7Ifb8bau1helYnmKcS90oASnjF/knxbtPsck6lwKk="; + sha256 = "sha256-h3Q8dOz61sRhDxRlcPTP+yhP/ntTTqggyAFvTgu6m6k="; }; vendorHash = "sha256-s3HHoz9URACuVVhePQQFviTqlQU7vCLOjTJPBlus1Vo="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index bf6b87e1a0fa..917554c0d84e 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "15.10.1"; + version = "15.10.2"; src = fetchFromGitLab { owner = data.owner; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 8cafe3b8909c..15995b07e1f0 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -546,7 +546,7 @@ gem 'lru_redux' # Locked as long as quoted-printable encoding issues are not resolved # Monkey-patched in `config/initializers/mail_encoding_patch.rb` # See https://gitlab.com/gitlab-org/gitlab/issues/197386 -gem 'mail', '= 2.7.1' +gem 'mail', '= 2.8.1' gem 'mail-smtp_pool', '~> 0.1.0', path: 'vendor/gems/mail-smtp_pool', require: false gem 'microsoft_graph_mailer', '~> 0.1.0', path: 'vendor/gems/microsoft_graph_mailer' @@ -593,12 +593,8 @@ gem 'app_store_connect' # For phone verification gem 'telesignenterprise', '~> 2.2' -# Ruby 3 extracts net-protocol into a separate gem, while Ruby 2 has it built-in -# This condition installs the gem only for Ruby 3 to avoid warnings on Ruby 2 -# Can be removed when support for Ruby 2 is dropped -install_if -> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.0.0") } do - # BufferedIO patch - gem 'net-protocol', '~> 0.1.3' -end +# BufferedIO patch +# Updating this version will require updating scripts/allowed_warnings.txt +gem 'net-protocol', '~> 0.1.3' gem 'duo_api', '~> 1.3' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 1f1f566be37c..b624e3908515 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -344,6 +344,7 @@ GEM danger gitlab (~> 4.2, >= 4.2.0) database_cleaner (1.7.0) + date (3.3.3) dead_end (3.1.1) debug_inspector (1.1.0) deckar01-task_list (2.3.2) @@ -927,8 +928,11 @@ GEM zeitwerk (~> 2.5) lru_redux (1.1.0) lumberjack (1.2.7) - mail (2.7.1) + mail (2.8.1) mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp marcel (1.0.2) marginalia (1.11.1) actionpack (>= 5.2) @@ -972,12 +976,19 @@ GEM nenv (0.3.0) net-http-persistent (4.0.1) connection_pool (~> 2.2) + net-imap (0.3.4) + date + net-protocol net-ldap (0.17.1) net-ntp (2.1.3) + net-pop (0.1.2) + net-protocol net-protocol (0.1.3) timeout net-scp (3.0.0) net-ssh (>= 2.6.5, < 7.0.0) + net-smtp (0.3.3) + net-protocol net-ssh (6.0.0) netrc (0.11.0) nio4r (2.5.8) @@ -1790,7 +1801,7 @@ DEPENDENCIES loofah (~> 2.19.1) lookbook (~> 1.5, >= 1.5.3) lru_redux - mail (= 2.7.1) + mail (= 2.8.1) mail-smtp_pool (~> 0.1.0)! marginalia (~> 1.11.1) memory_profiler (~> 1.0) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index fe75ce4a2a9c..4b90619af0cf 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -1064,6 +1064,16 @@ src: }; version = "1.7.0"; }; + date = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1"; + type = "gem"; + }; + version = "3.3.3"; + }; dead_end = { groups = ["default" "test"]; platforms = []; @@ -3416,15 +3426,15 @@ src: version = "1.2.7"; }; mail = { - dependencies = ["mini_mime"]; + dependencies = ["mini_mime" "net-imap" "net-pop" "net-smtp"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc"; + sha256 = "1bf9pysw1jfgynv692hhaycfxa8ckay1gjw5hz3madrbrynryfzc"; type = "gem"; }; - version = "2.7.1"; + version = "2.8.1"; }; mail-smtp_pool = { dependencies = ["connection_pool" "mail"]; @@ -3739,6 +3749,17 @@ src: }; version = "4.0.1"; }; + net-imap = { + dependencies = ["date" "net-protocol"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d996zf3g8xz244791b0qsl9vr7zg4lqnnmf9k2kshr9lki5jam8"; + type = "gem"; + }; + version = "0.3.4"; + }; net-ldap = { groups = ["default"]; platforms = []; @@ -3759,6 +3780,17 @@ src: }; version = "2.1.3"; }; + net-pop = { + dependencies = ["net-protocol"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wyz41jd4zpjn0v1xsf9j778qx1vfrl24yc20cpmph8k42c4x2w4"; + type = "gem"; + }; + version = "0.1.2"; + }; net-protocol = { dependencies = ["timeout"]; groups = ["default"]; @@ -3781,6 +3813,17 @@ src: }; version = "3.0.0"; }; + net-smtp = { + dependencies = ["net-protocol"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1c6md06hm5bf6rv53sk54dl2vg038pg8kglwv3rayx0vk2mdql9x"; + type = "gem"; + }; + version = "0.3.3"; + }; net-ssh = { groups = ["default"]; platforms = [];