Merge master into staging-next

This commit is contained in:
github-actions[bot]
2023-04-27 18:01:13 +00:00
committed by GitHub
29 changed files with 1389 additions and 1922 deletions
+1 -1
View File
@@ -4859,7 +4859,7 @@
name = "Eric Evenchick";
};
evenbrenden = {
email = "evenbrenden@gmail.com";
email = "packages@anythingexternal.com";
github = "evenbrenden";
githubId = 2512008;
name = "Even Brenden";
@@ -0,0 +1,24 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "aiac";
version = "2.2.0";
excludedPackages = [".ci"];
src = fetchFromGitHub {
owner = "gofireflyio";
repo = pname;
rev = "v${version}";
hash = "sha256-Ju2LoCDY4lQaiJ3OSkt01SaOqVLrDGiTAwxxRnbnz/0=";
};
vendorHash = "sha256-UaC3Ez/i+kPQGOJYtCRtaD2pn3kVZPTaoCcNG7LiFbY=";
ldflags = [ "-s" "-w" "-X github.com/gofireflyio/aiac/v3/libaiac.Version=v${version}" ];
meta = with lib; {
description = ''Artificial Intelligence Infrastructure-as-Code Generator.'';
homepage = "https://github.com/gofireflyio/aiac/";
license = licenses.asl20;
maintainers = with maintainers; [ qjoly ];
};
}
@@ -0,0 +1,64 @@
{ stdenv
, lib
, fetchFromGitHub
, qtbase
, qttools
, qmake
, qtserialbus
, qtserialport
, qtdeclarative
, wrapQtAppsHook
}:
stdenv.mkDerivation rec {
pname = "savvycan";
version = "208";
src = fetchFromGitHub {
owner = "collin80";
repo = "SavvyCAN";
rev = "V${version}";
hash = "sha256-agvCl8c7LqGyIKe0K3PdzuBUqTJZtUr434134olbUMw=";
};
buildInputs = [ qtbase qttools qtserialbus qtserialport qtdeclarative ];
nativeBuildInputs = [ qmake wrapQtAppsHook ];
meta = with lib; {
description = "QT based cross platform canbus tool";
homepage = "https://savvycan.com/";
changelog = "https://github.com/collin80/SavvyCAN/releases/tag/${version}";
maintainers = with maintainers; [ simoneruffini ];
platforms = platforms.all;
license = licenses.mit;
mainProgram = "SavvyCAN";
longDescription = ''
SavvyCAN is a cross platform QT based C++ program. It is a CAN bus reverse
engineering and capture tool. It was originally written to utilize EVTV
hardware such as the EVTVDue and CANDue hardware. It has since expanded to be
able to use any socketCAN compatible device as well as the Macchina M2 and
Teensy 3.x boards. SavvyCAN can use any CAN interface supported by QT's
SerialBus system (PeakCAN, Vector, SocketCAN, J2534, etc) It can capture and
send to multiple buses and CAN capture devices at once. It has many functions
specifically meant for reverse engineering data found on the CAN bus:
- Ability to capture even very highly loaded buses
- Ability to connect to many dongles simultaneously
- Scan captured traffic for data that looks coherent
- Show ASCII of captured data to find things like VIN numbers and traffic to
and from the radio
- Graph data found on the bus
- Load and Save many different file formats common to CAN capture tools (Vector
captures, Microchip, CANDo, PCAN, and many more)
- Load and Save DBC files. DBC files are used to store definitions for how data
are formatted on the bus. You can turn the raw data into things like a RPM,
odometer readings, and more.
- UDS scanning and decoding
- Scripting interface to be able to expand the scope of the software
- Best of all, it's free and open source. Don't like something about it? Change
it!
'';
};
}
@@ -17,14 +17,14 @@
stdenv.mkDerivation rec {
pname = "warp";
version = "0.5.2";
version = "0.5.3";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = pname;
rev = "v${version}";
hash = "sha256-VtmLWbZXKTv+sjICnaBt2EPbtDwIVZym/PZdL2N7UQo=";
hash = "sha256-RwsrE4ZIG0i0B7Xu7fDKyDQt4+W2Ntd+epTST8s/YDc=";
};
postPatch = ''
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-NT6reZUsieqMTX7HW9QmrjcgBpqxZOUfzht9b7suNeY=";
hash = "sha256-0L7Wz/vOudZ4Bd3umn+auejYGDnSoU6o07+u/MfrgqE=";
};
nativeBuildInputs = [
@@ -1,139 +0,0 @@
From c04ce502d29f7769efbff730d1f9060b8c24629a Mon Sep 17 00:00:00 2001
From: ckie <git-525ff67@ckie.dev>
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 <QtGui/QDesktopServices>
#include <QtGui/QContextMenuEvent>
#include <QColorDialog>
-#include <QPrinter>
#include <QFileDialog>
#ifdef QT_SVG_LIB
#include <QtSvg/QSvgGenerator>
@@ -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 <QInputDialog>
#include <QVBoxLayout>
#include <QColorDialog>
-#include <QPrinter>
#include <QGraphicsRectItem>
#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 <QFileDialog>
#include <QtGui/QClipboard>
#include <QApplication>
-#include <QPrinter>
#include <QColorDialog>
#include <QToolTip>
#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
+29 -21
View File
@@ -1,24 +1,40 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, opencv, pcl, libusb1, eigen
, wrapQtAppsHook, qtbase, g2o, ceres-solver, libpointmatcher, octomap, freenect
, libdc1394, librealsense, libGL, libGLU, vtk_8_withQt5, wrapGAppsHook, liblapack
, xorg }:
{ lib
, stdenv
, fetchFromGitHub
, pkg-config
, cmake
, opencv
, pcl
, libusb1
, eigen
, wrapQtAppsHook
, qtbase
, g2o
, ceres-solver
, libpointmatcher
, octomap
, freenect
, libdc1394
, librealsense
, libGL
, libGLU
, vtkWithQt5
, wrapGAppsHook
, liblapack
, xorg
}:
stdenv.mkDerivation rec {
pname = "rtabmap";
version = "unstable-2022-09-24";
version = "0.21.0";
src = fetchFromGitHub {
owner = "introlab";
repo = "rtabmap";
rev = "fa31affea0f0bd54edf1097b8289209c7ac0548e";
sha256 = "sha256-kcY+o31fSmwxBcvF/e+Wu6OIqiQzLKgEJJxcj+g3qDM=";
rev = "refs/tags/${version}";
hash = "sha256-1xb8O3VrErldid2OgAUMG28mSUO7QBUsPuSz8p03tSI";
};
patches = [
# Our Qt5 seems to be missing PrintSupport.. I think?
./0001-remove-printer-support.patch
];
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook wrapGAppsHook ];
buildInputs = [
## Required
@@ -41,25 +57,17 @@ stdenv.mkDerivation rec {
qtbase
libGL
libGLU
vtk_8_withQt5
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;
broken = true;
};
}
@@ -15,13 +15,13 @@
buildGoModule rec {
pname = "runc";
version = "1.1.6";
version = "1.1.7";
src = fetchFromGitHub {
owner = "opencontainers";
repo = "runc";
rev = "v${version}";
hash = "sha256-vcOOkpUywDqHW+ZZO0tSsMmJp3gSvyRy/nVrn1deLY0=";
hash = "sha256-reSC9j9ESjRigItBRytef78XBjmMGsqu0o9qcN2AstU=";
};
vendorHash = null;
+33 -26
View File
@@ -1,4 +1,5 @@
{ fetchFromGitHub
{ stdenv
, fetchFromGitHub
, lib
, gobject-introspection
, meson
@@ -6,24 +7,39 @@
, python3
, gtk3
, gdk-pixbuf
, xapp
, wrapGAppsHook
, gettext
, polkit
, glib
, gitUpdater
, bubblewrap
}:
python3.pkgs.buildPythonApplication rec {
let
pythonEnv = python3.withPackages (pp: with pp; [
grpcio-tools
protobuf
pygobject3
setproctitle
pp.xapp
zeroconf
grpcio
setuptools
cryptography
pynacl
netifaces
]);
in
stdenv.mkDerivation rec {
pname = "warpinator";
version = "1.4.5";
format = "other";
version = "1.6.1";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-5mMV4WinpFR9ihgoQsgIXre0VpBdg9S8GjSkx+7ocLg=";
hash = "sha256-H8bFSgx3IysHCoKrMZ9gbwRl9forEjY90a/PIC68E6k=";
};
nativeBuildInputs = [
@@ -39,20 +55,8 @@ python3.pkgs.buildPythonApplication rec {
glib
gtk3
gdk-pixbuf
];
propagatedBuildInputs = with python3.pkgs; [
grpcio-tools
protobuf
pygobject3
setproctitle
pythonEnv
xapp
zeroconf
grpcio
setuptools
cryptography
pynacl
netifaces
];
mesonFlags = [
@@ -66,15 +70,18 @@ python3.pkgs.buildPythonApplication rec {
find . -type f -exec sed -i \
-e s,/usr/libexec/warpinator,$out/libexec/warpinator,g \
{} +
'';
dontWrapGApps = true; # Prevent double wrapping
# We make bubblewrap mode always available since
# landlock mode is not supported in old kernels.
substituteInPlace src/warpinator-launch.py \
--replace '"/bin/python3"' '"${pythonEnv.interpreter}"' \
--replace "/bin/bwrap" "${bubblewrap}/bin/bwrap" \
--replace 'GLib.find_program_in_path("bwrap")' "True"
preFixup = ''
# these get loaded via import from bin, so don't need wrapping
chmod -x+X $out/libexec/warpinator/*.py
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
# Typo fix that can be removed on next update
# https://github.com/linuxmint/warpinator/pull/174
substituteInPlace src/remote.py \
--replace "receiver.remaining_count" "op.remaining_count"
'';
passthru.updateScript = gitUpdater {
@@ -7,11 +7,11 @@
buildGraalvmNativeImage rec {
pname = "babashka";
version = "1.3.178";
version = "1.3.179";
src = fetchurl {
url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
sha256 = "sha256-ihARaZ8GJsoFmlOd0qtbOAQkbs6a9zohJ9PREJoxdZg=";
sha256 = "sha256-tF+SqKY7tcJvmOATVwKIZemR2A3eqrbhvSBvr7tcq5U=";
};
graalvmDrv = graalvmCEPackages.graalvm19-ce;
@@ -2,12 +2,14 @@
, autoconf
, automake
, fetchFromGitHub
, fetchpatch
, gettext
, lib
, libiconv
, libtool
, libusb1
, pkg-config
, buildPackages
}:
stdenv.mkDerivation rec {
@@ -21,6 +23,14 @@ stdenv.mkDerivation rec {
sha256 = "sha256-/tyCoEW/rCLfZH2HhA3Nxuij9d/ZJgsfyP4fLlfyNRA=";
};
patches = [
# Backport cross fix.
(fetchpatch {
url = "https://github.com/libmtp/libmtp/commit/467fa26e6b14c0884b15cf6d191de97e5513fe05.patch";
sha256 = "2DrRrdcguJ9su4LxtT6YOjer8gUTxIoHVpk+6M9P4cg=";
})
];
outputs = [ "bin" "dev" "out" ];
nativeBuildInputs = [
@@ -41,6 +51,10 @@ stdenv.mkDerivation rec {
configurePlatforms = [ "build" "host" ];
makeFlags = lib.optionals (stdenv.isLinux && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
"MTP_HOTPLUG=${buildPackages.libmtp}/bin/mtp-hotplug"
];
enableParallelBuilding = true;
meta = with lib; {
+2 -2
View File
@@ -9,13 +9,13 @@
mkDerivation rec {
pname = "qxmpp";
version = "1.5.3";
version = "1.5.4";
src = fetchFromGitHub {
owner = "qxmpp-project";
repo = pname;
rev = "v${version}";
sha256 = "sha256-h2MBs46E2dvwOhs1cnSvrMll3nZSE9o4oEZV2Bd1Yh0=";
sha256 = "sha256-4MDP2OQK1fjlG74y396CSLt7s+QScWBqlms4aqLIC3s=";
};
nativeBuildInputs = [
@@ -2,18 +2,24 @@
, buildPythonPackage
, fetchPypi
, mock
, pythonOlder
}:
buildPythonPackage rec {
pname = "schedule";
version = "1.1.0";
version = "1.2.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "e6ca13585e62c810e13a08682e0a6a8ad245372e376ba2b8679294f377dfc8e4";
hash = "sha256-tK1peq+6cYTJ62oeLrxB94FUckKs3ozq6aCiWwTAki0=";
};
buildInputs = [ mock ];
buildInputs = [
mock
];
preCheck = ''
# https://github.com/dbader/schedule/issues/488
@@ -22,10 +28,15 @@ buildPythonPackage rec {
"# self.assertRaises(ScheduleValueError, every().day.until, datetime.time(hour=5))"
'';
pythonImportsCheck = [
"schedule"
];
meta = with lib; {
description = "Python job scheduling for humans";
homepage = "https://github.com/dbader/schedule";
changelog = "https://github.com/dbader/schedule/blob/${version}/HISTORY.rst";
license = licenses.mit;
maintainers = with maintainers; [ ];
};
}
+134 -45
View File
@@ -3,6 +3,7 @@
, appdirs
, azure-core
, bokeh
, boto3
, buildPythonPackage
, click
, docker_pycreds
@@ -10,12 +11,19 @@
, flask
, git
, gitpython
, google-cloud-compute
, google-cloud-storage
, hypothesis
, jsonref
, jsonschema
, keras
, kubernetes
, matplotlib
, mlflow
, nbclient
, nbformat
, pandas
, parameterized
, pathtools
, promise
, protobuf
@@ -26,21 +34,23 @@
, pytestCheckHook
, pythonOlder
, pythonRelaxDepsHook
, torch
, pyyaml
, requests
, responses
, scikit-learn
, sentry-sdk
, setproctitle
, setuptools
, shortuuid
, substituteAll
, tensorflow
, torch
, tqdm
}:
buildPythonPackage rec {
pname = "wandb";
version = "0.13.9";
version = "0.15.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -49,7 +59,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-BpFLN4WLT+fm5+50NDOU4bM73WjeGEhD6P8XKE9n9cI=";
hash = "sha256-UULsvvk9BsWUrJ8eD7uD2UnUJqmPrmjrJvCA7WRC/Cw=";
};
patches = [
@@ -85,19 +95,29 @@ buildPythonPackage rec {
nativeCheckInputs = [
azure-core
bokeh
boto3
flask
google-cloud-compute
google-cloud-storage
hypothesis
jsonref
jsonschema
keras
kubernetes
matplotlib
mlflow
nbclient
nbformat
pandas
parameterized
pydantic
pytest-mock
pytest-xdist
pytestCheckHook
torch
responses
scikit-learn
tensorflow
torch
tqdm
];
@@ -111,49 +131,118 @@ buildPythonPackage rec {
disabledTestPaths = [
# Tests that try to get chatty over sockets or spin up servers, not possible in the nix build environment.
"tests/unit_tests_old/test_cli.py"
"tests/unit_tests_old/test_data_types.py"
"tests/unit_tests_old/test_file_stream.py"
"tests/unit_tests_old/test_file_upload.py"
"tests/unit_tests_old/test_footer.py"
"tests/unit_tests_old/test_internal_api.py"
"tests/unit_tests_old/test_keras.py"
"tests/unit_tests_old/test_logging.py"
"tests/unit_tests_old/test_metric_internal.py"
"tests/unit_tests_old/test_public_api.py"
"tests/unit_tests_old/test_runtime.py"
"tests/unit_tests_old/test_sender.py"
"tests/unit_tests_old/test_summary.py"
"tests/unit_tests_old/test_tb_watcher.py"
"tests/unit_tests_old/test_time_resolution.py"
"tests/unit_tests_old/test_wandb.py"
"tests/unit_tests_old/test_wandb_agent.py"
"tests/unit_tests_old/test_wandb_artifacts.py"
"tests/unit_tests_old/test_wandb_integration.py"
"tests/unit_tests_old/test_wandb_run.py"
"tests/unit_tests/test_cli.py"
"tests/unit_tests/test_data_types.py"
"tests/unit_tests/test_file_upload.py"
"tests/unit_tests/test_footer.py"
"tests/unit_tests/test_internal_api.py"
"tests/unit_tests/test_label_full.py"
"tests/unit_tests/test_login.py"
"tests/unit_tests/test_metric_full.py"
"tests/unit_tests/test_metric_internal.py"
"tests/unit_tests/test_mode_disabled.py"
"tests/unit_tests/test_model_workflows.py"
"tests/unit_tests/test_mp_full.py"
"tests/unit_tests/test_plots.py"
"tests/unit_tests/test_public_api.py"
"tests/unit_tests/test_runtime.py"
"tests/unit_tests/test_sender.py"
"tests/unit_tests/test_start_method.py"
"tests/unit_tests/test_tb_watcher.py"
"tests/unit_tests/test_telemetry_full.py"
"tests/unit_tests/test_util.py"
"tests/pytest_tests/unit_tests_old/test_cli.py"
"tests/pytest_tests/unit_tests_old/test_data_types.py"
"tests/pytest_tests/unit_tests_old/test_file_stream.py"
"tests/pytest_tests/unit_tests_old/test_file_upload.py"
"tests/pytest_tests/unit_tests_old/test_footer.py"
"tests/pytest_tests/unit_tests_old/test_internal_api.py"
"tests/pytest_tests/unit_tests_old/test_keras.py"
"tests/pytest_tests/unit_tests_old/test_logging.py"
"tests/pytest_tests/unit_tests_old/test_metric_internal.py"
"tests/pytest_tests/unit_tests_old/test_public_api.py"
"tests/pytest_tests/unit_tests_old/test_runtime.py"
"tests/pytest_tests/unit_tests_old/test_sender.py"
"tests/pytest_tests/unit_tests_old/test_summary.py"
"tests/pytest_tests/unit_tests_old/test_tb_watcher.py"
"tests/pytest_tests/unit_tests_old/test_time_resolution.py"
"tests/pytest_tests/unit_tests_old/test_wandb_agent.py"
"tests/pytest_tests/unit_tests_old/test_wandb_artifacts.py"
"tests/pytest_tests/unit_tests_old/test_wandb_integration.py"
"tests/pytest_tests/unit_tests_old/test_wandb_run.py"
"tests/pytest_tests/unit_tests_old/test_wandb.py"
"tests/pytest_tests/unit_tests_old/tests_launch/test_launch_aws.py"
"tests/pytest_tests/unit_tests_old/tests_launch/test_launch_cli.py"
"tests/pytest_tests/unit_tests_old/tests_launch/test_launch_docker.py"
"tests/pytest_tests/unit_tests_old/tests_launch/test_launch_kubernetes.py"
"tests/pytest_tests/unit_tests_old/tests_launch/test_launch.py"
"tests/pytest_tests/unit_tests_old/tests_s_nb/test_notebooks.py"
"tests/pytest_tests/unit_tests/test_cli.py"
"tests/pytest_tests/unit_tests/test_data_types.py"
"tests/pytest_tests/unit_tests/test_internal_api.py"
"tests/pytest_tests/unit_tests/test_mode_disabled.py"
"tests/pytest_tests/unit_tests/test_model_workflows.py"
"tests/pytest_tests/unit_tests/test_plots.py"
"tests/pytest_tests/unit_tests/test_public_api.py"
"tests/pytest_tests/unit_tests/test_sender.py"
"tests/pytest_tests/unit_tests/test_util.py"
"tests/pytest_tests/unit_tests/test_wandb_verify.py"
# Requires docker access
"tests/pytest_tests/system_tests/test_artifacts/test_artifact_saver.py"
"tests/pytest_tests/system_tests/test_artifacts/test_wandb_artifacts_full.py"
"tests/pytest_tests/system_tests/test_artifacts/test_wandb_artifacts.py"
"tests/pytest_tests/system_tests/test_core/test_cli_full.py"
"tests/pytest_tests/system_tests/test_core/test_data_types_full.py"
"tests/pytest_tests/system_tests/test_core/test_file_stream_internal.py"
"tests/pytest_tests/system_tests/test_core/test_file_upload.py"
"tests/pytest_tests/system_tests/test_core/test_footer.py"
"tests/pytest_tests/system_tests/test_core/test_keras_full.py"
"tests/pytest_tests/system_tests/test_core/test_label_full.py"
"tests/pytest_tests/system_tests/test_core/test_metric_full.py"
"tests/pytest_tests/system_tests/test_core/test_metric_internal.py"
"tests/pytest_tests/system_tests/test_core/test_mode_disabled_full.py"
"tests/pytest_tests/system_tests/test_core/test_model_workflow.py"
"tests/pytest_tests/system_tests/test_core/test_mp_full.py"
"tests/pytest_tests/system_tests/test_core/test_public_api.py"
"tests/pytest_tests/system_tests/test_core/test_redir_full.py"
"tests/pytest_tests/system_tests/test_core/test_report_api.py"
"tests/pytest_tests/system_tests/test_core/test_runtime.py"
"tests/pytest_tests/system_tests/test_core/test_save_policies.py"
"tests/pytest_tests/system_tests/test_core/test_sender.py"
"tests/pytest_tests/system_tests/test_core/test_start_method.py"
"tests/pytest_tests/system_tests/test_core/test_system_info.py"
"tests/pytest_tests/system_tests/test_core/test_tb_watcher.py"
"tests/pytest_tests/system_tests/test_core/test_telemetry_full.py"
"tests/pytest_tests/system_tests/test_core/test_time_resolution.py"
"tests/pytest_tests/system_tests/test_core/test_torch_full.py"
"tests/pytest_tests/system_tests/test_core/test_validation_data_logger.py"
"tests/pytest_tests/system_tests/test_core/test_wandb_integration.py"
"tests/pytest_tests/system_tests/test_core/test_wandb_run.py"
"tests/pytest_tests/system_tests/test_core/test_wandb_settings.py"
"tests/pytest_tests/system_tests/test_core/test_wandb_tensorflow.py"
"tests/pytest_tests/system_tests/test_core/test_wandb_verify.py"
"tests/pytest_tests/system_tests/test_core/test_wandb.py"
"tests/pytest_tests/system_tests/test_importers/test_import_mlflow.py"
"tests/pytest_tests/system_tests/test_sweep/test_public_api.py"
"tests/pytest_tests/system_tests/test_sweep/test_sweep_scheduler.py"
"tests/pytest_tests/system_tests/test_sweep/test_wandb_agent_full.py"
"tests/pytest_tests/system_tests/test_sweep/test_wandb_agent.py"
"tests/pytest_tests/system_tests/test_sweep/test_wandb_sweep.py"
"tests/pytest_tests/system_tests/tests_launch/test_github_reference.py"
"tests/pytest_tests/system_tests/tests_launch/test_job.py"
"tests/pytest_tests/system_tests/tests_launch/test_launch_add.py"
"tests/pytest_tests/system_tests/tests_launch/test_launch_cli.py"
"tests/pytest_tests/system_tests/tests_launch/test_launch_kubernetes.py"
"tests/pytest_tests/system_tests/tests_launch/test_launch_local_container.py"
"tests/pytest_tests/system_tests/tests_launch/test_launch_run.py"
"tests/pytest_tests/system_tests/tests_launch/test_launch_sweep.py"
"tests/pytest_tests/system_tests/tests_launch/test_launch.py"
"tests/pytest_tests/system_tests/tests_launch/test_wandb_reference.py"
# Tries to access /homeless-shelter
"tests/unit_tests/test_tables.py"
"tests/pytest_tests/unit_tests/test_tables.py"
# E AssertionError: assert 'Cannot use both --async and --queue with wandb launch' in 'wandb: ERROR Find detailed error logs at: /build/source/wandb/debug-cli.nixbld.log\nError: The wandb service process exited with 1. Ensure that `sys.executable` is a valid python interpreter. You can override it with the `_executable` setting or with the `WANDB__EXECUTABLE` environment variable.\n'
# E + where 'wandb: ERROR Find detailed error logs at: /build/source/wandb/debug-cli.nixbld.log\nError: The wandb service process exited with 1. Ensure that `sys.executable` is a valid python interpreter. You can override it with the `_executable` setting or with the `WANDB__EXECUTABLE` environment variable.\n' = <Result SystemExit(1)>.output
"tests/pytest_tests/unit_tests_old/tests_launch/test_launch_jobs.py"
# Requires google-cloud-aiplatform which is not packaged as of 2023-04-25.
"tests/pytest_tests/unit_tests_old/tests_launch/test_launch_gcp.py"
# Requires google-cloud-artifact-registry which is not packaged as of 2023-04-25.
"tests/pytest_tests/unit_tests_old/tests_launch/test_kaniko_build.py"
"tests/pytest_tests/unit_tests/test_launch/test_registry/test_gcp_artifact_registry.py"
# Requires kfp which is not packaged as of 2023-04-25.
"tests/pytest_tests/system_tests/test_core/test_kfp.py"
# Requires metaflow which is not packaged as of 2023-04-25.
"tests/pytest_tests/unit_tests/test_metaflow.py"
# See https://github.com/wandb/wandb/issues/5423
"tests/pytest_tests/unit_tests/test_docker.py"
"tests/pytest_tests/unit_tests/test_library_public.py"
];
# Disable test that fails on darwin due to issue with python3Packages.psutil:
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "cloud-nuke";
version = "0.29.4";
version = "0.29.7";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
hash = "sha256-qQrgeUmsCOLlmeU4kwtovo/3cK9Vqzeng7W9M+j+hdk=";
hash = "sha256-JIMEmXZVPXDR8t+ECaV5OqThHiW2CUn2BrIvM+uxSMI=";
};
vendorHash = "sha256-6+uQAEp+fRlRrwfJR0eDMXs0mEQwzWadLxCrXrDREhs=";
vendorHash = "sha256-i+AzDEydK+mUvOb6LivuyaCqHaqIdPkE46nxvf7mLTw=";
ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ];
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "opengrok";
version = "1.11.5";
version = "1.12.0";
# binary distribution
src = fetchurl {
url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz";
hash = "sha256-HjWO4Ucd8RpB6r1P1PQ866DEkCQVQE4VpYmzun8jMhM=";
hash = "sha256-a+iDY00cqtDm1Bm4nclbW/vRpeqWVAjAlBbKS+SC9Us=";
};
nativeBuildInputs = [ makeWrapper ];
@@ -1,5 +1,5 @@
{ lib
, buildGo120Module
, buildGoModule
, fetchFromGitHub
, fetchNpmDeps
, cacert
@@ -14,15 +14,15 @@
, stdenv
}:
buildGo120Module rec {
buildGoModule rec {
pname = "evcc";
version = "0.116.3";
version = "0.116.4";
src = fetchFromGitHub {
owner = "evcc-io";
repo = pname;
rev = version;
hash = "sha256-w4AExQmItvSbUSGBOnoyP4rGnEYsyFUU9Y+lF+0xGVc=";
hash = "sha256-zNTDqokPjPtgBXEy81c1gl2WsbBf9FehJ5y75cYVlQ8=";
};
vendorHash = "sha256-lu6/tRf9o0n13lVsT9OBxc6Ytz3IVEE16vLZ+pZ4Czk=";
@@ -1,24 +1,19 @@
{ lib, mkYarnPackage, fetchFromGitHub, nodejs, runtimeShell
, nodePackages, python3, vips, glib, pkg-config
}:
{ lib, mkYarnPackage, fetchFromGitHub, nodejs, runtimeShell }:
# Notes for the upgrade:
# * Download the tarball of the new version to use.
# * Remove the `resolutions`-section from upstream `package.json`
# as this breaks with `yarn2nix`.
# * Regenerate `yarn.lock` and `yarn2nix --no-patch`.
# * Replace new `package.json`, `yarn.nix`, `yarn.lock` here.
# * Update `version`+`hash` and rebuild.
mkYarnPackage rec {
pname = "grafana-image-renderer";
version = "3.6.4";
version = "3.7.0";
src = fetchFromGitHub {
owner = "grafana";
repo = "grafana-image-renderer";
rev = "v${version}";
sha256 = "sha256-CWA2xmVWvPeKCvssQAMHMYJ3CxJ7sIC7GX3qb3QFLuA=";
sha256 = "sha256-kbL6I2aFHyCmBiB1x02e3H7wIO4TE8ty6vHJEu/T8fI=";
};
buildPhase = ''
@@ -37,14 +32,6 @@ mkYarnPackage rec {
yarnNix = ./yarn.nix;
yarnLock = ./yarn.lock;
pkgConfig.sharp = {
nativeBuildInputs = [ nodePackages.node-gyp python3 pkg-config ];
buildInputs = [ glib vips ];
postInstall = ''
node-gyp rebuild
'';
};
distPhase = ''
runHook preDist
@@ -20,52 +20,55 @@
"create-gcom-plugin-json": "ts-node scripts/createGcomPluginJson.ts ./scripts/tmp"
},
"dependencies": {
"@grpc/grpc-js": "^1.0",
"@grpc/proto-loader": "^0.5.4",
"@hapi/boom": "^9.1.0",
"@grpc/grpc-js": "^1.7.0",
"@grpc/proto-loader": "^0.7.2",
"@hapi/boom": "^10.0.0",
"chokidar": "^3.5.2",
"dompurify": "^2.4.0",
"express": "^4.16.3",
"express-prom-bundle": "^5.1.5",
"google-protobuf": "3.5.0",
"jimp": "0.16.1",
"express-prom-bundle": "^6.5.0",
"google-protobuf": "3.21.0",
"jimp": "^0.16.13",
"jsdom": "20.0.0",
"lodash": "^4.17.21",
"minimist": "^1.2.6",
"morgan": "^1.9.0",
"multer": "^1.4.5-lts.1",
"on-finished": "^2.3.0",
"poolpeteer": "^0.23.0",
"prom-client": "^11.5.3",
"puppeteer": "^13.1.3",
"prom-client": "^14.1.0",
"puppeteer": "^17.1.3",
"puppeteer-cluster": "^0.23.0",
"unique-filename": "^1.1.0",
"winston": "^3.2.1",
"jsdom": "19.0.0",
"dompurify": "^2.3.8",
"multer": "^1.4.5-lts.1"
"unique-filename": "^2.0.1",
"winston": "^3.8.2"
},
"devDependencies": {
"@grafana/eslint-config": "5.0.0",
"@types/multer": "1.4.7",
"@types/express": "^4.11.1",
"@types/node": "^14.14.41",
"@types/dompurify": "2.3.4",
"@types/express": "^4.17.14",
"@types/jsdom": "20.0.0",
"@typescript-eslint/eslint-plugin": "5.16.0",
"@typescript-eslint/parser": "5.31.0",
"axios": "0.26.0",
"@types/multer": "1.4.7",
"@types/node": "^18.7.18",
"@typescript-eslint/eslint-plugin": "5.37.0",
"@typescript-eslint/parser": "5.37.0",
"axios": "0.27.2",
"cross-env": "7.0.3",
"eslint": "8.22.0",
"eslint": "8.23.1",
"eslint-config-prettier": "8.5.0",
"eslint-plugin-jsdoc": "39.3.3",
"eslint-plugin-jsdoc": "39.3.6",
"eslint-plugin-prettier": "4.2.1",
"eslint-plugin-react": "7.31.0",
"eslint-plugin-react": "7.31.8",
"eslint-plugin-react-hooks": "4.6.0",
"husky": "4.3.8",
"husky": "8.0.1",
"lint-staged": "13.0.3",
"pkg": "5.8.0",
"prettier": "2.2.1",
"ts-node": "10.5.0",
"pkg": "5.8.1",
"prettier": "2.7.1",
"ts-node": "10.9.1",
"tsc-watch": "5.0.3",
"typescript": "4.7.4"
"typescript": "4.8.3"
},
"resolutions": {
"jpeg-js": "^0.4.4"
},
"lint-staged": {
"*.ts": [
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+5 -13
View File
@@ -1,8 +1,8 @@
{ lib, buildGoModule, fetchurl, fetchFromGitHub, fetchpatch, nixosTests, tzdata, wire }:
{ lib, buildGoModule, fetchurl, fetchFromGitHub, nixosTests, tzdata, wire }:
buildGoModule rec {
pname = "grafana";
version = "9.4.7";
version = "9.5.1";
excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ];
@@ -10,23 +10,15 @@ buildGoModule rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
sha256 = "sha256-vhGFZjxO20M3fQhXlEDDkad/yOyFOu48sHZ63MEnWIA=";
hash = "sha256-uYmbW7+h4dr2LlLpQ2kefcTZ+WdW56JwneTwj9BCIkU=";
};
srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
sha256 = "sha256-HiKr1ier13xUlrwsJrxo60wwqmiPcza2oOLIfMgFWc0=";
hash = "sha256-2bdQXN1CmcGDXDZUf/4uYtOw7HYA3KLGRKBRlXLJw4c=";
};
patches = [
(fetchpatch { # https://github.com/grafana/grafana/pull/65790
name = "fix-TestIntegrationAMConfigAccess.patch";
url = "https://github.com/grafana/grafana/commit/8500eb1c180b4d49a8e17bfd6df675d821d038a4.diff";
sha256 = "sha256-TWPn9fLjmCbXGXkxAc3NLTN+0XXjsaspaV4gYKg3+Mk=";
})
];
vendorSha256 = "sha256-sUvjZTg2/6UGjc2Qv8YO4IWlS4Y/FzGRVOQ9I/wp/aM=";
vendorHash = "sha256-b965ODZM0DgF8ZNrqa+Pwq8NE2qjePI9pBe2TgOVqwQ=";
nativeBuildInputs = [ wire ];
@@ -13,7 +13,7 @@
stdenv.mkDerivation rec {
pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}";
version = "2.10.2";
version = "2.10.3";
nativeBuildInputs = [ cmake ];
buildInputs = [ postgresql openssl libkrb5 ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
owner = "timescale";
repo = "timescaledb";
rev = version;
sha256 = "sha256-CUmSIeIPmUONZYCI0AlXng/1Vhq6t1RC6gvgIYa5A9k=";
sha256 = "sha256-gI5zPEg2jKQhK63E2rvPd6laF3dmP52oHg/UMitHifk=";
};
cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DTAP_CHECKS=OFF" ]
+3 -3
View File
@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "tailscale";
version = "1.38.4";
version = "1.40.0";
src = fetchFromGitHub {
owner = "tailscale";
repo = "tailscale";
rev = "v${version}";
hash = "sha256-HjN8VzysxQvx5spXgbgbItH3y1bLbfHO+udNQMuyhAk=";
hash = "sha256-iPf3ams613VHPesbxoBaaw9eav5p781+wEmbJ+15yfY=";
};
vendorHash = "sha256-LIvaxSo+4LuHUk8DIZ27IaRQwaDnjW6Jwm5AEc/V95A=";
vendorHash = "sha256-lirn07XE3JOS6oiwZBMwxzywkbXHowOJUMWWLrZtccY=";
nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ];
+2 -2
View File
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "qovery-cli";
version = "0.58.6";
version = "0.58.7";
src = fetchFromGitHub {
owner = "Qovery";
repo = pname;
rev = "v${version}";
hash = "sha256-LgxI0W3t1HyJEP8XBHd59LU3YUV0EOOnysmChOzWURs=";
hash = "sha256-96tbVlFvKe8ExgOhTeiDiq51NHTrh1BzBVp6omcydXg=";
};
vendorHash = "sha256-w40zewXGB76kMgP0GzUtyncBBnCDgxcGJ7EO107WWN0=";
+3 -2
View File
@@ -16,14 +16,14 @@ let
in
python.pkgs.buildPythonApplication rec {
pname = "esphome";
version = "2023.4.0";
version = "2023.4.1";
format = "setuptools";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-u3EQ2ZE6Yfa5M7lr0dULztTf4bGj6XEkta1LcTZCR50=";
hash = "sha256-XnsEidB/rqpiDABLMHHYX7ZMzyXi9OuAnyNFQAmLojA=";
};
postPatch = ''
@@ -97,6 +97,7 @@ python.pkgs.buildPythonApplication rec {
};
meta = with lib; {
changelog = "https://github.com/esphome/esphome/releases/tag/${version}";
description = "Make creating custom firmwares for ESP32/ESP8266 super easy";
homepage = "https://esphome.io/";
license = with licenses; [
+2 -2
View File
@@ -1,14 +1,14 @@
{ lib, stdenv, fetchurl }:
let
version = "1.2023.1";
version = "1.2023.6";
in
stdenv.mkDerivation rec {
pname = "plantuml-server";
inherit version;
src = fetchurl {
url = "https://github.com/plantuml/plantuml-server/releases/download/v${version}/plantuml-v${version}.war";
sha256 = "sha256-SaUk+gaMCpKF1HR9tpEhbZNmKV70LPHeH/YPsU8WGsU=";
sha256 = "sha256-ECzmT6VMjuoJT91iEYOS2ov0bsmNuwIKTwBgsLqwgDI=";
};
dontUnpack = true;
+3 -3
View File
@@ -9,13 +9,13 @@
rustPlatform.buildRustPackage rec {
pname = "feroxbuster";
version = "2.9.4";
version = "2.9.5";
src = fetchFromGitHub {
owner = "epi052";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-9PLj5tORWE4A6MWU9DF6JUbRebTOswIC/Jg6aq6SUPc=";
hash = "sha256-+cjRfuUspq9eE5PsYgha0Vj1ELHjTUxxdM7yR3L9T2k=";
};
# disable linker overrides on aarch64-linux
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
rm .cargo/config
'';
cargoHash = "sha256-Kest8QCfiS0F8pw1PULny7iuYf9oILiZykPsL2ZSskQ=";
cargoHash = "sha256-yd97iiKjMIlMhilU0L1yngNIKptv4I0nEIKWRfhx/40=";
OPENSSL_NO_VENDOR = true;
+27
View File
@@ -0,0 +1,27 @@
{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin }:
rustPlatform.buildRustPackage rec {
pname = "termbook-cli";
version = "1.4.6";
src = fetchFromGitHub {
owner = "Byron";
repo = "termbook";
rev = "v${version}";
sha256 = "Bo3DI0cMXIfP7ZVr8MAW/Tmv+4mEJBIQyLvRfVBDG8c=";
};
cargoSha256 = "sha256-9fFvJJlDzBmbI7hes/wfjAk1Cl2H55T5n8HLnUmDw/c=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
];
meta = with lib; {
description = "A runner for `mdbooks` to keep your documentation tested";
homepage = "https://github.com/Byron/termbook/";
changelog = "https://github.com/Byron/termbook/blob/${src.rev}/CHANGELOG.md";
license = licenses.asl20;
maintainers = with maintainers; [ phaer ];
};
}
+7 -1
View File
@@ -11486,7 +11486,7 @@ with pkgs;
rocket = libsForQt5.callPackage ../tools/graphics/rocket { };
rtabmap = libsForQt5.callPackage ../applications/video/rtabmap/default.nix {
pcl = pcl.override { vtk = vtk_8_withQt5; };
pcl = pcl.override { vtk = vtkWithQt5; };
};
rtaudio = callPackage ../development/libraries/audio/rtaudio {
@@ -13553,6 +13553,8 @@ with pkgs;
xteve = callPackage ../servers/xteve { };
termbook = callPackage ../tools/text/termbook { };
testdisk = libsForQt5.callPackage ../tools/system/testdisk { };
testdisk-qt = testdisk.override { enableQt = true; };
@@ -33587,6 +33589,8 @@ with pkgs;
sacc = callPackage ../applications/networking/gopher/sacc { };
savvycan = libsForQt5.callPackage ../applications/networking/sniffers/savvycan {};
sayonara = libsForQt5.callPackage ../applications/audio/sayonara { };
sbagen = callPackage ../applications/misc/sbagen { };
@@ -38297,6 +38301,8 @@ with pkgs;
atmos = callPackage ../applications/networking/cluster/atmos { };
aiac = callPackage ../applications/networking/cluster/aiac { };
fn-cli = callPackage ../applications/networking/cluster/fn-cli { };
areca = callPackage ../applications/backup/areca {