gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/staging-next' into staging

Browse Source
This commit is contained in:
K900
2025-12-10 12:01:58 +03:00
parent 14966c491f 38dedaab49
commit 7828f075c3
32 changed files with 683 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix
+11 -3
View File
@@ -4,6 +4,7 @@
melpaBuild,
fetchFromGitHub,
replaceVars,
fetchpatch,
acm,
markdown-mode,
basedpyright,
@@ -32,13 +33,13 @@ let
in
melpaBuild {
pname = "lsp-bridge";
version = "0-unstable-2025-06-28";
version = "0-unstable-2025-11-13";
src = fetchFromGitHub {
owner = "manateelazycat";
repo = "lsp-bridge";
rev = "3b37a04bd1b6bbcdc2b0ad7a5c388ad027eb7a25";
hash = "sha256-0pjRihJapljd/9nR7G+FC+gCqD82YGITPK2mcJcI7ZI=";
rev = "426794a45b57d923129dfa1e4ca07c34aa72e69c";
hash = "sha256-9nNg0yCtEBFNWP7TFGo1SsmtnnufoROyaeIJK0tjoEQ=";
};
patches = [
@@ -47,6 +48,13 @@ melpaBuild {
(replaceVars ./hardcode-dependencies.patch {
python = python.interpreter;
})
# Revert using quelpa repo to get check inputs
(fetchpatch {
url = "https://github.com/manateelazycat/lsp-bridge/commit/a999c8432817a806ed9ad74b5e918ab9612bd09b.patch";
revert = true;
hash = "sha256-NK6hooWn78Hk26tcQbIwUiiJuQ/hhlbLK+pgiZT//fI=";
})
];
packageRequires = [
pkgs/applications/editors/vim/plugins/generated.nix
+1
View File
@@ -21045,6 +21045,7 @@ final: prev: {
rev = "1331cfe8cbf9b9d79f4b60c1afc211b77c181ad4";
sha256 = "0dmypsgn6lxq2irxcigxh79l923ph4qk4m2hg27mjd8m079x4j2r";
};
meta.homepage = "https://github.com/garbas/vim-snipmate/";
meta.hydraPlatforms = [ ];
};
pkgs/build-support/build-mozilla-mach/default.nix
+1
View File
@@ -180,6 +180,7 @@ in
# > that I made in
# > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815006
# >
# > @garbas shared with me the list of patches applied for the Nix package.
# > As they are just for portability and tiny modifications, they don't
# > alter the experience of the product. In parallel, Rok also shared the
# > build options. They seem good (even if I cannot judge the quality of the
pkgs/by-name/as/asciinema-scenario/package.nix
+1
View File
@@ -17,6 +17,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "Create asciinema videos from a text file";
homepage = "https://github.com/garbas/asciinema-scenario/";
license = with licenses; [ mit ];
mainProgram = "asciinema-scenario";
};
pkgs/by-name/as/asmjit/package.nix
+6 -3
View File
@@ -4,17 +4,18 @@
cmake,
ninja,
lib,
nix-update-script,
}:
stdenv.mkDerivation {
pname = "asmjit";
version = "0-unstable-2025-02-12";
version = "1.18-unstable-2025-11-03";
src = fetchFromGitHub {
owner = "asmjit";
repo = "asmjit";
rev = "029075b84bf0161a761beb63e6eda519a29020db";
hash = "sha256-/9F1rFNPwJUrVOVeK9sIA+Q7UrqQpQy8T6g4ywcoJc8=";
rev = "b56f4176cb9b0c0501da659ac54d4c5877862c7b";
hash = "sha256-fOYJak+DiGM3vazKwOffTGuqPuUi7p+I0phBmtfqzME=";
};
nativeBuildInputs = [
@@ -24,6 +25,8 @@ stdenv.mkDerivation {
strictDeps = true;
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
meta = with lib; {
description = "Machine code generation for C++";
longDescription = ''
pkgs/by-name/bl/blend2d/package.nix
+6 -3
View File
@@ -4,17 +4,18 @@
fetchFromGitHub,
cmake,
asmjit,
nix-update-script,
}:
stdenv.mkDerivation {
pname = "blend2d";
version = "0.12";
version = "0.21.2-unstable-2025-11-03";
src = fetchFromGitHub {
owner = "blend2d";
repo = "blend2d";
rev = "717cbf4bc0f2ca164cf2f0c48f0497779241b6c5";
hash = "sha256-L3wDsjy0cocncZqKLy8in2yirrFJoqU3tFBfeBxlhs0=";
rev = "def0d1238c3e5d0983bb848e5676049d829e435b";
hash = "sha256-b9DlgJNpMSLMM+xrM7sKVRH/DAoGHhOrwq5sw4OKH+k=";
};
outputs = [
@@ -26,6 +27,8 @@ stdenv.mkDerivation {
cmakeFlags = [ (lib.cmakeFeature "ASMJIT_DIR" (toString asmjit.src)) ];
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
meta = {
description = "2D Vector Graphics Engine Powered by a JIT Compiler";
homepage = "https://blend2d.com";
pkgs/by-name/bo/bookstack/package.nix
+3 -3
View File
@@ -8,16 +8,16 @@
php83.buildComposerProject2 (finalAttrs: {
pname = "bookstack";
version = "25.11.4";
version = "25.11.6";
src = fetchFromGitHub {
owner = "bookstackapp";
repo = "bookstack";
tag = "v${finalAttrs.version}";
hash = "sha256-Hyob7OF9AOsu4AjS6qu8A93AsumSXiyWPDKWGAz6mJ0=";
hash = "sha256-2JyWCP2ISgl82P6W5dL5Zbl+phgREQEonQ+12fu3q/E=";
};
vendorHash = "sha256-srlqwp0/Gfs6hWO9IGSCwR3yTxz+euYgoVkU+UnaLio=";
vendorHash = "sha256-7T2pdzjqkT0bRw1d7IVVFHjJ22qKNj4czf5q8Xbs/aw=";
passthru = {
phpPackage = php83;
pkgs/by-name/co/contact/package.nix
+2 -2
View File
@@ -6,14 +6,14 @@
python3Packages.buildPythonApplication rec {
pname = "contact";
version = "1.4.3";
version = "1.4.4";
pyproject = true;
src = fetchFromGitHub {
owner = "pdxlocations";
repo = "contact";
tag = version;
hash = "sha256-PjWVjvuHAgHR1/G4LfwhG0g45XoLTUf6BumopwgOPe0=";
hash = "sha256-YLg4+AxtF0ZZe5nJMOcg1pPetdcKRnQlpADyYROP/EY=";
};
dependencies = [ python3Packages.meshtastic ];
pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix
+2 -2
View File
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "fcitx5-mcbopomofo";
version = "2.9.2";
version = "2.9.4";
src = fetchFromGitHub {
owner = "openvanilla";
repo = "fcitx5-mcbopomofo";
rev = version;
hash = "sha256-2TWJsEScC5rMz5dowJOQHA2Mjzsq+d9n2lKXdEWiELU=";
hash = "sha256-4nJrNAAh7N2hJW/+cKz2pmu004VXAkuw9y0PJ7ktIug=";
};
nativeBuildInputs = [
pkgs/by-name/gr/grype/package.nix
+3 -3
View File
@@ -11,13 +11,13 @@
buildGoModule (finalAttrs: {
pname = "grype";
version = "0.104.1";
version = "0.104.2";
src = fetchFromGitHub {
owner = "anchore";
repo = "grype";
tag = "v${finalAttrs.version}";
hash = "sha256-6oXpS3rJIQpUfMNRfIFT09HhOs7sTL1EqGouSZlr3z8=";
hash = "sha256-S+oscpVa8HhZZKd8qFX8xR84tc7pAncofp/5QzCX/bI=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@@ -32,7 +32,7 @@ buildGoModule (finalAttrs: {
proxyVendor = true;
vendorHash = "sha256-Z5QrF/d1RDUsQniCfbk6729TXTAHmcrGT+8F9K68HAo=";
vendorHash = "sha256-liVutQcKrOjG8/m0uMFE85MejTvd2kCVQ5iLWtnb/94=";
nativeBuildInputs = [ installShellFiles ];
pkgs/by-name/je/jellyfin-tui/package.nix
+3 -3
View File
@@ -13,16 +13,16 @@
rustPlatform.buildRustPackage rec {
pname = "jellyfin-tui";
version = "1.2.6";
version = "1.3.0";
src = fetchFromGitHub {
owner = "dhonus";
repo = "jellyfin-tui";
tag = "v${version}";
hash = "sha256-UwWL5YCBUHG6+r41E0mMaNKl+o2/YxhMCIFaQVR8X7A=";
hash = "sha256-AzeIoPdFfuzDrSPcAWqYq9sTHpLR222cz7BMHgVpmNA=";
};
cargoHash = "sha256-+oqC83gObCulyGbAx0EXPqnpyFBA4vtJSW6/MNide+U=";
cargoHash = "sha256-a08yTZAzBSldSJ+TulU10aF+wLYCAxCA4WRMNfZOWFw=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [
pkgs/by-name/ow/owi/package.nix
+3 -3
View File
@@ -15,14 +15,14 @@ let
in
ocamlPackages.buildDunePackage {
pname = "owi";
version = "0.2-unstable-2025-12-01";
version = "0.2-unstable-2025-12-08";
src = fetchFromGitHub {
owner = "ocamlpro";
repo = "owi";
rev = "92403520c3ad8ea1a57d734772e2c4c22589eca3";
rev = "b35dafd51853b40f6b403cc5c460bed8dd2c8027";
fetchSubmodules = true;
hash = "sha256-cVkHaXBeTgfHKLCIB3sTEIqu2kvYmo3gi42tRn2DcaA=";
hash = "sha256-qYSn47I6slnJ6brXGc5KcbR2rlSwuTyqdPyNKs1uTsQ=";
};
nativeBuildInputs = with ocamlPackages; [
pkgs/by-name/pd/pdf4qt/find_lcms2_path.patch
-21
View File
@@ -1,21 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 298cdca..8894db3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,7 +55,15 @@ endif()
qt_standard_project_setup()
find_package(OpenSSL REQUIRED)
-find_package(lcms2 REQUIRED)
+SET(LCMS2_NAMES ${LCMS2_NAMES} lcms2 liblcms2 liblcms2_static)
+FIND_LIBRARY(LCMS2_LIBRARY NAMES ${LCMS2_NAMES} )
+FIND_PATH(LCMS2_INCLUDE_DIR lcms2.h)
+add_library(lcms2::lcms2 UNKNOWN IMPORTED)
+set_target_properties(lcms2::lcms2 PROPERTIES
+ IMPORTED_LOCATION ${LCMS2_LIBRARY}
+ INTERFACE_INCLUDE_DIRECTORIES ${LCMS2_INCLUDE_DIR}
+ INTERFACE_COMPILE_DEFINITIONS "HAVE_LCMS2=1;CMS_NO_REGISTER_KEYWORD=1")
+set_property(GLOBAL APPEND PROPERTY INTERNAL_DEPS_PROP lcms2::lcms2)
find_package(ZLIB REQUIRED)
find_package(Freetype REQUIRED)
find_package(OpenJPEG CONFIG REQUIRED)
pkgs/by-name/pd/pdf4qt/migrated_to_blend2d_0.21.x.patch
+445
View File
@@ -0,0 +1,445 @@
diff --git a/Pdf4QtLibCore/sources/pdfblpainter.cpp b/Pdf4QtLibCore/sources/pdfblpainter.cpp
index 6ccedc625239bfeccf938d1ff78f71abd4c8c914..59a90a7e165c7ba161d23043b7d834c945a37242 100644
--- a/Pdf4QtLibCore/sources/pdfblpainter.cpp
+++ b/Pdf4QtLibCore/sources/pdfblpainter.cpp
@@ -222,19 +222,19 @@ bool PDFBLPaintEngine::begin(QPaintDevice*)
if (m_isMultithreaded)
{
info.flags = BL_CONTEXT_CREATE_FLAG_FALLBACK_TO_SYNC;
- info.threadCount = QThread::idealThreadCount();
+ info.thread_count = QThread::idealThreadCount();
}
- m_blContext->setHint(BL_CONTEXT_HINT_RENDERING_QUALITY, BL_RENDERING_QUALITY_MAX_VALUE);
+ m_blContext->set_hint(BL_CONTEXT_HINT_RENDERING_QUALITY, BL_RENDERING_QUALITY_MAX_VALUE);
- m_blOffscreenBuffer->createFromData(m_qtOffscreenBuffer.width(), m_qtOffscreenBuffer.height(), BL_FORMAT_PRGB32, m_qtOffscreenBuffer.bits(), m_qtOffscreenBuffer.bytesPerLine());
+ m_blOffscreenBuffer->create_from_data(m_qtOffscreenBuffer.width(), m_qtOffscreenBuffer.height(), BL_FORMAT_PRGB32, m_qtOffscreenBuffer.bits(), m_qtOffscreenBuffer.bytesPerLine());
if (m_blContext->begin(m_blOffscreenBuffer.value(), info) == BL_SUCCESS)
{
- m_blContext->clearAll();
+ m_blContext->clear_all();
qreal devicePixelRatio = m_qtOffscreenBuffer.devicePixelRatioF();
m_blContext->scale(devicePixelRatio);
- m_blContext->userToMeta();
+ m_blContext->user_to_meta();
setBLPen(m_blContext.value(), m_currentPen);
setBLBrush(m_blContext.value(), m_currentBrush);
@@ -296,18 +296,18 @@ void PDFBLPaintEngine::updateState(const QPaintEngineState& updatedState)
if (updatedState.state().testFlag(QPaintEngine::DirtyCompositionMode))
{
- m_blContext->setCompOp(getBLCompOp(updatedState.compositionMode()));
+ m_blContext->set_comp_op(getBLCompOp(updatedState.compositionMode()));
}
if (updatedState.state().testFlag(QPaintEngine::DirtyOpacity))
{
- m_blContext->setGlobalAlpha(updatedState.opacity());
+ m_blContext->set_global_alpha(updatedState.opacity());
}
if (updatedState.state().testFlag(QPaintEngine::DirtyTransform))
{
m_currentTransform = updatedState.transform();
- m_blContext->setTransform(getBLMatrix(updatedState.transform()));
+ m_blContext->set_transform(getBLMatrix(updatedState.transform()));
}
if (updatedState.state().testFlag(QPaintEngine::DirtyFont))
@@ -381,12 +381,12 @@ void PDFBLPaintEngine::drawRects(const QRect* rects, int rectCount)
if (isFillActive())
{
- m_blContext->fillRectArray(blRects.view());
+ m_blContext->fill_rect_array(blRects.view());
}
if (isStrokeActive())
{
- m_blContext->strokeRectArray(blRects.view());
+ m_blContext->stroke_rect_array(blRects.view());
}
}
@@ -427,12 +427,12 @@ void PDFBLPaintEngine::drawRects(const QRectF* rects, int rectCount)
if (isFillActive())
{
- m_blContext->fillRectArray(blRects.view());
+ m_blContext->fill_rect_array(blRects.view());
}
if (isStrokeActive())
{
- m_blContext->strokeRectArray(blRects.view());
+ m_blContext->stroke_rect_array(blRects.view());
}
}
@@ -482,7 +482,7 @@ void PDFBLPaintEngine::drawLines(const QLine* lines, int lineCount)
}
}
- m_blContext->strokeLine(line.x1(), line.y1(), line.x2(), line.y2());
+ m_blContext->stroke_line(line.x1(), line.y1(), line.x2(), line.y2());
}
}
@@ -531,7 +531,7 @@ void PDFBLPaintEngine::drawLines(const QLineF* lines, int lineCount)
}
}
- m_blContext->strokeLine(line.x1(), line.y1(), line.x2(), line.y2());
+ m_blContext->stroke_line(line.x1(), line.y1(), line.x2(), line.y2());
}
}
@@ -585,8 +585,8 @@ void PDFBLPaintEngine::drawPathImpl(const QPainterPath& path, bool enableStroke,
if (!fillPath.isEmpty())
{
m_blContext->save();
- m_blContext->resetTransform();
- m_blContext->fillPath(getBLPath(fillPath));
+ m_blContext->reset_transform();
+ m_blContext->fill_path(getBLPath(fillPath));
m_blContext->restore();
}
}
@@ -601,9 +601,9 @@ void PDFBLPaintEngine::drawPathImpl(const QPainterPath& path, bool enableStroke,
if (!finalTransformedStrokedPath.isEmpty())
{
m_blContext->save();
- m_blContext->resetTransform();
+ m_blContext->reset_transform();
setBLBrush(m_blContext.value(), m_currentPen.brush());
- m_blContext->fillPath(getBLPath(finalTransformedStrokedPath));
+ m_blContext->fill_path(getBLPath(finalTransformedStrokedPath));
m_blContext->restore();
}
}
@@ -616,19 +616,19 @@ void PDFBLPaintEngine::drawPathImpl(const QPainterPath& path, bool enableStroke,
if ((isFillActive() && enableFill) || forceFill)
{
- m_blContext->fillPath(blPath);
+ m_blContext->fill_path(blPath);
}
if (isStrokeActive() && enableStroke)
{
- m_blContext->strokePath(blPath);
+ m_blContext->stroke_path(blPath);
}
}
void PDFBLPaintEngine::drawPoints(const QPointF* points, int pointCount)
{
m_blContext->save();
- m_blContext->setFillStyle(BLRgba32(m_currentPen.color().rgba()));
+ m_blContext->set_fill_style(BLRgba32(m_currentPen.color().rgba()));
for (int i = 0; i < pointCount; ++i)
{
@@ -640,7 +640,7 @@ void PDFBLPaintEngine::drawPoints(const QPointF* points, int pointCount)
}
BLEllipse blEllipse(c.x(), c.y(), m_currentPen.widthF() * 0.5, m_currentPen.widthF() * 0.5);
- m_blContext->fillEllipse(blEllipse);
+ m_blContext->fill_ellipse(blEllipse);
}
m_blContext->restore();
@@ -649,7 +649,7 @@ void PDFBLPaintEngine::drawPoints(const QPointF* points, int pointCount)
void PDFBLPaintEngine::drawPoints(const QPoint* points, int pointCount)
{
m_blContext->save();
- m_blContext->setFillStyle(BLRgba32(m_currentPen.color().rgba()));
+ m_blContext->set_fill_style(BLRgba32(m_currentPen.color().rgba()));
for (int i = 0; i < pointCount; ++i)
{
@@ -661,7 +661,7 @@ void PDFBLPaintEngine::drawPoints(const QPoint* points, int pointCount)
}
BLEllipse blEllipse(c.x(), c.y(), m_currentPen.widthF() * 0.5, m_currentPen.widthF() * 0.5);
- m_blContext->fillEllipse(blEllipse);
+ m_blContext->fill_ellipse(blEllipse);
}
m_blContext->restore();
@@ -716,10 +716,10 @@ void PDFBLPaintEngine::drawTiledPixmap(const QRectF& r, const QPixmap& pixmap, c
int tilesY = qCeil(r.height() / pixmap.height());
BLImage blImage;
- blImage.createFromData(image.width(), image.height(), BL_FORMAT_PRGB32, image.bits(), image.bytesPerLine());
+ blImage.create_from_data(image.width(), image.height(), BL_FORMAT_PRGB32, image.bits(), image.bytesPerLine());
BLImage blDrawImage;
- blDrawImage.assignDeep(blImage);
+ blDrawImage.assign_deep(blImage);
for (int x = 0; x < tilesX; ++x)
{
@@ -730,7 +730,7 @@ void PDFBLPaintEngine::drawTiledPixmap(const QRectF& r, const QPixmap& pixmap, c
if (tilePos.x() < r.right() && tilePos.y() < r.bottom())
{
- m_blContext->blitImage(getBLPoint(tilePos), blDrawImage);
+ m_blContext->blit_image(getBLPoint(tilePos), blDrawImage);
}
}
}
@@ -776,12 +776,12 @@ void PDFBLPaintEngine::drawImage(const QRectF& r, const QImage& pm, const QRectF
}
BLImage blImage;
- blImage.createFromData(image.width(), image.height(), BL_FORMAT_PRGB32, image.bits(), image.bytesPerLine());
+ blImage.create_from_data(image.width(), image.height(), BL_FORMAT_PRGB32, image.bits(), image.bytesPerLine());
BLImage blDrawImage;
- blDrawImage.assignDeep(blImage);
+ blDrawImage.assign_deep(blImage);
- m_blContext->blitImage(BLRect(r.x(), r.y(), r.width(), r.height()),
+ m_blContext->blit_image(BLRect(r.x(), r.y(), r.width(), r.height()),
blDrawImage,
BLRectI(sr.x(), sr.y(), sr.width(), sr.height()));
}
@@ -838,11 +838,11 @@ BLPath PDFBLPaintEngine::getBLPath(const QPainterPath& path)
switch (element.type)
{
case QPainterPath::MoveToElement:
- blPath.moveTo(element.x, element.y);
+ blPath.move_to(element.x, element.y);
break;
case QPainterPath::LineToElement:
- blPath.lineTo(element.x, element.y);
+ blPath.line_to(element.x, element.y);
break;
case QPainterPath::CurveToElement:
@@ -851,7 +851,7 @@ BLPath PDFBLPaintEngine::getBLPath(const QPainterPath& path)
const QPainterPath::Element& ctrlPoint1 = path.elementAt(i++);
const QPainterPath::Element& ctrlPoint2 = path.elementAt(i++);
const QPainterPath::Element& endPoint = path.elementAt(i);
- blPath.cubicTo(ctrlPoint1.x, ctrlPoint1.y, ctrlPoint2.x, ctrlPoint2.y, endPoint.x, endPoint.y);
+ blPath.cubic_to(ctrlPoint1.x, ctrlPoint1.y, ctrlPoint2.x, ctrlPoint2.y, endPoint.x, endPoint.y);
}
break;
@@ -875,20 +875,20 @@ void PDFBLPaintEngine::setBLPen(BLContext& context, const QPen& pen)
const QList<qreal> customDashPattern = pen.dashPattern();
const Qt::PenStyle penStyle = pen.style();
- context.setStrokeAlpha(pen.color().alphaF());
- context.setStrokeWidth(width);
- context.setStrokeMiterLimit(miterLimit);
+ context.set_stroke_alpha(pen.color().alphaF());
+ context.set_stroke_width(width);
+ context.set_stroke_miter_limit(miterLimit);
switch (capStyle)
{
case Qt::FlatCap:
- context.setStrokeCaps(BL_STROKE_CAP_BUTT);
+ context.set_stroke_caps(BL_STROKE_CAP_BUTT);
break;
case Qt::SquareCap:
- context.setStrokeCaps(BL_STROKE_CAP_SQUARE);
+ context.set_stroke_caps(BL_STROKE_CAP_SQUARE);
break;
case Qt::RoundCap:
- context.setStrokeCaps(BL_STROKE_CAP_ROUND);
+ context.set_stroke_caps(BL_STROKE_CAP_ROUND);
break;
}
@@ -899,69 +899,69 @@ void PDFBLPaintEngine::setBLPen(BLContext& context, const QPen& pen)
dashArray.append(value);
}
- context.setStrokeDashOffset(dashOffset);
- context.setStrokeDashArray(dashArray);
+ context.set_stroke_dash_offset(dashOffset);
+ context.set_stroke_dash_array(dashArray);
switch (joinStyle)
{
case Qt::MiterJoin:
- context.setStrokeJoin(BL_STROKE_JOIN_MITER_CLIP);
+ context.set_stroke_join(BL_STROKE_JOIN_MITER_CLIP);
break;
case Qt::BevelJoin:
- context.setStrokeJoin(BL_STROKE_JOIN_BEVEL);
+ context.set_stroke_join(BL_STROKE_JOIN_BEVEL);
break;
case Qt::RoundJoin:
- context.setStrokeJoin(BL_STROKE_JOIN_ROUND);
+ context.set_stroke_join(BL_STROKE_JOIN_ROUND);
break;
case Qt::SvgMiterJoin:
- context.setStrokeJoin(BL_STROKE_JOIN_MITER_CLIP);
+ context.set_stroke_join(BL_STROKE_JOIN_MITER_CLIP);
break;
}
- context.setStrokeStyle(BLRgba32(color.rgba()));
+ context.set_stroke_style(BLRgba32(color.rgba()));
- BLStrokeOptions strokeOptions = context.strokeOptions();
+ BLStrokeOptions strokeOptions = context.stroke_options();
switch (penStyle)
{
case Qt::SolidLine:
- strokeOptions.dashArray.clear();
- strokeOptions.dashOffset = 0.0;
+ strokeOptions.dash_array.clear();
+ strokeOptions.dash_offset = 0.0;
break;
case Qt::DashLine:
{
constexpr double dashPattern[] = {4, 4};
- strokeOptions.dashArray.assignData(dashPattern, std::size(dashPattern));
+ strokeOptions.dash_array.assign_data(dashPattern, std::size(dashPattern));
break;
}
case Qt::DotLine:
{
constexpr double dashPattern[] = {1, 3};
- strokeOptions.dashArray.assignData(dashPattern, std::size(dashPattern));
+ strokeOptions.dash_array.assign_data(dashPattern, std::size(dashPattern));
break;
}
case Qt::DashDotLine:
{
constexpr double dashPattern[] = {4, 2, 1, 2};
- strokeOptions.dashArray.assignData(dashPattern, std::size(dashPattern));
+ strokeOptions.dash_array.assign_data(dashPattern, std::size(dashPattern));
break;
}
case Qt::DashDotDotLine:
{
constexpr double dashPattern[] = {4, 2, 1, 2, 1, 2};
- strokeOptions.dashArray.assignData(dashPattern, std::size(dashPattern));
+ strokeOptions.dash_array.assign_data(dashPattern, std::size(dashPattern));
break;
}
case Qt::CustomDashLine:
{
auto dashPattern = pen.dashPattern();
- strokeOptions.dashArray.assignData(dashPattern.data(), dashPattern.size());
- strokeOptions.dashOffset = pen.dashOffset();
+ strokeOptions.dash_array.assign_data(dashPattern.data(), dashPattern.size());
+ strokeOptions.dash_offset = pen.dashOffset();
break;
}
@@ -969,7 +969,7 @@ void PDFBLPaintEngine::setBLPen(BLContext& context, const QPen& pen)
break;
}
- context.setStrokeOptions(strokeOptions);
+ context.set_stroke_options(strokeOptions);
}
void PDFBLPaintEngine::setBLBrush(BLContext& context, const QBrush& brush)
@@ -981,7 +981,7 @@ void PDFBLPaintEngine::setBLBrush(BLContext& context, const QBrush& brush)
{
stops.append(BLGradientStop(stop.first, BLRgba32(stop.second.red(), stop.second.green(), stop.second.blue(), stop.second.alpha())));
}
- blGradient.assignStops(stops.constData(), stops.size());
+ blGradient.assign_stops(stops.constData(), stops.size());
};
switch (brush.style())
@@ -991,7 +991,7 @@ void PDFBLPaintEngine::setBLBrush(BLContext& context, const QBrush& brush)
{
QColor color = brush.color();
BLRgba32 blColor = BLRgba32(color.red(), color.green(), color.blue(), color.alpha());
- context.setFillStyle(blColor);
+ context.set_fill_style(blColor);
break;
}
case Qt::LinearGradientPattern:
@@ -1007,7 +1007,7 @@ void PDFBLPaintEngine::setBLBrush(BLContext& context, const QBrush& brush)
blLinearGradient.y1 = linearGradient->finalStop().y();
BLGradient blGradient(blLinearGradient);
setGradientStops(blGradient, *gradient);
- context.setFillStyle(blGradient);
+ context.set_fill_style(blGradient);
}
break;
}
@@ -1025,7 +1025,7 @@ void PDFBLPaintEngine::setBLBrush(BLContext& context, const QBrush& brush)
blRadialGradientValues.r0 = radialGradient->radius();
BLGradient blGradient(blRadialGradientValues);
setGradientStops(blGradient, *gradient);
- context.setFillStyle(blGradient);
+ context.set_fill_style(blGradient);
}
break;
}
@@ -1037,12 +1037,12 @@ bool PDFBLPaintEngine::loadBLFont(BLFont& font, QString fontName, PDFReal fontSi
QByteArray data = PDFSystemFont::getFontData(fontName.toLatin1());
BLFontData blFontData;
- if (blFontData.createFromData(data.data(), data.size()) == BL_SUCCESS)
+ if (blFontData.create_from_data(data.data(), data.size()) == BL_SUCCESS)
{
BLFontFace fontFace;
- if (fontFace.createFromData(blFontData, 0) == BL_SUCCESS)
+ if (fontFace.create_from_data(blFontData, 0) == BL_SUCCESS)
{
- if (font.createFromFace(fontFace, fontSize) == BL_SUCCESS)
+ if (font.create_from_face(fontFace, fontSize) == BL_SUCCESS)
{
return true;
}
@@ -1154,7 +1154,7 @@ void PDFBLPaintEngine::updateClipping(std::optional<QRegion> clipRegion,
m_finalClipPath.reset();
m_finalClipPathBoundingBox = QRectF();
m_clipSingleRect = false;
- m_blContext->restoreClipping();
+ m_blContext->restore_clipping();
return;
case Qt::ReplaceClip:
@@ -1188,14 +1188,14 @@ void PDFBLPaintEngine::updateClipping(std::optional<QRegion> clipRegion,
if (m_clipSingleRect)
{
- BLMatrix2D matrix = m_blContext->userTransform();
- m_blContext->resetTransform();
- m_blContext->clipToRect(getBLRect(m_finalClipPath->boundingRect()));
- m_blContext->setTransform(matrix);
+ BLMatrix2D matrix = m_blContext->user_transform();
+ m_blContext->reset_transform();
+ m_blContext->clip_to_rect(getBLRect(m_finalClipPath->boundingRect()));
+ m_blContext->set_transform(matrix);
}
else
{
- m_blContext->restoreClipping();
+ m_blContext->restore_clipping();
}
}
@@ -1312,7 +1312,7 @@ void PDFBLPaintEngine::setFillRule(Qt::FillRule fillRule)
break;
}
- m_blContext->setFillRule(blFillRule);
+ m_blContext->set_fill_rule(blFillRule);
}
} // namespace pdf
pkgs/by-name/pd/pdf4qt/package.nix
+10 -6
View File
@@ -10,24 +10,23 @@
openjpeg,
onetbb,
blend2d,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "pdf4qt";
version = "1.5.1.0";
version = "1.5.2.0";
src = fetchFromGitHub {
owner = "JakubMelka";
repo = "PDF4QT";
tag = "v${finalAttrs.version}";
hash = "sha256-Ysrz/uCSTFK5wGNdTXhpq6QVf7Ju1xWisNVUtBtdEjc=";
hash = "sha256-pY1PM3H9vANxogRzQvuIohIi9d8TL093kMAl49trTho=";
};
patches = [
# lcms2 cmake module only appears when built with vcpkg.
# We directly search for the corresponding libraries and
# header files instead.
./find_lcms2_path.patch
# https://github.com/JakubMelka/PDF4QT/pull/322
./migrated_to_blend2d_0.21.x.patch
];
nativeBuildInputs = [
@@ -50,6 +49,9 @@ stdenv.mkDerivation (finalAttrs: {
blend2d
];
# `blend2d.h` moved to `blend2d/blend2d.h` in blend2d >= 0.21.2
NIX_CFLAGS_COMPILE = "-I${blend2d.dev}/include/blend2d";
cmakeFlags = [
(lib.cmakeBool "PDF4QT_INSTALL_TO_USR" false)
];
@@ -60,6 +62,8 @@ stdenv.mkDerivation (finalAttrs: {
qtWrapperArgs+=(''${gappsWrapperArgs[@]})
'';
passthru.updateScript = nix-update-script { };
meta = {
description = "Open source PDF editor";
longDescription = ''
pkgs/by-name/po/poptracker/package.nix
+2 -2
View File
@@ -19,13 +19,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "poptracker";
version = "0.32.1";
version = "0.33.0";
src = fetchFromGitHub {
owner = "black-sliver";
repo = "PopTracker";
tag = "v${finalAttrs.version}";
hash = "sha256-DFJfuDOzcVdiXLv5EzO5TL3UJLCZPM1bTZharp2ww5U=";
hash = "sha256-3JcE963GSAUs82OF59Yf7PjQV0FHKsCYx+q3TWQsHpY=";
fetchSubmodules = true;
};
pkgs/by-name/pr/proxypin/gitHashes.json
+4
View File
@@ -0,0 +1,4 @@
{
"desktop_multi_window": "sha256-Tbl0DOxW1F8V2Kj34gcNRbBqr5t9Iq74qCT26deqFdQ=",
"flutter_code_editor": "sha256-B9aJh6e6iLBZAcacucsT9szWWBwWVBBPDhbKQfnxc6I="
}
pkgs/by-name/pr/proxypin/package.nix
+25 -10
View File
@@ -3,25 +3,28 @@
flutter332,
fetchFromGitHub,
autoPatchelfHook,
writeShellScript,
nix-update,
yq-go,
}:
flutter332.buildFlutterApplication rec {
let
version = "1.2.2";
in
flutter332.buildFlutterApplication {
pname = "proxypin";
version = "1.2.0";
inherit version;
src = fetchFromGitHub {
owner = "wanghongenpin";
repo = "proxypin";
tag = "v${version}";
hash = "sha256-PRknUOCaaDE4Ri70EAROx1K3g2bLKI/HKIvo1W1D8ko=";
hash = "sha256-aMBUQkG/sZ7M9GzxKpO56MuGPRFLRGjrFpvsIUGDgkA=";
};
pubspecLock = lib.importJSON ./pubspec.lock.json;
gitHashes = {
desktop_multi_window = "sha256-Tbl0DOxW1F8V2Kj34gcNRbBqr5t9Iq74qCT26deqFdQ=";
flutter_code_editor = "sha256-B9aJh6e6iLBZAcacucsT9szWWBwWVBBPDhbKQfnxc6I=";
};
gitHashes = lib.importJSON ./gitHashes.json;
postPatch = ''
substituteInPlace linux/my_application.cc \
@@ -34,11 +37,23 @@ flutter332.buildFlutterApplication rec {
substituteInPlace linux/proxy-pin.desktop \
--replace-fail "/opt/proxypin/data/flutter_assets/assets/icon.png" "proxypin" \
--replace-fail "/opt/proxypin/" ""
install -Dm0644 linux/proxy-pin.desktop $out/share/applications/proxypin.desktop
install -Dm0644 assets/icon.png $out/share/pixmaps/proxypin.png
install -D --mode=0644 linux/proxy-pin.desktop $out/share/applications/proxypin.desktop
install -D --mode=0644 assets/icon.png $out/share/icons/hicolor/256x256/apps/proxypin.png
'';
passthru.updateScript = ./update.sh;
passthru.updateScript = writeShellScript "update-proxypin" ''
${lib.getExe nix-update} --use-github-releases proxypin
export HOME=$(mktemp -d)
src=$(nix build --no-link --print-out-paths .#proxypin.src)
WORKDIR=$(mktemp -d)
cp --recursive --no-preserve=mode $src/* $WORKDIR
PACKAGE_DIR=$(dirname $(EDITOR=echo nix edit --file . proxypin))
pushd $WORKDIR
${lib.getExe flutter332} pub get
${lib.getExe yq-go} eval --output-format=json --prettyPrint pubspec.lock > $PACKAGE_DIR/pubspec.lock.json
popd
$PACKAGE_DIR/update-gitHashes.py
'';
meta = {
description = "Capture HTTP(S) traffic software";
pkgs/by-name/pr/proxypin/pubspec.lock.json
+54 -64
View File
@@ -104,11 +104,11 @@
"dependency": "transitive",
"description": {
"name": "cross_file",
"sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670",
"sha256": "942a4791cd385a68ccb3b32c71c427aba508a1bb949b86dff2adbe4049f16239",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.3.4+2"
"version": "0.3.5"
},
"crypto": {
"dependency": "transitive",
@@ -225,11 +225,11 @@
"dependency": "direct main",
"description": {
"name": "file_picker",
"sha256": "ef7d2a085c1b1d69d17b6842d0734aad90156de08df6bd3c12496d0bd6ddf8e2",
"sha256": "f2d9f173c2c14635cc0e9b14c143c49ef30b4934e8d1d274d6206fcb0086a06f",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "10.3.1"
"version": "10.3.3"
},
"fixnum": {
"dependency": "transitive",
@@ -308,11 +308,11 @@
"dependency": "transitive",
"description": {
"name": "flutter_plugin_android_lifecycle",
"sha256": "6382ce712ff69b0f719640ce957559dde459e55ecd433c767e06d139ddf16cab",
"sha256": "c2fe1001710127dfa7da89977a08d591398370d099aacdaa6d44da7eb14b8476",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.29"
"version": "2.0.31"
},
"flutter_qr_reader_plus": {
"dependency": "direct main",
@@ -490,11 +490,21 @@
"dependency": "direct main",
"description": {
"name": "logger",
"sha256": "55d6c23a6c15db14920e037fe7e0dc32e7cdaf3b64b4b25df2d541b5b6b81c0c",
"sha256": "a7967e31b703831a893bbc3c3dd11db08126fe5f369b5c648a36f821979f5be3",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.6.1"
"version": "2.6.2"
},
"macos_window_utils": {
"dependency": "direct main",
"description": {
"name": "macos_window_utils",
"sha256": "d4df3501fd32ac0d2d7590cb6a8e4758337d061c8fa0db816fdd636be63a8438",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.9.0"
},
"matcher": {
"dependency": "transitive",
@@ -570,21 +580,21 @@
"dependency": "transitive",
"description": {
"name": "path_provider_android",
"sha256": "d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9",
"sha256": "3b4c1fc3aa55ddc9cd4aa6759984330d5c8e66aa7702a6223c61540dc6380c37",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.2.17"
"version": "2.2.19"
},
"path_provider_foundation": {
"dependency": "transitive",
"description": {
"name": "path_provider_foundation",
"sha256": "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942",
"sha256": "16eef174aacb07e09c351502740fa6254c165757638eba1e9116b0a781201bbd",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.4.1"
"version": "2.4.2"
},
"path_provider_linux": {
"dependency": "transitive",
@@ -690,11 +700,11 @@
"dependency": "transitive",
"description": {
"name": "petitparser",
"sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646",
"sha256": "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.1.0"
"version": "7.0.1"
},
"platform": {
"dependency": "transitive",
@@ -850,11 +860,11 @@
"dependency": "transitive",
"description": {
"name": "shared_preferences_android",
"sha256": "5bcf0772a761b04f8c6bf814721713de6f3e5d9d89caf8d3fe031b02a342379e",
"sha256": "bd14436108211b0d4ee5038689a56d4ae3620fd72fd6036e113bf1345bc74d9e",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.4.11"
"version": "2.4.13"
},
"shared_preferences_foundation": {
"dependency": "transitive",
@@ -922,16 +932,6 @@
"source": "hosted",
"version": "1.10.1"
},
"sprintf": {
"dependency": "transitive",
"description": {
"name": "sprintf",
"sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "7.0.0"
},
"stack_trace": {
"dependency": "transitive",
"description": {
@@ -1036,21 +1036,21 @@
"dependency": "transitive",
"description": {
"name": "url_launcher_android",
"sha256": "0aedad096a85b49df2e4725fa32118f9fa580f3b14af7a2d2221896a02cd5656",
"sha256": "81777b08c498a292d93ff2feead633174c386291e35612f8da438d6e92c4447e",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.3.17"
"version": "6.3.20"
},
"url_launcher_ios": {
"dependency": "transitive",
"description": {
"name": "url_launcher_ios",
"sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb",
"sha256": "d80b3f567a617cb923546034cc94bfe44eb15f989fe670b37f26abdb9d939cb7",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.3.3"
"version": "6.3.4"
},
"url_launcher_linux": {
"dependency": "transitive",
@@ -1066,11 +1066,11 @@
"dependency": "transitive",
"description": {
"name": "url_launcher_macos",
"sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2",
"sha256": "c043a77d6600ac9c38300567f33ef12b0ef4f4783a2c1f00231d2b1941fea13f",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.2.2"
"version": "3.2.3"
},
"url_launcher_platform_interface": {
"dependency": "transitive",
@@ -1106,11 +1106,11 @@
"dependency": "transitive",
"description": {
"name": "uuid",
"sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff",
"sha256": "a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.5.1"
"version": "4.5.2"
},
"vclibs": {
"dependency": "direct main",
@@ -1156,11 +1156,11 @@
"dependency": "transitive",
"description": {
"name": "win32",
"sha256": "66814138c3562338d05613a6e368ed8cfb237ad6d64a9e9334be3f309acfca03",
"sha256": "d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "5.14.0"
"version": "5.15.0"
},
"win32_registry": {
"dependency": "transitive",
@@ -1192,16 +1192,6 @@
"source": "hosted",
"version": "0.5.1"
},
"windows_single_instance": {
"dependency": "direct main",
"description": {
"name": "windows_single_instance",
"sha256": "50d5dcd6bec90b4a5ed588b1822b1aad21b39fc96da843e61c734b3caccfd2fc",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.0.1"
},
"xdg_directories": {
"dependency": "transitive",
"description": {
@@ -1216,91 +1206,91 @@
"dependency": "transitive",
"description": {
"name": "xml",
"sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226",
"sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.5.0"
"version": "6.6.1"
},
"zstandard": {
"dependency": "direct main",
"description": {
"name": "zstandard",
"sha256": "f1635a33fedc97ea4140fb7f41ae0f591f23c171079ed1054a2a99423bbb21cd",
"sha256": "d2cae71d34dfdd014525259be2f84ebc2a738c94cc4232515df44a1415dde9d3",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.3.27"
"version": "1.3.29"
},
"zstandard_android": {
"dependency": "transitive",
"description": {
"name": "zstandard_android",
"sha256": "e345f280c23fa6d679797a7c5ad93862f02109ee3039b27262a82af574abae23",
"sha256": "7d85d814f147faa7a33d5cd5b5610dea451a57f95b34f98c93723bb2f2efbf98",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.3.27"
"version": "1.3.29"
},
"zstandard_ios": {
"dependency": "transitive",
"description": {
"name": "zstandard_ios",
"sha256": "824319352d9a88259e43a8e344b9ef4db54cf09cd6053792563a8ad9257e38f9",
"sha256": "50e6b3d05ad6ecf8def65c9fae46d4b786edd89150fd2bb207cdcef918946f0d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.3.27"
"version": "1.3.29"
},
"zstandard_linux": {
"dependency": "transitive",
"description": {
"name": "zstandard_linux",
"sha256": "65bf0d25e7e930866615b9a22c16ad36603b6800f8030fcd5538b2f1ce8c6ac0",
"sha256": "66a61f7839016671a18448b73dab1910f7390bd9ab15bc118c8591381103f5b2",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.3.27"
"version": "1.3.29"
},
"zstandard_macos": {
"dependency": "transitive",
"description": {
"name": "zstandard_macos",
"sha256": "876a9eaacbf4a94392e8514b56305c1b6bea042dd17891e7527a7c859a3ab984",
"sha256": "f4e02dc613f9d0c960edad8a330b41c4e0f0a548aea26668a12f45eebacd6aa1",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.3.27"
"version": "1.3.29"
},
"zstandard_platform_interface": {
"dependency": "transitive",
"description": {
"name": "zstandard_platform_interface",
"sha256": "0b82c4a43552eccc92033a6504ab2ac442d9456f20132b08296bafd41a807e2f",
"sha256": "0261e2ce3520eace49e5d1e766e69a8c2613d24f0805c94e08544a139ad20e48",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.3.27"
"version": "1.3.29"
},
"zstandard_web": {
"dependency": "transitive",
"description": {
"name": "zstandard_web",
"sha256": "a72a265fd5f1092ff916e49fa7669c306dbaf161454780d446f88e626d55804c",
"sha256": "ed0d385dab253fefbe7c42e4eb7b58d3f2425713420402cc3f3b281d5a49e8a7",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.3.27"
"version": "1.3.29"
},
"zstandard_windows": {
"dependency": "transitive",
"description": {
"name": "zstandard_windows",
"sha256": "2095eae95f774973088fcbddc094a4ed11d2cac6d731911c987a0c06e743dddd",
"sha256": "86bbd10b9d563dd22eedd4df94904078ac443d8f941b79a72c4fda534da76461",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.3.27"
"version": "1.3.29"
}
},
"sdks": {
pkgs/by-name/pr/proxypin/update-gitHashes.py
Executable
+51
View File
@@ -0,0 +1,51 @@
#! /usr/bin/env nix-shell
#! nix-shell -i python3 -p python3 nix-prefetch-git
import json
import subprocess
import sys
from pathlib import Path
THIS_FOLDER = Path(__file__).parent.resolve()
PUBSPEC_LOCK = THIS_FOLDER / "pubspec.lock.json"
GIT_HASHES = THIS_FOLDER / "gitHashes.json"
def fetch_git_hash(url: str, rev: str) -> str:
result = subprocess.run(
["nix-prefetch-git", "--url", url, "--rev", rev],
capture_output=True,
text=True,
check=True,
)
return json.loads(result.stdout)["hash"]
def main() -> None:
if not PUBSPEC_LOCK.exists():
sys.exit(1)
try:
data = json.loads(PUBSPEC_LOCK.read_text())
except json.JSONDecodeError:
sys.exit(1)
output: dict[str, str] = {}
for name, info in data.get("packages", {}).items():
if info.get("source") != "git":
continue
desc = info.get("description")
if not isinstance(desc, dict):
continue
url = desc.get("url")
rev = desc.get("resolved-ref")
if not (isinstance(url, str) and isinstance(rev, str)):
continue
try:
package_hash = fetch_git_hash(url, rev)
except subprocess.CalledProcessError:
continue
output[name] = package_hash
GIT_HASHES.write_text(json.dumps(output, indent=2) + "\n")
if __name__ == "__main__":
main()
pkgs/by-name/pr/proxypin/update.sh
-34
View File
@@ -1,34 +0,0 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p yq nix bash coreutils nix-update common-updater-scripts ripgrep flutter
set -eou pipefail
PACKAGE_DIR="$(realpath "$(dirname "$0")")"
cd "$PACKAGE_DIR"/..
while ! test -f flake.nix; do cd ..; done
NIXPKGS_DIR="$PWD"
latestVersion=$(
list-git-tags --url=https://github.com/wanghongenpin/proxypin |
rg '^v(.*)' -r '$1' |
sort --version-sort |
tail -n1
)
currentVersion=$(nix-instantiate --eval -E "with import ./. {}; proxypin.version or (lib.getVersion proxypin)" | tr -d '"')
if [[ "$currentVersion" == "$latestVersion" ]]; then
echo "package is up-to-date: $currentVersion"
exit 0
fi
nix-update --version=$latestVersion proxypin
export HOME="$(mktemp -d)"
src="$(nix-build --no-link "$NIXPKGS_DIR" -A proxypin.src)"
TMPDIR="$(mktemp -d)"
cp --recursive --no-preserve=mode "$src"/* $TMPDIR
cd $TMPDIR
flutter pub get
yq . pubspec.lock >"$PACKAGE_DIR"/pubspec.lock.json
rm -rf $TMPDIR
pkgs/by-name/qw/qwen-code/package.nix
+3 -3
View File
@@ -13,16 +13,16 @@
buildNpmPackage (finalAttrs: {
pname = "qwen-code";
version = "0.3.0";
version = "0.4.0";
src = fetchFromGitHub {
owner = "QwenLM";
repo = "qwen-code";
tag = "v${finalAttrs.version}";
hash = "sha256-VUI7Br3k3g87tQW1AEccTTojOKNO0HA4jwA7PvYrlN8=";
hash = "sha256-B7dL0pWSCPwPKwwTHycgC3/qHB66AUWZc62sen7U/7c=";
};
npmDepsHash = "sha256-Fv3Tca0LlVwpKOoDyG8wiojn0pip8IH79lxqxISd8O0=";
npmDepsHash = "sha256-SPb+TSi4MCiAr9ruS1Idg3KfTbX6gtMK7f/+vdnabt8=";
nativeBuildInputs = [
jq
pkgs/by-name/ra/radicle-ci-broker/package.nix
+7 -3
View File
@@ -7,20 +7,21 @@
gitMinimal,
sqlite,
radicle-node,
writableTmpDirAsHomeHook,
versionCheckHook,
nixosTests,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "radicle-ci-broker";
version = "0.23.0";
version = "0.24.0";
src = fetchFromRadicle {
seed = "seed.radicle.xyz";
repo = "zwTxygwuz5LDGBq255RA2CbNGrz8";
node = "z6MkgEMYod7Hxfy9qCvDv5hYHkZ4ciWmLFgfvm3Wn1b2w2FV";
tag = "v${finalAttrs.version}";
hash = "sha256-JLsrn8a+lBH0PM8Wp7UmUcT+sd4NS/CJk/Bd70Hs9i8=";
hash = "sha256-E9i5EhzI+9PX2Sm2nNyB5SMi6F/EmjifeD0futPBi6k=";
leaveDotGit = true;
postFetch = ''
git -C $out rev-parse --short HEAD > $out/.git_head
@@ -28,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
'';
};
cargoHash = "sha256-F2OG4bV5q4k1bi4NFqxaDPw0UnAM15kNH2u2Qp/kauk=";
cargoHash = "sha256-RlqomX4XiKn/YuCdBh6H/y+8JFBwC06eDEAmhz71UXs=";
postPatch = ''
substituteInPlace build.rs \
@@ -41,6 +42,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
preCheck = ''
ln -s "$PWD/target/${stdenv.hostPlatform.rust.rustcTarget}/$cargoBuildType" target/debug
rad auth --alias alice --stdin </dev/null
'';
nativeCheckInputs = [
@@ -48,6 +51,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
gitMinimal
sqlite
radicle-node
writableTmpDirAsHomeHook
];
checkFlags = [ "--skip=acceptance_criteria_for_upgrades" ];
pkgs/by-name/rw/rwpspread/package.nix
+3 -3
View File
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "rwpspread";
version = "0.4.0";
version = "0.5.0";
src = fetchFromGitHub {
owner = "0xk1f0";
repo = "rwpspread";
rev = "v${version}";
hash = "sha256-1i1675OiyleCXcc/uN95kyY7m5ht/rS3UKY7EmuSsrk=";
hash = "sha256-lp9XvILpvNZtffJLyDUCo5Xyor4X4bwsfxAIqS8Hf7M=";
};
cargoHash = "sha256-NuOOg9aIa0JW+urxDVaPn66bS4H7+0tbKYNVDUV8D80=";
cargoHash = "sha256-aGy29kGwCKHBNzszYR+w+1m8gZ/lFd0MOlFHtDDzjj4=";
nativeBuildInputs = [ pkg-config ];
pkgs/by-name/sy/syft/package.nix
+3 -3
View File
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "syft";
version = "1.38.0";
version = "1.38.2";
src = fetchFromGitHub {
owner = "anchore";
repo = "syft";
tag = "v${version}";
hash = "sha256-XSwGTaR0pZXFdLqTBAWmiK2VqIkZ/7I+uckUUvDfmVQ=";
hash = "sha256-t8YG4RDuEfIlzvcG1/ozuLWyzX4T+JZfO4mvedKBsY4=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@@ -29,7 +29,7 @@ buildGoModule rec {
# hash mismatch with darwin
proxyVendor = true;
vendorHash = "sha256-6n+aA5/8B89KSLnjB61kalX7Ugbtg+VwCaZ/ni2fe/w=";
vendorHash = "sha256-k2LkkABh6Rp/DFhagRM62UdDLFsM5nrtiltZZX5p+yk=";
nativeBuildInputs = [ installShellFiles ];
pkgs/development/python-modules/aiosql/default.nix
+8 -7
View File
@@ -3,7 +3,9 @@
buildPythonPackage,
fetchFromGitHub,
pg8000,
psycopg,
pytest-asyncio,
pytest-postgresql,
pytestCheckHook,
pythonOlder,
setuptools,
@@ -14,21 +16,19 @@
buildPythonPackage rec {
pname = "aiosql";
version = "13.4";
version = "14.1";
pyproject = true;
disabled = pythonOlder "3.8";
outputs = [
"doc"
"out"
"doc"
];
src = fetchFromGitHub {
owner = "nackjicholson";
repo = "aiosql";
tag = version;
hash = "sha256-a3pRzcDMXdaDs0ub6k5bPRwnk+RCbxZ7ceIt8/fMSPg=";
hash = "sha256-BNsjVVyYRfp3sNdzQwHy9nQveP2AHfXGK10DLybat9I=";
};
sphinxRoot = "docs/source";
@@ -40,10 +40,11 @@ buildPythonPackage rec {
sphinxHook
];
propagatedBuildInputs = [ pg8000 ];
nativeCheckInputs = [
pg8000
psycopg
pytest-asyncio
pytest-postgresql
pytestCheckHook
];
pkgs/development/python-modules/granian/default.nix
+9 -3
View File
@@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "granian";
version = "2.5.7";
version = "2.6.0";
pyproject = true;
src = fetchFromGitHub {
owner = "emmett-framework";
repo = "granian";
tag = "v${version}";
hash = "sha256-IXL4T3y7OBU+/Kv1593NHaS6fKG+a3SkEWdNVDSuKKA=";
hash = "sha256-Jj75ycr9Y0aCTP5YGzd6um/7emWKqqegUDB7HpTfTcM=";
};
# Granian forces a custom allocator for all the things it runs,
@@ -39,7 +39,7 @@ buildPythonPackage rec {
cargoDeps = rustPlatform.fetchCargoVendor {
inherit pname version src;
hash = "sha256-xqAUspCRKQfXa8sPJ/ZbgOXrds7KdTUKBk0k4085wMo=";
hash = "sha256-Q7BWwvkK5rRuhVobxW4qXLo6tnusOaQYN8mBoNVoulw=";
};
nativeBuildInputs = with rustPlatform; [
@@ -79,6 +79,12 @@ buildPythonPackage rec {
enabledTestPaths = [ "tests/" ];
disabledTests = [
# SSLCertVerificationError: certificate verify failed: certificate has expired
"test_asgi_ws_scope"
"test_rsgi_ws_scope"
];
pythonImportsCheck = [ "granian" ];
passthru.updateScript = nix-update-script { };
pkgs/development/python-modules/granian/no-alloc.patch
+7 -7
View File
@@ -1,26 +1,26 @@
diff --git a/Cargo.toml b/Cargo.toml
index cbf1cdb..e819e14 100644
index c7d1647..d5710bd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -41,7 +41,6 @@ hyper = { version = "=1.6", features = ["http1", "http2", "server"] }
@@ -41,7 +41,6 @@ hyper = { version = "=1.8", features = ["http1", "http2", "server"] }
hyper-util = { version = "=0.1", features = ["server-auto", "tokio"] }
itertools = "0.14"
log = "0.4"
-mimalloc = { version = "0.1.43", default-features = false, features = ["local_dynamic_tls"], optional = true }
-mimalloc = { version = "0.1.43", default-features = false, features = ["local_dynamic_tls", "v3"], optional = true }
mime_guess = "=2.0"
pem = "=3.0"
percent-encoding = "=2.3"
@@ -52,7 +51,6 @@ pyo3-log = "=0.12"
@@ -52,7 +51,6 @@ pyo3-log = { version = "=0.13", git = "https://github.com/gi0baro/pyo3-log.git",
rustls-pemfile = "2.2"
socket2 = { version = "=0.6", features = ["all"] }
sysinfo = "=0.36"
sysinfo = "=0.37"
-tikv-jemallocator = { version = "0.6.0", default-features = false, features = ["disable_initial_exec_tls"], optional = true }
tls-listener = { version = "=0.11", features = ["rustls-ring"] }
tls-listener = { version = "=0.11", git = "https://github.com/gi0baro/tls-listener.git", branch = "0.11.x", features = ["rustls-ring", "rustls-tls12"] }
tokio = { version = "1.45", features = ["full"] }
tokio-stream = "0.1"
@@ -62,10 +60,6 @@ tokio-util = { version = "0.7", features = ["codec", "rt"] }
[build-dependencies]
pyo3-build-config = "=0.25"
pyo3-build-config = "=0.27"
-[features]
-jemalloc = ["dep:tikv-jemallocator"]
pkgs/development/python-modules/pyportainer/default.nix
+2 -2
View File
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "pyportainer";
version = "1.0.14";
version = "1.0.15";
pyproject = true;
src = fetchFromGitHub {
owner = "erwindouna";
repo = "pyportainer";
tag = "v${version}";
hash = "sha256-5ARTHT5NmRBMOMVRPWAICdScAGUbkebtLyJqUW195Mw=";
hash = "sha256-Lp2bX5+lsfSPEuc0q+tD8tBrMdKq7GZC+tG0cuieNOQ=";
};
build-system = [ poetry-core ];
pkgs/development/python-modules/pysrdaligateway/default.nix
+2 -2
View File
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "pysrdaligateway";
version = "0.17.2";
version = "0.19.0";
pyproject = true;
src = fetchFromGitHub {
owner = "maginawin";
repo = "PySrDaliGateway";
tag = "v${version}";
hash = "sha256-wqZ1lb0W5tTBiMxe5Yt9+tCMOH15QP8LDB2OlJRHtng=";
hash = "sha256-m4gkhDYrw+58FN80zTKjSPK/3Wsl7rZ+Xlo/iWNZTWw=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/samplerate/default.nix
+2 -2
View File
@@ -22,14 +22,14 @@
buildPythonPackage rec {
pname = "samplerate";
version = "0.2.2";
version = "0.2.3";
pyproject = true;
src = fetchFromGitHub {
owner = "tuxu";
repo = "python-samplerate";
tag = "v${version}";
hash = "sha256-aSlnPwFNZRffDsLqhYD1Pd5JOwvv9GcWyseZmeyrvt0=";
hash = "sha256-7FAdIqsYCapmEAYiAuoS5m/jFExXZX3hn3kwxn9NWEc=";
};
postPatch = ''
pkgs/development/tools/rgp/default.nix
+4 -4
View File
@@ -27,15 +27,15 @@
}:
let
buildNum = "2025-06-12-1681";
buildNum = "2025-10-29-1732";
in
stdenv.mkDerivation {
pname = "rgp";
version = "2.5";
version = "2.6";
src = fetchurl {
url = "https://gpuopen.com/download/radeon-developer-tool-suite/RadeonDeveloperToolSuite-${buildNum}.tgz";
hash = "sha256-e7IxoaZi77klrihRO6vDh1o2Clj5lNsVlzQ7btgLsu4=";
url = "https://gpuopen.com/download/RadeonDeveloperToolSuite-${buildNum}.tgz";
hash = "sha256-iqdfVAG0ARPfjkJEtX7v2hpDnf3k60nAvQ+AZzcFnBM=";
};
nativeBuildInputs = [