From 9c14449a5b9c3f14a70413d5d1c3c639ea664677 Mon Sep 17 00:00:00 2001 From: Cathal Mullan Date: Thu, 8 Dec 2022 12:41:03 +0000 Subject: [PATCH 01/65] maintainers: add cathalmullan --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 21e53a2ecc94..59576c45bb0f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2287,6 +2287,12 @@ githubId = 5394722; name = "Spencer Baugh"; }; + cathalmullan = { + email = "contact@cathal.dev"; + github = "CathalMullan"; + githubId = 37139470; + name = "Cathal Mullan"; + }; catouc = { email = "catouc@philipp.boeschen.me"; github = "catouc"; From 44f8fcf2231bb8a3019ce7ac234c727200e94dcc Mon Sep 17 00:00:00 2001 From: Cathal Mullan Date: Thu, 8 Dec 2022 12:42:14 +0000 Subject: [PATCH 02/65] phlare: init at 0.3.0 --- pkgs/servers/monitoring/phlare/default.nix | 40 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/servers/monitoring/phlare/default.nix diff --git a/pkgs/servers/monitoring/phlare/default.nix b/pkgs/servers/monitoring/phlare/default.nix new file mode 100644 index 000000000000..2730686bdc81 --- /dev/null +++ b/pkgs/servers/monitoring/phlare/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "phlare"; + version = "0.3.0"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "grafana"; + repo = "phlare"; + sha256 = "sha256-z1PT5chkpHQJPziY7bGf6W1X5uezL6E2GUV6w/NlyFk="; + }; + + proxyVendor = true; + vendorSha256 = "sha256-KJbh+M9jYxUW9akVBHZoB/mtOHWpMPtlwIgC9fu+NYY="; + + ldflags = let + prefix = "github.com/grafana/phlare/pkg/util/build"; + in [ + "-s" "-w" + # https://github.com/grafana/phlare/blob/v0.3.0/Makefile#L32 + "-X ${prefix}.Version=${version}" + "-X ${prefix}.Branch=v${version}" + "-X ${prefix}.Revision=v${version}" + "-X ${prefix}.BuildUser=nix" + "-X ${prefix}.BuildDate=1980-01-01T00:00:00Z" + ]; + + subPackages = [ + "cmd/phlare" + "cmd/profilecli" + ]; + + meta = with lib; { + description = "Grafana Phlare is an open source database that provides fast, scalable, highly available, and efficient storage and querying of profiling data."; + license = licenses.agpl3; + homepage = "https://grafana.com/oss/phlare"; + maintainers = with maintainers; [ cathalmullan ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 96d9cb14ea13..d9ee56c0edd5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23831,6 +23831,8 @@ with pkgs; mimir = callPackage ../servers/monitoring/mimir { }; + phlare = callPackage ../servers/monitoring/phlare { }; + grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; grafana-image-renderer = callPackage ../servers/monitoring/grafana-image-renderer { }; From d465579657d72af3c5c1a102a2d85291a6a77f47 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 Feb 2023 18:17:29 +0000 Subject: [PATCH 03/65] spicedb-zed: 0.8.0 -> 0.9.1 --- pkgs/servers/spicedb/zed.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/spicedb/zed.nix b/pkgs/servers/spicedb/zed.nix index 982242a0e78f..df1866fc343b 100644 --- a/pkgs/servers/spicedb/zed.nix +++ b/pkgs/servers/spicedb/zed.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "zed"; - version = "0.8.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "authzed"; repo = "zed"; rev = "v${version}"; - hash = "sha256-/tYQqS0l5Z/yeNd6GJHONtD3YeQ7nvvWcilBAahDDPA="; + hash = "sha256-bA9ZIYzt6d0PaIChQcS9uUakxmsx/SElHite6boAd3o="; }; - vendorHash = "sha256-3JQgtWaPi2e9lSXF+3IIXDptQXjFJOBsMPfisEea8kE="; + vendorHash = "sha256-4Y/98VEZWjk2k4UPtGEumOMbjjR4V1OnPvj5mxuX/DQ="; meta = with lib; { description = "Command line for managing SpiceDB"; From 1a4a178f6090af319441ea8c3a4dbced337ee47e Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 22 Feb 2023 02:04:23 +0100 Subject: [PATCH 04/65] abc-verifier: unstable-2022-11-09 -> unstable-2023-02-04 --- pkgs/applications/science/logic/abc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index 6a20a68324f1..6ac9dd64982f 100644 --- a/pkgs/applications/science/logic/abc/default.nix +++ b/pkgs/applications/science/logic/abc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "abc-verifier"; - version = "unstable-2022-11-09"; + version = "unstable-2023-02-04"; src = fetchFromGitHub { owner = "yosyshq"; repo = "abc"; - rev = "be9a35c0363174a7cef21d55ed80d92a9ef95ab1"; - hash = "sha256-IN9YgJONcC55N89OXMrMuNuznTdjXNWxR0IngH8OWC8="; + rev = "a8f0ef2368aa56b3ad20a52298a02e63b2a93e2d"; + hash = "sha256-48i6AKQhMG5hcnkS0vejOy1PqFbeb6FpU7Yx0rEvHDI="; }; nativeBuildInputs = [ cmake ]; From ee1ea62bd33c83b274b021d66d0402599d72c7e4 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 22 Feb 2023 02:04:56 +0100 Subject: [PATCH 05/65] yosys: 0.25 -> 0.26 https://github.com/YosysHQ/yosys/releases/tag/yosys-0.26 --- pkgs/development/compilers/yosys/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index e1c035745f70..dfe5152993f3 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -71,13 +71,13 @@ let in stdenv.mkDerivation rec { pname = "yosys"; - version = "0.25"; + version = "0.26"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; rev = "${pname}-${version}"; - hash = "sha256-hOuuKvT6ZM7G0HTGtVeEHHfJWqwUinD+DxT3r0CQZH0="; + hash = "sha256-0xV+323YTK+VhnD05SmvGv8uT4TzqA9IZ/iKl1as1Kc="; }; enableParallelBuilding = true; From 476de5c070f47b7733d948bf74fa5bfe304e2570 Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Sun, 19 Feb 2023 21:10:04 -0500 Subject: [PATCH 06/65] cudatoolkit: prune broken symlinks in `postFixup` As cudatoolkit is currently written, 11.8 introduces a broken symlink in `include` (also named `include`) and in `lib` (named `lib64`). This trips up some consumers, like `tensorflow-gpu`. --- pkgs/development/compilers/cudatoolkit/common.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/compilers/cudatoolkit/common.nix b/pkgs/development/compilers/cudatoolkit/common.nix index a98e188271cb..e986ae2dc14d 100644 --- a/pkgs/development/compilers/cudatoolkit/common.nix +++ b/pkgs/development/compilers/cudatoolkit/common.nix @@ -229,6 +229,13 @@ stdenv.mkDerivation rec { addOpenGLRunpath $out/cuda_sanitizer_api/compute-sanitizer/* addOpenGLRunpath $out/cuda_sanitizer_api/compute-sanitizer/x86/* addOpenGLRunpath $out/target-linux-x64/* + '' + + # Prune broken symlinks which can cause problems with consumers of this package. + '' + while read -r -d "" file; do + echo "Found and removing broken symlink $file" + rm "$file" + done < <(find "$out" "$lib" "$doc" -xtype l -print0) ''; # cuda-gdb doesn't run correctly when not using sandboxing, so From b21e6f2c580921f71d2194421a29c3abe3e715cd Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 12 Jan 2023 17:58:51 +0800 Subject: [PATCH 07/65] deepin-camera: init at 1.4.8 --- .../deepin/apps/deepin-camera/default.nix | 95 +++++++++++++++++++ .../apps/deepin-camera/dont_use_libPath.diff | 25 +++++ pkgs/desktops/deepin/default.nix | 1 + 3 files changed, 121 insertions(+) create mode 100644 pkgs/desktops/deepin/apps/deepin-camera/default.nix create mode 100644 pkgs/desktops/deepin/apps/deepin-camera/dont_use_libPath.diff diff --git a/pkgs/desktops/deepin/apps/deepin-camera/default.nix b/pkgs/desktops/deepin/apps/deepin-camera/default.nix new file mode 100644 index 000000000000..27556ed73e04 --- /dev/null +++ b/pkgs/desktops/deepin/apps/deepin-camera/default.nix @@ -0,0 +1,95 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, qttools +, wrapQtAppsHook +, dtkwidget +, qt5integration +, qt5platform-plugins +, image-editor +, qtbase +, qtmultimedia +, ffmpeg +, ffmpegthumbnailer +, libusb1 +, portaudio +, libv4l +, gst_all_1 +, systemd +}: + +stdenv.mkDerivation rec { + pname = "deepin-camera"; + version = "1.4.8"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-p2RCetx1lgLonXZaC3umE+nDgZnp64o3iR2MgQhbisM="; + }; + + # QLibrary and dlopen work with LD_LIBRARY_PATH + patches = [ ./dont_use_libPath.diff ]; + + postPatch = '' + substituteInPlace src/CMakeLists.txt \ + --replace "/usr/share/libimagevisualresult/filter_cube" "${image-editor}/share/libimagevisualresult/filter_cube" \ + --replace "/usr/include/libusb-1.0" "${lib.getDev libusb1}/include/libusb-1.0" + substituteInPlace src/com.deepin.Camera.service \ + --replace "/usr/bin/qdbus" "${lib.getBin qttools}/bin/qdbus" \ + --replace "/usr/share/applications/deepin-camera.desktop" "$out/share/applications/deepin-camera.desktop" + ''; + + nativeBuildInputs = [ + cmake + pkg-config + qttools + wrapQtAppsHook + ]; + + buildInputs = [ + dtkwidget + qt5platform-plugins + image-editor + qtbase + qtmultimedia + ffmpeg + ffmpegthumbnailer + libusb1 + portaudio + libv4l + ] ++ (with gst_all_1 ; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + ]); + + cmakeFlags = [ "-DVERSION=${version}" ]; + + NIX_CFLAGS_COMPILE = [ + "-I${gst_all_1.gstreamer.dev}/include/gstreamer-1.0" + "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0" + ]; + + # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH + qtWrapperArgs = [ + "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ ffmpeg ffmpegthumbnailer gst_all_1.gstreamer gst_all_1.gst-plugins-base libusb1 libv4l portaudio systemd ]}" + ]; + + preFixup = '' + qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") + ''; + + meta = with lib; { + description = "Tool to view camera, take photo and video"; + homepage = "https://github.com/linuxdeepin/deepin-camera"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/apps/deepin-camera/dont_use_libPath.diff b/pkgs/desktops/deepin/apps/deepin-camera/dont_use_libPath.diff new file mode 100644 index 000000000000..b4ef86f79b38 --- /dev/null +++ b/pkgs/desktops/deepin/apps/deepin-camera/dont_use_libPath.diff @@ -0,0 +1,25 @@ +diff --git a/src/src/mainwindow.cpp b/src/src/mainwindow.cpp +index d3c6f5c..4817446 100644 +--- a/src/src/mainwindow.cpp ++++ b/src/src/mainwindow.cpp +@@ -781,19 +781,7 @@ void CMainWindow::slotPopupSettingsDialog() + + QString CMainWindow::libPath(const QString &strlib) + { +- QDir dir; +- QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); +- dir.setPath(path); +- QStringList list = dir.entryList(QStringList() << (strlib + "*"), QDir::NoDotAndDotDot | QDir::Files); //filter name with strlib +- +- if (list.contains(strlib)) +- return strlib; +- +- list.sort(); +- if (list.size() > 0) +- return list.last(); +- +- return ""; ++ return strlib; + } + + void CMainWindow::reflushSnapshotLabel() diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 5afb5e03059c..af19ad55a81b 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -32,6 +32,7 @@ let #### Dtk Application deepin-album = callPackage ./apps/deepin-album { }; deepin-calculator = callPackage ./apps/deepin-calculator { }; + deepin-camera = callPackage ./apps/deepin-camera { }; deepin-compressor = callPackage ./apps/deepin-compressor { }; deepin-draw = callPackage ./apps/deepin-draw { }; deepin-editor = callPackage ./apps/deepin-editor { }; From f3b02496409aba7a1a215fbd337b18ab52278abe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Feb 2023 05:12:30 +0000 Subject: [PATCH 08/65] ameba: 1.4.0 -> 1.4.1 --- pkgs/development/tools/ameba/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ameba/default.nix b/pkgs/development/tools/ameba/default.nix index 303275e3b9c5..f1fe0568e779 100644 --- a/pkgs/development/tools/ameba/default.nix +++ b/pkgs/development/tools/ameba/default.nix @@ -2,13 +2,13 @@ crystal.buildCrystalPackage rec { pname = "ameba"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "crystal-ameba"; repo = "ameba"; rev = "v${version}"; - hash = "sha256-9dMzT/SnO16jfUfYYiT4MOGnlgrw0jWTNL37u1Y5oBI="; + hash = "sha256-UNMOLbZeSdvTuDgveQ/vRC+PlAdVo1bGnpMz3g1seY8="; }; format = "make"; From e219e871020145fbadabc1d9de97311deb482da3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Feb 2023 05:13:53 +0000 Subject: [PATCH 09/65] bear: 3.1.0 -> 3.1.1 --- pkgs/development/tools/build-managers/bear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index 90e5098a364e..3132678eade1 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "bear"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "rizsotto"; repo = pname; rev = version; - sha256 = "sha256-b9QeXUdvXoJNFxi7i2IVq7Xeyo5T54A0Sl9BvAV25JM="; + sha256 = "sha256-EiAGM2tfzHp2rTAsf+mrfQ7VfX0NTFakcLVpT/plqh8="; }; nativeBuildInputs = [ cmake pkg-config ]; From ae585bbb543c227cd1c9d828b928cce4dc6fd361 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Feb 2023 05:43:33 +0000 Subject: [PATCH 10/65] ostree: 2022.7 -> 2023.1 --- pkgs/tools/misc/ostree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index c0ef2a037db6..0a41ef0f8bec 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -43,13 +43,13 @@ let ])); in stdenv.mkDerivation rec { pname = "ostree"; - version = "2022.7"; + version = "2023.1"; outputs = [ "out" "dev" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"; - sha256 = "sha256-i+KpJhyU6LnsQRM4D/xID4WYJF+zIaAJutT65LgiQR8="; + sha256 = "sha256-3XkrFnaToZccn24xaAE9kGrANRAP9scZo7Mi60S5b1U="; }; patches = [ From 57cbe6c11d21b74d099b2df4c628c112b179bfe5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Feb 2023 06:50:15 +0000 Subject: [PATCH 11/65] spotify-player: 0.11.1 -> 0.12.0 --- pkgs/applications/audio/spotify-player/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/spotify-player/default.nix b/pkgs/applications/audio/spotify-player/default.nix index 93a66559bc9a..2330d9c27972 100644 --- a/pkgs/applications/audio/spotify-player/default.nix +++ b/pkgs/applications/audio/spotify-player/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "spotify-player"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "aome510"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iaDaPjh2wZXxBxBDhWp+hHrJZyXqw6HSzgCzbZj9iho="; + sha256 = "sha256-nWXXaRHTzCXmu4eKw88pKuWXgdG9n7azPeBbXYz+Fio="; }; - cargoHash = "sha256-I8n/fR1aOsSex2p0u5FaqoJCh2J0oMxkikS9aynxgpA="; + cargoHash = "sha256-y/qHiwZes4nVtjbFN/jL2LFugGpRKnYij7+XXZbqguQ="; nativeBuildInputs = [ pkg-config From 79e58dd40ff71b573575c79752bcd535cc378ceb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Feb 2023 07:19:57 +0000 Subject: [PATCH 12/65] python310Packages.bitstruct: 8.15.1 -> 8.17.0 --- pkgs/development/python-modules/bitstruct/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bitstruct/default.nix b/pkgs/development/python-modules/bitstruct/default.nix index 4602e650b7f3..d83eb87baff1 100644 --- a/pkgs/development/python-modules/bitstruct/default.nix +++ b/pkgs/development/python-modules/bitstruct/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "bitstruct"; - version = "8.15.1"; + version = "8.17.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-b6atv7jzuMtowhsTqmXSPrLDrDJBmrkm8/0f/3F6kSU="; + hash = "sha256-65S0DkIYojqo+QQGuDap5u2D5IuNESzj+WQIRjvRuHQ="; }; pythonImportsCheck = [ From 8d4ec9d697439128c942e5640c8800ad9839efd6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Feb 2023 07:26:21 +0000 Subject: [PATCH 13/65] python310Packages.httpx-ntlm: 1.0.0 -> 1.1.0 --- pkgs/development/python-modules/httpx-ntlm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/httpx-ntlm/default.nix b/pkgs/development/python-modules/httpx-ntlm/default.nix index a014872ad696..6e304104c99d 100644 --- a/pkgs/development/python-modules/httpx-ntlm/default.nix +++ b/pkgs/development/python-modules/httpx-ntlm/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "httpx-ntlm"; - version = "1.0.0"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "httpx_ntlm"; inherit version; - hash = "sha256-pv/OxgcO0JWk2nCZp+bKlOdX7NqV6V5xZRDy5dd13qQ="; + hash = "sha256-a1a5laZ4tNOtpVDFCK1t2IXWbyJytZMhuad2JtmA52I="; }; propagatedBuildInputs = [ From ba9b8a6b9293c46d902712bd797db27e7176215b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 22 Feb 2023 09:45:11 +0100 Subject: [PATCH 14/65] python310Packages.httpx-ntlm: remove postPatch section --- pkgs/development/python-modules/httpx-ntlm/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/python-modules/httpx-ntlm/default.nix b/pkgs/development/python-modules/httpx-ntlm/default.nix index 6e304104c99d..95f0d4323b56 100644 --- a/pkgs/development/python-modules/httpx-ntlm/default.nix +++ b/pkgs/development/python-modules/httpx-ntlm/default.nix @@ -26,12 +26,6 @@ buildPythonPackage rec { pyspnego ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "pyspnego==0.3.*" "pyspnego>=0.3.*" \ - --replace "cryptography==36.0.*" "cryptography>=36.0.*" - ''; - # https://github.com/ulodciv/httpx-ntlm/issues/5 doCheck = false; From 8c1af064fb5e44fbf580c9efa140b9aad2c4c85a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 22 Feb 2023 09:46:49 +0100 Subject: [PATCH 15/65] python310Packages.httpx-ntlm: remove cryptography --- pkgs/development/python-modules/httpx-ntlm/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/httpx-ntlm/default.nix b/pkgs/development/python-modules/httpx-ntlm/default.nix index 95f0d4323b56..c23f928d20d7 100644 --- a/pkgs/development/python-modules/httpx-ntlm/default.nix +++ b/pkgs/development/python-modules/httpx-ntlm/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, cryptography , fetchPypi , httpx , pyspnego @@ -21,7 +20,6 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - cryptography httpx pyspnego ]; From 2372db7c6da8ccf6d8945d7247a9371688ca4e89 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 22 Feb 2023 09:57:24 +0100 Subject: [PATCH 16/65] ameba: add changelog --- pkgs/development/tools/ameba/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/ameba/default.nix b/pkgs/development/tools/ameba/default.nix index f1fe0568e779..5205d1adbc25 100644 --- a/pkgs/development/tools/ameba/default.nix +++ b/pkgs/development/tools/ameba/default.nix @@ -7,7 +7,7 @@ crystal.buildCrystalPackage rec { src = fetchFromGitHub { owner = "crystal-ameba"; repo = "ameba"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-UNMOLbZeSdvTuDgveQ/vRC+PlAdVo1bGnpMz3g1seY8="; }; @@ -16,6 +16,7 @@ crystal.buildCrystalPackage rec { meta = with lib; { description = "A static code analysis tool for Crystal"; homepage = "https://crystal-ameba.github.io"; + changelog = "https://github.com/crystal-ameba/ameba/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ kimburgess ]; }; From dc401cf73f046869e2012b821617f21cf61624bd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Feb 2023 09:46:20 +0000 Subject: [PATCH 17/65] protoc-gen-connect-go: 1.5.0 -> 1.5.2 --- pkgs/development/tools/protoc-gen-connect-go/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/protoc-gen-connect-go/default.nix b/pkgs/development/tools/protoc-gen-connect-go/default.nix index 5941b2cc51e1..09f4a86eeab0 100644 --- a/pkgs/development/tools/protoc-gen-connect-go/default.nix +++ b/pkgs/development/tools/protoc-gen-connect-go/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "protoc-gen-connect-go"; - version = "1.5.0"; + version = "1.5.2"; src = fetchFromGitHub { owner = "bufbuild"; repo = "connect-go"; rev = "refs/tags/v${version}"; - hash = "sha256-lk7PcSsqm2oLYerhXGxcyqkw5VJ46JIASU87ppybd78="; + hash = "sha256-tZNMxheADUhHBOKtFBezOYiLWTR0Ztviq05ogh+uwXw="; }; vendorHash = "sha256-Bh2JCWTaML/QU/sLBsxLKMzzH++K22BTGusfcVW2GBw="; From 66f816e4025e1756f5e68bf09aa0a2bfaaf7e9fb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Feb 2023 10:19:49 +0000 Subject: [PATCH 18/65] folly: 2023.02.06.00 -> 2023.02.13.00 --- pkgs/development/libraries/folly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 9f54350e4e22..6decf1c73a5e 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "folly"; - version = "2023.02.06.00"; + version = "2023.02.13.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "sha256-37BoLs7LynuMuF7cdJtVOfZSs22PZr6DYNAVwigZghw="; + sha256 = "sha256-YKS+UIlgDhMefovkkR/GlJcZtAjGLC9e8uhqfniH1eY="; }; nativeBuildInputs = [ From d3437ac64c80d0d0194ee2391494009b145ca822 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 22 Feb 2023 11:44:19 +0100 Subject: [PATCH 19/65] python310Packages.losant-rest: 1.17.1 -> 1.17.2 Diff: https://github.com/Losant/losant-rest-python/compare/v1.17.1...v1.17.2 --- pkgs/development/python-modules/losant-rest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/losant-rest/default.nix b/pkgs/development/python-modules/losant-rest/default.nix index 8effe91bc6e5..7c84d19a9ddc 100644 --- a/pkgs/development/python-modules/losant-rest/default.nix +++ b/pkgs/development/python-modules/losant-rest/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "losant-rest"; - version = "1.17.1"; + version = "1.17.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Losant"; repo = "losant-rest-python"; rev = "v${version}"; - hash = "sha256-H0dGPcGSiV8fZwZRGWIx39ObriPmsr1pZaFkSsXrTQA="; + hash = "sha256-R17pMVK0T2LLQPNX7mwIlkmuRyNs8rx0sJZa8F60mvs="; }; propagatedBuildInputs = [ From 4e0356c63e42c43c50bd12af09dea601ee0c52c3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 22 Feb 2023 11:52:52 +0100 Subject: [PATCH 20/65] python310Packages.python-box: 7.0.0 -> 7.0.1 Diff: https://github.com/cdgriffith/Box/compare/refs/tags/7.0.0...7.0.1 Changelog: https://github.com/cdgriffith/Box/blob/7.0.1/CHANGES.rst --- .../python-modules/python-box/default.nix | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/python-box/default.nix b/pkgs/development/python-modules/python-box/default.nix index 18e841f85e1d..cc66888ad4e7 100644 --- a/pkgs/development/python-modules/python-box/default.nix +++ b/pkgs/development/python-modules/python-box/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , msgpack , poetry-core , pytestCheckHook @@ -16,8 +15,8 @@ buildPythonPackage rec { pname = "python-box"; - version = "7.0.0"; - format = "pyproject"; + version = "7.0.1"; + format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,20 +24,10 @@ buildPythonPackage rec { owner = "cdgriffith"; repo = "Box"; rev = "refs/tags/${version}"; - hash = "sha256-CvcVN5DTaT8mSf2FtFrt7DHP+YLbVI15/5Vjfmgae34="; + hash = "sha256-Ddt8/S6HzmOt1kvzRzed3+TbOacw6RG9nd2UNn+ELB4="; }; - patches = [ - # Switch to poetry-core, https://github.com/cdgriffith/Box/pull/247 - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/cdgriffith/Box/commit/a43b98c5f5ff1074568dcef27cf17e7065d1019c.patch"; - hash = "sha256-ul/MVSzgjN3D+Vuzn7YPITaDrtS58vDmA23hy1EVF9U="; - }) - ]; - nativeBuildInputs = [ - poetry-core setuptools ]; From 290786ddf7dfd6a74002d9dc57e1715faa45cf0f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 22 Feb 2023 12:10:07 +0100 Subject: [PATCH 21/65] python310Packages.reolink-aio: 0.4.2 -> 0.5.0 Diff: https://github.com/starkillerOG/reolink_aio/compare/refs/tags/0.4.2...0.5.0 Changelog: https://github.com/starkillerOG/reolink_aio/releases/tag/0.5.0 --- pkgs/development/python-modules/reolink-aio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index 5f3a22c3a1e0..61392cdbf497 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.4.2"; + version = "0.5.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-7XD8nmuja8BL66OCdflKWiKyR47TRXUjJLSmcgqSl8g="; + hash = "sha256-6fG7wKanw/ECsO7tqT69iTRjhhUpS2lKXMvW9FiqSi8="; }; postPatch = '' From 26b31e2123e28d7d11d5705afeb447436b492582 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Feb 2023 11:36:25 +0000 Subject: [PATCH 22/65] devbox: 0.3.3 -> 0.3.4 --- pkgs/development/tools/devbox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/devbox/default.nix b/pkgs/development/tools/devbox/default.nix index 0b82242fa810..da630f0d1cf3 100644 --- a/pkgs/development/tools/devbox/default.nix +++ b/pkgs/development/tools/devbox/default.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "devbox"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "jetpack-io"; repo = pname; rev = version; - hash = "sha256-T1laFLVDtDYOA5x3zWcBU7ae1uN1cQUqLHtY36uEXOI="; + hash = "sha256-Wm8IpXmxBm6Ifh7fV9viKAfIC8BdjN1prpUyeI9eNXE="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { # integration tests want file system access doCheck = false; - vendorHash = "sha256-3u3qg8BojCVp0gx8ZKRv2WS5K307CnTlFjvTgrlfw8w="; + vendorHash = "sha256-5uh1G+puVVG0A1d+R4pZfbv63zyB86ihBjzoT63Xf1s="; nativeBuildInputs = [ installShellFiles ]; From b021cf91ff904730a9b09ce2eed45405e012894c Mon Sep 17 00:00:00 2001 From: Mahmoud Ayman Date: Wed, 22 Feb 2023 13:48:49 +0200 Subject: [PATCH 23/65] anki-bin: 2.1.58 -> 2.1.60 --- pkgs/games/anki/bin.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix index be940ec9c7e3..15a5b83ccd0e 100644 --- a/pkgs/games/anki/bin.nix +++ b/pkgs/games/anki/bin.nix @@ -3,22 +3,22 @@ let pname = "anki-bin"; # Update hashes for both Linux and Darwin! - version = "2.1.58"; + version = "2.1.60"; sources = { linux = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-qt6.tar.zst"; - sha256 = "sha256-9rlNShbdosCa60f4JlhC14dl3j2DxqFr3GgOOMWdXFY="; + sha256 = "sha256-IXgIVMcaZBTasRteZz3tRaDQ2rsWel2cNondK2VnzTU="; }; # For some reason anki distributes completely separate dmg-files for the aarch64 version and the x86_64 version darwin-x86_64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-intel-qt6.dmg"; - sha256 = "sha256-Zp5C9r5uAfIg8szMtpCzWV3N7Em7iYN7WLO6DiEslWc="; + sha256 = "sha256-DQZsKkJ8SMAFpZ2/aVRAigmbsdnW79jW7otPOd8Y/v8="; }; darwin-aarch64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-apple-qt6.dmg"; - sha256 = "sha256-Ssg+SuCYBfaQ+XZP7hnZDD/k5dMduU5oj8H+gP+iPMY="; + sha256 = "sha256-y67nxlsyKT1PuBq8KMh8NatpLViClaN6BIMMoralKdQ="; }; }; From 910e8bbd60968f379222aeef2a62c9dc938f31de Mon Sep 17 00:00:00 2001 From: Lorenz Leutgeb Date: Wed, 22 Feb 2023 13:00:07 +0100 Subject: [PATCH 24/65] gradle: 6.9.3 -> 6.9.4 --- pkgs/development/tools/build-managers/gradle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index d8a797dc9189..5f92214d404d 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -134,9 +134,9 @@ rec { }; gradle_6 = gen { - version = "6.9.3"; + version = "6.9.4"; nativeVersion = "0.22-milestone-20"; - sha256 = "0p83zgszmrwa26a4q8nvzva2af5lfzy6xvcs57y9588smsw51wyw"; + sha256 = "16iqh4bn7ndch51h2lgkdqyyhnd91fdfjx55fa3z3scdacl0491y"; defaultJava = jdk11; }; } From 47d8256aad36c76611b29e5db027239eaed50fe1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Feb 2023 12:57:45 +0000 Subject: [PATCH 25/65] watchmate: 0.4.0 -> 0.4.1 --- pkgs/applications/misc/watchmate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/watchmate/default.nix b/pkgs/applications/misc/watchmate/default.nix index cbe31867228a..fe5b7678f0c9 100644 --- a/pkgs/applications/misc/watchmate/default.nix +++ b/pkgs/applications/misc/watchmate/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "watchmate"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "azymohliad"; repo = "watchmate"; rev = "v${version}"; - hash = "sha256-WRoAQDOsCi9VbshGzdw+qrVFKQhOQwPgxOfWXYJ3nhg="; + hash = "sha256-JPlydIMkWhmHqGeeKfoc+0lK2X6B3j3Z34YrD29rrXs="; }; - cargoHash = "sha256-pEXC5IVcMhqYM+bGyTh/vaSS9LxYE2YbtIaPplc4Al8="; + cargoHash = "sha256-cAXJrhWD/uOlKWvFU947EGC9A9qwquwiVG0x1u1We6o="; nativeBuildInputs = [ pkg-config From ec438cd68769862021dd13bb64ec38b7094b1009 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Feb 2023 13:58:11 +0000 Subject: [PATCH 26/65] yadm: 3.2.1 -> 3.2.2 --- pkgs/applications/version-management/yadm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix index 32c2e14da1cf..73a2035c31fb 100644 --- a/pkgs/applications/version-management/yadm/default.nix +++ b/pkgs/applications/version-management/yadm/default.nix @@ -29,7 +29,7 @@ to support their use in yadm. resholve.mkDerivation rec { pname = "yadm"; - version = "3.2.1"; + version = "3.2.2"; nativeBuildInputs = [ installShellFiles ]; @@ -37,7 +37,7 @@ resholve.mkDerivation rec { owner = "TheLocehiliosan"; repo = "yadm"; rev = version; - hash = "sha256:0h3gxhdf32g21xx9si0lv0sa4ipb1k0n5qpln0w2vipvfgakn5mn"; + hash = "sha256-GcuqMlE8oef9+LIqKoCotktU7GcgPBE9CTVrZ8bKhv4="; }; dontConfigure = true; From ff7b46fb0f4452b2625c713e7e5ab1eab04de08e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Feb 2023 14:11:42 +0000 Subject: [PATCH 27/65] cargo-deb: 1.42.0 -> 1.42.1 --- pkgs/development/tools/rust/cargo-deb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-deb/default.nix b/pkgs/development/tools/rust/cargo-deb/default.nix index 0472dd8dfa69..053e1a5ef031 100644 --- a/pkgs/development/tools/rust/cargo-deb/default.nix +++ b/pkgs/development/tools/rust/cargo-deb/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deb"; - version = "1.42.0"; + version = "1.42.1"; src = fetchFromGitHub { owner = "kornelski"; repo = pname; rev = "v${version}"; - hash = "sha256-5IWx9tScm64Rwi6RMsbXl1Eajtc/c5PWaZEDrgibTAY="; + hash = "sha256-8o3WQ/kaYhp1gjHLQeDU9JITv9crxAVCP8UReIVd4Fc="; }; - cargoHash = "sha256-nwCfUxIrr4DxKqePu/vwxfLld08+GGXZwQWz6Gltmao="; + cargoHash = "sha256-EbcH2aBs9haXKBdEWJRPqJ1PSLj3pHdHJi38LH08uTk="; nativeBuildInputs = [ makeWrapper From a75f182a47c08d9230175e0e9b3f26c5aa89a95b Mon Sep 17 00:00:00 2001 From: Cody Hiar Date: Wed, 22 Feb 2023 08:18:11 -0700 Subject: [PATCH 28/65] python3Packages.python-jwt: init at 1.3.1 --- .../python-modules/python-jwt/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/python-jwt/default.nix diff --git a/pkgs/development/python-modules/python-jwt/default.nix b/pkgs/development/python-modules/python-jwt/default.nix new file mode 100644 index 000000000000..c938832e29d8 --- /dev/null +++ b/pkgs/development/python-modules/python-jwt/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, cryptography +, freezegun +, pytestCheckHook +, pytest-cov +}: + +buildPythonPackage rec { + pname = "jwt"; + version = "1.3.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + inherit version; + owner = "GehirnInc"; + repo = "python-jwt"; + rev = "v${version}"; + sha256 = "sha256-N1J8yBVX/O+92cRp+q2gA2cFsd+C7JjUR9jo0VGoINg="; + }; + + postPatch = '' + # pytest-flake8 is incompatible flake8 6.0.0 and currently unmaintained + substituteInPlace setup.cfg --replace "--flake8" "" + ''; + + propagatedBuildInputs = [ + cryptography + ]; + + nativeCheckInputs = [ + pytestCheckHook + freezegun + pytest-cov + ]; + + pythonImportsCheck = [ "jwt" ]; + + meta = with lib; { + description = "JSON Web Token library for Python 3"; + homepage = "https://github.com/GehirnInc/python-jwt"; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 267ceb9b8586..2344bbdd794b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6542,6 +6542,8 @@ self: super: with self; { nxt-python = callPackage ../development/python-modules/nxt-python { }; + python-jwt = callPackage ../development/python-modules/python-jwt { }; + python-nvd3 = callPackage ../development/python-modules/python-nvd3 { }; py-deprecate = callPackage ../development/python-modules/py-deprecate { }; From b01d0ee15c81cb13f7405543c7a2200e23f42236 Mon Sep 17 00:00:00 2001 From: Cody Hiar Date: Wed, 22 Feb 2023 08:18:25 -0700 Subject: [PATCH 29/65] maintainers: add thornycrackers --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/development/python-modules/python-jwt/default.nix | 1 + 2 files changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ff7d1a669179..eab4f0cda6cd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14745,6 +14745,12 @@ githubId = 1634990; name = "Tom McLaughlin"; }; + thornycrackers = { + email = "codyfh@gmail.com"; + github = "thornycrackers"; + githubId = 4313010; + name = "Cody Hiar"; + }; thoughtpolice = { email = "aseipp@pobox.com"; github = "thoughtpolice"; diff --git a/pkgs/development/python-modules/python-jwt/default.nix b/pkgs/development/python-modules/python-jwt/default.nix index c938832e29d8..43ff05814965 100644 --- a/pkgs/development/python-modules/python-jwt/default.nix +++ b/pkgs/development/python-modules/python-jwt/default.nix @@ -42,5 +42,6 @@ buildPythonPackage rec { description = "JSON Web Token library for Python 3"; homepage = "https://github.com/GehirnInc/python-jwt"; license = licenses.asl20; + maintainers = with maintainers; [ thornycrackers ]; }; } From e208767e112aa96b57b35eb78a2b69b63894d33d Mon Sep 17 00:00:00 2001 From: Mahmoud Ayman Date: Wed, 22 Feb 2023 14:02:58 +0200 Subject: [PATCH 30/65] maintainers: add mahmoudk1000 to the list --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f8ebb3e9fac2..3bcee3e825be 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8990,6 +8990,12 @@ githubId = 1238350; name = "Matthias Herrmann"; }; + mahmoudk1000 = { + email = "mahmoudk1000@gmail.com"; + github = "mahmoudk1000"; + githubId = 24735185; + name = "Mahmoud Ayman"; + }; majesticmullet = { email = "hoccthomas@gmail.com.au"; github = "MajesticMullet"; From ad6c8e2a18a6477c44b591a23233585172f0dba0 Mon Sep 17 00:00:00 2001 From: Mahmoud Ayman Date: Wed, 22 Feb 2023 14:04:38 +0200 Subject: [PATCH 31/65] anki-bin: add mahmoudk1000 to the maintainers --- pkgs/games/anki/bin.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix index 15a5b83ccd0e..38d67cb62177 100644 --- a/pkgs/games/anki/bin.nix +++ b/pkgs/games/anki/bin.nix @@ -45,7 +45,7 @@ let meta = with lib; { inherit (anki.meta) license homepage description longDescription; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; - maintainers = with maintainers; [ atemu ]; + maintainers = with maintainers; [ mahmoudk1000 atemu ]; }; passthru = { inherit sources; }; From 062c091a5097bbe9fcf1f0785b52c131b7ec425f Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 22 Feb 2023 11:23:35 -0500 Subject: [PATCH 32/65] _0x: replace patch with Cargo.lock https://github.com/NixOS/nixpkgs/pull/217084 plans to migrate Rust packages to use `importCargoLock`, but the migration script cannot handle `cargoPatches`: https://github.com/NixOS/nixpkgs/pull/217084#discussion_r1111253151 --- pkgs/tools/misc/0x/Cargo.lock | 232 ++++++++++++++++++++++++ pkgs/tools/misc/0x/add-Cargo-lock.diff | 236 ------------------------- pkgs/tools/misc/0x/default.nix | 8 +- 3 files changed, 238 insertions(+), 238 deletions(-) create mode 100644 pkgs/tools/misc/0x/Cargo.lock delete mode 100644 pkgs/tools/misc/0x/add-Cargo-lock.diff diff --git a/pkgs/tools/misc/0x/Cargo.lock b/pkgs/tools/misc/0x/Cargo.lock new file mode 100644 index 000000000000..4c0c44ae6ea1 --- /dev/null +++ b/pkgs/tools/misc/0x/Cargo.lock @@ -0,0 +1,232 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "approx" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +dependencies = [ + "num-traits", +] + +[[package]] +name = "argh" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7e7e4aa7e40747e023c0761dafcb42333a9517575bbf1241747f68dd3177a62" +dependencies = [ + "argh_derive", + "argh_shared", +] + +[[package]] +name = "argh_derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69f2bd7ff6ed6414f4e5521bd509bae46454bbd513801767ced3f21a751ab4bc" +dependencies = [ + "argh_shared", + "heck", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "argh_shared" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47253b98986dafc7a3e1cf3259194f1f47ac61abb57a57f46ec09e48d004ecda" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "colorous" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "882e392738ed515520f38708166e9efec85ee154f80bf1fc64510e2fc54bf481" + +[[package]] +name = "find-crate" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2" +dependencies = [ + "toml", +] + +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] +name = "ohx" +version = "0.1.0" +dependencies = [ + "argh", + "colorous", + "palette", +] + +[[package]] +name = "palette" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f9cd68f7112581033f157e56c77ac4a5538ec5836a2e39284e65bd7d7275e49" +dependencies = [ + "approx", + "num-traits", + "palette_derive", + "phf", +] + +[[package]] +name = "palette_derive" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05eedf46a8e7c27f74af0c9cfcdb004ceca158cb1b918c6f68f8d7a549b3e427" +dependencies = [ + "find-crate", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "phf" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" +dependencies = [ + "phf_macros", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_macros" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92aacdc5f16768709a569e913f7451034034178b05bdc8acda226659a3dccc66" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "phf_shared" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" +dependencies = [ + "siphasher", +] + +[[package]] +name = "proc-macro2" +version = "1.0.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" + +[[package]] +name = "serde" +version = "1.0.143" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53e8e5d5b70924f74ff5c6d64d9a5acd91422117c60f48c4e07855238a254553" + +[[package]] +name = "siphasher" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" + +[[package]] +name = "syn" +version = "1.0.99" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "toml" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +dependencies = [ + "serde", +] + +[[package]] +name = "unicode-ident" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf" + +[[package]] +name = "unicode-segmentation" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" diff --git a/pkgs/tools/misc/0x/add-Cargo-lock.diff b/pkgs/tools/misc/0x/add-Cargo-lock.diff deleted file mode 100644 index 01498c2977b6..000000000000 --- a/pkgs/tools/misc/0x/add-Cargo-lock.diff +++ /dev/null @@ -1,236 +0,0 @@ -diff -Naur 0x-main.old/Cargo.lock 0x-main/Cargo.lock ---- 0x-main.old/Cargo.lock 1969-12-31 21:00:00.000000000 -0300 -+++ 0x-main/Cargo.lock 2022-08-12 02:28:29.538688138 -0300 -@@ -0,0 +1,232 @@ -+# This file is automatically @generated by Cargo. -+# It is not intended for manual editing. -+version = 3 -+ -+[[package]] -+name = "approx" -+version = "0.5.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" -+dependencies = [ -+ "num-traits", -+] -+ -+[[package]] -+name = "argh" -+version = "0.1.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a7e7e4aa7e40747e023c0761dafcb42333a9517575bbf1241747f68dd3177a62" -+dependencies = [ -+ "argh_derive", -+ "argh_shared", -+] -+ -+[[package]] -+name = "argh_derive" -+version = "0.1.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "69f2bd7ff6ed6414f4e5521bd509bae46454bbd513801767ced3f21a751ab4bc" -+dependencies = [ -+ "argh_shared", -+ "heck", -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "argh_shared" -+version = "0.1.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "47253b98986dafc7a3e1cf3259194f1f47ac61abb57a57f46ec09e48d004ecda" -+ -+[[package]] -+name = "autocfg" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -+ -+[[package]] -+name = "colorous" -+version = "1.0.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "882e392738ed515520f38708166e9efec85ee154f80bf1fc64510e2fc54bf481" -+ -+[[package]] -+name = "find-crate" -+version = "0.6.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2" -+dependencies = [ -+ "toml", -+] -+ -+[[package]] -+name = "heck" -+version = "0.3.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -+dependencies = [ -+ "unicode-segmentation", -+] -+ -+[[package]] -+name = "num-traits" -+version = "0.2.15" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -+dependencies = [ -+ "autocfg", -+] -+ -+[[package]] -+name = "ohx" -+version = "0.1.0" -+dependencies = [ -+ "argh", -+ "colorous", -+ "palette", -+] -+ -+[[package]] -+name = "palette" -+version = "0.6.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8f9cd68f7112581033f157e56c77ac4a5538ec5836a2e39284e65bd7d7275e49" -+dependencies = [ -+ "approx", -+ "num-traits", -+ "palette_derive", -+ "phf", -+] -+ -+[[package]] -+name = "palette_derive" -+version = "0.6.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "05eedf46a8e7c27f74af0c9cfcdb004ceca158cb1b918c6f68f8d7a549b3e427" -+dependencies = [ -+ "find-crate", -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "phf" -+version = "0.11.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" -+dependencies = [ -+ "phf_macros", -+ "phf_shared", -+] -+ -+[[package]] -+name = "phf_generator" -+version = "0.11.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" -+dependencies = [ -+ "phf_shared", -+ "rand", -+] -+ -+[[package]] -+name = "phf_macros" -+version = "0.11.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "92aacdc5f16768709a569e913f7451034034178b05bdc8acda226659a3dccc66" -+dependencies = [ -+ "phf_generator", -+ "phf_shared", -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "phf_shared" -+version = "0.11.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" -+dependencies = [ -+ "siphasher", -+] -+ -+[[package]] -+name = "proc-macro2" -+version = "1.0.43" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" -+dependencies = [ -+ "unicode-ident", -+] -+ -+[[package]] -+name = "quote" -+version = "1.0.21" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" -+dependencies = [ -+ "proc-macro2", -+] -+ -+[[package]] -+name = "rand" -+version = "0.8.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -+dependencies = [ -+ "rand_core", -+] -+ -+[[package]] -+name = "rand_core" -+version = "0.6.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" -+ -+[[package]] -+name = "serde" -+version = "1.0.143" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "53e8e5d5b70924f74ff5c6d64d9a5acd91422117c60f48c4e07855238a254553" -+ -+[[package]] -+name = "siphasher" -+version = "0.3.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" -+ -+[[package]] -+name = "syn" -+version = "1.0.99" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "unicode-ident", -+] -+ -+[[package]] -+name = "toml" -+version = "0.5.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" -+dependencies = [ -+ "serde", -+] -+ -+[[package]] -+name = "unicode-ident" -+version = "1.0.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf" -+ -+[[package]] -+name = "unicode-segmentation" -+version = "1.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" diff --git a/pkgs/tools/misc/0x/default.nix b/pkgs/tools/misc/0x/default.nix index a8264df3c34c..b76c13e66287 100644 --- a/pkgs/tools/misc/0x/default.nix +++ b/pkgs/tools/misc/0x/default.nix @@ -14,9 +14,13 @@ rustPlatform.buildRustPackage { hash = "sha256-NzD/j8rBfk/cpoBnkFHFqpXz58mswLZr8TUS16vlrZQ="; }; - cargoPatches = [ ./add-Cargo-lock.diff ]; + cargoLock = { + lockFile = ./Cargo.lock; + }; - cargoHash = "sha256-3qaPGIbl1jF4784KGxbfBTgW/0ayxIO9Ufp9vkhIJa4="; + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; meta = with lib; { homepage = "https://github.com/mcy/0x"; From 6d291b02c454b02e2e8e156c68d2ef5cc88f5fe8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Feb 2023 17:18:01 +0000 Subject: [PATCH 33/65] obsidian: 1.1.9 -> 1.1.15 --- pkgs/applications/misc/obsidian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index f7b902cf54cb..48508a4af05f 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -12,7 +12,7 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "1.1.9"; + version = "1.1.15"; appname = "Obsidian"; meta = with lib; { description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; @@ -25,7 +25,7 @@ let filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - sha256 = if stdenv.isDarwin then "sha256-x+9WG938YQFP/HF7B9xENOXFSdOrPFOJ1ufxXj3kXps=" else "sha256-dFR7LaDRJwpxrNyPNseGi66gIAHOKf5Au2VXl7SBGSE="; + sha256 = if stdenv.isDarwin then "sha256-x+9WG938YQFP/HF7B9xENOXFSdOrPFOJ1ufxXj3kXps=" else "sha256-rDA0GXQ++QAT4UaT23WkCA5CKCuJsF4ca0g086AiCao="; }; icon = fetchurl { From ff00ca7f86aa7cb635079e91ef3f66eb333e0927 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= <1771332+vlaci@users.noreply.github.com> Date: Wed, 22 Feb 2023 19:31:43 +0100 Subject: [PATCH 34/65] lief: enable darwin support It is supported by upstream --- pkgs/development/libraries/lief/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/lief/default.nix b/pkgs/development/libraries/lief/default.nix index f94ceed78ae8..e7e8d2032ed5 100644 --- a/pkgs/development/libraries/lief/default.nix +++ b/pkgs/development/libraries/lief/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { description = "Library to Instrument Executable Formats"; homepage = "https://lief.quarkslab.com/"; license = [ licenses.asl20 ]; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; maintainers = [ maintainers.lassulus ]; }; } From 64be5cc145d54b9d50cd61623daa9ec7a3d4e4b5 Mon Sep 17 00:00:00 2001 From: Henri Menke Date: Wed, 22 Feb 2023 20:41:17 +0100 Subject: [PATCH 35/65] nixos/alps: fix embarrasing typo --- nixos/modules/services/web-apps/alps.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/alps.nix b/nixos/modules/services/web-apps/alps.nix index 1a58df2da1d2..05fb676102df 100644 --- a/nixos/modules/services/web-apps/alps.nix +++ b/nixos/modules/services/web-apps/alps.nix @@ -84,7 +84,7 @@ in { "-addr" "${cfg.bindIP}:${toString cfg.port}" "-theme" "${cfg.theme}" "imaps://${cfg.imaps.host}:${toString cfg.imaps.port}" - "smpts://${cfg.smtps.host}:${toString cfg.smtps.port}" + "smtps://${cfg.smtps.host}:${toString cfg.smtps.port}" ]; }; }; From 70b361a13c6919500d2d07b4bf84202133cd1207 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Wed, 22 Feb 2023 20:44:05 +0100 Subject: [PATCH 36/65] eid-mw: 5.1.9 -> 5.1.10 --- pkgs/tools/security/eid-mw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index dcd4686bb3ef..a4b6f6c164f3 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "eid-mw"; # NOTE: Don't just blindly update to the latest version/tag. Releases are always for a specific OS. - version = "5.1.9"; + version = "5.1.10"; src = fetchFromGitHub { owner = "Fedict"; repo = "eid-mw"; rev = "v${version}"; - hash = "sha256-E7mNEgh8hujagqQe0ycEGcRDOlxVY7KzXw+DD8Wf9N8="; + hash = "sha256-2Xru/s7KawZlIxON5nO679P+L3okofE054WDfRsE3ZI="; }; nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config makeWrapper ]; From 3f6137791b43f94d6c788ef7c8f1156d32cb3869 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 22 Feb 2023 13:17:16 -0800 Subject: [PATCH 37/65] rnote: 0.5.13 -> 0.5.14 Diff: https://github.com/flxzt/rnote/compare/v0.5.13...v0.5.14 Changelog: https://github.com/flxzt/rnote/releases/tag/v0.5.14 --- pkgs/applications/graphics/rnote/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/rnote/default.nix b/pkgs/applications/graphics/rnote/default.nix index 400b5d262c40..0af4a3909825 100644 --- a/pkgs/applications/graphics/rnote/default.nix +++ b/pkgs/applications/graphics/rnote/default.nix @@ -23,19 +23,19 @@ stdenv.mkDerivation rec { pname = "rnote"; - version = "0.5.13"; + version = "0.5.14"; src = fetchFromGitHub { owner = "flxzt"; repo = "rnote"; rev = "v${version}"; - hash = "sha256-8HMaCO+v9PbkoS8Z1BmndiU7UmlG4TT0+bSESIwa3RM="; + hash = "sha256-55hB8UyK+EPJ6/Yj5yNK6endNU9Ux/kZmQNjcrYq6KU="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-rXAPILGzLZ3Ne4nhdaPZH1R2ezaF+D/P2t/Sod6nxo8="; + hash = "sha256-NPRImc0nVhYgq9JfGoSM1mT1Z6KQjVWgoLIagOUCM5M="; }; nativeBuildInputs = [ From da14312c42bd6f5211afa25882322c78d3782968 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Wed, 22 Feb 2023 23:33:25 +0100 Subject: [PATCH 38/65] gitkraken: 9.1.0 -> 9.1.1 --- .../applications/version-management/gitkraken/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 4d9115465769..434da9188ef7 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -10,24 +10,24 @@ with lib; let pname = "gitkraken"; - version = "9.1.0"; + version = "9.1.1"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; srcs = { x86_64-linux = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "sha256-HRd2jfTbdFKVMbnD4CzMsE22urExGrpf8rgli3dqVUY="; + sha256 = "sha256-CbIKdErthpMnVIuv+EJsWBRixMDG8h9aQ2XcmqpzKUc="; }; x86_64-darwin = fetchzip { url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip"; - sha256 = "sha256-zJEjJ+l0/S8B2b7mlDd2sln8GsvCaZZIcarC45rLATQ="; + sha256 = "sha256-J6ruK1UE0A9VG1tUHeSUDEL4wqRmUnOH8ftKHIIQuVc="; }; aarch64-darwin = fetchzip { url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip"; - sha256 = "sha256-5wep4FDNZwNOK05tm24132JuyBWUJRyeRpJDF7PLYoQ="; + sha256 = "sha256-cjz/pbV+uV6tbhj3NXDfZ93hgxFtNYhFIh6+jG4pFtU="; }; }; From 3d4897aec5ae0da69d5d46d61297f8f3007fa3e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 22 Feb 2023 14:52:45 -0800 Subject: [PATCH 39/65] python310Packages.sip: 6.7.5 -> 6.7.7 --- .../python-modules/sip/default.nix | 39 ++++++++++--------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 5facfac582c0..5d6fde555d6f 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -1,34 +1,35 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, packaging, ply, toml, fetchpatch }: +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, setuptools +, wheel +, packaging +, ply +, toml +}: buildPythonPackage rec { pname = "sip"; - version = "6.7.5"; + version = "6.7.7"; + + format = "pyproject"; src = fetchPypi { - pname = "sip"; - inherit version; - sha256 = "sha256-llXQieHQxfv2a94RVYqHSYBykTK1vQwq41WsGnuJOrQ="; + inherit pname version; + hash = "sha256-3unAb6iubUQaQB+SKGf8YZbt2idO69n7/sVPB2nCqeI="; }; + nativeBuildInputs = [ + setuptools + wheel + ]; + propagatedBuildInputs = [ packaging ply toml ]; # There aren't tests doCheck = false; - # FIXME: Why isn't this detected automatically? - # Needs to be specified in pyproject.toml, e.g.: - # [tool.sip.bindings.MODULE] - # tags = [PLATFORM_TAG] - platform_tag = - if stdenv.targetPlatform.isLinux then - "WS_X11" - else if stdenv.targetPlatform.isDarwin then - "WS_MACX" - else if stdenv.targetPlatform.isWindows then - "WS_WIN" - else - throw "unsupported platform"; - pythonImportsCheck = [ "sipbuild" ]; meta = with lib; { From 3d142abd143906342899a02b3d4ab66a61afb0f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 22 Feb 2023 15:27:46 -0800 Subject: [PATCH 40/65] calibre: don't rely on sip.platform_tag --- pkgs/applications/misc/calibre/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index d7198461eeab..d642a81d2f75 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -58,8 +58,6 @@ stdenv.mkDerivation rec { prePatch = '' sed -i "s@\[tool.sip.project\]@[tool.sip.project]\nsip-include-dirs = [\"${python3Packages.pyqt6}/${python3Packages.python.sitePackages}/PyQt6/bindings\"]@g" \ setup/build.py - sed -i "s/\[tool.sip.bindings.pictureflow\]/[tool.sip.bindings.pictureflow]\ntags = [\"${python3Packages.sip.platform_tag}\"]/g" \ - setup/build.py # Remove unneeded files and libs rm -rf src/odf resources/calibre-portable.* From 6c6bdf81b6ae86fba84a62bf33289f20b9357465 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Thu, 23 Feb 2023 04:59:02 +0530 Subject: [PATCH 41/65] flyctl: 0.0.456 -> 0.0.464 --- pkgs/development/web/flyctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index b19e2e7a288c..e66731b8d2c6 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.456"; + version = "0.0.464"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-RKdw8Yk7G1QhtxYyQtaYS1iKECXxD8kEavzRcvPtmdM="; + hash = "sha256-rfdxOhViYzL+tK4p+8deqLgk81HBFsD17j05mx0Xkrk="; }; - vendorHash = "sha256-57Ccqiuu2KQWdNqzqrmVXf7KnvjUjB9S1TMnDYu6b/I="; + vendorHash = "sha256-sJl6v57/Is3g5EQ6oU/CkoqkXL75U5oUsdLdo8ChfH4="; subPackages = [ "." ]; From 1fe9b60df985ad2f8a71d36db0af5a2a6088df17 Mon Sep 17 00:00:00 2001 From: Astro Date: Wed, 1 Feb 2023 17:51:44 +0100 Subject: [PATCH 42/65] oxigraph: init at 0.3.11 --- pkgs/servers/oxigraph/default.nix | 40 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/servers/oxigraph/default.nix diff --git a/pkgs/servers/oxigraph/default.nix b/pkgs/servers/oxigraph/default.nix new file mode 100644 index 000000000000..12dba25d1e6d --- /dev/null +++ b/pkgs/servers/oxigraph/default.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, IOKit +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "oxigraph"; + version = "0.3.11"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-7KbDZKKJPk3QTp4siIbdB6xKbslw73Lhc7NoeOuA0Og="; + fetchSubmodules = true; + }; + + cargoSha256 = "sha256-Yqn6hwejg6LzcqW0MiUN3tqrOql6cpu/5plaOz+2/ns="; + + nativeBuildInputs = [ + rustPlatform.bindgenHook + ]; + buildInputs = lib.optionals stdenv.isDarwin [ IOKit Security ]; + + cargoBuildFlags = [ "--package" "oxigraph_server" ]; + + # requires packaging of the associated python modules + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/oxigraph/oxigraph"; + description = "SPARQL graph database"; + platforms = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" ]; + maintainers = with maintainers; [ astro ]; + license = with licenses; [ asl20 mit ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d968a4a6e4bc..735c25661966 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9301,6 +9301,10 @@ with pkgs; ox = callPackage ../applications/editors/ox { }; + oxigraph = callPackage ../servers/oxigraph { + inherit (darwin.apple_sdk.frameworks) IOKit Security; + }; + file-rename = callPackage ../tools/filesystems/file-rename { }; kcollectd = libsForQt5.callPackage ../tools/misc/kcollectd {}; From 9b0222313354a0c2a52b2625033897c7e9425831 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Feb 2023 00:41:06 +0100 Subject: [PATCH 43/65] python310Packages.aioesphomeapi: 13.3.1 -> 13.4.0 Diff: esphome/aioesphomeapi@refs/tags/v13.3.1...v13.4.0 Changelog: https://github.com/esphome/aioesphomeapi/releases/tag/v13.4.0 --- .../development/python-modules/aioesphomeapi/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index c0d21eec563a..0be98209ca2e 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "13.3.1"; + version = "13.4.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,14 +21,9 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Pca+SMuUL3XyQpLAL6SOYPnztc95WF2o0v4+5Nc5Nxg="; + hash = "sha256-auqG+2Y+Dgwtkwbidi430n4t+GnZlBHIPUmsfl1aPa0="; }; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "protobuf>=3.12.2,<4.0" "protobuf>=3.12.2" - ''; - propagatedBuildInputs = [ noiseprotocol protobuf From 0cbae1a9f1e97f62239e534e4c31a1b9fa3fc0b4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Feb 2023 00:48:35 +0100 Subject: [PATCH 44/65] python310Packages.mox: remove - unmaintained for over a decade - no python 3.11 support (AttributeError: module 'inspect' has no attribute 'getargspec') - replaced by mock --- .../python-modules/mox/default.nix | 41 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 pkgs/development/python-modules/mox/default.nix diff --git a/pkgs/development/python-modules/mox/default.nix b/pkgs/development/python-modules/mox/default.nix deleted file mode 100644 index 3513ac2b2cc8..000000000000 --- a/pkgs/development/python-modules/mox/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, six -}: - -buildPythonPackage rec { - pname = "mox"; - version = "0.7.8"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "ivancrneto"; - repo = "pymox"; - rev = "v${version}"; - hash = "sha256-gODE9IGDk3WtO8iPOlp98fGp6Ih2laA3YlOHmq62m8Y="; - }; - - propagatedBuildInputs = [ - six - ]; - - nativeCheckInputs = [ - pytestCheckHook - ]; - - pythonImportsCheck = [ - "mox" - ]; - - meta = with lib; { - description = "Mock object framework"; - homepage = "https://github.com/ivancrneto/pymox"; - license = licenses.asl20; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index b2e8033b97e4..04749a61430c 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -130,6 +130,7 @@ mapAliases ({ mailman-web = throw "Please use pkgs.mailman-web"; # added 2022-04-29 mistune_0_8 = throw "mistune_0_8 was removed because it was outdated and insecure"; # added 2022-08-12 mistune_2_0 = mistune; # added 2022-08-12 + mox = throw "mox was removed because it is unmaintained"; # added 2023-02-21 mutmut = throw "mutmut has been promoted to a top-level attribute"; # added 2022-10-02 net2grid = gridnet; # add 2022-04-22 nose-cover3 = throw "nose-cover3 has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-02-16 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 28812e165401..422e6cbb533d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6074,8 +6074,6 @@ self: super: with self; { mox3 = callPackage ../development/python-modules/mox3 { }; - mox = callPackage ../development/python-modules/mox { }; - mpd2 = callPackage ../development/python-modules/mpd2 { }; mpi4py = callPackage ../development/python-modules/mpi4py { }; From d5a383955adea496c17708f85edd0d8ada6aaaaa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Feb 2023 00:54:18 +0100 Subject: [PATCH 45/65] python310Packages.meteofrance-api: add changelog to meta --- pkgs/development/python-modules/meteofrance-api/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/meteofrance-api/default.nix b/pkgs/development/python-modules/meteofrance-api/default.nix index 9183bc8170f5..5f3d41f60ad7 100644 --- a/pkgs/development/python-modules/meteofrance-api/default.nix +++ b/pkgs/development/python-modules/meteofrance-api/default.nix @@ -62,6 +62,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to access information from the Meteo-France API"; homepage = "https://github.com/hacf-fr/meteofrance-api"; + changelog = "https://github.com/hacf-fr/meteofrance-api/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From 8076ea3f1e2877c4612a70b61e83fc253a5b087d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Feb 2023 00:57:05 +0100 Subject: [PATCH 46/65] python310Packages.meteofrance-api: 1.1.0 -> 1.2.0 Diff: https://github.com/hacf-fr/meteofrance-api/compare/refs/tags/v1.1.0...v1.2.0 Changelog: https://github.com/hacf-fr/meteofrance-api/releases/tag/v1.2.0 --- .../development/python-modules/meteofrance-api/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/meteofrance-api/default.nix b/pkgs/development/python-modules/meteofrance-api/default.nix index 5f3d41f60ad7..b6fb1d51446d 100644 --- a/pkgs/development/python-modules/meteofrance-api/default.nix +++ b/pkgs/development/python-modules/meteofrance-api/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "meteofrance-api"; - version = "1.1.0"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hacf-fr"; repo = pname; - rev = "v${version}"; - hash = "sha256-1ZN/9ur6uhK7M5TurmmWgUjzkc79MPqKnT637hbAAWA="; + rev = "refs/tags/v${version}"; + hash = "sha256-W26R+L2ZJpycEQ9KwkHqVARKsd/5YkJCxMeciKnKAX8="; }; nativeBuildInputs = [ @@ -56,6 +56,7 @@ buildPythonPackage rec { "test_places" "test_rain" "test_session" + "test_observation" "test_workflow" ]; From 1462929de0e3fcd34864c62a3f8ee737db800116 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 22 Feb 2023 15:57:06 -0800 Subject: [PATCH 47/65] python310Packages.vallox-websocket-api: 3.0.0 -> 3.1.0 Diff: https://github.com/yozik04/vallox_websocket_api/compare/refs/tags/3.0.0...3.1.0 Changelog: https://github.com/yozik04/vallox_websocket_api/releases/tag/3.1.0 --- .../python-modules/vallox-websocket-api/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/vallox-websocket-api/default.nix b/pkgs/development/python-modules/vallox-websocket-api/default.nix index 0b667d921841..5697ff812994 100644 --- a/pkgs/development/python-modules/vallox-websocket-api/default.nix +++ b/pkgs/development/python-modules/vallox-websocket-api/default.nix @@ -5,22 +5,22 @@ , setuptools , construct , websockets -, asynctest +, pytest-asyncio , pytestCheckHook }: buildPythonPackage rec { pname = "vallox-websocket-api"; - version = "3.0.0"; + version = "3.1.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "yozik04"; repo = "vallox_websocket_api"; rev = "refs/tags/${version}"; - hash = "sha256-iy5ipW7ldvLWhfxgPlWcsFeKrAXqtyypveAX74u8zmo="; + hash = "sha256-JbTuBzRSgMTPSgWEEAJGc8R44VLHiMr4qocbBjpJBmk="; }; nativeBuildInputs = [ @@ -33,10 +33,12 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - asynctest + pytest-asyncio pytestCheckHook ]; + pythonImportsCheck = [ "vallox_websocket_api" ]; + meta = { description = "Async API for Vallox ventilation units"; homepage = "https://github.com/yozik04/vallox_websocket_api"; From 496dd49d1c702df310aec532241bee80f9c42bdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 22 Feb 2023 16:09:25 -0800 Subject: [PATCH 48/65] python310Packages.pyqt5: 5.15.7 -> 5.15.9 --- pkgs/development/python-modules/pyqt/5.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index b78f16233ea5..70fb1ef8a85d 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "PyQt5"; - version = "5.15.7"; + version = "5.15.9"; format = "pyproject"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-dVEhpSs6CMsHJ1wQ67lldtNuMg5XJZHbFs/bxVgQFZQ="; + hash = "sha256-3EHoQBqQ3D4raStBG9VJKrVZrieidCTu1L05FVZOxMA="; }; patches = [ From 953c6fed96699dbb28de8a8a1ff5d3825af36c4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 22 Feb 2023 16:11:52 -0800 Subject: [PATCH 49/65] python310Packages.pyqt6: 6.4.0 -> 6.4.2 --- pkgs/development/python-modules/pyqt/6.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyqt/6.x.nix b/pkgs/development/python-modules/pyqt/6.x.nix index fce9308093ec..d98c4c695b6f 100644 --- a/pkgs/development/python-modules/pyqt/6.x.nix +++ b/pkgs/development/python-modules/pyqt/6.x.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "PyQt6"; - version = "6.4.0"; + version = "6.4.2"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-kTkkab4fSRkF+p54+k5AWaiathbd8uz9UlvB1lwmu5M="; + hash = "sha256-dAJE9gj+Fe4diWlcQ/MaFMrspBxPAqw2yG37pKXVgT0="; }; patches = [ From 89c8ef30a6a5d8210f16ce88154c682c26818fd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 20 Feb 2023 09:48:39 -0800 Subject: [PATCH 50/65] nixos/imaginary: bind to localhost by default --- nixos/modules/services/networking/imaginary.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/imaginary.nix b/nixos/modules/services/networking/imaginary.nix index 5437da572778..a655903d1031 100644 --- a/nixos/modules/services/networking/imaginary.nix +++ b/nixos/modules/services/networking/imaginary.nix @@ -10,9 +10,12 @@ in { address = mkOption { type = types.str; - default = ""; - description = mdDoc "Bind address. Corresponds to the `-a` flag."; - example = "localhost"; + default = "localhost"; + description = mdDoc '' + Bind address. Corresponds to the `-a` flag. + Set to `""` to bind to all addresses. + ''; + example = "[::1]"; }; port = mkOption { From 6f2e446ea7f0492e56337fa3044107e0d8866497 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 13 Feb 2023 11:16:11 -0800 Subject: [PATCH 51/65] python310Packages.hass-nabucasa: don't depend on asynctest Upstream removed it in https://github.com/NabuCasa/hass-nabucasa/pull/318 and didn't use it for Python >= 3.8 anyway. --- pkgs/development/python-modules/hass-nabucasa/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index b3fe9e7cb59e..687a04b8846d 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -1,7 +1,6 @@ { lib , acme , aiohttp -, asynctest , atomicwrites-homeassistant , attrs , buildPythonPackage @@ -44,7 +43,6 @@ buildPythonPackage rec { doCheck = lib.versionAtLeast pytest-aiohttp.version "1.0.0"; nativeCheckInputs = [ - asynctest pytest-aiohttp pytestCheckHook ]; From 0d2542fa9d67ee0486fb8133896de905b79525cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 12 Feb 2023 19:35:50 -0800 Subject: [PATCH 52/65] flatcam: pin shapely at 1.8.4 --- .../science/electronics/flatcam/default.nix | 32 +++++++++++++++++-- .../flatcam/shapely-library-paths.patch | 31 ++++++++++++++++++ 2 files changed, 60 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/science/electronics/flatcam/shapely-library-paths.patch diff --git a/pkgs/applications/science/electronics/flatcam/default.nix b/pkgs/applications/science/electronics/flatcam/default.nix index 1f6679625ec7..25efbd754b2a 100644 --- a/pkgs/applications/science/electronics/flatcam/default.nix +++ b/pkgs/applications/science/electronics/flatcam/default.nix @@ -1,10 +1,36 @@ { lib -, python3Packages +, stdenv +, python3 , fetchFromBitbucket , fetchpatch +, substituteAll +, geos }: -python3Packages.buildPythonApplication rec { +let + python = python3.override { + packageOverrides = self: super: { + shapely = super.shapely.overridePythonAttrs (old: rec { + version = "1.8.4"; + src = self.fetchPypi { + pname = "Shapely"; + inherit version; + hash = "sha256-oZXlHKr6IYKR8suqP+9p/TNTyT7EtlsqRyLEz0DDGYw="; + }; + # Environment variable used in shapely/_buildcfg.py + GEOS_LIBRARY_PATH = "${geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}"; + patches = [ + # Patch to search form GOES .so/.dylib files in a Nix-aware way + (substituteAll { + src = ./shapely-library-paths.patch; + libgeos_c = GEOS_LIBRARY_PATH; + libc = lib.optionalString (!stdenv.isDarwin) "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}.6"; + }) + ]; + }); + }; + }; +in python.pkgs.buildPythonApplication rec { pname = "flatcam"; version = "8.5"; @@ -15,7 +41,7 @@ python3Packages.buildPythonApplication rec { sha256 = "199kiiml18k34z1zhk2hbhibphmnv0kb11kxiajq52alps0mjb3m"; }; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python.pkgs; [ matplotlib numpy packaging diff --git a/pkgs/applications/science/electronics/flatcam/shapely-library-paths.patch b/pkgs/applications/science/electronics/flatcam/shapely-library-paths.patch new file mode 100644 index 000000000000..d095eada9d6e --- /dev/null +++ b/pkgs/applications/science/electronics/flatcam/shapely-library-paths.patch @@ -0,0 +1,31 @@ +diff --git a/shapely/geos.py b/shapely/geos.py +index 88c5f53..1ccd6e4 100644 +--- a/shapely/geos.py ++++ b/shapely/geos.py +@@ -96,6 +96,7 @@ if sys.platform.startswith('linux'): + alt_paths = [ + 'libgeos_c.so.1', + 'libgeos_c.so', ++ '@libgeos_c@', + ] + _lgeos = load_dll('geos_c', fallbacks=alt_paths) + +@@ -160,6 +161,7 @@ elif sys.platform == 'darwin': + "/usr/local/lib/libgeos_c.dylib", + # homebrew Apple Silicon + "/opt/homebrew/lib/libgeos_c.dylib", ++ "@libgeos_c@", + ] + _lgeos = load_dll('geos_c', fallbacks=alt_paths) + +diff --git a/tests/test_dlls.py b/tests/test_dlls.py +index c71da8e..c36262c 100644 +--- a/tests/test_dlls.py ++++ b/tests/test_dlls.py +@@ -18,4 +18,5 @@ class LoadingTestCase(unittest.TestCase): + '/opt/homebrew/lib/libgeos_c.dylib', # homebrew (macOS) + os.path.join(sys.prefix, "lib", "libgeos_c.so"), # anaconda (Linux) + 'libgeos_c.so.1', +- 'libgeos_c.so']) ++ 'libgeos_c.so', ++ '@libgeos_c@']) From 07e1d5bc22d8e913ae7c49fc151654490b6dd81e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 21 Feb 2023 15:57:07 -0800 Subject: [PATCH 53/65] metadata-cleaner: 2.4.0 -> 2.5.0 Diff: https://gitlab.com/rmnvgr/metadata-cleaner/-/compare/v2.4.0...v2.5.0 Changelog: https://gitlab.com/rmnvgr/metadata-cleaner/-/blob/v2.5.0/CHANGELOG.md --- pkgs/applications/misc/metadata-cleaner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/metadata-cleaner/default.nix b/pkgs/applications/misc/metadata-cleaner/default.nix index efa10faf2a0f..8d88612b728b 100644 --- a/pkgs/applications/misc/metadata-cleaner/default.nix +++ b/pkgs/applications/misc/metadata-cleaner/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { pname = "metadata-cleaner"; - version = "2.4.0"; + version = "2.5.0"; format = "other"; @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { owner = "rmnvgr"; repo = pname; rev = "v${version}"; - hash = "sha256-/Zi82ri61cQHt1D8DjeVHTSeEn9ubQJD931kP0ffiOs="; + hash = "sha256-15qs2EsvEmQQPsarozP4HVpa0/3YJBSZ9M+1s/w5LaA="; }; nativeBuildInputs = [ From af735e7623db2c72d5aa506bcef19fbb946f2b5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 20 Feb 2023 21:34:40 -0800 Subject: [PATCH 54/65] python310Packages.recurring-ical-events: 2.0.1 -> 2.0.2 Diff: https://github.com/niccokunzmann/python-recurring-ical-events/compare/v2.0.1...v2.0.2 Changelog: https://github.com/niccokunzmann/python-recurring-ical-events/blob/v2.0.2/README.rst#changelog --- .../python-modules/recurring-ical-events/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/recurring-ical-events/default.nix b/pkgs/development/python-modules/recurring-ical-events/default.nix index 830aeb242815..ff57846c20c0 100644 --- a/pkgs/development/python-modules/recurring-ical-events/default.nix +++ b/pkgs/development/python-modules/recurring-ical-events/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "recurring-ical-events"; - version = "2.0.1"; + version = "2.0.2"; format = "setuptools"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "niccokunzmann"; repo = "python-recurring-ical-events"; rev = "v${version}"; - hash = "sha256-1tmUf0HIKufiocAZPxkTLyicMU0o8dhSjCij2Lc/lyk="; + hash = "sha256-aM7c/HE8xLqT5wCLaCrfFn6c7FIkCJA6TTICZprAgNM="; }; propagatedBuildInputs = [ From f99e8bafe6f751c8ff56eeb4e0fb0415a8b805da Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Fri, 23 Sep 2022 14:37:36 -0700 Subject: [PATCH 55/65] nixos/installer: add sd-image-powerpc64le.nix This builds on top of nixpkgs mainline 00d83471803a8a308a52fc4b09b6ec41dfb36453 with the following two PRs cherry-picked: - https://github.com/NixOS/nixpkgs/pull/192670 - https://github.com/NixOS/nixpkgs/pull/192668 using the following command: ``` nix build -f nixos -L \ -I nixos-config=nixos/modules/installer/sd-card/sd-image-powerpc64le.nix \ config.system.build.sdImage ``` I was able to successfully boot the image, although it boots to a login prompt rather than a shell, and won't accept the empty password for `root`. I guess I'll have to figure out why that is. To boot the image: `zstd`-decompress the it, mount it, and use `kexec`: ``` cd boot/nixos kexec -l \ *-vmlinux \ --initrd *-initrd \ --dt-no-old-root \ --command-line="$(grep APPEND ../extlinux/extlinux.conf | sed 's_^ *APPEND *__')" ``` The machine I used for testing has only one storage device which is completely allocated to LVM. It appears that the NixOS ISO loader doesn't look for partition tables within LVM volumes. To work aroundn this, I had to extract the `ext4` image within the partition table within the `sd-card` image and put that in its own LVM volume. This likely won't be an obstacle for users who write the image to a USB stick or similar. --- .../sd-card/sd-image-powerpc64le.nix | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 nixos/modules/installer/sd-card/sd-image-powerpc64le.nix diff --git a/nixos/modules/installer/sd-card/sd-image-powerpc64le.nix b/nixos/modules/installer/sd-card/sd-image-powerpc64le.nix new file mode 100644 index 000000000000..143c678e43fb --- /dev/null +++ b/nixos/modules/installer/sd-card/sd-image-powerpc64le.nix @@ -0,0 +1,49 @@ +# To build, use: +# nix-build nixos -I nixos-config=nixos/modules/installer/sd-card/sd-image-powerpc64le.nix -A config.system.build.sdImage +{ config, lib, pkgs, ... }: + +{ + imports = [ + ../../profiles/base.nix + ../../profiles/installation-device.nix + ./sd-image.nix + ]; + + boot.loader = { + # powerpc64le-linux typically uses petitboot + grub.enable = false; + generic-extlinux-compatible = { + # petitboot is not does not support all of the extlinux extensions to + # syslinux, but its parser is very forgiving; it essentially ignores + # whatever it doesn't understand. See below for a filename adjustment. + enable = true; + }; + }; + + boot.consoleLogLevel = lib.mkDefault 7; + boot.kernelParams = [ "console=hvc0" ]; + + sdImage = { + populateFirmwareCommands = ""; + populateRootCommands = '' + mkdir -p ./files/boot + ${config.boot.loader.generic-extlinux-compatible.populateCmd} \ + -c ${config.system.build.toplevel} \ + -d ./files/boot + '' + # https://github.com/open-power/petitboot/blob/master/discover/syslinux-parser.c + # petitboot will look in these paths (plus all-caps versions of them): + # /boot/syslinux/syslinux.cfg + # /syslinux/syslinux.cfg + # /syslinux.cfg + + '' + mv ./files/boot/extlinux ./files/boot/syslinux + mv ./files/boot/syslinux/extlinux.conf ./files/boot/syslinux/syslinux.cfg + '' + # petitboot does not support relative paths for LINUX or INITRD; it prepends + # a `/` when parsing these fields + + '' + sed -i 's_^\(\W\W*\(INITRD\|initrd\|LINUX\|linux\)\W\)\.\./_\1/boot/_' ./files/boot/syslinux/syslinux.cfg + ''; + }; +} From 453be8e802c4b38143cffd4bebe1c9ae469faa3f Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 23 Feb 2023 06:33:11 +0200 Subject: [PATCH 56/65] xmrig-mo: unbreak on more platforms --- pkgs/applications/misc/xmrig/moneroocean.nix | 3 +-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/xmrig/moneroocean.nix b/pkgs/applications/misc/xmrig/moneroocean.nix index 538bf3507a7b..197c7195aa3c 100644 --- a/pkgs/applications/misc/xmrig/moneroocean.nix +++ b/pkgs/applications/misc/xmrig/moneroocean.nix @@ -12,11 +12,10 @@ xmrig.overrideAttrs (oldAttrs: rec { }; meta = with lib; { - broken = stdenv.isDarwin; description = "A fork of the XMRig CPU miner with support for algorithm switching"; homepage = "https://github.com/MoneroOcean/xmrig"; license = licenses.gpl3Plus; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = platforms.unix; maintainers = with maintainers; [ j0hax ]; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2d9e8c44625..f3114ef6a704 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31403,7 +31403,7 @@ with pkgs; xmrig = darwin.apple_sdk_11_0.callPackage ../applications/misc/xmrig { }; - xmrig-mo = callPackage ../applications/misc/xmrig/moneroocean.nix { }; + xmrig-mo = darwin.apple_sdk_11_0.callPackage ../applications/misc/xmrig/moneroocean.nix { }; xmrig-proxy = darwin.apple_sdk_11_0.callPackage ../applications/misc/xmrig/proxy.nix { }; From 5148862235613f47a8e5d1d8a8eeaaf7cd565c9c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 Feb 2023 03:07:33 +0000 Subject: [PATCH 57/65] =?UTF-8?q?terraform-providers.auth0:=200.43.0=20?= =?UTF-8?q?=E2=86=92=200.44.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 128e2de529b5..9b03b72365c1 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -82,13 +82,13 @@ "vendorHash": "sha256-99PwwxVHfRGC0QCQGhifRzqWFOHZ1R7Ge2ou7OjiggQ=" }, "auth0": { - "hash": "sha256-3iB/Vcv6Vzs9teulhu0npl6IuIJRsKy8FkBcIPTKw8A=", + "hash": "sha256-3hAfDzK7iO4D68OsCvuXQx5Gk0VOtoBiw21tBJjDJtQ=", "homepage": "https://registry.terraform.io/providers/auth0/auth0", "owner": "auth0", "repo": "terraform-provider-auth0", - "rev": "v0.43.0", + "rev": "v0.44.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-pRbhgukYRn0Ej0v/ANKZ3gtkmfL8qo1E6F/fKDNf/Iw=" + "vendorHash": "sha256-UP9A0lcW5QbTuur1MMjKMlvC8S3nenqs0WjpoqvwEQI=" }, "avi": { "hash": "sha256-mBLdIL4mUI4zA3c9gB4DL1QY0xHW15Q1rO/v1gVYKYU=", From 4cc42f749e483bb36b0c1611ef111cf827468945 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 Feb 2023 03:09:07 +0000 Subject: [PATCH 58/65] =?UTF-8?q?terraform-providers.gitlab:=2015.8.0=20?= =?UTF-8?q?=E2=86=92=2015.9.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 9b03b72365c1..c7d70b7e9c12 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -429,13 +429,13 @@ "vendorHash": null }, "gitlab": { - "hash": "sha256-bCF6BLuzjUZToZKerfsGcav4DD6AWwOrlELxQKygHv4=", + "hash": "sha256-nBmb+wHl6FEHIH/P9SsDCtvDKVHzcL4/iaQwtuSjbVg=", "homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab", "owner": "gitlabhq", "repo": "terraform-provider-gitlab", - "rev": "v15.8.0", + "rev": "v15.9.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-aVbJT31IIgW0GYzwVX7kT4j7E+dadSbnttThh2lzGyE=" + "vendorHash": "sha256-yK2M07+FmMEE9YuCJk86qLncHr2ToeZQAzWRQz1lLNM=" }, "google": { "hash": "sha256-WE1UjyqsrhlGWJHZ6VlNCBtdSsXM6ewK4WJrmqFN6NU=", From 03f6371b8da73bf22415cf8ef31a085c7b8ac4f1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 Feb 2023 03:10:47 +0000 Subject: [PATCH 59/65] =?UTF-8?q?terraform-providers.heroku:=205.1.11=20?= =?UTF-8?q?=E2=86=92=205.1.12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index c7d70b7e9c12..9d850e7d16a9 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -503,11 +503,11 @@ "vendorHash": null }, "heroku": { - "hash": "sha256-Fc8nCrFR3cHEN68y277/eZ6DLVfFxEyliCkii5343MI=", + "hash": "sha256-HRwG8VNl13HdibczNDWiCS74vrRImM/g3zn4MgQQx3s=", "homepage": "https://registry.terraform.io/providers/heroku/heroku", "owner": "heroku", "repo": "terraform-provider-heroku", - "rev": "v5.1.11", + "rev": "v5.1.12", "spdx": "MPL-2.0", "vendorHash": null }, From 2e3016d9a6e30b65e4994ff73836a11f70c8b11a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 Feb 2023 03:11:50 +0000 Subject: [PATCH 60/65] =?UTF-8?q?terraform-providers.google:=204.53.1=20?= =?UTF-8?q?=E2=86=92=204.54.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 9d850e7d16a9..0309c6a997df 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -438,12 +438,12 @@ "vendorHash": "sha256-yK2M07+FmMEE9YuCJk86qLncHr2ToeZQAzWRQz1lLNM=" }, "google": { - "hash": "sha256-WE1UjyqsrhlGWJHZ6VlNCBtdSsXM6ewK4WJrmqFN6NU=", + "hash": "sha256-sFfL/PcX5a2tWKo3VxGCM8pJUH18Up70Y/1NXgvNgRw=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.53.1", + "rev": "v4.54.0", "spdx": "MPL-2.0", "vendorHash": "sha256-oModEw/gaQCDHLf+2EKf1O1HQSGWnqEReXowE6F7W0o=" }, From 09e51eaddad8a6fb17f92064224615bc1a864266 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 Feb 2023 03:13:59 +0000 Subject: [PATCH 61/65] =?UTF-8?q?terraform-providers.ovh:=200.27.0=20?= =?UTF-8?q?=E2=86=92=200.28.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 0309c6a997df..b302a8b3e27b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -874,11 +874,11 @@ "vendorHash": null }, "ovh": { - "hash": "sha256-xims3nYFVSS38FIMJhUhtK7lKpnRzzlojYZY6t57owA=", + "hash": "sha256-d/G2o1G0cdb5shSv1WG7YBbhNift2sKjUd/Cz9XgvJ8=", "homepage": "https://registry.terraform.io/providers/ovh/ovh", "owner": "ovh", "repo": "terraform-provider-ovh", - "rev": "v0.27.0", + "rev": "v0.28.1", "spdx": "MPL-2.0", "vendorHash": null }, From 299c2b61e5dc6bea4719d9a63a3b1abbec538cb8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 Feb 2023 03:16:39 +0000 Subject: [PATCH 62/65] =?UTF-8?q?terraform-providers.scaleway:=202.11.0=20?= =?UTF-8?q?=E2=86=92=202.11.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index b302a8b3e27b..e4f2dda0d7d0 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -964,11 +964,11 @@ "vendorHash": null }, "scaleway": { - "hash": "sha256-HpdXghgEZ3UAv+njHQws1/f23tKquWwafO/O9X29c1M=", + "hash": "sha256-sUYRsh1t4y9SNdt0QzhP1BM3CglxYy/ciZAEGCLj7c8=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.11.0", + "rev": "v2.11.1", "spdx": "MPL-2.0", "vendorHash": "sha256-e/Pqu58ngWnoMKjDKEUm49e0D0PfYEqxm/BxfN8UX3c=" }, From 1badd0069c4cd191607c2f3d6197b399aa69b8ef Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 Feb 2023 03:19:40 +0000 Subject: [PATCH 63/65] =?UTF-8?q?terraform-providers.oci:=204.108.1=20?= =?UTF-8?q?=E2=86=92=204.109.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index e4f2dda0d7d0..507c1120e765 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -811,11 +811,11 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-JkJEghLvttmQ1Hc9s8fbUXa/onDNuKDBb0k1gXD373s=", + "hash": "sha256-6UVsSOAh/JigJkiK+RbHsv7t/IuejouaRL+o8F0ndAo=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v4.108.1", + "rev": "v4.109.0", "spdx": "MPL-2.0", "vendorHash": null }, From 33f5fe5c9cffdf8cb1ae10eae272db2d0ba974cd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 Feb 2023 03:19:41 +0000 Subject: [PATCH 64/65] =?UTF-8?q?terraform-providers.vra7:=203.0.6=20?= =?UTF-8?q?=E2=86=92=203.0.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 507c1120e765..a537c877b405 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1218,11 +1218,11 @@ "vendorHash": "sha256-OzcDMLWwnBYIkBcL6U1t9oCNhZZokBUf2TONb+OfgPE=" }, "vra7": { - "hash": "sha256-lHyrBJz6954te57uKpgrqOVztDsDUSqkHtWXnlG0QUw=", + "hash": "sha256-J+lhKDl8CGpDgdfuv0uWd7yDNiwrWAzoXCxkEidqJH4=", "homepage": "https://registry.terraform.io/providers/vmware/vra7", "owner": "vmware", "repo": "terraform-provider-vra7", - "rev": "v3.0.6", + "rev": "v3.0.7", "spdx": "MPL-2.0", "vendorHash": null }, From 7380dec31850d238c81350a5fc23d9ec56b3c4a1 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 23 Feb 2023 13:45:12 +1000 Subject: [PATCH 65/65] =?UTF-8?q?terraform-providers.cloudinit:=202.2.0=20?= =?UTF-8?q?=E2=86=92=202.3.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index a537c877b405..74d4e6b96728 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -237,13 +237,13 @@ "vendorHash": "sha256-mEWhLh4E3SI7xfmal1sJ5PdAYbYJrW/YFoBjTW9w4bA=" }, "cloudinit": { - "hash": "sha256-P4m2ym7p10gwHR9CdPT37OvrgkvOKLG5wxVyYD4UZXs=", + "hash": "sha256-Ojr/qxfaj78Wfro5NZSoavW+FfByIi+P98RNxmG/1ao=", "homepage": "https://registry.terraform.io/providers/hashicorp/cloudinit", "owner": "hashicorp", "repo": "terraform-provider-cloudinit", - "rev": "v2.2.0", + "rev": "v2.3.1", "spdx": "MPL-2.0", - "vendorHash": null + "vendorHash": "sha256-h4CO3sC41RPSmkTlWUCiRvQ1NRZkT2v1uHFOemvBN8s=" }, "cloudscale": { "hash": "sha256-DQ7yIqA9gII0Ub1C8DEa1AMhQbzRFvsng8TMBGz+qzg=",