From 116ae00e73d78e723b813b8872553c68cbcb1dac Mon Sep 17 00:00:00 2001 From: Moritz Hedtke Date: Wed, 15 Dec 2021 20:27:18 +0100 Subject: [PATCH 001/106] nixos/step-ca: create a step-ca user This allows you to create the certificate files owned by that user so the service can read them. --- nixos/modules/services/security/step-ca.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/modules/services/security/step-ca.nix b/nixos/modules/services/security/step-ca.nix index 27b2ceed1a43..bfb29fbc6c15 100644 --- a/nixos/modules/services/security/step-ca.nix +++ b/nixos/modules/services/security/step-ca.nix @@ -108,6 +108,9 @@ in ConditionFileNotEmpty = ""; # override upstream }; serviceConfig = { + User = "step-ca"; + Group = "step-ca"; + UMask = "0077"; Environment = "HOME=%S/step-ca"; WorkingDirectory = ""; # override upstream ReadWriteDirectories = ""; # override upstream @@ -129,6 +132,14 @@ in }; }; + users.users.step-ca = { + home = "/var/lib/step-ca"; + group = "step-ca"; + isSystemUser = true; + }; + + users.groups.step-ca = {}; + networking.firewall = lib.mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.port ]; }; From 16a1b346d4ef285cffe712e898de18b4948c5ece Mon Sep 17 00:00:00 2001 From: ckie Date: Wed, 9 Feb 2022 12:57:11 +0200 Subject: [PATCH 002/106] vtk: create versionless symlinks in /lib A little quality-of-life change for consumers of this library. Depending on the upstream version in dependant derivations is inconveninent. --- pkgs/development/libraries/vtk/generic.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index c180b05e9521..69e360901779 100644 --- a/pkgs/development/libraries/vtk/generic.nix +++ b/pkgs/development/libraries/vtk/generic.nix @@ -90,6 +90,12 @@ in stdenv.mkDerivation rec { sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c ''; + preFixup = '' + for lib in $out/lib/libvtk*.so; do + ln -s $lib $out/lib/"$(basename "$lib" | sed -e 's/-[[:digit:]]*.[[:digit:]]*//g')" + done + ''; + meta = with lib; { description = "Open source libraries for 3D computer graphics, image processing and visualization"; homepage = "https://www.vtk.org/"; From 635992489cf0ceb53eb25ccd45bddef53afb2483 Mon Sep 17 00:00:00 2001 From: ckie Date: Wed, 9 Feb 2022 12:59:40 +0200 Subject: [PATCH 003/106] vtk: move headers out of /include/vtk-* I believe this is a remanant of a global /usr/include which isn't required with Nix and only complicates dependants' build scripts. Backwards compatibility is maintained by way of a symlink. --- pkgs/development/libraries/vtk/generic.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index 69e360901779..d770bd54d04c 100644 --- a/pkgs/development/libraries/vtk/generic.nix +++ b/pkgs/development/libraries/vtk/generic.nix @@ -94,6 +94,10 @@ in stdenv.mkDerivation rec { for lib in $out/lib/libvtk*.so; do ln -s $lib $out/lib/"$(basename "$lib" | sed -e 's/-[[:digit:]]*.[[:digit:]]*//g')" done + + mv $out/include/vtk-${majorVersion}/* $out/include + rmdir $out/include/vtk-${majorVersion} + ln -s $out/include $out/include/vtk-${majorVersion} ''; meta = with lib; { From 4308069bf1b3d5207e6f69472a05444ca9fa2d7a Mon Sep 17 00:00:00 2001 From: ckie Date: Wed, 9 Feb 2022 13:03:43 +0200 Subject: [PATCH 004/106] rtabmap: init at unstable-2022-02-07 --- .../rtabmap/0001-remove-printer-support.patch | 139 ++++++++++++++++++ pkgs/applications/video/rtabmap/default.nix | 59 ++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 200 insertions(+) create mode 100644 pkgs/applications/video/rtabmap/0001-remove-printer-support.patch create mode 100644 pkgs/applications/video/rtabmap/default.nix diff --git a/pkgs/applications/video/rtabmap/0001-remove-printer-support.patch b/pkgs/applications/video/rtabmap/0001-remove-printer-support.patch new file mode 100644 index 000000000000..f3b31ed95861 --- /dev/null +++ b/pkgs/applications/video/rtabmap/0001-remove-printer-support.patch @@ -0,0 +1,139 @@ +From c04ce502d29f7769efbff730d1f9060b8c24629a Mon Sep 17 00:00:00 2001 +From: ckie +Date: Tue, 8 Feb 2022 19:18:49 +0200 +Subject: [PATCH] remove printer support + +--- + app/src/CMakeLists.txt | 4 ++-- + guilib/src/CMakeLists.txt | 4 ++-- + guilib/src/GraphViewer.cpp | 12 +----------- + guilib/src/ImageView.cpp | 16 ---------------- + guilib/src/utilite/UPlot.cpp | 9 --------- + 5 files changed, 5 insertions(+), 40 deletions(-) + +diff --git a/app/src/CMakeLists.txt b/app/src/CMakeLists.txt +index b20a07d4..2cad8c1e 100644 +--- a/app/src/CMakeLists.txt ++++ b/app/src/CMakeLists.txt +@@ -63,9 +63,9 @@ ENDIF() + TARGET_LINK_LIBRARIES(rtabmap rtabmap_core rtabmap_gui rtabmap_utilite ${LIBRARIES}) + IF(Qt5_FOUND) + IF(Qt5Svg_FOUND) +- QT5_USE_MODULES(rtabmap Widgets Core Gui Svg PrintSupport) ++ QT5_USE_MODULES(rtabmap Widgets Core Gui Svg) + ELSE() +- QT5_USE_MODULES(rtabmap Widgets Core Gui PrintSupport) ++ QT5_USE_MODULES(rtabmap Widgets Core Gui) + ENDIF() + ENDIF(Qt5_FOUND) + +diff --git a/guilib/src/CMakeLists.txt b/guilib/src/CMakeLists.txt +index 3711205b..a393aa25 100644 +--- a/guilib/src/CMakeLists.txt ++++ b/guilib/src/CMakeLists.txt +@@ -208,9 +208,9 @@ ADD_LIBRARY(rtabmap_gui ${SRC_FILES}) + TARGET_LINK_LIBRARIES(rtabmap_gui rtabmap_core rtabmap_utilite ${LIBRARIES}) + IF(Qt5_FOUND) + IF(Qt5Svg_FOUND) +- QT5_USE_MODULES(rtabmap_gui Widgets Core Gui Svg PrintSupport) ++ QT5_USE_MODULES(rtabmap_gui Widgets Core Gui Svg) + ELSE() +- QT5_USE_MODULES(rtabmap_gui Widgets Core Gui PrintSupport) ++ QT5_USE_MODULES(rtabmap_gui Widgets Core Gui) + ENDIF() + ENDIF(Qt5_FOUND) + +diff --git a/guilib/src/GraphViewer.cpp b/guilib/src/GraphViewer.cpp +index 58907c34..7b41061f 100644 +--- a/guilib/src/GraphViewer.cpp ++++ b/guilib/src/GraphViewer.cpp +@@ -38,7 +38,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #include + #include + #include +-#include + #include + #ifdef QT_SVG_LIB + #include +@@ -2011,16 +2010,7 @@ void GraphViewer::contextMenuEvent(QContextMenuEvent * event) + this->scene()->setSceneRect(this->scene()->itemsBoundingRect()); // Re-shrink the scene to it's bounding contents + QSize sceneSize = this->scene()->sceneRect().size().toSize(); + +- if(QFileInfo(filePath).suffix().compare("pdf") == 0) +- { +- QPrinter printer(QPrinter::HighResolution); +- printer.setOrientation(QPrinter::Portrait); +- printer.setOutputFileName( filePath ); +- QPainter p(&printer); +- scene()->render(&p); +- p.end(); +- } +- else if(QFileInfo(filePath).suffix().compare("svg") == 0) ++ if(QFileInfo(filePath).suffix().compare("svg") == 0) + { + #ifdef QT_SVG_LIB + QSvgGenerator svgGen; +diff --git a/guilib/src/ImageView.cpp b/guilib/src/ImageView.cpp +index 714f2d36..887e7bdc 100644 +--- a/guilib/src/ImageView.cpp ++++ b/guilib/src/ImageView.cpp +@@ -37,7 +37,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #include + #include + #include +-#include + #include + #include "rtabmap/utilite/ULogger.h" + #include "rtabmap/gui/KeypointItem.h" +@@ -843,21 +842,6 @@ void ImageView::contextMenuEvent(QContextMenuEvent * e) + } + + _savedFileName = text; +- if(QFileInfo(text).suffix().compare("pdf") == 0) +- { +- QPrinter printer(QPrinter::HighResolution); +- printer.setOrientation(QPrinter::Portrait); +- printer.setOutputFileName( text ); +- QPainter p(&printer); +- p.begin(&printer); +- double xscale = printer.pageRect().width()/double(_graphicsView->sceneRect().width()); +- double yscale = printer.pageRect().height()/double(_graphicsView->sceneRect().height()); +- double scale = qMin(xscale, yscale); +- p.scale(scale, scale); +- _graphicsView->scene()->render(&p, _graphicsView->sceneRect(), _graphicsView->sceneRect()); +- p.end(); +- } +- else + { + QImage img(_graphicsView->sceneRect().width(), _graphicsView->sceneRect().height(), QImage::Format_ARGB32_Premultiplied); + QPainter p(&img); +diff --git a/guilib/src/utilite/UPlot.cpp b/guilib/src/utilite/UPlot.cpp +index 1b11c65e..8bf94841 100644 +--- a/guilib/src/utilite/UPlot.cpp ++++ b/guilib/src/utilite/UPlot.cpp +@@ -42,7 +42,6 @@ + #include + #include + #include +-#include + #include + #include + #ifdef QT_SVG_LIB +@@ -2849,14 +2848,6 @@ void UPlot::contextMenuEvent(QContextMenuEvent * event) + else + { + #endif +- if(QFileInfo(text).suffix().compare("pdf") == 0) +- { +- QPrinter printer; +- printer.setOutputFormat(QPrinter::PdfFormat); +- printer.setOutputFileName(text); +- this->render(&printer); +- } +- else + { + QPixmap figure = QPixmap::grabWidget(this); + figure.save(text); +-- +2.34.1 + diff --git a/pkgs/applications/video/rtabmap/default.nix b/pkgs/applications/video/rtabmap/default.nix new file mode 100644 index 000000000000..c6429b093486 --- /dev/null +++ b/pkgs/applications/video/rtabmap/default.nix @@ -0,0 +1,59 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, opencv, pcl, libusb1, eigen +, wrapQtAppsHook, qtbase, g2o, ceres-solver, libpointmatcher, octomap, freenect +, libdc1394, librealsense, libGL, libGLU, vtkWithQt5, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "rtabmap"; + version = "unstable-2022-02-07"; + + src = fetchFromGitHub { + owner = "introlab"; + repo = "rtabmap"; + rev = "f584f42ea423c44138aa0668b5c8eb18f2978fe2"; + sha256 = "sha256-xotOcaz5XrmzwEKuVEQZoeq6fEVbACK7PSUW9kULH40="; + }; + + patches = [ + # Our Qt5 seems to be missing PrintSupport.. I think? + ./0001-remove-printer-support.patch + ]; + + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook wrapGAppsHook ]; + buildInputs = [ + ## Required + opencv + pcl + ## Optional + libusb1 + eigen + g2o + ceres-solver + # libpointmatcher - ABI mismatch + octomap + freenect + libdc1394 + # librealsense - missing includedir + qtbase + libGL + libGLU + vtkWithQt5 + ]; + + # Disable warnings that are irrelevant to us as packagers + cmakeFlags = "-Wno-dev"; + + # We run one of the executables we build while the build is + # still running (and patchelf hasn't been invoked) which means + # the RPATH is not set correctly. This hacks around that error: + # + # build/bin/rtabmap-res_tool: error while loading shared libraries: librtabmap_utilite.so.0.20: cannot open shared object file: No such file or directory + LD_LIBRARY_PATH = "/build/source/build/bin"; + + meta = with lib; { + description = "Real-Time Appearance-Based 3D Mapping"; + homepage = "https://introlab.github.io/rtabmap/"; + license = licenses.bsd3; + maintainers = with maintainers; [ ckie ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82bd5f88666f..37d66c2088ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9033,6 +9033,8 @@ with pkgs; rocket = libsForQt5.callPackage ../tools/graphics/rocket { }; + rtabmap = libsForQt5.callPackage ../applications/video/rtabmap/default.nix { }; + rtaudio = callPackage ../development/libraries/audio/rtaudio { jack = libjack2; inherit (darwin.apple_sdk.frameworks) CoreAudio; From 382289027f92ff3973f14d983a55b183c9b1c0bd Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 2 Aug 2021 21:18:40 +0200 Subject: [PATCH 005/106] lib/types: Fix emptyValue of listOf and nonEmptyListOf An empty list is [], not {}! Also, non-empty lists shouldn't have a default of an empty list! --- lib/types.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/types.nix b/lib/types.nix index f2f9b2bca985..3fa9d881a650 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -390,7 +390,7 @@ rec { ).optionalValue ) def.value ) defs))); - emptyValue = { value = {}; }; + emptyValue = { value = []; }; getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["*"]); getSubModules = elemType.getSubModules; substSubModules = m: listOf (elemType.substSubModules m); @@ -402,7 +402,7 @@ rec { let list = addCheck (types.listOf elemType) (l: l != []); in list // { description = "non-empty " + list.description; - # Note: emptyValue is left as is, because another module may define an element. + emptyValue = { }; # no .value attr, meaning unset }; attrsOf = elemType: mkOptionType rec { From b333395be54397a62e6befe2bc91664f53306b41 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 15 Oct 2021 16:48:38 +0200 Subject: [PATCH 006/106] lib/tests: Add tests for emptyValue --- lib/tests/modules.sh | 9 ++++++++ lib/tests/modules/emptyValues.nix | 36 +++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 lib/tests/modules/emptyValues.nix diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 590937da5b8f..88d152d39352 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -284,6 +284,15 @@ checkConfigOutput '^"a b"$' config.resultFoo ./declare-variants.nix ./define-var checkConfigOutput '^"a y z"$' config.resultFooBar ./declare-variants.nix ./define-variant.nix checkConfigOutput '^"a b c"$' config.resultFooFoo ./declare-variants.nix ./define-variant.nix +## emptyValue's +checkConfigOutput "[ ]" config.list.a ./emptyValues.nix +checkConfigOutput "{ }" config.attrs.a ./emptyValues.nix +checkConfigOutput "null" config.null.a ./emptyValues.nix +checkConfigOutput "{ }" config.submodule.a ./emptyValues.nix +# These types don't have empty values +checkConfigError 'The option .int.a. is used but not defined' config.int.a ./emptyValues.nix +checkConfigError 'The option .nonEmptyList.a. is used but not defined' config.nonEmptyList.a ./emptyValues.nix + cat < Date: Fri, 18 Feb 2022 03:52:43 +0000 Subject: [PATCH 007/106] codeql: 2.8.0 -> 2.8.1 --- pkgs/development/tools/analysis/codeql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index 8bf2ed7c04ec..a6a95e74e4a1 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.8.0"; + version = "2.8.1"; dontConfigure = true; dontBuild = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "sha256-IcYD9o6rv1ti4IvTEEJ5iV1OdJP7cHN0vetrvabxeas="; + sha256 = "sha256-zZoK5x+nE8AVZWDSMmsVPFuXNnAHBPyu9+1GgSwN19c="; }; nativeBuildInputs = [ From 200b52600458ed86ff2bf2ba3151ef7e83f0ec9c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Feb 2022 08:05:39 +0000 Subject: [PATCH 008/106] fluxcd: 0.26.3 -> 0.27.0 --- pkgs/applications/networking/cluster/fluxcd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 30a12281c872..eb73fd90e5b0 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: let - version = "0.26.3"; - sha256 = "0j6zvcjykk775nnj8s0n5154lqslgfpi8884gh6sv204z2drfjff"; - manifestsSha256 = "1pfk0fj228zy0m1cz0400l4r41l7p0gsdq5lqnl3a8vgb4f6i41q"; + version = "0.27.0"; + sha256 = "12d5azl30071s31dqbvbi1c5a5746cb9y45g889hgcyl50yzm2dx"; + manifestsSha256 = "0mhx9xgir9ych9p0j5yc4swf371njfbwyk3cqa1nmipgpxbfczc6"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-34hSbOB7n9OFpVqe8y1+jAC3j0HEBg9LhYOvVGH9kLY="; + vendorSha256 = "sha256-iyyGLHtJVXc7rdu2VkuGo+Y1tTS0krW7F/lD5TmjTQs="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests From b69e359d84c203fe77a5513054a39c8e3432c610 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Feb 2022 12:50:09 +0000 Subject: [PATCH 009/106] krapslog: 0.3.2 -> 0.4.0 --- pkgs/tools/misc/krapslog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/krapslog/default.nix b/pkgs/tools/misc/krapslog/default.nix index 5aec73bde5cb..1175739159dd 100644 --- a/pkgs/tools/misc/krapslog/default.nix +++ b/pkgs/tools/misc/krapslog/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "krapslog"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "acj"; repo = "krapslog-rs"; rev = version; - sha256 = "sha256-bzpZuLFSoIjZpK9cbxQEeyRwzuP7aDRG/xn/0056j+c="; + sha256 = "sha256-ETP0BvtfMHznEbM0Vu/gMoRvXn4y2XcXw6CoU60A+Cg="; }; - cargoSha256 = "sha256-o9e0EakIbi+qk0gPxlPGfNvRidmCklieJ94sYBSR3IY="; + cargoSha256 = "sha256-ioD0V1S/kPF5etey04Xz1Iz/jDpyunx9PtpWKdwk21g="; buildInputs = lib.optional stdenv.isDarwin libiconv; From 78ec9d6e6c9e1a7360aefd822c8879841811c20a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Feb 2022 20:02:40 +0000 Subject: [PATCH 010/106] okapi: 1.2.0 -> 1.3.0 --- pkgs/development/libraries/okapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/okapi/default.nix b/pkgs/development/libraries/okapi/default.nix index e9b0b95d1af8..eb85bb1d41f0 100644 --- a/pkgs/development/libraries/okapi/default.nix +++ b/pkgs/development/libraries/okapi/default.nix @@ -2,11 +2,11 @@ rustPlatform.buildRustPackage rec { pname = "okapi"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { url = "https://github.com/trinsic-id/okapi/releases/download/v${version}/okapi-vendor-${version}.tar.gz"; - sha256 = "sha256-1aADcwEEWMhoJjwc8wkEcmBYXz+5josOfI/KLaton2k="; + sha256 = "sha256-I3wTcT7vLgH+B8gNzl8Yr/qMIDkMJUrG++SOSS+FUmQ="; }; cargoVendorDir = "vendor"; From 04f8d7e341f1319a2d1bef4db944cc207d408c95 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Feb 2022 01:14:30 +0000 Subject: [PATCH 011/106] spaceship-prompt: 3.16.2 -> 3.16.3 --- pkgs/shells/zsh/spaceship-prompt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/spaceship-prompt/default.nix b/pkgs/shells/zsh/spaceship-prompt/default.nix index b0384eccc369..9c3843a7cefd 100644 --- a/pkgs/shells/zsh/spaceship-prompt/default.nix +++ b/pkgs/shells/zsh/spaceship-prompt/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "spaceship-prompt"; - version = "3.16.2"; + version = "3.16.3"; src = fetchFromGitHub { owner = "denysdovhan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/b+ko4d4lbjWC2rIjFBPePyzhvfHk4xyg2s86GfFNd4="; + sha256 = "sha256-eIvNfs9c8Ftcnbtg7lNNc2d3OWWpse91yTzcLqoeFqI="; }; dontBuild = true; From 579f00c5ad4647f71878f88a8913354c6e4a36c6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Feb 2022 01:35:51 +0000 Subject: [PATCH 012/106] stripe-cli: 1.7.12 -> 1.7.13 --- pkgs/tools/admin/stripe-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/tools/admin/stripe-cli/default.nix index ed20f688260a..673f7796f8c3 100644 --- a/pkgs/tools/admin/stripe-cli/default.nix +++ b/pkgs/tools/admin/stripe-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.7.12"; + version = "1.7.13"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xDhLd1tCw+W3xXxBgHDKZtMZszXsNelv2dMygHNVq64="; + sha256 = "sha256-XYhOBEpHVAJ/PHovMylme56le33IUM5C9HEZAm/gG3I="; }; - vendorSha256 = "sha256-AsEem/KuA+jxioG96Ofn0te93fyZ9sebPkLPA+LAUkk="; + vendorSha256 = "sha256-OP39ZuWBz/lutuYGbYLVEtjIirXq89QTdltq2v0NWRE="; subPackages = [ "cmd/stripe" From 2eb8fcaa178d94f5fd5e0a33a3eb58c9f0f70807 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Feb 2022 17:58:34 +0000 Subject: [PATCH 013/106] libtsm: 4.0.1 -> 4.0.2 --- pkgs/development/libraries/libtsm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libtsm/default.nix b/pkgs/development/libraries/libtsm/default.nix index 9c8e418fba4f..25214242b531 100644 --- a/pkgs/development/libraries/libtsm/default.nix +++ b/pkgs/development/libraries/libtsm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libtsm"; - version = "4.0.1"; + version = "4.0.2"; src = fetchFromGitHub { owner = "Aetf"; repo = "libtsm"; rev = "v${version}"; - sha256 = "0mwn91i5h5d518i1s05y7hzv6bc13vzcvxszpfh77473iwg4wprx"; + sha256 = "sha256-BYMRPjGRVSnYzkdbxypkuE0YkeVLPJ32iGZ1b0R6wto="; }; buildInputs = [ libxkbcommon ]; From e169c528ffe12300555ce5c959d55b3b2b75f7d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Feb 2022 23:35:17 +0000 Subject: [PATCH 014/106] otpclient: 2.4.7 -> 2.4.8 --- pkgs/applications/misc/otpclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/otpclient/default.nix b/pkgs/applications/misc/otpclient/default.nix index 364bb6c80deb..afc0ac71d5d2 100644 --- a/pkgs/applications/misc/otpclient/default.nix +++ b/pkgs/applications/misc/otpclient/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "otpclient"; - version = "2.4.7"; + version = "2.4.8"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UR7h+btmOSnpjkrQMiABcM1tOFjOhNVWuKYDF9qXfFo="; + sha256 = "sha256-2exqMYcxg0UxlH+ZANQv2MFii9dZ6nizB4vxGR9cAwk="; }; buildInputs = [ gtk3 jansson libgcrypt libzip libpng libcotp zbar ]; From a7a964dddcb9faf0994e2c1338335ca154b87d3c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Feb 2022 02:06:48 +0000 Subject: [PATCH 015/106] ryzenadj: 0.8.3 -> 0.9.0 --- pkgs/os-specific/linux/ryzenadj/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/ryzenadj/default.nix b/pkgs/os-specific/linux/ryzenadj/default.nix index cdc2425ae4ad..3013df7e2913 100644 --- a/pkgs/os-specific/linux/ryzenadj/default.nix +++ b/pkgs/os-specific/linux/ryzenadj/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, pciutils, cmake }: stdenv.mkDerivation rec { pname = "ryzenadj"; - version = "0.8.3"; + version = "0.9.0"; src = fetchFromGitHub { owner = "FlyGoat"; repo = "RyzenAdj"; rev = "v${version}"; - sha256 = "sha256-eb8DskF0SJtc0tDKJ1vU7dtuQmHO7RX8vm4DQki2ZEg="; + sha256 = "sha256-RoKRqqIVY9zjyXzGxHo+J4OV7cKc7CkqsdbpreB7EHc="; }; nativeBuildInputs = [ pciutils cmake ]; From 2b81805f80efd6f1090fa8b5fc707449c540d047 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Feb 2022 09:19:21 +0000 Subject: [PATCH 016/106] cherrytree: 0.99.45 -> 0.99.46 --- pkgs/applications/misc/cherrytree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index 237c91267839..067ad872f640 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "cherrytree"; - version = "0.99.45"; + version = "0.99.46"; src = fetchFromGitHub { owner = "giuspen"; repo = "cherrytree"; rev = version; - sha256 = "sha256-DGhzqv7huFVgCdXy3DuIBT+7s2q6FB7+gFPd4zEXi2M="; + sha256 = "sha256-yX9USGiiCwtBcg055D8xBHoiCafQWtQFqf5i5bsi13U="; }; nativeBuildInputs = [ From ab68ec83ebd4f166d0c4b92af0747ab6baac09fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Feb 2022 11:01:54 +0000 Subject: [PATCH 017/106] drogon: 1.7.4 -> 1.7.5 --- pkgs/development/libraries/drogon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/drogon/default.nix b/pkgs/development/libraries/drogon/default.nix index 7258cb767e3f..432e7626156b 100644 --- a/pkgs/development/libraries/drogon/default.nix +++ b/pkgs/development/libraries/drogon/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "drogon"; - version = "1.7.4"; + version = "1.7.5"; src = fetchFromGitHub { owner = "drogonframework"; repo = "drogon"; rev = "v${version}"; - sha256 = "02igryrv8782rwqb4w49frymlw9n7hv8fskqsw43rqly650vzakb"; + sha256 = "sha256-DrpaXUaoO35DgmX8cYb3kbXfd6PlqI6pjEKnroiRxvg="; fetchSubmodules = true; }; From 6b001db34c2030871475e27cc6c8ce2066322f6b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Feb 2022 12:39:18 +0000 Subject: [PATCH 018/106] go-task: 3.10.0 -> 3.11.0 --- pkgs/development/tools/go-task/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index 05ffe14dd4de..d6e5855d992c 100644 --- a/pkgs/development/tools/go-task/default.nix +++ b/pkgs/development/tools/go-task/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-task"; - version = "3.10.0"; + version = "3.11.0"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "v${version}"; - sha256 = "sha256-E0wMFdLK8lA8oluFQuq7hPMWh4t6OsoJ14d7ErDjAdA="; + sha256 = "sha256-KHeZ0UH7qa+fii+sT7q9ri3DpLOKqQZqCAKQYn4l5M8="; }; - vendorSha256 = "sha256-ClMvbxDKwwoVUC9+AJPZfBxJ26KKuLueUn9Nz/gh4Fs="; + vendorSha256 = "sha256-u+LeH9GijquBeYlA3f2GcyoSP/S7BtBqb8C9OgEA9fY="; doCheck = false; From cc4703a9594d4ad0761cb6ed8ed6cdc34bf01a47 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Feb 2022 18:24:10 +0000 Subject: [PATCH 019/106] mycorrhiza: 1.8.1 -> 1.8.2 --- pkgs/servers/mycorrhiza/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mycorrhiza/default.nix b/pkgs/servers/mycorrhiza/default.nix index 16e15a8dd2ae..65c6d8ae77a4 100644 --- a/pkgs/servers/mycorrhiza/default.nix +++ b/pkgs/servers/mycorrhiza/default.nix @@ -4,16 +4,16 @@ buildGoModule rec { pname = "mycorrhiza"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "bouncepaw"; repo = "mycorrhiza"; rev = "v${version}"; - sha256 = "sha256-81Ok/0cDkFqKEAwWtpxM3InMfu0R9rZJzQ41AhWuVuo="; + sha256 = "sha256-+8cW7xNr4gzNHQ/hBpASoe9g7W/QFQhtO/dZ9umgJec="; }; - vendorSha256 = "sha256-9FMxj3AkbKyUMZWj1S0myoKem4mupOHPIfxNHjYk8mU="; + vendorSha256 = "sha256-foAjMPvNJnjpxRAXEgNeYuvDAoBdMwiQc9BiNxifzUc="; subPackages = [ "." ]; From 0480c113a1040323080b27be739e22be6c7ecdda Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Feb 2022 02:44:09 +0000 Subject: [PATCH 020/106] buildbot: 3.4.0 -> 3.4.1 --- pkgs/development/python-modules/buildbot/default.nix | 4 ++-- pkgs/development/python-modules/buildbot/pkg.nix | 2 +- pkgs/development/python-modules/buildbot/plugins.nix | 10 +++++----- pkgs/development/python-modules/buildbot/worker.nix | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index a6ae6e87036b..2836ee24c34a 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -31,11 +31,11 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "3.4.0"; + version = "3.4.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-14w1sF1aOpfUW76uhAIUpdrjAEhQkEWcRGg9Osc+qFk="; + sha256 = "sha256-GmKMqejHjtEiEtlZffze7PGNjVwUKB/ZcvUgJ4DoeDQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix index a1d2fa59cb5d..a35506c89b8d 100644 --- a/pkgs/development/python-modules/buildbot/pkg.nix +++ b/pkgs/development/python-modules/buildbot/pkg.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-NAc85JomnxS052SjCu8+UQ/hik2gbq1u7/gc21Nj67Q="; + sha256 = "sha256-A2a5rEL5MN9jlu5vVnUIKx9ma2H6wuJAWjkqLpQgcfc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix index 797395205a04..5b64f4c51ab9 100644 --- a/pkgs/development/python-modules/buildbot/plugins.nix +++ b/pkgs/development/python-modules/buildbot/plugins.nix @@ -7,7 +7,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-65ZbCiNtxH3YjAcdhv5cwSUNrLT65jlQh/2oL8342Tw="; + sha256 = "sha256-Hly1dwUbWblHoP+ufjxyz4boXby8kxeFSHLMHcCpc1o="; }; # Remove unneccessary circular dependency on buildbot @@ -34,7 +34,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-2wu6rE5tgjPXxlcIND8s+DAmX9CF29M3ElonV0L8WOs="; + sha256 = "sha256-QuV808Wg9epCgjehuUaMKCLLTLfFJVWBdKPy8sZfBYg="; }; buildInputs = [ buildbot-pkg ]; @@ -56,7 +56,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-Vu4CouTuVyxpmx5C4fthQJPdFBAtN1jliQjy4pLYAzc="; + sha256 = "sha256-p8PRQaWrPb63RrF4FtTX65qM3HdzI4Gl4tR0zTOBFEI="; }; buildInputs = [ buildbot-pkg ]; @@ -78,7 +78,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-BDzI4VBbNGCKRxv6294IIVkDXZV0KHauvUYDjIVovvE="; + sha256 = "sha256-cNYptEp98padbyoY1DmZbpaED7O5pfck9oMjst4RHnI="; }; buildInputs = [ buildbot-pkg ]; @@ -100,7 +100,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-hkcxwZWFJOLHMIRJfzzMTEoH6oc2UblJEKFjYthFfDc="; + sha256 = "sha256-o747SIyqJom4ucZ7hmODcP0VC7i+ydgvi+oMxn/vupc="; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix index 0c7e2f33716f..97a3eec770bd 100644 --- a/pkgs/development/python-modules/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -7,7 +7,7 @@ buildPythonPackage (rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-SFZ0Q51hrBb7eBMGzvVOhc/ogFCIO/Mo7U9652WJ2GU="; + sha256 = "sha256-9wdUvp00vuP7peJ+Oo4guHLfIz0YWHwp6q/zlKOOoXg="; }; propagatedBuildInputs = [ twisted future ]; From 21eb8f63d59606dc973fe67dfbe73ca2a4887f75 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Feb 2022 05:22:23 +0000 Subject: [PATCH 021/106] gdown: 4.3.0 -> 4.3.1 --- pkgs/development/python-modules/gdown/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gdown/default.nix b/pkgs/development/python-modules/gdown/default.nix index 180624ea8168..9ac5b03a12a3 100644 --- a/pkgs/development/python-modules/gdown/default.nix +++ b/pkgs/development/python-modules/gdown/default.nix @@ -11,12 +11,12 @@ buildPythonApplication rec { pname = "gdown"; - version = "4.3.0"; + version = "4.3.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KswYue892Mlpa8wnPf9bt8MEJGtjGaMjlDt0TXGoEdE="; + sha256 = "sha256-ZFy1/3ZI+Zu/fZbOhswNoRlKFCUSXcPO/bJetSkiyHE="; }; propagatedBuildInputs = [ From 8906d7c9b8740824e43804af4d3742dddc012948 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Feb 2022 07:15:46 +0000 Subject: [PATCH 022/106] dolt: 0.37.0 -> 0.37.1 --- pkgs/servers/sql/dolt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index e3be7cbdec45..74fddbd49827 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dolt"; - version = "0.37.0"; + version = "0.37.1"; src = fetchFromGitHub { owner = "liquidata-inc"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-uAZlQpuNUpg2ZZJBU7A49fCm6GlrYaFyn6ZrmNBW1Y0="; + sha256 = "sha256-rLnjWJPIf2SzWpaQxt/4zACihKptly/OJ+w0/uJBacY="; }; modRoot = "./go"; From 1f3babaa22650eb16f006d8724c31eeb2cf3b2b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Feb 2022 07:25:58 +0000 Subject: [PATCH 023/106] dtrx: 8.2.1 -> 8.2.2 --- pkgs/tools/compression/dtrx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix index 392c2b960f27..98fc0befafbf 100644 --- a/pkgs/tools/compression/dtrx/default.nix +++ b/pkgs/tools/compression/dtrx/default.nix @@ -21,13 +21,13 @@ python3Packages.buildPythonApplication rec { pname = "dtrx"; - version = "8.2.1"; + version = "8.2.2"; src = fetchFromGitHub { owner = "dtrx-py"; repo = "dtrx"; rev = version; - sha256 = "sha256-ayQ52teXWpw3ZvPhfqxFHxMZatQK9NKv/97ovANFZcE="; + sha256 = "sha256-thtBVGgKRYHOAFuxDvuFxcIHoyYAI58AiNCx4vuVXGs="; }; postInstall = From 87cc2bc2944bb05e0d24c8430648647d4199ab11 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Feb 2022 08:16:29 +0000 Subject: [PATCH 024/106] charis-sil: 6.001 -> 6.101 --- pkgs/data/fonts/charis-sil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/charis-sil/default.nix b/pkgs/data/fonts/charis-sil/default.nix index 75f1d89be770..3294cb711052 100644 --- a/pkgs/data/fonts/charis-sil/default.nix +++ b/pkgs/data/fonts/charis-sil/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "6.001"; + version = "6.101"; in fetchzip rec { name = "charis-sil-${version}"; @@ -14,7 +14,7 @@ in unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" ''; - sha256 = "sha256-eKSOvYuTMpAnTk4sRiWFUDJrTsF+K5716ALCepaUU08="; + sha256 = "sha256-b1ms9hJ6IPe7W6O9KgzHZvwT4/nAoLOhdydcUrwNfnU="; meta = with lib; { homepage = "https://software.sil.org/charis"; From 620471678e65a5cf87f3ce7e9e506f28547bbdb1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Feb 2022 10:53:05 +0100 Subject: [PATCH 025/106] python3Packages.pyroute2-core: 0.6.5 -> 0.6.7 --- pkgs/development/python-modules/pyroute2-core/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-core/default.nix b/pkgs/development/python-modules/pyroute2-core/default.nix index fe92d88beaec..d8820e6d9d0f 100644 --- a/pkgs/development/python-modules/pyroute2-core/default.nix +++ b/pkgs/development/python-modules/pyroute2-core/default.nix @@ -2,16 +2,20 @@ , buildPythonPackage , fetchPypi , pyroute2-core +, pythonOlder }: buildPythonPackage rec { pname = "pyroute2-core"; - version = "0.6.5"; + version = "0.6.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "pyroute2.core"; inherit version; - sha256 = "sha256-Jm10Dq5A+mTdBFQfAH0022ls7PMVTLpb4w+nWmfUOFI="; + hash = "sha256-N74cQcWx57lYIPiQTL+/Ec5Kf1rgdMrRkkYIdyaLjN4="; }; # pyroute2 sub-modules have no tests From fb8072c40cf14b0165ad4ec8af3fc4d1c2c87b7e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Feb 2022 10:53:39 +0100 Subject: [PATCH 026/106] python3Packages.pyroute2-ethtool: 0.6.5 -> 0.6.7 --- .../python-modules/pyroute2-ethtool/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-ethtool/default.nix b/pkgs/development/python-modules/pyroute2-ethtool/default.nix index 6f2695507863..fe4eac248700 100644 --- a/pkgs/development/python-modules/pyroute2-ethtool/default.nix +++ b/pkgs/development/python-modules/pyroute2-ethtool/default.nix @@ -2,16 +2,20 @@ , buildPythonPackage , fetchPypi , pyroute2-core +, pythonOlder }: buildPythonPackage rec { pname = "pyroute2-ethtool"; - version = "0.6.5"; + version = "0.6.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "pyroute2.ethtool"; inherit version; - sha256 = "sha256-yvgBS2dlIRNcR2DXLPWu72q7x/onUhD36VMzBzzHcVo="; + hash = "sha256-jwPg7xcmQU3F4cVrs2GVUxBXV6waMkrnmyZkHo2kLR0="; }; propagatedBuildInputs = [ From 69cb5edaf77d73b2e685fddbff9797fdd06af9db Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Feb 2022 10:54:04 +0100 Subject: [PATCH 027/106] python3Packages.pyroute2-ipdb: 0.6.5 -> 0.6.7 --- pkgs/development/python-modules/pyroute2-ipdb/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-ipdb/default.nix b/pkgs/development/python-modules/pyroute2-ipdb/default.nix index 7411f49cb52a..cb40f0b4eff1 100644 --- a/pkgs/development/python-modules/pyroute2-ipdb/default.nix +++ b/pkgs/development/python-modules/pyroute2-ipdb/default.nix @@ -2,16 +2,20 @@ , buildPythonPackage , fetchPypi , pyroute2-core +, pythonOlder }: buildPythonPackage rec { pname = "pyroute2-ipdb"; - version = "0.6.5"; + version = "0.6.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "pyroute2.ipdb"; inherit version; - sha256 = "sha256-8gKP0QE9iviIFQ0DPuz3U3ZXpL434MzOqYAICZYetXc="; + hash = "sha256-uMEPUleEBIaIV4bCejTmeHYhKeaN9SNcUMzBAODNBEU="; }; propagatedBuildInputs = [ From 95ffac758cfce9dae18c998c8b27e58ad85da9b1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Feb 2022 10:54:19 +0100 Subject: [PATCH 028/106] python3Packages.pyroute2-ndb: 0.6.5 -> 0.6.7 --- .../python-modules/pyroute2-ndb/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-ndb/default.nix b/pkgs/development/python-modules/pyroute2-ndb/default.nix index 7caa902dfa7d..2564e4601199 100644 --- a/pkgs/development/python-modules/pyroute2-ndb/default.nix +++ b/pkgs/development/python-modules/pyroute2-ndb/default.nix @@ -2,16 +2,20 @@ , buildPythonPackage , fetchPypi , pyroute2-core +, pythonOlder }: buildPythonPackage rec { pname = "pyroute2-ndb"; - version = "0.6.5"; + version = "0.6.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "pyroute2.ndb"; inherit version; - sha256 = "sha256-pNMJWE6e9seEKvT4MrSPxTRKsiXnDjhLrtG3/iuU2fg="; + hash = "sha256-o/rmbOwfRUPw/g1Cc/5otqKvGe3Br3y4iSXad/PfTPw="; }; propagatedBuildInputs = [ @@ -21,7 +25,9 @@ buildPythonPackage rec { # pyroute2 sub-modules have no tests doCheck = false; - pythonImportsCheck = [ "pr2modules.ndb" ]; + pythonImportsCheck = [ + "pr2modules.ndb" + ]; meta = with lib; { description = "NDB module for pyroute2"; From b9650e22d9f87acf1a1075171d7994934e4d778b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Feb 2022 10:54:36 +0100 Subject: [PATCH 029/106] python3Packages.pyroute2-nftables: 0.6.5 -> 0.6.7 --- pkgs/development/python-modules/pyroute2-nftables/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-nftables/default.nix b/pkgs/development/python-modules/pyroute2-nftables/default.nix index ec5ada77dd2e..6b0b4bc35c92 100644 --- a/pkgs/development/python-modules/pyroute2-nftables/default.nix +++ b/pkgs/development/python-modules/pyroute2-nftables/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pyroute2-nftables"; - version = "0.6.5"; + version = "0.6.7"; src = fetchPypi { pname = "pyroute2.nftables"; inherit version; - sha256 = "sha256-sUVaY6PvwFDRCNVQ0cr9AR7d7W6JTZnnvfoC1ZK/bxY="; + sha256 = "sha256-d9LdXxBQGa40MmGuK2cFOOEI7X4Y1pPv0ObW9n7ZUjo="; }; propagatedBuildInputs = [ From b5c8b9791fea6e8148d9e052a62b36aceae49043 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Feb 2022 10:54:56 +0100 Subject: [PATCH 030/106] python3Packages.pyroute2-nslink: 0.6.5 -> 0.6.7 --- .../python-modules/pyroute2-nslink/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-nslink/default.nix b/pkgs/development/python-modules/pyroute2-nslink/default.nix index 722ea0a12f9c..0050c4aa795e 100644 --- a/pkgs/development/python-modules/pyroute2-nslink/default.nix +++ b/pkgs/development/python-modules/pyroute2-nslink/default.nix @@ -2,16 +2,20 @@ , buildPythonPackage , fetchPypi , pyroute2-core +, pythonOlder }: buildPythonPackage rec { pname = "pyroute2-nslink"; - version = "0.6.5"; + version = "0.6.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "pyroute2.nslink"; inherit version; - sha256 = "sha256-KS5sKDKnNUTBxtW6cn9xF6qEflX4jXjpS31GB7KZmZ4="; + hash = "sha256-p+U3Y5vKCxuvMl/yNKlay57tlU4GKttCJrAwctKa5TY="; }; propagatedBuildInputs = [ From 5b42c045a80f3d5694b327ea0b53cb46581df3c2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Feb 2022 10:55:11 +0100 Subject: [PATCH 031/106] python3Packages.pyroute2-protocols: 0.6.5 -> 0.6.7 --- .../python-modules/pyroute2-protocols/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-protocols/default.nix b/pkgs/development/python-modules/pyroute2-protocols/default.nix index ec3226f0cd98..39308e162e2d 100644 --- a/pkgs/development/python-modules/pyroute2-protocols/default.nix +++ b/pkgs/development/python-modules/pyroute2-protocols/default.nix @@ -2,16 +2,20 @@ , buildPythonPackage , fetchPypi , pyroute2-core +, pythonOlder }: buildPythonPackage rec { pname = "pyroute2-protocols"; - version = "0.6.5"; + version = "0.6.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "pyroute2.protocols"; inherit version; - sha256 = "sha256-lj9Q8ew+44m+Y72miQyuZhzjHmdLqYB+c2FK+ph1d84="; + hash = "sha256-GdququbQcU+exzxifb8UGamkSUMhR94j+auF8I6e7/Q="; }; propagatedBuildInputs = [ From 8ec171dc8f46a29dab5418414628deef8a9a6194 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Feb 2022 10:55:26 +0100 Subject: [PATCH 032/106] python3Packages.pyroute2: 0.6.5 -> 0.6.7 --- .../python-modules/pyroute2/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 9afea342e6d7..1fda8265428a 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, importlib-metadata , mitogen , pyroute2-core , pyroute2-ethtool @@ -9,15 +10,19 @@ , pyroute2-ndb , pyroute2-nftables , pyroute2-nslink +, pythonOlder }: buildPythonPackage rec { pname = "pyroute2"; - version = "0.6.5"; + version = "0.6.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-0JlciuuWwOTu1NYul8nXlQAKGjO3R9bcVDJmZYV88Rw="; + hash = "sha256-qBv9jshyg0S9IThdrXHTFcb2neQPDmURmtSbqYCKlWo="; }; propagatedBuildInputs = [ @@ -29,18 +34,22 @@ buildPythonPackage rec { pyroute2-ndb pyroute2-nftables pyroute2-nslink + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata ]; # Requires root privileges, https://github.com/svinota/pyroute2/issues/778 doCheck = false; - pythonImportsCheck = [ "pyroute2" ]; + pythonImportsCheck = [ + "pyroute2" + ]; meta = with lib; { description = "Python Netlink library"; homepage = "https://github.com/svinota/pyroute2"; license = licenses.asl20; - maintainers = with maintainers; [ mic92 ]; + maintainers = with maintainers; [ fab mic92 ]; platforms = platforms.unix; }; } From fcea2d9652f7835017e0da3dc77030fa0757deb5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Feb 2022 10:55:43 +0100 Subject: [PATCH 033/106] python3Packages.pyroute2-ipset: 0.6.5 -> 0.6.7 --- .../development/python-modules/pyroute2-ipset/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-ipset/default.nix b/pkgs/development/python-modules/pyroute2-ipset/default.nix index 5ab21f8f22c7..300b1d21fa1d 100644 --- a/pkgs/development/python-modules/pyroute2-ipset/default.nix +++ b/pkgs/development/python-modules/pyroute2-ipset/default.nix @@ -2,16 +2,20 @@ , buildPythonPackage , fetchPypi , pyroute2-core +, pythonOlder }: buildPythonPackage rec { pname = "pyroute2-ipset"; - version = "0.6.5"; + version = "0.6.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "pyroute2.ipset"; inherit version; - sha256 = "sha256-rlJ8D5mXSCMKH2iNmit8JXst9tdDafROylMNAHeTt50="; + hash = "sha256-roNLNXmnW27a+TgxtMi8HO5hF4agxdjQ0DMsYW6O44c="; }; propagatedBuildInputs = [ From 7b6c4c5438e82a808997d485cc0da2f0c9be5f49 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Feb 2022 12:20:05 +0100 Subject: [PATCH 034/106] python3Packages.whitenoise: 5.3.0 -> 6.0.0 --- .../python-modules/whitenoise/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/whitenoise/default.nix b/pkgs/development/python-modules/whitenoise/default.nix index 5598b189afac..d4d956119409 100644 --- a/pkgs/development/python-modules/whitenoise/default.nix +++ b/pkgs/development/python-modules/whitenoise/default.nix @@ -1,6 +1,7 @@ { lib , brotli , buildPythonPackage +, django , fetchFromGitHub , pytestCheckHook , pythonOlder @@ -9,14 +10,16 @@ buildPythonPackage rec { pname = "whitenoise"; - version = "5.3.0"; - disabled = pythonOlder "3.5"; + version = "6.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "evansd"; repo = pname; - rev = "v${version}"; - sha256 = "17j1rml1hb43c7fs7kf4ygkpmnjppzgsbnyw3plq9w3yh9w5hkhg"; + rev = version; + hash = "sha256-mUjyX4eQOiMweje6UPyfyJsiHwzF5OQ93KuxFedWxbQ="; }; propagatedBuildInputs = [ @@ -24,6 +27,7 @@ buildPythonPackage rec { ]; checkInputs = [ + django pytestCheckHook requests ]; @@ -40,7 +44,9 @@ buildPythonPackage rec { "test_modified" ]; - pythonImportsCheck = [ "whitenoise" ]; + pythonImportsCheck = [ + "whitenoise" + ]; meta = with lib; { description = "Radically simplified static file serving for WSGI applications"; From 3db3cb00cb5d7c69ba3409231982934b5fd4cbb8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Feb 2022 13:17:00 +0000 Subject: [PATCH 035/106] andika: 6.001 -> 6.101 --- pkgs/data/fonts/andika/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/andika/default.nix b/pkgs/data/fonts/andika/default.nix index aaa380098a27..02ee29a382ed 100644 --- a/pkgs/data/fonts/andika/default.nix +++ b/pkgs/data/fonts/andika/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "6.001"; + version = "6.101"; in fetchzip rec { name = "andika-${version}"; @@ -14,7 +14,7 @@ in unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" ''; - sha256 = "sha256-ukPFBLjHQbOosQ1h0ImVlz8HhNNMp0e41SjzUhQaZtc="; + sha256 = "sha256-J/Ad+fmCMOxLoo+691LE6Bgi/l3ovIfWScwwVWtqACI="; meta = with lib; { homepage = "https://software.sil.org/andika"; From fd20b684114601b65767036612b30a4a22b38fa7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Feb 2022 13:27:29 +0000 Subject: [PATCH 036/106] doulos-sil: 6.001 -> 6.101 --- pkgs/data/fonts/doulos-sil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/doulos-sil/default.nix b/pkgs/data/fonts/doulos-sil/default.nix index a1e686a320ed..f720c2cac7dc 100644 --- a/pkgs/data/fonts/doulos-sil/default.nix +++ b/pkgs/data/fonts/doulos-sil/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "6.001"; + version = "6.101"; in fetchzip rec { name = "doulos-sil-${version}"; @@ -14,7 +14,7 @@ in unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" ''; - sha256 = "sha256-MkeLLT7EAeSuCMxVVxVfajHufxr+xMLIz2hf3wF3U4o="; + sha256 = "sha256-vYdnudMkkWz6r8pwq98fyO0zcfFBRPmrqlmWxHCOIcc="; meta = with lib; { homepage = "https://software.sil.org/doulos"; From a01f82c9435120fed4fc7d6fbaff43b783fd5605 Mon Sep 17 00:00:00 2001 From: nixbitcoin Date: Mon, 21 Feb 2022 13:29:43 +0000 Subject: [PATCH 037/106] btcpayserver: 1.4.4 -> 1.4.6 --- .../blockchains/btcpayserver/default.nix | 4 +- .../blockchains/btcpayserver/deps.nix | 47 +++++++++---------- 2 files changed, 23 insertions(+), 28 deletions(-) diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index 39203e60c78d..8500bbc993f7 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -3,13 +3,13 @@ buildDotnetModule rec { pname = "btcpayserver"; - version = "1.4.4"; + version = "1.4.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-PW5a1Bw21skpboWDtlZHGWtFwfImznD7nYI92RT7GGQ="; + sha256 = "sha256-G6/juGBdiOc8Gh9pKFQlBfUDJzDFMd9gMtILeoF8SMk="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix index 659207b5c54b..57602e2231c2 100644 --- a/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -31,18 +31,18 @@ }) (fetchNuGet { pname = "BTCPayServer.Lightning.All"; - version = "1.2.19"; - sha256 = "0g8wm7idxb3pksqn3kkv62k27r7rzxdjdg3drhfsfrlvi0fm2w9j"; + version = "1.3.2"; + sha256 = "0xcfba8n9zf5m1nb48ilggp03kpki4nv4kx7k7a5w1gxgm6k6j9z"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; - version = "1.2.9"; - sha256 = "0vplw03l0rldqrw98ybm1d8fcglj9zwhxw6j8blhh27x1wdp0x0c"; + version = "1.3.1"; + sha256 = "1xakwnb839dl0qnhqprsnfq8png31iyb0fsngljis5jc8yvb4353"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; - version = "1.2.10"; - sha256 = "12i5glirw23mw15hvnn6jr7wxv2jlg8x88s6izz5f1y81bxcmkk7"; + version = "1.3.1"; + sha256 = "0a79p6i3xiq6svv08c4hhihkvqa2ac7fphi3g9i0cwh47ak0k5h2"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; @@ -51,28 +51,23 @@ }) (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; - version = "1.2.8"; - sha256 = "1zqbhz80q004py8qwd4ma0fm9yd0rkza5r2dap6sfwpvng2c82fj"; + version = "1.3.1"; + sha256 = "165p1246fn628hlwdrx7sanlxa6qqpn480rq1asn5r1602w21844"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Eclair"; - version = "1.2.10"; - sha256 = "1gqnsxbclvbkjhpwxdqpxcvjkzrardxzfkm6fadwa4jr2y5nhdkq"; + version = "1.3.1"; + sha256 = "1vlwm5mw8wffp00xhkx19yavk59b5x540sg81vis3q7hjvvgca5c"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; - version = "1.0.1"; - sha256 = "0b3psykci3jjwx0gbw6zwzsviph40bn46xb21dnd64djbq2iaa6p"; + version = "1.3.1"; + sha256 = "0qga34vi4fzfr0g4qk0ad8xkqdig2ishmdj9i32s5yrrjrkx7c8d"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.LND"; - version = "1.2.14"; - sha256 = "1lmlakpr67zgwx4qm86ylnivkxfyvq2ypjry17pfiwr11z8p5jih"; - }) - (fetchNuGet { - pname = "BTCPayServer.Lightning.Ptarmigan"; - version = "1.2.8"; - sha256 = "1l68n5mk918mfmpr1dkq1m7ql4zc2c4y7vglghna5pfy6jq7ryni"; + version = "1.3.1"; + sha256 = "1b70jlyzy9xjvfywzi6i3l3sd4mkknxpni9akdi0phsfqysmy0wl"; }) (fetchNuGet { pname = "BuildBundlerMinifier"; @@ -839,11 +834,6 @@ version = "6.0.15"; sha256 = "038dcl2k88w4cijws3pdnjflgy4lmqx70z0l7yqz355kmxjz8ain"; }) - (fetchNuGet { - pname = "NBitcoin"; - version = "6.0.19"; - sha256 = "1vd9hcavqkh0yhzmwnyyk8yd4i205217k90m7w0lln5vqvmq14kk"; - }) (fetchNuGet { pname = "NBitcoin"; version = "6.0.3"; @@ -854,6 +844,11 @@ version = "6.0.8"; sha256 = "1f90zyrd35fzx0vgvd83jhd6hczd4037h2k198xiyxj04l4m3wm5"; }) + (fetchNuGet { + pname = "NBitcoin"; + version = "7.0.1"; + sha256 = "05kqpjyp3ckb2183g9vfsdv362y5xg5j21p36zls0x3b0jgrwxw7"; + }) (fetchNuGet { pname = "NBitpayClient"; version = "1.0.0.39"; @@ -1091,8 +1086,8 @@ }) (fetchNuGet { pname = "Selenium.WebDriver.ChromeDriver"; - version = "96.0.4664.4500"; - sha256 = "1kfnrimy49mab6v4afkk290djjyldnn683wdj15dax2mv8yxbyxs"; + version = "98.0.4758.10200"; + sha256 = "10mc50gm78zbxrwvxlygzmj2a29liiacv8haax0534c26vj9dwkl"; }) (fetchNuGet { pname = "Selenium.WebDriver"; From 3feee7f66e7c1914c3fa973b50cffccb0b9318a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Feb 2022 14:55:43 +0000 Subject: [PATCH 038/106] hexd: 1.0.0 -> 1.1.0 --- pkgs/tools/misc/hexd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/hexd/default.nix b/pkgs/tools/misc/hexd/default.nix index 467e85128b82..e3a3f79f3268 100644 --- a/pkgs/tools/misc/hexd/default.nix +++ b/pkgs/tools/misc/hexd/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { pname = "hexd"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "FireyFly"; repo = "hexd"; rev = "v${version}"; - sha256 = "1lm0mj5c71id5kpqar8n44023s1kymb3q45nsz0hjh9v7p8libp0"; + sha256 = "sha256-b/dROBQVPEiMBTcu4MTi6Lf6ChkFZqZrJ1V0j54rrFY="; }; makeFlags = [ "PREFIX=$(out)" ]; From 87c1d9f92ce36f139e2ad0d5cef59a88965dd9f9 Mon Sep 17 00:00:00 2001 From: Rasmus Thomsen Date: Fri, 18 Feb 2022 11:15:42 +0100 Subject: [PATCH 039/106] bada-bib: 0.4.1 -> 0.5.1 --- pkgs/applications/science/misc/bada-bib/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/misc/bada-bib/default.nix b/pkgs/applications/science/misc/bada-bib/default.nix index 356630329bbe..bd2f94ac4a74 100644 --- a/pkgs/applications/science/misc/bada-bib/default.nix +++ b/pkgs/applications/science/misc/bada-bib/default.nix @@ -9,15 +9,15 @@ , glib , gnome , gobject-introspection -, gtk3 +, gtk4 , libxml2 , pkg-config , python3Packages -, wrapGAppsHook }: +, wrapGAppsHook4 }: python3Packages.buildPythonApplication rec { pname = "bada-bib"; - version = "0.4.1"; + version = "0.5.1"; format = "other"; strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { owner = "RogerCrocker"; repo = "BadaBib"; rev = "v${version}"; - sha256 = "sha256-kub2lLauru2RrinzxMDyBVC0htPx0Niv/M6bbmTS7Hk="; + sha256 = "sha256-tb/720WPqcO4w1EMmidjtEidsjZ0dEhe+/vnJPM6kxo="; }; nativeBuildInputs = [ @@ -35,13 +35,13 @@ python3Packages.buildPythonApplication rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ gdk-pixbuf glib - gtk3 + gtk4 ]; checkInputs = [ From c19d2d6c3db22e75cec1e2b8fe10db09a510295b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Feb 2022 17:32:19 +0000 Subject: [PATCH 040/106] resvg: 0.21.0 -> 0.22.0 --- pkgs/tools/graphics/resvg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/resvg/default.nix b/pkgs/tools/graphics/resvg/default.nix index 67fe03728463..431814047147 100644 --- a/pkgs/tools/graphics/resvg/default.nix +++ b/pkgs/tools/graphics/resvg/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "resvg"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - sha256 = "sha256-I0I6gb2jG0ZeEp6WwDipe43wuek43CWm0zGBX2hAros="; + sha256 = "sha256-3WFzLyg6335twcAMIjzza9r45ljcFlAzvTqyqXOfs1A="; }; - cargoSha256 = "sha256-EdbyaVrHjjVUNmQM96VKCeU3ss1G/N4OZxFMLvFgRqY="; + cargoSha256 = "sha256-twKiuxRpsiJu+hHrg6kUclX9+BWPUop492C+CkwQF2k="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; From e9bbf66080754975eb932180df0ec580cf08dc5b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Feb 2022 18:25:43 +0000 Subject: [PATCH 041/106] shadowsocks-rust: 1.13.2 -> 1.13.3 --- pkgs/tools/networking/shadowsocks-rust/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix index 8c14352c05db..e30319d14828 100644 --- a/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; - version = "1.13.2"; + version = "1.13.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "shadowsocks"; repo = pname; - sha256 = "sha256-4lOEft1uiGN7OgFQzSn+QV8/wHl+W2yM3RAc5t8bUtk="; + sha256 = "sha256-h0sSNN+039zstxmGWCnbn31xBzZaQhLSnxlyeoNRaGM="; }; - cargoSha256 = "sha256-NKq/lnpGrCLZjWdKquysoi25SsFtmtDrPIioDgQoMjw="; + cargoSha256 = "sha256-vT+bx616aZ4VtAOh3p7U9hWgFskxskR5+M7CrSqoa9Y="; RUSTC_BOOTSTRAP = 1; From 0450d5dda8f82a71c863fdba7888c5e6ed6deeb3 Mon Sep 17 00:00:00 2001 From: Kevin Amado Date: Mon, 21 Feb 2022 19:01:41 -0500 Subject: [PATCH 042/106] alejandra: 0.3.1 -> 0.4.0 --- pkgs/tools/nix/alejandra/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/nix/alejandra/default.nix b/pkgs/tools/nix/alejandra/default.nix index d1ad257568ff..6af7fd8bc611 100644 --- a/pkgs/tools/nix/alejandra/default.nix +++ b/pkgs/tools/nix/alejandra/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "alejandra"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "kamadorueda"; repo = "alejandra"; rev = version; - sha256 = "sha256-IQ+hv/R6uRPEPr7+SRXyYol4/cQo1ZqcqJxy26CpOoY="; + sha256 = "sha256-vMfCEX0DqxT4yC4qPJEoAENUj0pHfsXnLaZaBfzYXJo="; }; - cargoSha256 = "sha256-PIqdjtqbSVQoxLj5jGSbrzRQ3qddZvp1Y7tIuFs7UEg="; + cargoSha256 = "sha256-wsH9zsAYSuBeyyr8KBFOEMb0qlqC5cDAIoKgTaJA6eI="; passthru.tests = { version = testVersion { package = alejandra; }; From cd8dfd140ce52c6552048093b5092023d4bf27fb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 00:46:42 +0000 Subject: [PATCH 043/106] python310Packages.subarulink: 0.4.2 -> 0.4.3 --- pkgs/development/python-modules/subarulink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix index 24678319b04a..ab514735ec26 100644 --- a/pkgs/development/python-modules/subarulink/default.nix +++ b/pkgs/development/python-modules/subarulink/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "subarulink"; - version = "0.4.2"; + version = "0.4.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "G-Two"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EI7m2SFa1eAtncMA0g1OmXumzub4UvE6ssGfUGtLO2Q="; + sha256 = "sha256-q+a+OFFMAGl8KQi+KZ8h21+Pj0XEqP9ZIJii2PCgD6E="; }; propagatedBuildInputs = [ From 0d033358d6fcbed3a1cf0864e0acddbb06ed74b3 Mon Sep 17 00:00:00 2001 From: betaboon Date: Mon, 21 Feb 2022 09:32:44 +0100 Subject: [PATCH 044/106] python3Packages.pivy: fix build --- pkgs/development/python-modules/pivy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix index 6637198b5643..092bcbfcfd9d 100644 --- a/pkgs/development/python-modules/pivy/default.nix +++ b/pkgs/development/python-modules/pivy/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { doCheck = false; postPatch = '' - substituteInPlace CMakeLists.txt --replace \$'{SoQt_INCLUDE_DIRS}' \ + substituteInPlace distutils_cmake/CMakeLists.txt --replace \$'{SoQt_INCLUDE_DIRS}' \ \$'{Coin_INCLUDE_DIR}'\;\$'{SoQt_INCLUDE_DIRS}' ''; From d4dc5559857ea6132a557b570809ee7f8edf7c12 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 26 Jan 2022 12:31:28 +1000 Subject: [PATCH 045/106] aardvark-dns: init at 1.0.0 --- .../tools/networking/aardvark-dns/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/tools/networking/aardvark-dns/default.nix diff --git a/pkgs/tools/networking/aardvark-dns/default.nix b/pkgs/tools/networking/aardvark-dns/default.nix new file mode 100644 index 000000000000..fd557ba24112 --- /dev/null +++ b/pkgs/tools/networking/aardvark-dns/default.nix @@ -0,0 +1,36 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "aardvark-dns"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "containers"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-RFA/C0Q4u1WMQ0bsFKbkyzar0vDRfQ6YPpu/Np3xXWA="; + }; + + cargoVendorDir = "vendor"; + + preBuild = '' + rm build.rs + + export \ + VERGEN_BUILD_SEMVER="${version}" \ + VERGEN_BUILD_TIMESTAMP="$SOURCE_DATE_EPOCH" \ + VERGEN_GIT_SHA="${src.rev}" \ + VERGEN_RUSTC_HOST_TRIPLE="" + ''; + + meta = with lib; { + description = "Authoritative dns server for A/AAAA container records"; + homepage = "https://github.com/containers/aardvark-dns"; + license = licenses.asl20; + maintainers = with maintainers; [ ] ++ teams.podman.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d91bcffde8b0..758d4d3e45bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -879,6 +879,8 @@ with pkgs; _9pfs = callPackage ../tools/filesystems/9pfs { }; + aardvark-dns = callPackage ../tools/networking/aardvark-dns { }; + a2ps = callPackage ../tools/text/a2ps { }; abcm2ps = callPackage ../tools/audio/abcm2ps { }; From 74b10859829153d5c5d50f7c77b86763759e8654 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 22 Jan 2022 17:09:34 +1000 Subject: [PATCH 046/106] netavark: init at 1.0.0 --- pkgs/tools/networking/netavark/default.nix | 48 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/tools/networking/netavark/default.nix diff --git a/pkgs/tools/networking/netavark/default.nix b/pkgs/tools/networking/netavark/default.nix new file mode 100644 index 000000000000..e29acd23dc41 --- /dev/null +++ b/pkgs/tools/networking/netavark/default.nix @@ -0,0 +1,48 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, installShellFiles +, mandown +}: + +rustPlatform.buildRustPackage rec { + pname = "netavark"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "containers"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-E3Mdrc8/IwuOOwwVf4LaLrNFzuO95MEvy8BbStQRgoE="; + }; + + cargoVendorDir = "vendor"; + + preBuild = '' + substituteInPlace Cargo.toml \ + --replace 'build = "build.rs"' "" + + rm build.rs + + export \ + VERGEN_BUILD_SEMVER="${version}" \ + VERGEN_BUILD_TIMESTAMP="$SOURCE_DATE_EPOCH" \ + VERGEN_GIT_SHA="${src.rev}" \ + VERGEN_RUSTC_HOST_TRIPLE="" + ''; + + nativeBuildInputs = [ installShellFiles mandown ]; + + postBuild = '' + make -C docs + installManPage docs/*.1 + ''; + + meta = with lib; { + description = "Rust based network stack for containers"; + homepage = "https://github.com/containers/netavark"; + license = licenses.asl20; + maintainers = with maintainers; [ ] ++ teams.podman.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 758d4d3e45bc..2afc3d838382 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8062,6 +8062,8 @@ with pkgs; netatalk = callPackage ../tools/filesystems/netatalk { }; + netavark = callPackage ../tools/networking/netavark { }; + netcdf = callPackage ../development/libraries/netcdf { hdf5 = hdf5.override { usev110Api = true; }; }; From 73a0253df156299e65d7db76e7f86e64dede68a0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 02:00:58 +0000 Subject: [PATCH 047/106] bemenu: 0.6.6 -> 0.6.7 --- pkgs/applications/misc/bemenu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix index 0464ec5828d4..e92bd4b82ad0 100644 --- a/pkgs/applications/misc/bemenu/default.nix +++ b/pkgs/applications/misc/bemenu/default.nix @@ -11,13 +11,13 @@ assert x11Support -> xorg != null; stdenv.mkDerivation rec { pname = "bemenu"; - version = "0.6.6"; + version = "0.6.7"; src = fetchFromGitHub { owner = "Cloudef"; repo = pname; rev = version; - sha256 = "sha256-687/v3YvRXbop5EouXS5/aI5P+o0QgpWlUCVzDG8jzM="; + sha256 = "sha256-cUkSXEB92I0UYTobQzUb2so1MUXJkryAqrmASx9RMF0="; }; nativeBuildInputs = [ pkg-config pcre ]; From c908f448da09a6b9bc461932c95e0c7ae3fcee1e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 02:08:59 +0000 Subject: [PATCH 048/106] python310Packages.hahomematic: 0.35.0 -> 0.35.1 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 656b89ab7b53..e34887b1e837 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "0.35.0"; + version = "0.35.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "sha256-VgtdnKj+TlAsFr1un6eMlYfumap4mwE8H4kkKAUrxfo="; + sha256 = "sha256-ZQwL++j7wIaBYkLDAxUH2jhzxvf40tjgUPTZR4kySNk="; }; propagatedBuildInputs = [ From 759245748cf570876f0eb4ea966388814bf9e4ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 02:13:00 +0000 Subject: [PATCH 049/106] python310Packages.pyswitchbot: 0.13.2 -> 0.13.3 --- pkgs/development/python-modules/pyswitchbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index 96037d512838..bd2d5cc74c59 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.13.2"; + version = "0.13.3"; format = "setuptools"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = version; - sha256 = "0pdmssd5dr364p3lrkxqryjc0rbaw6xp724zwqf3i87qs6ljs928"; + sha256 = "sha256-Zgpnw4It3yyy9RQqt5SxeJXl1Z3J3Rp9baLfiw5Bgow="; }; propagatedBuildInputs = [ From ef27286f781d8ec92012066b5731656f2cceffc9 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 22 Feb 2022 02:19:12 +0000 Subject: [PATCH 050/106] =?UTF-8?q?vala=5F0=5F48:=200.48.22=20=E2=86=92=20?= =?UTF-8?q?0.48.23?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/vala/raw/0.48.23/NEWS --- pkgs/development/compilers/vala/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 17ba5b14214c..8a96c02f683c 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -87,8 +87,8 @@ let in rec { vala_0_48 = generic { - version = "0.48.22"; - sha256 = "sha256-27NHjEvjZvCTFkrGHNOu29zz5EQE2eNkFK4VEk525os="; + version = "0.48.23"; + sha256 = "sha256-3jzIWNmV4HR0IZ4lo+Hw7ZmAcNLiBtOjE9Q3ml93oGo="; }; vala_0_52 = generic { From a3a73e8d8dec0061a087543a765201a78452ae01 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 02:20:59 +0000 Subject: [PATCH 051/106] python310Packages.pex: 2.1.66 -> 2.1.67 --- pkgs/development/python-modules/pex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index ba6fd3cb7f8e..5e47b69ac774 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.66"; + version = "2.1.67"; format = "flit"; src = fetchPypi { inherit pname version; - sha256 = "sha256-FYDudoCgxk2wkjPVXTnzHzCQRwtHmgJS+2mwoKbj3Ms="; + sha256 = "sha256-rtxHRuZ30S81pdWUvQnSImcEX6/vCY/pvKFNY7sJaBw="; }; nativeBuildInputs = [ From 61f9295f1164e51d08ad5261bf45a40fba85cbae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 02:30:13 +0000 Subject: [PATCH 052/106] python310Packages.rki-covid-parser: 1.3.2 -> 1.3.3 --- pkgs/development/python-modules/rki-covid-parser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rki-covid-parser/default.nix b/pkgs/development/python-modules/rki-covid-parser/default.nix index 83b8d9319f26..928723897b5d 100644 --- a/pkgs/development/python-modules/rki-covid-parser/default.nix +++ b/pkgs/development/python-modules/rki-covid-parser/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "rki-covid-parser"; - version = "1.3.2"; + version = "1.3.3"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "thebino"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lJFeGg34L+hmH/ZhTx7FGir/9dK/rviaGveOl2HgNlM="; + sha256 = "sha256-e0MJjE4zgBPL+vt9EkgsdGrgqUyKK/1S9ZFxy56PUjc="; }; propagatedBuildInputs = [ From 7143f443af4866875252e96378c4569827f3df52 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 04:17:35 +0000 Subject: [PATCH 053/106] ddosify: 0.7.3 -> 0.7.4 --- pkgs/development/tools/ddosify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ddosify/default.nix b/pkgs/development/tools/ddosify/default.nix index 91ce1bb08719..a313cc512224 100644 --- a/pkgs/development/tools/ddosify/default.nix +++ b/pkgs/development/tools/ddosify/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ddosify"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-urls47jS9Vu64PC/Ie+UTDfg17krs+UegqKub1QaYK4="; + sha256 = "sha256-LIk23TZiLP2FEeHVEtd3CCUgBJ9YijclpFLyDhv6zRA="; }; vendorSha256 = "sha256-lbo9P2UN9TmUAqyhFdbOHWokoAogVQZihpcOlhmumxU="; From f20f185b8f6e8c180fe42fb6c231cd809657652a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 22 Feb 2022 04:20:00 +0000 Subject: [PATCH 054/106] git-gone: 0.3.7 -> 0.3.8 --- .../git-and-tools/git-gone/default.nix | 35 ++++++++++--------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix index 47d6cc023b80..449634ae6992 100644 --- a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix @@ -1,36 +1,39 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, makeWrapper, openssl, git, libiconv, Security, installShellFiles }: +{ lib +, stdenv +, fetchFromGitea +, rustPlatform +, libiconv +, Security +, installShellFiles +}: rustPlatform.buildRustPackage rec { pname = "git-gone"; - version = "0.3.7"; + version = "0.3.8"; - src = fetchFromGitHub { - owner = "lunaryorn"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "flausch"; repo = pname; rev = "v${version}"; - sha256 = "0hhy1yazda9r4n753a5m9jf31fbzmm4v8wvl3pksspj2syglmll8"; + sha256 = "sha256-hKbq2rJwEZI3391RsZXsQSjjp7rSqglUckRDYAu42KE="; }; - cargoSha256 = "0mbc1742szpxnqqah6q0yhkn4fyyxqzg830bd1vzr07v273wr06r"; + cargoSha256 = "sha256-gBQ4V8Bwx6Di8aVnOYwx0UZZIIOFxZAXT7Tl1Yli0Fk="; - nativeBuildInputs = [ pkg-config makeWrapper installShellFiles ]; + nativeBuildInputs = [ installShellFiles ]; - buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; postInstall = '' installManPage git-gone.1 ''; - postFixup = '' - wrapProgram $out/bin/git-gone --prefix PATH : "${lib.makeBinPath [ git ]}" - ''; - meta = with lib; { - description = "Cleanup stale Git branches of pull requests"; - homepage = "https://github.com/lunaryorn/git-gone"; + description = "Cleanup stale Git branches of merge requests"; + homepage = "https://codeberg.org/flausch/git-gone"; + changelog = "https://codeberg.org/flausch/git-gone/raw/tag/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = [ maintainers.marsam ]; - platforms = platforms.unix; }; } From f879d400d62e3e1eef8d52b9e63636bbab59be8f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 04:24:30 +0000 Subject: [PATCH 055/106] python310Packages.azure-mgmt-containerservice: 16.4.0 -> 17.0.0 --- .../python-modules/azure-mgmt-containerservice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index b9e75eca44c3..57fe4655aeec 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "16.4.0"; + version = "17.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "23a8047668ebd1fa7c3c2445eba4e69c07675306e2a94ae6a3e455df162bd008"; + sha256 = "sha256-oUbWdZryabCCg/gTujchT7p1nS7IDoU5W9MQ4ekJYH8="; }; propagatedBuildInputs = [ From da6aa1a265003fcd86e8b6843c4275b742440dd1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 05:49:50 +0000 Subject: [PATCH 056/106] fselect: 0.7.9 -> 0.8.0 --- pkgs/tools/misc/fselect/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fselect/default.nix b/pkgs/tools/misc/fselect/default.nix index c02ceaac119c..fbdb90b12b70 100644 --- a/pkgs/tools/misc/fselect/default.nix +++ b/pkgs/tools/misc/fselect/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fselect"; - version = "0.7.9"; + version = "0.8.0"; src = fetchFromGitHub { owner = "jhspetersson"; repo = "fselect"; rev = version; - sha256 = "sha256-Z1F63tMO3qzi/PrdVR0WCcPXx5E6PwjYPF99Bolnxc8="; + sha256 = "sha256-nFfzvTCiNlv+EzK51w04JHh8tfsim/8hFCxnZZue5No="; }; - cargoSha256 = "sha256-tGzfIQ4nAFA/mXPL6cOaz97W5tjtPGsmbTSkUDFSAzY="; + cargoSha256 = "sha256-B7uJ9hLN/WhLA/bqoO7WZ38tN0tDMZ2KW/vjfOgcQ3A="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optional stdenv.isDarwin libiconv; From 86b9be78430de76bd944d35bdb794c773174d06c Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 22 Feb 2022 02:20:13 +0000 Subject: [PATCH 057/106] vala_0_52: drop Reaches end of life according to https://wiki.gnome.org/Projects/Vala --- pkgs/development/compilers/vala/default.nix | 7 ------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 8 deletions(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 8a96c02f683c..1dc910c62227 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -18,8 +18,6 @@ let { "0.48" = ./disable-graphviz-0.46.1.patch; - "0.52" = ./disable-graphviz-0.46.1.patch; - "0.54" = ./disable-graphviz-0.46.1.patch; }.${lib.versions.majorMinor version} or (throw "no graphviz patch for this version of vala"); @@ -91,11 +89,6 @@ in rec { sha256 = "sha256-3jzIWNmV4HR0IZ4lo+Hw7ZmAcNLiBtOjE9Q3ml93oGo="; }; - vala_0_52 = generic { - version = "0.52.10"; - sha256 = "sha256-nCAb+BLZh04hveU/jZwU9lF0ixqBRB/1ySkSJESQEAg="; - }; - vala_0_54 = generic { version = "0.54.6"; sha256 = "SdYNlqP99sQoc5dEK8bW2Vv0CqffZ47kkSjEsRum5Gk="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f750ddb10ce7..30f3c73c218b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13416,7 +13416,6 @@ with pkgs; inherit (callPackage ../development/compilers/vala { }) vala_0_48 - vala_0_52 vala_0_54 vala; From 0010bbc46515ad9e4b9f84265aed135b0d7bb1af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 15 Feb 2022 07:14:51 +0000 Subject: [PATCH 058/106] python3Packages.pytube: 11.0.2 -> 12.0.0 --- pkgs/development/python-modules/pytube/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytube/default.nix b/pkgs/development/python-modules/pytube/default.nix index d2c8be795f1d..d00d26f1bae2 100644 --- a/pkgs/development/python-modules/pytube/default.nix +++ b/pkgs/development/python-modules/pytube/default.nix @@ -7,21 +7,30 @@ buildPythonPackage rec { pname = "pytube"; - version = "11.0.2"; + version = "12.0.0"; disabled = pythonOlder "3.6"; + format = "setuptools"; + src = fetchFromGitHub { owner = "pytube"; repo = "pytube"; rev = "v${version}"; - hash = "sha256-3HrkhlwV8OLqbzC6QgddLB1fQxWbwCQ6STCgUXlr5So="; + hash = "sha256-1zoLd4J7aCR5omMpCZhlttWDu7mYyKCypH3JEB4VGXg="; }; checkInputs = [ pytestCheckHook ]; + disabledTestPaths = [ + "tests/test_extract.py" + "tests/test_query.py" + "tests/test_streams.py" + "tests/test_main.py" + ]; + pythonImportsCheck = [ "pytube" ]; meta = with lib; { From e1a362eb388cc7568503e6defb268e8cced6f4e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 19 Feb 2022 08:18:27 +0000 Subject: [PATCH 059/106] python3Packages.async-lru: unstable-2020-10-24 -> unstable-2022-02-03 --- pkgs/development/python-modules/async-lru/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/async-lru/default.nix b/pkgs/development/python-modules/async-lru/default.nix index 8a5694ffde77..9dc412ccde86 100644 --- a/pkgs/development/python-modules/async-lru/default.nix +++ b/pkgs/development/python-modules/async-lru/default.nix @@ -8,19 +8,19 @@ buildPythonPackage rec { pname = "async-lru"; - version = "unstable-2020-10-24"; + version = "unstable-2022-02-03"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "aio-libs"; repo = "async-lru"; - rev = "ae252508f9c5aecf9c02ddeb879d06c28dbffc42"; - sha256 = "1gk5qzdvhl2j1mw7xzchbw7bcgk9mzhvqa62nwwmvlbnx88pkwnc"; + rev = "3574af7691371015c47faf77e0abf8c7b06a3cdc"; + hash = "sha256-EsadpQlRNnebp0UUybzQwzyK4zwFlortutv3VTUsprU="; }; postPatch = '' - sed -i '/^addopts/d' setup.cfg + sed -i -e '/^addopts/d' -e '/^filterwarnings/,+2d' setup.cfg ''; checkInputs = [ From 0ec19bc5b71472fd69034c8af4aca74f5679027e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 06:58:03 +0000 Subject: [PATCH 060/106] gvm-libs: 21.4.3 -> 21.4.4 --- pkgs/development/libraries/gvm-libs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gvm-libs/default.nix b/pkgs/development/libraries/gvm-libs/default.nix index 63692ca7de0e..a141d36e3300 100644 --- a/pkgs/development/libraries/gvm-libs/default.nix +++ b/pkgs/development/libraries/gvm-libs/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "gvm-libs"; - version = "21.4.3"; + version = "21.4.4"; src = fetchFromGitHub { owner = "greenbone"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1NVLGyUDUnOy3GYDtVyhGTvWOYoWp95EbkgTlFWuxE8="; + sha256 = "sha256-Ps8J9JuLKcrowl9wgZ3Wm7JTXyiejQPDr4OV/IvDy+I="; }; nativeBuildInputs = [ From f122e9550c93c8995d3552c187ba53024b0fc3e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 21 Feb 2022 18:37:52 +0000 Subject: [PATCH 061/106] python3Packages.imap-tools: 0.51.0 -> 0.51.1 https://github.com/ikvk/imap_tools/releases/tag/v0.51.1 --- pkgs/development/python-modules/imap-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix index 59de3b3f3ff0..866721b09f5b 100644 --- a/pkgs/development/python-modules/imap-tools/default.nix +++ b/pkgs/development/python-modules/imap-tools/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "0.51.0"; + version = "0.51.1"; disabled = isPy27; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "ikvk"; repo = "imap_tools"; rev = "v${version}"; - hash = "sha256-ZJen+hpNpeZjScD7aqdaW796KRlJ8K1JBXPOagpceXk="; + hash = "sha256-ppxQtFK7U006z7qonm3B5gN99CHB9mEX3l0XjrhZQo8="; }; checkInputs = [ From 67027010941515b4419244ed161dd0f655f959aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 16 Feb 2022 01:27:42 +0000 Subject: [PATCH 062/106] abcmidi: 2022.01.28 -> 2022.02.13 --- pkgs/tools/audio/abcmidi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 7237ba880cef..87b8940026a0 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2022.01.28"; + version = "2022.02.13"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - hash = "sha256-+g5oKUfm6vRuRQfOx0QDueYMabgScL8Mfw5GJcXQztg="; + hash = "sha256-iPeGcEDGvltXqJY50B+yDKYKRF4Oz9GQifn7Pqe8dG8="; }; meta = with lib; { From 4956aa9a01d2dd6dce1ac51b80ffd22a5ffa7f1f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 07:39:46 +0000 Subject: [PATCH 063/106] imgproxy: 3.2.2 -> 3.3.0 --- pkgs/servers/imgproxy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix index a7c20d112096..29b33cd66104 100644 --- a/pkgs/servers/imgproxy/default.nix +++ b/pkgs/servers/imgproxy/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "imgproxy"; - version = "3.2.2"; + version = "3.3.0"; src = fetchFromGitHub { owner = pname; repo = pname; - sha256 = "sha256-z1Vt6rTpQ9sSwT+hr4wGZmZl55MyDx1AIDqSWmCXbMc="; + sha256 = "sha256-8oUPqtoxdJ768CmDNBicBGCyejt2v9GIahVRL6pYDJ4="; rev = "v${version}"; }; - vendorSha256 = "sha256-MHcV6n6uZsjC85vQVl+o6JD+psvE2xuPr//3RueT8V0="; + vendorSha256 = "sha256-Dr5qCLVsv22BcISo2OyB+VEDncPwpcp323w9IfDTQv0="; doCheck = false; From acc9c35df0f71723c5b67bbf2426f8a3dc786a96 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Feb 2022 08:43:59 +0100 Subject: [PATCH 064/106] python3Packages.pyswitchbot: disable on older Python releases --- pkgs/development/python-modules/pyswitchbot/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index bd2d5cc74c59..38e7e2733ead 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -2,6 +2,7 @@ , bluepy , buildPythonPackage , fetchFromGitHub +, pythonOlder }: buildPythonPackage rec { @@ -9,11 +10,13 @@ buildPythonPackage rec { version = "0.13.3"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = version; - sha256 = "sha256-Zgpnw4It3yyy9RQqt5SxeJXl1Z3J3Rp9baLfiw5Bgow="; + hash = "sha256-Zgpnw4It3yyy9RQqt5SxeJXl1Z3J3Rp9baLfiw5Bgow="; }; propagatedBuildInputs = [ From 6a353243b8cf5fe3dc0a41e7182910ae137a4f9a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 08:03:27 +0000 Subject: [PATCH 065/106] jackett: 0.20.596 -> 0.20.604 --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 799b812047dc..282ee8e9f85b 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.20.596"; + version = "0.20.604"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "wIJSqsIb3/SOicjLgnv0Lt3Wv1qKPHslRcDlZCvckUs="; + sha256 = "a2hJOu/TvT+6mQEt+9JB4l/Niz2+r8JuxANv4JUSM6U="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; From 206f3e74ddda6e53fcc8db05cce571e597b46a9f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Feb 2022 09:03:14 +0100 Subject: [PATCH 066/106] python3Packages.adafruit-platformdetect: 3.19.2 -> 3.20.0 --- .../python-modules/adafruit-platformdetect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index a93137f136b8..da4ac528d1a6 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.19.6"; + version = "3.20.0"; format = "setuptools"; src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - sha256 = "sha256-Y9g0A9pVjEVcITyaQsyAew6rraTPwZuevSsDD46c0DM="; + sha256 = "sha256-bbzEI/Ig7yQn4/fRmX8tIe6UL+J8iV1TbrCXBU+oLms="; }; nativeBuildInputs = [ From 56d6192bfd3f53cf4189782d985e847665504e92 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Feb 2022 09:47:30 +0100 Subject: [PATCH 067/106] checkov: 2.0.875 -> 2.0.885 --- pkgs/development/tools/analysis/checkov/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 79efb55f0810..392c05de37d3 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -32,13 +32,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.875"; + version = "2.0.885"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-ZM554FZayuxxf9dgbGcvfPoXm5rWjjZoNySnKpxRO/w="; + hash = "sha256-jhZ2LdCb7+4SMXcoWw9hKT77Qdiw+HWff0jkkvaci28="; }; nativeBuildInputs = with py.pkgs; [ @@ -106,11 +106,12 @@ buildPythonApplication rec { "TestSarifReport" # Will probably be fixed in one of the next releases "test_valid_cyclonedx_bom" - "test_record_relative_path_with_direct_oberlay" - "test_record_relative_path_with_direct_prod2_oberlay" + "test_record_relative_path_with" + "test_record_relative_path_with_relative_dir" # Requires prettytable release which is only available in staging "test_skipped_check_exists" - "test_record_relative_path_with_relative_dir" + # AssertionError: 0 not greater than 0 + "test_skip_mapping_default" ]; disabledTestPaths = [ From ff916c7e607b9975aad28eff0d13c366caa12fc2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 08:53:26 +0000 Subject: [PATCH 068/106] python310Packages.cloudsmith-api: 1.8.2 -> 1.30.0 --- pkgs/development/python-modules/cloudsmith-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cloudsmith-api/default.nix b/pkgs/development/python-modules/cloudsmith-api/default.nix index 0e1aca73522e..517f3b99befd 100644 --- a/pkgs/development/python-modules/cloudsmith-api/default.nix +++ b/pkgs/development/python-modules/cloudsmith-api/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "cloudsmith-api"; - version = "1.8.2"; + version = "1.30.0"; format = "wheel"; src = fetchPypi { pname = "cloudsmith_api"; inherit format version; - sha256 = "f00410210f0efa1af7a2d344deafc12b946e3efc7d5c8374b27dc67ed8580183"; + sha256 = "sha256-IKxeNAMJTMCpP/jz7lHuetHCpddypgYdCKQcI/9pIj8="; }; propagatedBuildInputs = [ From 5497715d1d8675b13850336ffd975815eec0f8ae Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Tue, 22 Feb 2022 09:23:26 +0000 Subject: [PATCH 069/106] exploitdb: 2022-02-19 -> 2022-02-22 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index fc92019292d4..806a4a488bdc 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2022-02-19"; + version = "2022-02-22"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-cHAvExbZqqLGPRsa578Po1G3uX2EIcx/visOB0RgNQc="; + sha256 = "sha256-gCvxIMM1fBUhU03LnBaS+wOgr45C9Wjz5ahgT+DEZnI="; }; nativeBuildInputs = [ makeWrapper ]; From 95ca2ce47a571fb6683574c48f79c135eeb441c2 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Thu, 16 Sep 2021 09:23:29 +0200 Subject: [PATCH 070/106] lispPackages.mmap: init at 20201220-git --- .../quicklisp-to-nix-output/mmap.nix | 33 +++++++++++++++++++ .../lisp-modules/quicklisp-to-nix-systems.txt | 1 + .../lisp-modules/quicklisp-to-nix.nix | 14 ++++++++ 3 files changed, 48 insertions(+) create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/mmap.nix diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mmap.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mmap.nix new file mode 100644 index 000000000000..f5425cf549ff --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mmap.nix @@ -0,0 +1,33 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "mmap"; + version = "20201220-git"; + + description = "Portable mmap (file memory mapping) utility library."; + + deps = [ args."alexandria" args."babel" args."cffi" args."documentation-utils" args."trivial-features" args."trivial-indent" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/mmap/2020-12-20/mmap-20201220-git.tgz"; + sha256 = "147xw351xh90k3yvc1fn7k418afmgngd56i8a6d7p41fzs54g6ij"; + }; + + packageName = "mmap"; + + asdFilesToKeep = ["mmap.asd"]; + overrides = x: x; +} +/* (SYSTEM mmap DESCRIPTION + Portable mmap (file memory mapping) utility library. SHA256 + 147xw351xh90k3yvc1fn7k418afmgngd56i8a6d7p41fzs54g6ij URL + http://beta.quicklisp.org/archive/mmap/2020-12-20/mmap-20201220-git.tgz MD5 + e2dbeb48b59735bd2ed54ea7f9cdfe0f NAME mmap FILENAME mmap DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME cffi FILENAME cffi) + (NAME documentation-utils FILENAME documentation-utils) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-indent FILENAME trivial-indent)) + DEPENDENCIES + (alexandria babel cffi documentation-utils trivial-features trivial-indent) + VERSION 20201220-git SIBLINGS (mmap-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt index 4eb9be0b972e..81859abaf464 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -178,6 +178,7 @@ mgl-pax minheap misc-extensions mk-string-metrics +mmap moptilities more-conditions mt19937 diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix index 60338d0ea091..55081a5ccd0c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -2702,6 +2702,20 @@ let quicklisp-to-nix-packages = rec { })); + "mmap" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."mmap" or (x: {})) + (import ./quicklisp-to-nix-output/mmap.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "documentation-utils" = quicklisp-to-nix-packages."documentation-utils"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; + })); + + "mk-string-metrics" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."mk-string-metrics" or (x: {})) From 74f880ab5823cd98a587ac628881896b786c9e8c Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Sat, 25 Sep 2021 13:23:39 +0200 Subject: [PATCH 071/106] lispPackages.slynk: init at sly-20210411-git --- .../quicklisp-to-nix-output/slynk.nix | 30 +++++++++++++++++++ .../lisp-modules/quicklisp-to-nix-systems.txt | 1 + .../lisp-modules/quicklisp-to-nix.nix | 8 +++++ 3 files changed, 39 insertions(+) create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/slynk.nix diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/slynk.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/slynk.nix new file mode 100644 index 000000000000..02b641043eca --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/slynk.nix @@ -0,0 +1,30 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "slynk"; + version = "sly-20210411-git"; + + parasites = [ "slynk/arglists" "slynk/fancy-inspector" "slynk/indentation" "slynk/mrepl" "slynk/package-fu" "slynk/profiler" "slynk/retro" "slynk/stickers" "slynk/trace-dialog" ]; + + description = "System lacks description"; + + deps = [ ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/sly/2021-04-11/sly-20210411-git.tgz"; + sha256 = "1a96aapsz3fhnnnb8njn8v2ddrh6kwisppd90cc7v8knh043xgks"; + }; + + packageName = "slynk"; + + asdFilesToKeep = ["slynk.asd"]; + overrides = x: x; +} +/* (SYSTEM slynk DESCRIPTION System lacks description SHA256 + 1a96aapsz3fhnnnb8njn8v2ddrh6kwisppd90cc7v8knh043xgks URL + http://beta.quicklisp.org/archive/sly/2021-04-11/sly-20210411-git.tgz MD5 + 7f0ff6b8a07d23599c77cd33c6d59ea6 NAME slynk FILENAME slynk DEPS NIL + DEPENDENCIES NIL VERSION sly-20210411-git SIBLINGS NIL PARASITES + (slynk/arglists slynk/fancy-inspector slynk/indentation slynk/mrepl + slynk/package-fu slynk/profiler slynk/retro slynk/stickers + slynk/trace-dialog)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt index 81859abaf464..d723903c0ee3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -208,6 +208,7 @@ salza2 serapeum simple-date simple-date-time +slynk smart-buffer smug spinneret diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix index 55081a5ccd0c..a43351b1aff1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -2338,6 +2338,14 @@ let quicklisp-to-nix-packages = rec { })); + "slynk" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."slynk" or (x: {})) + (import ./quicklisp-to-nix-output/slynk.nix { + inherit fetchurl; + })); + + "simple-date-time" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."simple-date-time" or (x: {})) From f93c58512ce886f26d3fa0b25b7a0c176f6dd8d8 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 22 Feb 2022 11:24:12 +0100 Subject: [PATCH 072/106] python3Packages.uvloop: fix build on aarch64-darwin by disabling broken test --- pkgs/development/python-modules/uvloop/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix index 41a0972a3155..72ede5dc1716 100644 --- a/pkgs/development/python-modules/uvloop/default.nix +++ b/pkgs/development/python-modules/uvloop/default.nix @@ -53,6 +53,8 @@ buildPythonPackage rec { ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ # Flaky test: https://github.com/MagicStack/uvloop/issues/412 "--deselect" "tests/test_tcp.py::Test_UV_TCPSSL::test_shutdown_timeout_handler_not_set" + # Broken: https://github.com/NixOS/nixpkgs/issues/160904 + "--deselect" "tests/test_context.py::Test_UV_Context::test_create_ssl_server_manual_connection_lost" ]; disabledTestPaths = [ From 98035afeb8346fbb2d3bab9d875f2ef529f213ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 10:25:39 +0000 Subject: [PATCH 073/106] mdzk: 0.5.0 -> 0.5.1 --- pkgs/applications/misc/mdzk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/mdzk/default.nix b/pkgs/applications/misc/mdzk/default.nix index f4d242346e9e..5e98aca96a72 100644 --- a/pkgs/applications/misc/mdzk/default.nix +++ b/pkgs/applications/misc/mdzk/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdzk"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "mdzk-rs"; repo = "mdzk"; rev = version; - sha256 = "sha256-NkoKQKcww5ktEbxbOY6WP8OemCB+rvXbuN9oSPjLE3Y="; + sha256 = "sha256-UiJ28VI4qXo04WojNaExTVQ3aTIXCQrdMbNM0DDy8A4="; }; - cargoSha256 = "sha256-uJ00tGiKtcYghFUh0fcYg4nZc/o8yhvlVs+6/aRNY5s="; + cargoSha256 = "sha256-CiA8Z1+S6+Lwms70IiRvIN83gValHuy6kHOukR2O7/Q="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; From 60b70fec0b966a4711328703005f69f470a06b39 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 10:50:49 +0000 Subject: [PATCH 074/106] mpd-discord-rpc: 1.2.3 -> 1.3.0 --- pkgs/tools/audio/mpd-discord-rpc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/audio/mpd-discord-rpc/default.nix b/pkgs/tools/audio/mpd-discord-rpc/default.nix index 9b8fc94d2edc..052488dc795b 100644 --- a/pkgs/tools/audio/mpd-discord-rpc/default.nix +++ b/pkgs/tools/audio/mpd-discord-rpc/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "mpd-discord-rpc"; - version = "1.2.3"; + version = "1.3.0"; src = fetchFromGitHub { owner = "JakeStanger"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FkdndkXj48JLKRwZ9lLVQrGU7QvBZvYC9Y2iYS0RiCY="; + sha256 = "sha256-b6V9puPFufQcTI5o88MbHf5+j+agJAr+DPYieVy+T6M="; }; - cargoSha256 = "sha256-w6Usc86yn7mq/wxljSpko/JPnLHmkyeILKa31YsQrFg="; + cargoSha256 = "sha256-U4wbKfRUC0sL9SistPNZjAGuXZB+XD1llAru33EAOHE="; meta = with lib; { description = "Rust application which displays your currently playing song / album / artist from MPD in Discord using Rich Presence"; From 1090fcb7c937e6659f93ffbd7794e9f57de71e42 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 22 Feb 2022 12:04:04 +0100 Subject: [PATCH 075/106] nixos/home-assistant: allow null config value While the documentation said to set this to null, in case an imperative config was supposed to be used, this was not possible with the typing in place. --- nixos/modules/services/home-automation/home-assistant.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix index f4197650ab23..5a40baf7fb14 100644 --- a/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -135,7 +135,7 @@ in { }; config = mkOption { - type = types.submodule { + type = types.nullOr (types.submodule { freeformType = format.type; options = { # This is a partial selection of the most common options, so new users can quickly @@ -244,7 +244,7 @@ in { }; }; }; - }; + }); example = literalExpression '' { homeassistant = { From 0dd8ef5ef7bab2214b3ad2b34ba8466c37e9e078 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 22 Feb 2022 12:07:02 +0100 Subject: [PATCH 076/106] nixos/home-assistant: update package option description Overriding can now happen using module options, which is preferred because it is more discoverable and doesn't require knowledge of overrides in the first place. --- nixos/modules/services/home-automation/home-assistant.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix index 5a40baf7fb14..6022227f6ea8 100644 --- a/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -349,10 +349,6 @@ in { ''; description = '' The Home Assistant package to use. - Override extraPackages or extraComponents in order to add additional dependencies. - If you specify and do not set - to false, overriding extraComponents will have no effect. - Avoid home-assistant.overridePythonAttrs if you use autoExtraComponents. ''; }; From 25db9143c4dcdb2d419ad349f3fc23a40e33dffd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 11:26:19 +0000 Subject: [PATCH 077/106] python310Packages.sphinxext-opengraph: 0.5.1 -> 0.6.0 --- .../python-modules/sphinxext-opengraph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxext-opengraph/default.nix b/pkgs/development/python-modules/sphinxext-opengraph/default.nix index 8b8cb4cdbb53..a64ad184a634 100644 --- a/pkgs/development/python-modules/sphinxext-opengraph/default.nix +++ b/pkgs/development/python-modules/sphinxext-opengraph/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "sphinxext-opengraph"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "wpilibsuite"; repo = "sphinxext-opengraph"; rev = "v${version}"; - sha256 = "sha256-US0UXxcTlN7x5v2ilpL+umTr7tadqthqhvfaQnm7tCc="; + sha256 = "sha256-FLou/Ag+uf6uTjzSAAAFbQScgRtHvMT21ZwlKBYNhlU="; }; propagatedBuildInputs = [ From d76955da6899b4cddcd28e7383f5d67c73fffde3 Mon Sep 17 00:00:00 2001 From: Wout Mertens Date: Tue, 22 Feb 2022 12:35:57 +0100 Subject: [PATCH 078/106] netdata: add protobuf support --- pkgs/tools/system/netdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 79f829ffdfb1..0ae4e77910ef 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, callPackage, fetchFromGitHub, autoreconfHook, pkg-config, makeWrapper , CoreFoundation, IOKit, libossp_uuid , nixosTests -, curl, libcap, libuuid, lm_sensors, zlib +, curl, libcap, libuuid, lm_sensors, zlib, protobuf , withCups ? false, cups , withDBengine ? true, libuv, lz4, judy , withIpmi ? (!stdenv.isDarwin), freeipmi @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ]; - buildInputs = [ curl.dev zlib.dev ] + buildInputs = [ curl.dev zlib.dev protobuf ] ++ optionals stdenv.isDarwin [ CoreFoundation IOKit libossp_uuid ] ++ optionals (!stdenv.isDarwin) [ libcap.dev libuuid.dev ] ++ optionals withCups [ cups ] From ec9dcce541319b164b8e6370dc141815518cd07f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 11:44:46 +0000 Subject: [PATCH 079/106] python310Packages.beartype: 0.9.1 -> 0.10.1 --- pkgs/development/python-modules/beartype/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/beartype/default.nix b/pkgs/development/python-modules/beartype/default.nix index d77a4db3e331..51479bbe3231 100644 --- a/pkgs/development/python-modules/beartype/default.nix +++ b/pkgs/development/python-modules/beartype/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "beartype"; - version = "0.9.1"; + version = "0.10.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "YjYw3CQ7DaWoTw+kFOaqryYT5WetGav+aoHBfqWrYvE="; + sha256 = "sha256-7yKOZpOLT0SH2LMGodGaCTi8TvJEthYjCfQjzMjO/HY="; }; checkInputs = [ From 9f2d210fde8e647bcfd92e70098faffb7ae0636d Mon Sep 17 00:00:00 2001 From: Marek Fajkus Date: Tue, 22 Feb 2022 12:58:50 +0100 Subject: [PATCH 080/106] elmPackages.elm: explicitely use ghc8107 --- pkgs/development/compilers/elm/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 149d81150548..ab19ac42d24c 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -7,7 +7,7 @@ let fetchElmDeps = pkgs.callPackage ./fetchElmDeps.nix { }; - hsPkgs = self: pkgs.haskellPackages.override { + hsPkgs = self: pkgs.haskell.packages.ghc8107.override { overrides = self: super: with pkgs.haskell.lib.compose; with lib; let elmPkgs = rec { elm = overrideCabal (drv: { @@ -200,4 +200,3 @@ in lib.makeScope pkgs.newScope (self: with self; { inherit (nodePkgs) elm-doc-preview elm-live elm-upgrade elm-xref elm-analyse elm-git-install; }) ) - From dd00116269179f636a29191af1e3cfce9ca84a0b Mon Sep 17 00:00:00 2001 From: linsui Date: Tue, 22 Feb 2022 22:46:05 +0800 Subject: [PATCH 081/106] dotter: init at 0.12.9 --- pkgs/tools/misc/dotter/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/misc/dotter/default.nix diff --git a/pkgs/tools/misc/dotter/default.nix b/pkgs/tools/misc/dotter/default.nix new file mode 100644 index 000000000000..fdfabf8f778a --- /dev/null +++ b/pkgs/tools/misc/dotter/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchFromGitHub, rustPlatform, which }: + +rustPlatform.buildRustPackage rec { + pname = "dotter"; + version = "0.12.9"; + + src = fetchFromGitHub { + owner = "SuperCuber"; + repo = "dotter"; + rev = version; + sha256 = "0rxinrm110i5cbkl7c7vgk7dl0x79cg6g23bdjixsg7h0572c2gi"; + }; + + cargoSha256 = "0fr2dvzbpwqvf98wwrxv76nwbrv4m9ppx7br4x78gm8dhf2nj4zx"; + + checkInputs = [ which ]; + + meta = with lib; { + description = "A dotfile manager and templater written in rust 🦀"; + homepage = "https://github.com/SuperCuber/dotter"; + license = licenses.unlicense; + maintainers = with maintainers; [ linsui ]; + mainProgram = "dotter"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7f0df4384763..b69adcd4c524 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1752,6 +1752,8 @@ with pkgs; doona = callPackage ../tools/security/doona { }; + dotter = callPackage ../tools/misc/dotter { }; + droidcam = callPackage ../applications/video/droidcam { }; ecdsautils = callPackage ../tools/security/ecdsautils { }; From df94e74d685de7b9b68dec0d5937052d084a7276 Mon Sep 17 00:00:00 2001 From: rembo10 Date: Tue, 22 Feb 2022 20:19:32 +0530 Subject: [PATCH 082/106] headphones: 0.6.0-alpha.1 -> 0.6.0-beta.5 --- pkgs/servers/headphones/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/headphones/default.nix b/pkgs/servers/headphones/default.nix index a9403bf9edd4..f39390f5ea92 100644 --- a/pkgs/servers/headphones/default.nix +++ b/pkgs/servers/headphones/default.nix @@ -2,13 +2,13 @@ python3.pkgs.buildPythonApplication rec { pname = "headphones"; - version = "0.6.0-alpha.1"; + version = "0.6.0-beta.5"; src = fetchFromGitHub { owner = "rembo10"; repo = "headphones"; rev = "v${version}"; - sha256 = "sha256-+mWtceQoHSMRkA8izZnKM0cgbt0P5Hr3arKOevpKvqc="; + sha256 = "1ddqk5ch1dlh895cm99li4gb4a596mvq3d0gah9vrbn6fyhp3b4v"; }; dontBuild = true; @@ -17,17 +17,21 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/opt/headphones cp -R {data,headphones,lib,Headphones.py} $out/opt/headphones echo v${version} > $out/opt/headphones/version.txt makeWrapper $out/opt/headphones/Headphones.py $out/bin/headphones + + runHook postInstall ''; meta = with lib; { description = "Automatic music downloader for SABnzbd"; - license = licenses.gpl3; + license = licenses.gpl3Plus; homepage = "https://github.com/rembo10/headphones"; maintainers = with lib.maintainers; [ rembo10 ]; }; From 67574bd99457d0971357baded8274c4442d8c2f7 Mon Sep 17 00:00:00 2001 From: Stephen Hassard Date: Mon, 21 Feb 2022 14:51:34 -0800 Subject: [PATCH 083/106] nim: 1.6.2 -> 1.6.4 --- pkgs/development/compilers/nim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 06b19b547b67..4f3b200477f0 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -98,12 +98,12 @@ in { nim-unwrapped = stdenv.mkDerivation rec { pname = "nim-unwrapped"; - version = "1.6.2"; + version = "1.6.4"; strictDeps = true; src = fetchurl { url = "https://nim-lang.org/download/nim-${version}.tar.xz"; - hash = "sha256-msRxT6bDFdaR2n9diUHBsZDU1Dc5fZdC4yfC1RiT43M="; + hash = "sha256-f8MJKFW1wiAM2f7tEz0EYFgj8lDXO01KxQEwA3DgoMI="; }; buildInputs = [ boehmgc openssl pcre readline sqlite ]; From e71f3a7ef823decbfc9efe46231c849804c241b3 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 22 Feb 2022 14:13:02 +0000 Subject: [PATCH 084/106] pinta: re-added missing runtime icons On PR #155224, we switched to `dotnet build` to copy the Pinta assets to the derivation. This worked mostly fine, however it seems to have missed the runtime icons. We didn't catch the issue on #155224 neither, probably because of some resource cache somewhere. This commit re-adds the missing runtime icons by copying them manually. --- pkgs/applications/graphics/pinta/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix index ed2aae72d47a..b598c53b8947 100644 --- a/pkgs/applications/graphics/pinta/default.nix +++ b/pkgs/applications/graphics/pinta/default.nix @@ -63,6 +63,10 @@ buildDotnetModule rec { # Rename the binary mv "$out/bin/Pinta" "$out/bin/pinta" + # Copy runtime icons + mkdir -p $out/share/icons/hicolor/16x16/ + cp -r Pinta.Resources/icons/hicolor/16x16/* $out/share/icons/hicolor/16x16/ + # Install dotnet build installer/linux/install.proj \ -target:Install \ From c2147ab6a88250ed668c1b3e577b8c735f63d054 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 22 Feb 2022 17:17:14 +0100 Subject: [PATCH 085/106] modprobe: install systemd's modprobe options Shipped by systemd to combat kmod default options that interfere with the netdev setup, when those drivers are initially loaded. --- nixos/modules/system/boot/modprobe.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/system/boot/modprobe.nix b/nixos/modules/system/boot/modprobe.nix index 7426d148891f..27f78835adb2 100644 --- a/nixos/modules/system/boot/modprobe.nix +++ b/nixos/modules/system/boot/modprobe.nix @@ -72,6 +72,8 @@ with lib; ''; environment.etc."modprobe.d/debian.conf".source = pkgs.kmod-debian-aliases; + environment.etc."modprobe.d/systemd.conf".source = "${pkgs.systemd}/lib/modprobe.d/systemd.conf"; + environment.systemPackages = [ pkgs.kmod ]; system.activationScripts.modprobe = stringAfter ["specialfs"] From b4ac004d09a32160932a22f53c767f3f578051a3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 22 Feb 2022 17:29:41 +0100 Subject: [PATCH 086/106] nixos/test/networking: test bonding netdev creation Previously the bonding driver would create an initial `bond0` interface when it was loaded. If the network management integration used that interface and did not recreate it, it was stuck to the default `balance-rr` mode. Deploying systemds modprobe.d configuration sets `max_bonds=0`, so we don't run into that issue anymore. Hence we now make sure that we can indeed create `bond0` with `802.3ad` (LACP), which is a non default mode. --- nixos/tests/networking.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index 2510937b5dcd..2d68bc859df5 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -246,13 +246,13 @@ let networking = { useNetworkd = networkd; useDHCP = false; - bonds.bond = { + bonds.bond0 = { interfaces = [ "eth1" "eth2" ]; - driverOptions.mode = "balance-rr"; + driverOptions.mode = "802.3ad"; }; interfaces.eth1.ipv4.addresses = mkOverride 0 [ ]; interfaces.eth2.ipv4.addresses = mkOverride 0 [ ]; - interfaces.bond.ipv4.addresses = mkOverride 0 + interfaces.bond0.ipv4.addresses = mkOverride 0 [ { inherit address; prefixLength = 30; } ]; }; }; @@ -274,6 +274,10 @@ let client2.wait_until_succeeds("ping -c 2 192.168.1.1") client2.wait_until_succeeds("ping -c 2 192.168.1.2") + + with subtest("Verify bonding mode"): + for client in client1, client2: + client.succeed('grep -q "Bonding Mode: IEEE 802.3ad Dynamic link aggregation" /proc/net/bonding/bond0') ''; }; bridge = let From ba57683511dec72ff0e753f80de9616bd758d55b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 16:32:59 +0000 Subject: [PATCH 087/106] swego: 0.97 -> 0.98 --- pkgs/servers/swego/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/swego/default.nix b/pkgs/servers/swego/default.nix index 9009abb92060..7ead19f5ceb1 100644 --- a/pkgs/servers/swego/default.nix +++ b/pkgs/servers/swego/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "swego"; - version = "0.97"; + version = "0.98"; src = fetchFromGitHub { owner = "nodauf"; repo = "Swego"; rev = "v${version}"; - sha256 = "sha256-T4xkjNdOSD0kHLVfwUz1PrFokLmnbzcj/pbV36W+2ZQ="; + sha256 = "sha256-fS1mrB4379hnnkLMkpKqV2QB680t5T0QEqsvqOp9pzY="; }; - vendorSha256 = "sha256-GiYJfykcBvIoJ0zvdtT3P+iHmBgBWIeOTaniFysAPHs="; + vendorSha256 = "sha256-N4HDngQFNCzQ74W52R0khetN6+J7npvBC/bYZBAgLB4="; postInstall = '' mv $out/bin/src $out/bin/$pname From 50323b2c9b95b85ad9fc5a51dafd15fb427d001b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 17:23:33 +0000 Subject: [PATCH 088/106] ticker: 4.4.4 -> 4.5.0 --- pkgs/applications/misc/ticker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/ticker/default.nix b/pkgs/applications/misc/ticker/default.nix index e345c344f902..ebc9b4996685 100644 --- a/pkgs/applications/misc/ticker/default.nix +++ b/pkgs/applications/misc/ticker/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "ticker"; - version = "4.4.4"; + version = "4.5.0"; src = fetchFromGitHub { owner = "achannarasappa"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KICxcfZLBwCo12p5R9wt7Tk440wkUIE7G6lGfWIdxR8="; + sha256 = "sha256-THVzurv1LB2lxGsCw0ZPUF5QLgtUfN4ZNp8ak05I2Es="; }; - vendorSha256 = "sha256-1FnewgsKlOnBAdm7vyBngrFsDHNCzpZA3IDccxALeJ8="; + vendorSha256 = "sha256-6bosJ2AlbLZ551tCNPmvNyyReFJG+iS3SYUFti2/CAw="; ldflags = [ "-s" "-w" "-X github.com/achannarasappa/ticker/cmd.Version=v${version}" From 79dd82eadd34300b04d1363be6a2ab84670ac0cb Mon Sep 17 00:00:00 2001 From: Philipp Date: Tue, 22 Feb 2022 18:42:35 +0100 Subject: [PATCH 089/106] mtxclient: 0.6.1 -> 0.6.2 --- pkgs/development/libraries/mtxclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index 4e5eed1e4391..92285501748a 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mtxclient"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "mtxclient"; rev = "v${version}"; - sha256 = "sha256-hTB0a5KXcQb0MCEX9YonDJOGlTmRkrOIP9UFlwuJc6g="; + sha256 = "sha256-TsGoSVewQJlr0zj8qYEd+UU8DlncZDCqfrqTv89LEYU="; }; postPatch = '' From fde95785c90a82c20e728251a14f4a4c6cd85973 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 22 Feb 2022 10:08:35 -0800 Subject: [PATCH 090/106] commitizen: 2.20.4 -> 2.21.2 --- pkgs/applications/version-management/commitizen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/commitizen/default.nix b/pkgs/applications/version-management/commitizen/default.nix index b8befad558d5..d02c8eed9eb6 100644 --- a/pkgs/applications/version-management/commitizen/default.nix +++ b/pkgs/applications/version-management/commitizen/default.nix @@ -21,13 +21,13 @@ buildPythonApplication rec { pname = "commitizen"; - version = "2.20.4"; + version = "2.21.2"; src = fetchFromGitHub { owner = "commitizen-tools"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2DhWiUAkAkyNxYB1CGzUB2nGZeCWvFqSztrxasUPSXw="; + sha256 = "sha256-ZFKUG8dE1hpWPGitdQlYeBSzWn3LPR7VGWsuq1Le5OQ="; deepClone = true; }; From bedabfbcef9285804729aa78f933d8ceb4897ecf Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sun, 13 Feb 2022 12:00:00 +0000 Subject: [PATCH 091/106] rustPlatform.bindgenHook: init --- doc/languages-frameworks/rust.section.md | 2 ++ pkgs/build-support/rust/hooks/default.nix | 10 ++++++++++ pkgs/build-support/rust/hooks/rust-bindgen-hook.sh | 13 +++++++++++++ .../compilers/rust/make-rust-platform.nix | 2 +- pkgs/development/tools/rust/bindgen/default.nix | 4 +++- 5 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 pkgs/build-support/rust/hooks/rust-bindgen-hook.sh diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 56faf636df10..e19783e29e6a 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -464,6 +464,8 @@ you of the correct hash. be disabled by setting `dontUseCargoParallelTests`. * `cargoInstallHook`: install binaries and static/shared libraries that were built using `cargoBuildHook`. +* `bindgenHook`: for crates which use `bindgen` as a build dependency, lets + `bindgen` find `libclang` and `libclang` find the libraries in `buildInputs`. ### Examples {#examples} diff --git a/pkgs/build-support/rust/hooks/default.nix b/pkgs/build-support/rust/hooks/default.nix index d86c9ebaed80..d33692457077 100644 --- a/pkgs/build-support/rust/hooks/default.nix +++ b/pkgs/build-support/rust/hooks/default.nix @@ -1,6 +1,7 @@ { buildPackages , callPackage , cargo +, clang , diffutils , lib , makeSetupHook @@ -92,4 +93,13 @@ in { rustBuildPlatform rustTargetPlatform rustTargetPlatformSpec; }; } ./maturin-build-hook.sh) {}; + + bindgenHook = callPackage ({}: makeSetupHook { + name = "rust-bindgen-hook"; + substitutions = { + libclang = clang.cc.lib; + inherit clang; + }; + } + ./rust-bindgen-hook.sh) {}; } diff --git a/pkgs/build-support/rust/hooks/rust-bindgen-hook.sh b/pkgs/build-support/rust/hooks/rust-bindgen-hook.sh new file mode 100644 index 000000000000..53624b124f2b --- /dev/null +++ b/pkgs/build-support/rust/hooks/rust-bindgen-hook.sh @@ -0,0 +1,13 @@ +# populates LIBCLANG_PATH and BINDGEN_EXTRA_CLANG_ARGS for rust projects that +# depend on the bindgen crate + +# if you modify this, you probably also need to modify the wrapper for the cli +# of bindgen in pkgs/development/tools/rust/bindgen/wrapper.sh + +populateBindgenEnv () { + export LIBCLANG_PATH=@libclang@/lib + BINDGEN_EXTRA_CLANG_ARGS="$(< @clang@/nix-support/cc-cflags) $(< @clang@/nix-support/libc-cflags) $(< @clang@/nix-support/libcxx-cxxflags) $NIX_CFLAGS_COMPILE" + export BINDGEN_EXTRA_CLANG_ARGS +} + +postHook="${postHook:-}"$'\n'"populateBindgenEnv"$'\n' diff --git a/pkgs/development/compilers/rust/make-rust-platform.nix b/pkgs/development/compilers/rust/make-rust-platform.nix index f479b052019e..2071c48cc6d5 100644 --- a/pkgs/development/compilers/rust/make-rust-platform.nix +++ b/pkgs/development/compilers/rust/make-rust-platform.nix @@ -31,5 +31,5 @@ rec { # Hooks inherit (callPackage ../../../build-support/rust/hooks { inherit stdenv cargo rustc; - }) cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook maturinBuildHook; + }) cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook maturinBuildHook bindgenHook; } diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index 782996d92180..444db1173225 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -34,7 +34,9 @@ let touch $out ''; }; - } '' + } + # if you modify the logic to find the right clang flags, also modify rustPlatform.bindgenHook + '' mkdir -p $out/bin export cincludes="$(< ${clang}/nix-support/cc-cflags) $(< ${clang}/nix-support/libc-cflags)" export cxxincludes="$(< ${clang}/nix-support/libcxx-cxxflags)" From 7e29b55e9d4c09ed7d045bcb2593ed025ad95107 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sun, 13 Feb 2022 12:00:00 +0000 Subject: [PATCH 092/106] helvum: use rustPlatform.bindgenHook --- pkgs/applications/audio/helvum/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/audio/helvum/default.nix b/pkgs/applications/audio/helvum/default.nix index dc8bf5302649..798af97ab32f 100644 --- a/pkgs/applications/audio/helvum/default.nix +++ b/pkgs/applications/audio/helvum/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { rustPlatform.cargoSetupHook rustPlatform.rust.cargo rustPlatform.rust.rustc + rustPlatform.bindgenHook ]; buildInputs = [ @@ -49,8 +50,6 @@ stdenv.mkDerivation rec { pipewire ]; - LIBCLANG_PATH = "${libclang.lib}/lib"; - meta = with lib; { description = "A GTK patchbay for pipewire"; homepage = "https://gitlab.freedesktop.org/pipewire/helvum"; From a6898bc1205701671eddfc67f80f643165253e7f Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sun, 13 Feb 2022 12:00:00 +0000 Subject: [PATCH 093/106] ashpd-demo: use rustPlatform.bindgenHook --- pkgs/development/tools/ashpd-demo/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/development/tools/ashpd-demo/default.nix b/pkgs/development/tools/ashpd-demo/default.nix index f6842dacec9e..9d873b8461f1 100644 --- a/pkgs/development/tools/ashpd-demo/default.nix +++ b/pkgs/development/tools/ashpd-demo/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { rustPlatform.cargoSetupHook rustPlatform.rust.rustc wrapGAppsHook4 + rustPlatform.bindgenHook desktop-file-utils glib # for glib-compile-schemas ]; @@ -63,11 +64,6 @@ stdenv.mkDerivation rec { libshumate ]; - # libspa-sys requires this for bindgen - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; - # included by libspa-sys requires - BINDGEN_EXTRA_CLANG_ARGS = "-I${llvmPackages.libclang.lib}/lib/clang/${lib.getVersion llvmPackages.clang}/include -I${glibc.dev}/include"; - passthru = { updateScript = nix-update-script { attrPath = pname; From f3027942a4fbc43df98f73aa3616cfa061502af8 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sun, 13 Feb 2022 12:00:00 +0000 Subject: [PATCH 094/106] matrix-conduit: use rustPlatform.bindgenHook --- pkgs/servers/matrix-conduit/default.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/servers/matrix-conduit/default.nix b/pkgs/servers/matrix-conduit/default.nix index cde926de2696..c2cb3123b747 100644 --- a/pkgs/servers/matrix-conduit/default.nix +++ b/pkgs/servers/matrix-conduit/default.nix @@ -14,21 +14,14 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-fpjzc2HiWP6nV8YZOwxsIOhy4ht/tQqcvCkcLMIFUaQ="; nativeBuildInputs = with pkgs; [ - clang - llvmPackages.libclang + rustPlatform.bindgenHook ]; buildInputs = with pkgs; [ pkg-config - clangStdenv - llvmPackages.libclang.lib rocksdb ]; - preBuild = with pkgs; '' - export LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib"; - ''; - cargoBuildFlags = "--bin conduit"; meta = with lib; { From 6d900390cad16324e46458e5c4d41eaf8892fa02 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sun, 13 Feb 2022 12:00:00 +0000 Subject: [PATCH 095/106] wluma: use rustPlatform.bindgenHook --- pkgs/tools/wayland/wluma/default.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/wayland/wluma/default.nix b/pkgs/tools/wayland/wluma/default.nix index fd4db1a934ab..555e40384cef 100644 --- a/pkgs/tools/wayland/wluma/default.nix +++ b/pkgs/tools/wayland/wluma/default.nix @@ -24,25 +24,14 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ makeWrapper pkg-config + rustPlatform.bindgenHook ]; buildInputs = [ udev - v4l-utils.lib + v4l-utils ]; - LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib"; - - # Works around the issue with rust-bindgen and the Nix gcc wrapper: - # https://hoverbear.org/blog/rust-bindgen-in-nix/ - preBuild = '' - export BINDGEN_EXTRA_CLANG_ARGS="$(< ${stdenv.cc}/nix-support/libc-cflags) \ - $(< ${stdenv.cc}/nix-support/cc-cflags) \ - -isystem ${llvmPackages.libclang.lib}/lib/clang/${lib.getVersion llvmPackages.clang}/include \ - -idirafter ${stdenv.cc.cc}/lib/gcc/${stdenv.hostPlatform.config}/${lib.getVersion stdenv.cc.cc}/include \ - -idirafter ${v4l-utils.dev}/include" - ''; - postInstall = '' wrapProgram $out/bin/wluma \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ vulkan-loader ]}" From e60782c7fa2c6258e6ef7da5fe0c44da25c69f34 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Wed, 16 Feb 2022 12:00:00 +0000 Subject: [PATCH 096/106] firefox: use rustPlatform.bindgenHook --- .../networking/browsers/firefox/common.nix | 23 ++----------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index ca8e227664ed..d57839b0e4b6 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -11,7 +11,7 @@ , hunspell, libevent, libstartup_notification , libvpx , icu70, libpng, glib, pciutils -, autoconf213, which, gnused, rustPackages +, autoconf213, which, gnused, rustPackages, rustPlatform , rust-cbindgen, nodejs, nasm, fetchpatch , gnum4 , gtk3, wrapGAppsHook @@ -196,6 +196,7 @@ buildStdenv.mkDerivation ({ which unzip wrapGAppsHook + rustPlatform.bindgenHook ] ++ lib.optionals buildStdenv.isDarwin [ xcbuild rsync ] ++ extraNativeBuildInputs; @@ -210,28 +211,8 @@ buildStdenv.mkDerivation ({ rm -f .mozconfig* # this will run autoconf213 configureScript="$(realpath ./mach) configure" - export MOZCONFIG=$(pwd)/mozconfig export MOZBUILD_STATE_PATH=$(pwd)/mozbuild - # Set C flags for Rust's bindgen program. Unlike ordinary C - # compilation, bindgen does not invoke $CC directly. Instead it - # uses LLVM's libclang. To make sure all necessary flags are - # included we need to look in a few places. - # TODO: generalize this process for other use-cases. - - BINDGEN_CFLAGS="$(< ${buildStdenv.cc}/nix-support/libc-crt1-cflags) \ - $(< ${buildStdenv.cc}/nix-support/libc-cflags) \ - $(< ${buildStdenv.cc}/nix-support/cc-cflags) \ - $(< ${buildStdenv.cc}/nix-support/libcxx-cxxflags) \ - ${lib.optionalString buildStdenv.cc.isClang "-idirafter ${buildStdenv.cc.cc.lib}/lib/clang/${lib.getVersion buildStdenv.cc.cc}/include"} \ - ${lib.optionalString buildStdenv.cc.isGNU "-isystem ${lib.getDev buildStdenv.cc.cc}/include/c++/${lib.getVersion buildStdenv.cc.cc} -isystem ${buildStdenv.cc.cc}/include/c++/${lib.getVersion buildStdenv.cc.cc}/${buildStdenv.hostPlatform.config}"} \ - $NIX_CFLAGS_COMPILE" - ${ - # Bindgen doesn't like the flag added by `separateDebugInfo`. - lib.optionalString enableDebugSymbols '' - BINDGEN_CFLAGS="''${BINDGEN_CFLAGS/ -Wa,--compress-debug-sections/}" - ''} - echo "ac_add_options BINDGEN_CFLAGS='$BINDGEN_CFLAGS'" >> $MOZCONFIG '' + (lib.optionalString googleAPISupport '' # Google API key used by Chromium and Firefox. # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution, From e2e23aac07ead3372473526d057fb9df486fe32f Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 22 Feb 2022 11:27:30 -0800 Subject: [PATCH 097/106] commitizen: use argcomplete 1.12.3 --- .../version-management/commitizen/default.nix | 39 ++++++++++++------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/version-management/commitizen/default.nix b/pkgs/applications/version-management/commitizen/default.nix index d02c8eed9eb6..0aa3f0d02ab2 100644 --- a/pkgs/applications/version-management/commitizen/default.nix +++ b/pkgs/applications/version-management/commitizen/default.nix @@ -1,24 +1,37 @@ { buildPythonApplication -, lib -, fetchFromGitHub -, poetry -, termcolor -, questionary , colorama , decli -, tomlkit +, fetchFromGitHub +, git , jinja2 -, pyyaml -, argcomplete -, typing-extensions +, lib , packaging -, pytestCheckHook +, poetry , pytest-freezegun , pytest-mock , pytest-regressions -, git +, pytestCheckHook +, pyyaml +, questionary +, termcolor +, tomlkit +, typing-extensions + +, argcomplete, fetchPypi }: +let + # NOTE: Upstream requires argcomplete <2, so we make it here. + argcomplete_1 = argcomplete.overrideAttrs (old: rec { + version = "1.12.3"; + src = fetchPypi { + inherit (old) pname; + inherit version; + sha256 = "sha256-LH2//YwEXqU0kh5jsL5v5l6IWZmQ2NxAisjFQrcqVEU="; + }; + }); +in + buildPythonApplication rec { pname = "commitizen"; version = "2.21.2"; @@ -43,7 +56,7 @@ buildPythonApplication rec { tomlkit jinja2 pyyaml - argcomplete + argcomplete_1 typing-extensions packaging ]; @@ -54,7 +67,7 @@ buildPythonApplication rec { pytest-freezegun pytest-mock pytest-regressions - argcomplete + argcomplete_1 git ]; From 02a518f00e83c78fda66d9ba722a501367ad1a66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20He=C3=9Felmann?= Date: Tue, 22 Feb 2022 20:57:53 +0100 Subject: [PATCH 098/106] openshift: fix build on darwin `ncurses` is required as build input at build time on macOS. Therefore `ncurses` is moved from `buildInputs` to `nativeBuildInputs`. Without this change the build fails with `tput: command not found`. --- .../networking/cluster/openshift/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index a1d4b1468376..dd542f9ffac6 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -33,9 +33,16 @@ in buildGoPackage rec { goPackagePath = "github.com/openshift/origin"; - buildInputs = [ libkrb5 ncurses ]; + buildInputs = [ libkrb5 ]; - nativeBuildInputs = [ which rsync go-bindata clang installShellFiles ]; + nativeBuildInputs = [ + clang + go-bindata + installShellFiles + ncurses + rsync + which + ]; patchPhase = '' patchShebangs ./hack From 2bdd38d848fc5bb417bdbb237d1034787cd27850 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 16 Feb 2022 08:06:17 +0100 Subject: [PATCH 099/106] =?UTF-8?q?ocamlPackages.gg:=200.9.1=20=E2=86=92?= =?UTF-8?q?=201.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/gg/default.nix | 31 ++++++++----------- 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/pkgs/development/ocaml-modules/gg/default.nix b/pkgs/development/ocaml-modules/gg/default.nix index 58e2b67eacc6..fb1920776900 100644 --- a/pkgs/development/ocaml-modules/gg/default.nix +++ b/pkgs/development/ocaml-modules/gg/default.nix @@ -1,31 +1,26 @@ -{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, opaline }: +{ lib, stdenv, fetchurl, ocaml, findlib, topkg, ocamlbuild }: let - inherit (lib) getVersion versionAtLeast; - - pname = "gg"; - version = "0.9.1"; - webpage = "https://erratique.ch/software/${pname}"; + homepage = "https://erratique.ch/software/gg"; + version = "1.0.0"; in -assert versionAtLeast (getVersion ocaml) "4.01.0"; +lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") + "gg is not available for OCaml ${ocaml.version}" stdenv.mkDerivation { - name = "ocaml-${pname}-${version}"; + pname = "ocaml${ocaml.version}-gg"; + inherit version; src = fetchurl { - url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "0czj41sr8jsivl3z8wyblf9k971j3kx2wc3s0c1nhzcc8allg9i2"; + url = "${homepage}/releases/gg-${version}.tbz"; + sha256 = "sha256:0j7bpj8k17csnz6v6frkz9aycywsb7xmznnb31g8rbfk3626f3ci"; }; - buildInputs = [ ocaml findlib ocamlbuild opaline ]; + buildInputs = [ ocaml findlib ocamlbuild topkg ]; - createFindlibDestdir = true; - - buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; - - installPhase = "opaline -libdir $OCAMLFIND_DESTDIR"; + inherit (topkg) buildPhase installPhase; meta = with lib; { description = "Basic types for computer graphics in OCaml"; @@ -35,8 +30,8 @@ stdenv.mkDerivation { matrices, quaternions, axis aligned boxes, colors, color spaces, and raster data. ''; - homepage = webpage; - platforms = ocaml.meta.platforms or []; + inherit homepage; + inherit (ocaml.meta) platforms; license = licenses.bsd3; maintainers = [ maintainers.jirkamarsik ]; }; From 1bfcbcc05d0a962e0a138ccfb14d187c9993e196 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 22 Feb 2022 13:37:57 -0800 Subject: [PATCH 100/106] java-service-wrapper: 3.5.48 -> 3.5.49 * java-service-wrapper: 3.5.48 -> 3.5.49 (#161255) * java-service-wrapper: update meta changelog and SPDX3 license identifier and run pre- and post- hooks Co-authored-by: Renaud --- .../tools/system/java-service-wrapper/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/java-service-wrapper/default.nix b/pkgs/tools/system/java-service-wrapper/default.nix index 43aa2b10cc3f..7c4002b8a9b8 100644 --- a/pkgs/tools/system/java-service-wrapper/default.nix +++ b/pkgs/tools/system/java-service-wrapper/default.nix @@ -5,36 +5,45 @@ stdenv.mkDerivation rec { pname = "java-service-wrapper"; - version = "3.5.48"; + version = "3.5.49"; src = fetchurl { url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz"; - sha256 = "sha256-woANhwLOhvTnq+Bnc8zCIDZEJOv3swNfeI/3nQ7Y1SM="; + hash = "sha256-gcScF5LIqWVBv8erI3hG5tt5BZPO2XlhFACz1Y60+v4="; }; buildInputs = [ jdk ]; nativeBuildInputs = [ ant cunit ncurses ]; buildPhase = '' + runHook preBuild + export ANT_HOME=${ant} export JAVA_HOME=${jdk}/lib/openjdk/jre/ export JAVA_TOOL_OPTIONS=-Djava.home=$JAVA_HOME export CLASSPATH=${jdk}/lib/openjdk/lib/tools.jar ${if stdenv.isi686 then "./build32.sh" else "./build64.sh"} + + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -p $out/{bin,lib} cp bin/wrapper $out/bin/wrapper cp lib/wrapper.jar $out/lib/wrapper.jar cp lib/libwrapper.so $out/lib/libwrapper.so + + runHook postInstall ''; meta = with lib; { description = "Enables a Java Application to be run as a Windows Service or Unix Daemon"; homepage = "https://wrapper.tanukisoftware.com/"; - license = licenses.gpl2; + changelog = "https://wrapper.tanukisoftware.com/doc/english/release-notes.html#${version}"; + license = licenses.gpl2Only; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ maintainers.suhr ]; }; From 02f8153b6744e4df9e4caaa1ff8a2fbce440a101 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 21:52:26 +0000 Subject: [PATCH 101/106] python310Packages.types-requests: 2.27.10 -> 2.27.11 --- pkgs/development/python-modules/types-requests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index 4fc0cf836a15..165c65f3a9ef 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.27.10"; + version = "2.27.11"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-XcsIj8qneO/u5rf8RpZwN+mD+/uf7AJZRXi9M/115VU="; + sha256 = "sha256-an7SSyF4CvSlteJMMQss2IX7YS31/ZVYTQPYfl8qGVo="; }; propagatedBuildInputs = [ From e0d35ba801380c9d3c98f046845ce51030a833f6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 22 Feb 2022 14:11:35 -0800 Subject: [PATCH 102/106] i3status-rust: 0.21.5 -> 0.21.6 * i3status-rust: 0.21.5 -> 0.21.6 (#161061) and use SPDX3 license identifier Co-authored-by: Renaud --- pkgs/applications/window-managers/i3/status-rust.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index da04da4e9eae..cdcfcca15eae 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "i3status-rust"; - version = "0.21.5"; + version = "0.21.6"; src = fetchFromGitHub { owner = "greshake"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0maPT1NdWFkSupU6CL2cFd6hlZ2BMxAOK6f3rQbfFA8="; + sha256 = "sha256-2PBGw5LHIOOPXBZ+12wL2ZGH+gfbkXNIItpE6SLT8so="; }; - cargoSha256 = "sha256-QUecTmw8pWqrTdcstbXoFf53dFfwFN51tQ7ngUzkyV0="; + cargoSha256 = "sha256-wtxfdQw5zKCxYu7N2BpcLVTlitQmwY7s8oO4dpK8MjE="; nativeBuildInputs = [ pkg-config makeWrapper ]; @@ -56,7 +56,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Very resource-friendly and feature-rich replacement for i3status"; homepage = "https://github.com/greshake/i3status-rust"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ backuitist globin ma27 ]; platforms = platforms.linux; }; From ef319a62b399b2ee4c2fe6a75ae8f0682eeb3bf2 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Wed, 23 Feb 2022 00:13:56 +0100 Subject: [PATCH 103/106] opensnitch-ui: inlude dependency pyasn (#160134) --- pkgs/tools/networking/opensnitch/ui.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/opensnitch/ui.nix b/pkgs/tools/networking/opensnitch/ui.nix index 8c0b7686d8a7..79a8af4ee0ff 100644 --- a/pkgs/tools/networking/opensnitch/ui.nix +++ b/pkgs/tools/networking/opensnitch/ui.nix @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { unicode-slugify pyinotify notify2 - # pyasn # dpendency missing but not mandatory + pyasn ]; preBuild = '' From ec239953a9528bc70c61ecd1f99c2eecf674ec25 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 22 Feb 2022 15:18:49 -0800 Subject: [PATCH 104/106] datree: 0.15.16 -> 0.15.22 * datree: 0.15.16 -> 0.15.19 (#161175) * datreee: 0.15.19 -> 0.15.22 Co-authored-by: Renaud --- pkgs/development/tools/datree/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/datree/default.nix b/pkgs/development/tools/datree/default.nix index b50d348d7dbb..e94917f15d7c 100644 --- a/pkgs/development/tools/datree/default.nix +++ b/pkgs/development/tools/datree/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "datree"; - version = "0.15.16"; + version = "0.15.22"; src = fetchFromGitHub { owner = "datreeio"; repo = "datree"; rev = version; - sha256 = "sha256-FIFsx6iSirUY14cn6E7CPhZQKtcgnyZ2fYghrMUx3Lw="; + hash = "sha256-g5u2QQtVmNp01KtUKwC8uoEIuoBDLHsOlRz1Mv0n/y8="; }; - vendorSha256 = "sha256-HaOgRbF3gMsl6PufdB5IZ2sLunvPo4GeObLb7DRSD0o="; + vendorSha256 = "1cvlvlwdk41f145kzifg7rv7ymwhc9k0ck91bn106240rq1igcr0"; ldflags = [ "-s" From 47dc10cb7d59215f464f767358612854c5522c15 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 22 Feb 2022 15:32:00 -0800 Subject: [PATCH 105/106] upterm: 0.6.7 -> 0.7.3 * upterm: 0.6.7 -> 0.6.8 (#160843) * upterm: 0.6.8 -> 0.7.3 Co-authored-by: Renaud --- pkgs/tools/misc/upterm/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/upterm/default.nix b/pkgs/tools/misc/upterm/default.nix index 00c6441cffe9..29775881378d 100644 --- a/pkgs/tools/misc/upterm/default.nix +++ b/pkgs/tools/misc/upterm/default.nix @@ -1,17 +1,18 @@ { lib , buildGoModule , fetchFromGitHub -, installShellFiles }: +, installShellFiles +}: buildGoModule rec { pname = "upterm"; - version = "0.6.7"; + version = "0.7.3"; src = fetchFromGitHub { owner = "owenthereal"; repo = "upterm"; rev = "v${version}"; - sha256 = "sha256-JxyrH48CXaaa+LkTpUPsT9aq95IuuvDoyfZndrSF1IA="; + hash = "sha256-eEzFqKYhsG5e1DVLWJq08NM9xyfn1yPNV0NIgOErj4E="; }; vendorSha256 = null; From 2ef808d2663862f78f1799ca525a614bae95ab28 Mon Sep 17 00:00:00 2001 From: Matt Sawyer Date: Tue, 22 Feb 2022 16:07:01 -0800 Subject: [PATCH 106/106] eternal-terminal: remove broken linker flag for c++fs (#161416) --- pkgs/tools/networking/eternal-terminal/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix index 63560ce7ad6a..035a99103fc7 100644 --- a/pkgs/tools/networking/eternal-terminal/default.nix +++ b/pkgs/tools/networking/eternal-terminal/default.nix @@ -42,10 +42,6 @@ stdenv.mkDerivation rec { "-std=c++17" ]; - LDFLAGS = lib.optional stdenv.cc.isClang [ - "-lc++fs" - ]; - meta = with lib; { description = "Remote shell that automatically reconnects without interrupting the session"; homepage = "https://eternalterminal.dev/";