forked from mirrors/nixpkgs
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
3737b3ce39
|
|
@ -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 ];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,139 @@
|
|||
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
|
||||
|
||||
59
pkgs/applications/video/rtabmap/default.nix
Normal file
59
pkgs/applications/video/rtabmap/default.nix
Normal file
|
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
@ -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");
|
||||
|
|
@ -87,13 +85,8 @@ let
|
|||
|
||||
in rec {
|
||||
vala_0_48 = generic {
|
||||
version = "0.48.22";
|
||||
sha256 = "sha256-27NHjEvjZvCTFkrGHNOu29zz5EQE2eNkFK4VEk525os=";
|
||||
};
|
||||
|
||||
vala_0_52 = generic {
|
||||
version = "0.52.10";
|
||||
sha256 = "sha256-nCAb+BLZh04hveU/jZwU9lF0ixqBRB/1ySkSJESQEAg=";
|
||||
version = "0.48.23";
|
||||
sha256 = "sha256-3jzIWNmV4HR0IZ4lo+Hw7ZmAcNLiBtOjE9Q3ml93oGo=";
|
||||
};
|
||||
|
||||
vala_0_54 = generic {
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -90,6 +90,16 @@ 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
|
||||
|
||||
mv $out/include/vtk-${majorVersion}/* $out/include
|
||||
rmdir $out/include/vtk-${majorVersion}
|
||||
ln -s $out/include $out/include/vtk-${majorVersion}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open source libraries for 3D computer graphics, image processing and visualization";
|
||||
homepage = "https://www.vtk.org/";
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -2,18 +2,21 @@
|
|||
, bluepy
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyswitchbot";
|
||||
version = "0.13.2";
|
||||
version = "0.13.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Danielhiversen";
|
||||
repo = "pySwitchbot";
|
||||
rev = version;
|
||||
sha256 = "0pdmssd5dr364p3lrkxqryjc0rbaw6xp724zwqf3i87qs6ljs928";
|
||||
hash = "sha256-Zgpnw4It3yyy9RQqt5SxeJXl1Z3J3Rp9baLfiw5Bgow=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -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; {
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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; {
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
|
|
|
|||
|
|
@ -9149,6 +9149,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;
|
||||
|
|
@ -13424,7 +13426,6 @@ with pkgs;
|
|||
|
||||
inherit (callPackage ../development/compilers/vala { })
|
||||
vala_0_48
|
||||
vala_0_52
|
||||
vala_0_54
|
||||
vala;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue