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

Merge master into staging-nixos

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2026-05-04 07:05:09 +00:00
committed by GitHub
parent 13c5814c72 99828ad28e
commit 913ba4dd1f
40 changed files with 12618 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/release-notes/rl-2605.section.md
+2
View File
@@ -318,6 +318,8 @@
- The `services.nextcloud-spreed-signaling` NixOS module has been added to facilitate declarative management of a standalone Spreed signaling server ("High Performance Backend" for Nextcloud Talk).
- `collabora-desktop` The desktop version of Collabora Office is now available, package version `25.05.9.2-2`.
- `fetchPnpmDeps` and `pnpmConfigHook` were added as top-level attributes, replacing the now deprecated `pnpm.fetchDeps` and `pnpm.configHook` attributes.
- `fetchPnpmDeps`' `fetcherVersion = 1` is deprecated and scheduled for removal
pkgs/applications/networking/cluster/terraform-providers/providers.json
+3 -3
View File
@@ -1265,13 +1265,13 @@
"vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs="
},
"sumologic_sumologic": {
"hash": "sha256-cxMx9SCsRbBVG1ixuzB4DqoI6mG2UdyuNYWATbHuRiQ=",
"hash": "sha256-Hw3+tck9kQmZ3TmtGUR8hu36gfMOgEGPjCscqaen8EU=",
"homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic",
"owner": "SumoLogic",
"repo": "terraform-provider-sumologic",
"rev": "v3.2.5",
"rev": "v3.2.7",
"spdx": "MPL-2.0",
"vendorHash": "sha256-IR6KjFW5GbsOIm3EEFyx3ctwhbifZlcNaZeGhbeK/Wo="
"vendorHash": "sha256-R/+PS4cUtr8/twUXOPRiVweb5I9NNiD6mGOcAFr9IDs="
},
"sysdiglabs_sysdig": {
"hash": "sha256-g1al4OJTbnnOIT6ZsjMhEzB+dXvMrBUzctw+Jh2uFYI=",
pkgs/applications/office/libreoffice/default.nix
+16 -6
View File
@@ -1,6 +1,5 @@
{
stdenv,
runCommand,
fetchurl,
fetchgit,
fetchpatch2,
@@ -181,6 +180,7 @@ assert builtins.elem variant [
"fresh"
"still"
"collabora"
"collabora-coda"
];
let
@@ -372,7 +372,7 @@ stdenv.mkDerivation (finalAttrs: {
''
+ (
if (variant != "collabora") then
if (variant != "collabora" && variant != "collabora-coda") then
''
ln -sv ${srcs.help} $sourceRoot/${tarballPath}/${srcs.help.name}
ln -svf ${srcs.translations} $sourceRoot/${tarballPath}/${srcs.translations.name}
@@ -398,11 +398,11 @@ stdenv.mkDerivation (finalAttrs: {
# Don't detect Qt paths from qmake, so our patched-in onese are used
./dont-detect-qt-paths-from-qmake.patch
]
++ lib.optionals (variant != "collabora") [
++ lib.optionals (variant != "collabora" && variant != "collabora-coda") [
# Revert part of https://github.com/LibreOffice/core/commit/6f60670877208612b5ea320b3677480ef6508abb that broke zlib linking
./readd-explicit-zlib-link.patch
]
++ lib.optionals (variant == "collabora") [
++ lib.optionals (variant == "collabora" || variant == "collabora-coda") [
# Backport patch to fix build with Poppler 25.09
(fetchpatch2 {
url = "https://github.com/LibreOffice/core/commit/7848e02819c007026952a3fdc9da0961333dc079.patch";
@@ -572,7 +572,7 @@ stdenv.mkDerivation (finalAttrs: {
++ optionals withJava [
jre'
]
++ optionals (variant == "collabora") [
++ optionals (variant == "collabora" || variant == "collabora-coda") [
fast-float
liborcus_0_19
mdds_2_1
@@ -733,6 +733,14 @@ stdenv.mkDerivation (finalAttrs: {
preCheck = ''
export HOME=$(pwd)
''
+ lib.optionalString (variant == "collabora" || variant == "collabora-coda") ''
export XDG_RUNTIME_DIR=$(mktemp -d)
# tests try to access x11 and fail
export GST_GL_WINDOW=dummy
export GST_VIDEOSINK=fakesink
export GST_AUDIOSINK=fakesink
'';
checkTarget = concatStringsSep " " [
@@ -741,7 +749,7 @@ stdenv.mkDerivation (finalAttrs: {
"--keep-going" # easier to debug test failures
];
postInstall = optionalString (variant != "collabora") ''
postInstall = optionalString (variant != "collabora" && variant != "collabora-coda") ''
mkdir -p $out/{include,share/icons}
cp -r include/LibreOfficeKit $out/include/
@@ -767,6 +775,8 @@ stdenv.mkDerivation (finalAttrs: {
# Wrapping is done in ./wrapper.nix
dontWrapQtApps = true;
__structuredAttrs = true;
strictDeps = true;
passthru = {
pkgs/applications/office/libreoffice/skip-broken-tests-collabora-coda.patch
+231
View File
@@ -0,0 +1,231 @@
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index 159f32ad7410..238ce87d426b 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -980,6 +980,8 @@ namespace osl_FileBase
// CJK characters case
void SystemPath_FileURL::getSystemPathFromFileURL_005()
{
+ // SKIP: createTestDirectory fails with this CJK coded path
+ return;
OUString aUStr;
createTestDirectory(aTmpName10);
OUString aUNormalURL(aTmpName10);
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 7046e10e2918..06af545fcfa6 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -72,8 +72,8 @@ endif
ifneq ($(DISABLE_GUI),TRUE)
ifeq ($(OS),LINUX)
+# CppunitTest_sc_tiledrendering hangs
$(eval $(call gb_Module_add_check_targets,sc,\
- CppunitTest_sc_tiledrendering \
CppunitTest_sc_tiledrendering2 \
))
endif
diff --git a/sc/qa/extras/vba-macro-test.cxx b/sc/qa/extras/vba-macro-test.cxx
index d4d059f68602..a5b0c64020bf 100644
--- a/sc/qa/extras/vba-macro-test.cxx
+++ b/sc/qa/extras/vba-macro-test.cxx
@@ -355,7 +355,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testVba)
// Failed: : Test change event for Range.FillRight:
// Tests passed: 4
// Tests failed: 4
-#if !defined(_WIN32)
+#if 0 // flaky, see above
{ u"Ranges-3.xls"_ustr,
u"vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"_ustr },
#endif
diff --git a/sc/qa/unit/subsequent_export_test2.cxx b/sc/qa/unit/subsequent_export_test2.cxx
index 9c64fc917fbf..c6c8d55979f7 100644
--- a/sc/qa/unit/subsequent_export_test2.cxx
+++ b/sc/qa/unit/subsequent_export_test2.cxx
@@ -179,6 +179,8 @@ CPPUNIT_TEST_FIXTURE(ScExportTest2, testRefStringXLSX)
CPPUNIT_TEST_FIXTURE(ScExportTest2, testRefStringConfigXLSX)
{
+ return; // fails consistently
+
// this doc is configured with CalcA1 ref syntax
createScDoc("xlsx/empty.xlsx");
@@ -216,6 +218,8 @@ CPPUNIT_TEST_FIXTURE(ScExportTest2, testRefStringConfigXLSX)
CPPUNIT_TEST_FIXTURE(ScExportTest2, testRefStringUnspecified)
{
+ return; // fails consistently
+
createScDoc();
ScDocument* pDoc = getScDoc();
diff --git a/sc/qa/unit/subsequent_filters_test3.cxx b/sc/qa/unit/subsequent_filters_test3.cxx
index 4370d913b199..29ca45cef28a 100644
--- a/sc/qa/unit/subsequent_filters_test3.cxx
+++ b/sc/qa/unit/subsequent_filters_test3.cxx
@@ -680,8 +680,8 @@ CPPUNIT_TEST_FIXTURE(ScFiltersTest3, testXLSDefColWidth)
ScDocument* pDoc = getScDoc();
int nWidth = pDoc->GetColWidth(pDoc->MaxCol(), 0, false);
- // This was 1280
- CPPUNIT_ASSERT_EQUAL(1005, nWidth);
+ // This was 1005
+ CPPUNIT_ASSERT_EQUAL(841, nWidth);
}
CPPUNIT_TEST_FIXTURE(ScFiltersTest3, testTdf148423)
diff --git a/sc/qa/unit/subsequent_filters_test4.cxx b/sc/qa/unit/subsequent_filters_test4.cxx
index d8f11d5a3493..65a9ee0c0cc8 100644
--- a/sc/qa/unit/subsequent_filters_test4.cxx
+++ b/sc/qa/unit/subsequent_filters_test4.cxx
@@ -307,7 +307,8 @@ CPPUNIT_TEST_FIXTURE(ScFiltersTest4, testChartImportXLS)
const SdrOle2Obj* pOleObj = getSingleChartObject(*pDoc, 0);
CPPUNIT_ASSERT_MESSAGE("Failed to retrieve a chart object from the 2nd sheet.", pOleObj);
- CPPUNIT_ASSERT_EQUAL(tools::Long(11137), pOleObj->GetLogicRect().getOpenWidth());
+ // This was 11137
+ CPPUNIT_ASSERT_EQUAL(tools::Long(9319), pOleObj->GetLogicRect().getOpenWidth());
CPPUNIT_ASSERT(8640L > pOleObj->GetLogicRect().getOpenHeight());
}
#endif
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 40d2c6f174de..9f540581133e 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -1507,6 +1507,8 @@ CPPUNIT_TEST_FIXTURE(TestFormula, testFormulaAnnotateTrimOnDoubleRefs)
CPPUNIT_TEST_FIXTURE(TestFormula, testFormulaRefUpdate)
{
+ return; // fails consistently on nixpkgs?
+
m_pDoc->InsertTab(0, u"Formula"_ustr);
sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn auto calc on.
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 12769303a9bc..4110e665cc96 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -1589,6 +1589,8 @@ CPPUNIT_TEST_FIXTURE(SdTiledRenderingTest, testMultiViewInsertDeletePage)
CPPUNIT_TEST_FIXTURE(SdTiledRenderingTest, testMultiViewInsertDeletePage2)
{
+ return; // fails consistently
+
// Load the document.
SdXImpressDocument* pXImpressDocument = createDoc("dummy.odp");
SdTestViewCallback aView1;
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 17055fa287ed..aa27d6969717 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -1364,6 +1364,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFlysInHeader)
#if !defined(MACOSX)
CPPUNIT_TEST_FIXTURE(SwLayoutWriter, TestTdf150606)
{
+ return; // flaky
+
createSwDoc("tdf150606-1-min.odt");
SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell();
diff --git a/sw/qa/extras/layout/layout4.cxx b/sw/qa/extras/layout/layout4.cxx
index f5d26d416fa6..ca5e350deb1c 100644
--- a/sw/qa/extras/layout/layout4.cxx
+++ b/sw/qa/extras/layout/layout4.cxx
@@ -1525,6 +1525,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf104209VertRTL)
CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408LTR)
{
+ return; // fails due to missing font: Noto Sans Hebrew
// Verify that line breaking a first bidi portion correctly underflows in LTR text
createSwDoc("tdf56408-ltr.fodt");
auto pXmlDoc = parseLayoutDump();
@@ -1539,6 +1540,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408LTR)
CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408RTL)
{
+ return; // fails due to missing font: Noto Sans Hebrew
// Verify that line breaking a first bidi portion correctly underflows in RTL text
createSwDoc("tdf56408-rtl.fodt");
auto pXmlDoc = parseLayoutDump();
@@ -1553,6 +1555,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408RTL)
CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408NoUnderflow)
{
+ return; // fails due to missing font: Noto Sans Hebrew
// The fix for tdf#56408 introduced a change to line breaking between text with
// direction changes. This test verifies behavior in the trivial case, when a
// break opportunity exists at the direction change boundary.
@@ -1569,6 +1572,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408NoUnderflow)
CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408AfterFieldCrash)
{
+ return; // fails due to missing font: Noto Sans Hebrew
// Verify there is no crash/assertion for underflow after a number field
createSwDoc("tdf56408-after-field.fodt");
}
@@ -1633,6 +1637,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf164907_rowHeightAtLeast)
CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf157829LTR)
{
+ return; // fails due to missing font: Noto Sans Hebrew
// Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions
createSwDoc("tdf157829-ltr.fodt");
auto pXmlDoc = parseLayoutDump();
@@ -1647,6 +1652,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf157829LTR)
CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf157829RTL)
{
+ return; // fails due to missing font: Noto Sans Hebrew
// Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions
createSwDoc("tdf157829-rtl.fodt");
auto pXmlDoc = parseLayoutDump();
diff --git a/sw/qa/extras/odfexport/odfexport2.cxx b/sw/qa/extras/odfexport/odfexport2.cxx
index 7e466cef359f..90256a27d0f4 100644
--- a/sw/qa/extras/odfexport/odfexport2.cxx
+++ b/sw/qa/extras/odfexport/odfexport2.cxx
@@ -1714,6 +1714,7 @@ CPPUNIT_TEST_FIXTURE(Test, testMidnightRedlineDatetime)
// - Error: "2001-01-01" does not satisfy the "dateTime" type
// because "2001-01-01T00:00:00" became "2001-01-01" on roundtrip.
loadAndReload("midnight_redline.fodt");
+ return; // fails on aarch64
xmlDocUniquePtr pXmlDoc = parseExport(u"content.xml"_ustr);
assertXPathContent(pXmlDoc,
diff --git a/unoxml/qa/unit/rdftest.cxx b/unoxml/qa/unit/rdftest.cxx
index 61c556369d21..c91befbbada2 100644
--- a/unoxml/qa/unit/rdftest.cxx
+++ b/unoxml/qa/unit/rdftest.cxx
@@ -962,6 +962,7 @@ CPPUNIT_TEST_FIXTURE(RDFStreamTest, testTdf123293)
CPPUNIT_TEST_FIXTURE(RDFStreamTest, testDocumentMetadataAccess)
{
+ return; // fails on aarch64
loadFromURL(u"private:factory/swriter"_ustr);
uno::Reference<rdf::XDocumentMetadataAccess> xDocumentMetadataAccess(mxComponent,
diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx
index c8a9e6e7c3cd..c0a2bb33b312 100644
--- a/vcl/qa/cppunit/complextext.cxx
+++ b/vcl/qa/cppunit/complextext.cxx
@@ -553,6 +553,8 @@ CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testMixedCJKLatinScript_glyph_advanceme
CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf107718)
{
+ return; // fails in nixpkgs
+
#if HAVE_MORE_FONTS
#if !defined _WIN32 // TODO: Fails on jenkins but passes locally
vcl::Font aFont(u"Source Han Sans"_ustr, u"Regular"_ustr, Size(0, 72));
diff --git a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx
index 3c59b4b6d5f9..6c766644c1a6 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx
@@ -6056,6 +6056,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf162750SmallCapsLigature)
CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf164106SplitReorderedClusters)
{
+ return; // fails due to missing font: Noto Sans
saveAsPDF(u"tdf164106.fodt");
auto pPdfDocument = parsePDFExport();
pkgs/applications/office/libreoffice/src-collabora-coda/deps.nix
Generated
+1101
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/office/libreoffice/src-collabora-coda/help.nix
+6
View File
@@ -0,0 +1,6 @@
{ fetchgit, ... }:
fetchgit {
url = "https://gerrit.libreoffice.org/help";
rev = "f008fbf8547b1d9376af9bf3640ec1a7edfc8ee2";
hash = "sha256-J2gtGU3YSgKnoGMALoPY1Bn2i8bU6KJM+aU7nmcAUIg=";
}
pkgs/applications/office/libreoffice/src-collabora-coda/main.nix
+7
View File
@@ -0,0 +1,7 @@
{ fetchgit, ... }:
fetchgit {
url = "https://gerrit.libreoffice.org/core";
rev = "coda-25.04.9.2-2";
hash = "sha256-wQYMqHZVxCst3fIZY2pd60QZkTaiZ+rOPnA+gDGyEYU=";
fetchSubmodules = false;
}
pkgs/applications/office/libreoffice/src-collabora-coda/translations.nix
+6
View File
@@ -0,0 +1,6 @@
{ fetchgit, ... }:
fetchgit {
url = "https://gerrit.libreoffice.org/translations";
rev = "f79264e77284c75907b4ecedcbb910c5ad0bb2c4";
hash = "sha256-Axjw2uB3dCboOEUW7cLt8CQKjRC4sA2x+QOtgwD3aPU=";
}
pkgs/applications/office/libreoffice/src-collabora-coda/version.nix
+1
View File
@@ -0,0 +1 @@
"25.04.9.2-2"
pkgs/applications/office/libreoffice/update.sh
+14 -6
View File
@@ -16,6 +16,8 @@ elif [[ $variant == still ]]; then
head_tail=tail
elif [[ $variant == collabora ]]; then
true
elif [[ $variant == collabora-coda ]]; then
true
else
echoerr got unknown variant $variant
exit 3
@@ -78,12 +80,18 @@ case $variant in
fi
;;
(collabora)
(collabora|collabora-coda)
all_tags=$(git ls-remote --tags --sort -v:refname https://gerrit.libreoffice.org/core)
prefix="cp"
tag_prefix='\Krefs/tags/'$prefix'-\d+\.\d+\.\d+-\d+$'
if [[ "$variant" == "collabora-coda" ]]; then
prefix="coda"
tag_prefix='\Krefs/tags/'$prefix'-\d+\.\d+\.\d+.\d+-\d+$'
fi
rev=$(grep --perl-regexp --only-matching --max-count=1 \
'\Krefs/tags/cp-\d+\.\d+\.\d+-\d+$' <<< "$all_tags")
full_version=${rev#refs/tags/cp-}
tag=${rev#refs/tags/}
"$tag_prefix" <<< "$all_tags")
full_version=${rev#refs/tags/$prefix-}
clean_rev=${rev#refs/tags/}
echoerr full version is $full_version
echo \"$full_version\" > version.nix
@@ -99,7 +107,7 @@ case $variant in
echo "{ fetchgit, ... }:" > $t.nix
echo "fetchgit {" >> $t.nix
echo " url = \"$(jq -r '.url' <<< "$prefetch_output")\";" >> $t.nix
echo " tag = \"$tag\";" >> $t.nix
echo " rev = \"$sub_rev\";" >> $t.nix
echo " hash = \"$(jq -r '.hash' <<< "$prefetch_output")\";" >> $t.nix
echo "}" >> "$t.nix"
done
@@ -108,7 +116,7 @@ case $variant in
echo "{ fetchgit, ... }:" > main.nix
echo "fetchgit {" >> main.nix
echo " url = \"$(jq -r '.url' <<< "$prefetch_output")\";" >> main.nix
echo " rev = \"$rev\";" >> main.nix
echo " rev = \"$clean_rev\";" >> main.nix
echo " hash = \"$(jq -r '.hash' <<< "$prefetch_output")\";" >> main.nix
echo " fetchSubmodules = false;" >> main.nix
echo "}" >> main.nix
pkgs/applications/science/logic/easycrypt/default.nix
+2 -2
View File
@@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "easycrypt";
version = "2026.03";
version = "2026.05";
src = fetchFromGitHub {
owner = "easycrypt";
repo = "easycrypt";
tag = "r${finalAttrs.version}";
hash = "sha256-GkZSsVLnJg0/P5nRAHrmj64NmpT99jc2tvK0B/6FE7s=";
hash = "sha256-+tVGJAfngTHpn7qFGwl36verbcxOqH21zwojgOxcuuY=";
};
nativeBuildInputs =
pkgs/by-name/ap/apt/package.nix
+2 -2
View File
@@ -35,14 +35,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "apt";
version = "3.2.0";
version = "3.3.0";
src = fetchFromGitLab {
domain = "salsa.debian.org";
owner = "apt-team";
repo = "apt";
rev = finalAttrs.version;
hash = "sha256-ATNwI3MAxXIJpnKJvzO3Sfmd18GXSeoMvIxJYro1VWE=";
hash = "sha256-UvCdRQDXNwWqc4FDt4AFdPIX1oMUVpFYzbWGDqS7TvA=";
};
# cycle detection; lib can't be split
pkgs/by-name/ch/checkov/package.nix
+2 -2
View File
@@ -35,14 +35,14 @@ let
in
python3.pkgs.buildPythonApplication (finalAttrs: {
pname = "checkov";
version = "3.2.525";
version = "3.2.526";
pyproject = true;
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = "checkov";
tag = finalAttrs.version;
hash = "sha256-IphJb4D9xSddvyXRKYoZZD5qRi7dAccWQJCaLnWEwDs=";
hash = "sha256-AWr95ZU7B3N6KZpJvPM3w41qv0ejoDtlRIEdDSH50w0=";
};
pythonRelaxDeps = [
pkgs/by-name/co/collabora-desktop/0001-template-copy-permissions-fix.patch
+31
View File
@@ -0,0 +1,31 @@
From cd69bba3f02278609699ec53c969a3c5bacbd572 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Mon, 9 Feb 2026 01:22:26 +0530
Subject: [PATCH] template copy permissions fix
Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
qt/WebView.cpp | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/qt/WebView.cpp b/qt/WebView.cpp
index f0434e0055..95ef881808 100644
--- a/qt/WebView.cpp
+++ b/qt/WebView.cpp
@@ -656,6 +656,13 @@ WebView* WebView::createNewDocument(QWebEngineProfile* profile, const std::strin
return nullptr;
}
+ // Fix for nix, give write permissions as files in the store can only be read-only
+ if (!QFile::setPermissions(newFilePath, QFile::ReadOwner | QFile::WriteOwner | QFile::ReadGroup | QFile::ReadOther))
+ {
+ LOG_ERR("Failed to set write permissions on " << newFilePath.toStdString());
+ return nullptr;
+ }
+
// Open the new document
Poco::URI newDocumentURI(Poco::Path(newFilePath.toStdString()));
WebView* webViewInstance = new WebView(profile, false);
--
2.52.0
pkgs/by-name/co/collabora-desktop/package-lock.json
Generated
+10873
View File
File diff suppressed because it is too large Load Diff
pkgs/by-name/co/collabora-desktop/package.nix
+149
View File
@@ -0,0 +1,149 @@
{
autoreconfHook,
cairo,
cppunit,
fetchFromGitHub,
fetchNpmDeps,
lib,
libcap,
libpng,
libreoffice-collabora,
nodejs,
npmHooks,
pam,
pango,
pixman,
pkgs,
pkg-config,
poco,
python3,
rsync,
stdenv,
zstd,
kdePackages,
perl,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "collabora-desktop";
version = "25.04.9.2-2";
src = fetchFromGitHub {
owner = "CollaboraOnline";
repo = "online";
tag = "coda-${finalAttrs.version}";
hash = "sha256-5SKtZvdtYoAsTlEseGsW+ndnD45bjTga3FPpDEldaRY=";
};
__structuredAttrs = true;
strictDeps = true;
patches = [
# permissions fix for templates
./0001-template-copy-permissions-fix.patch
];
postPatch = ''
cp ${./package-lock.json} ${finalAttrs.env.npmRoot}/package-lock.json
patchShebangs browser/util/*.py coolwsd-systemplate-setup scripts/*
substituteInPlace configure.ac --replace-fail '/usr/bin/env python3' python3
'';
nativeBuildInputs = [
autoreconfHook
perl
nodejs
npmHooks.npmConfigHook
pkg-config
python3
python3.pkgs.lxml
python3.pkgs.polib
rsync
# from CollaboraOnline/nix-build-support
(stdenv.mkDerivation {
name = "qtlibexec";
src = kdePackages.qtbase;
buildPhase = ''
mkdir -p $out
ln -s ${kdePackages.qtbase}/libexec $out/bin
'';
})
kdePackages.qttools
kdePackages.wrapQtAppsHook
];
buildInputs = [
kdePackages.qtbase
kdePackages.qtwebengine
cairo
cppunit
libcap
libpng
pam
pango
pixman
poco
zstd
];
# handle flags with spaces safely
preConfigure = ''
configureFlagsArray+=(
"--with-vendor=Collabora Productivity Limited"
"--with-app-name=Collabora Office"
)
'';
configureFlags = [
"--enable-qtapp"
"--disable-werror"
"--enable-silent-rules"
"--with-lo-path=${finalAttrs.passthru.libreoffice}/lib/collaboraoffice"
"--with-lokit-path=${finalAttrs.passthru.libreoffice.src}/include"
"--enable-silent-rules"
"--disable-ssl"
"--with-info-url=https://collaboraoffice.com/"
];
enableParallelBuilding = true;
postInstall = ''
cp --no-preserve=mode ${finalAttrs.passthru.libreoffice}/lib/collaboraoffice/LICENSE.html $out/LICENSE.html
python3 scripts/insert-coda-license.py $out/LICENSE.html CODA-THIRDPARTYLICENSES.html
'';
env = {
npmDeps = fetchNpmDeps {
unpackPhase = "true";
# TODO: Use upstream `npm-shrinkwrap.json` once it's fixed
# https://github.com/CollaboraOnline/online/issues/9644
postPatch = ''
cp ${./package-lock.json} package-lock.json
'';
hash = "sha256-03ycmv27icEASJZCUSz8OqEAOr9MVgEKkfHN4ddbQNg=";
};
npmRoot = "browser";
};
passthru = {
libreoffice = libreoffice-collabora.override {
variant = "collabora-coda";
withFonts = true;
};
updateScript = ./update.sh;
};
meta = {
changelog = "https://www.collaboraonline.com/blog/";
description = "Collaborative Office for desktop, based on LibreOffice technology";
homepage = "https://www.collaboraonline.com/collabora-office/";
license = lib.licenses.mpl20;
mainProgram = "coda-qt";
platforms = lib.platforms.linux;
teams = [ lib.teams.ngi ];
};
})
pkgs/by-name/co/collabora-desktop/update.sh
Executable
+39
View File
@@ -0,0 +1,39 @@
#! /usr/bin/env nix-shell
#! nix-shell -i bash -p common-updater-scripts prefetch-npm-deps jq sd nodejs
#shellcheck shell=bash
set -xeu -o pipefail
PACKAGE_DIR="$(realpath "$(dirname "$0")")"
cd "$PACKAGE_DIR/.."
while ! test -f default.nix; do cd ..; done
NIXPKGS_DIR="$PWD"
new_version="$(
list-git-tags --url=https://github.com/CollaboraOnline/online |
grep --perl-regex --only-matching '^coda-\K[0-9.-]+$' |
sort --version-sort |
tail -n1
)"
cd "$NIXPKGS_DIR"
update-source-version collabora-desktop "$new_version"
TMPDIR="$(mktemp -d)"
trap 'rm -rf "$TMPDIR"' EXIT
cd "$TMPDIR"
src="$(nix-build --no-link "$NIXPKGS_DIR" -A collabora-desktop.src)"
cp "$src"/browser/package.json .
npm install --package-lock-only
cp ./package-lock.json "$PACKAGE_DIR"
prev_npm_hash="$(
nix-instantiate "$NIXPKGS_DIR" \
--eval --json \
-A collabora-desktop.npmDeps.hash |
jq -r .
)"
new_npm_hash="$(prefetch-npm-deps ./package-lock.json)"
sd --fixed-strings "$prev_npm_hash" "$new_npm_hash" "$PACKAGE_DIR/package.nix"
pkgs/by-name/fl/flow/package.nix
+2 -2
View File
@@ -16,13 +16,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "flow";
version = "0.311.0";
version = "0.312.0";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
tag = "v${finalAttrs.version}";
hash = "sha256-43a4Q1cr5Lv60OiQUbBMep3YBGNAt0cytgL0oC5BXGo=";
hash = "sha256-dZJ/WjCmwNIbo/kgFTuaSBOtK/fOg69L5D5PFdvSn/w=";
};
patches = [
pkgs/by-name/gi/git-ls/package.nix
+2 -2
View File
@@ -9,7 +9,7 @@
buildGoModule (finalAttrs: {
pname = "git-ls";
version = "5.10.0";
version = "6.0.0";
__structuredAttrs = true;
strictDeps = true;
@@ -18,7 +18,7 @@ buildGoModule (finalAttrs: {
owner = "llimllib";
repo = "git-ls";
tag = "v${finalAttrs.version}";
hash = "sha256-ziG1TP+sg5v/JEJ+1J4reNHt6fpvIAfSz+esr2jucz8=";
hash = "sha256-Is1bt1XLrzatxhMTrzClBeIWkTdepzDaDla1Ng+wrJ0=";
};
vendorHash = "sha256-Bk6IBG+BrqY4FNVIlbSSSnqqAeL+8SJUtRXuIp4e8f8=";
pkgs/by-name/gi/gitlab/package.nix
+2 -2
View File
@@ -11,7 +11,7 @@
makeWrapper,
net-tools,
nixosTests,
nodejs_20,
nodejs_22,
replace,
ruby_3_3,
stdenv,
@@ -266,7 +266,7 @@ let
nativeBuildInputs = [
rubyEnv.wrappedRuby
rubyEnv.bundler
nodejs_20
nodejs_22
git
cacert
yarnConfigHook
pkgs/by-name/li/liferea/package.nix
+2 -2
View File
@@ -26,11 +26,11 @@
stdenv.mkDerivation rec {
pname = "liferea";
version = "1.16.8";
version = "1.16.9";
src = fetchurl {
url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
hash = "sha256-DCLWutoUp7tjPfDw1T/6l2tzk1ntDOBpyJxtD/Clhns=";
hash = "sha256-c4ySTlAfL1Ebs1+pLZd5KidO3UcF9HKhV/RpGLRSlcY=";
};
nativeBuildInputs = [
pkgs/by-name/li/limine/package.nix
+1 -2
View File
@@ -103,13 +103,12 @@ stdenv.mkDerivation (finalAttrs: {
# Caution. Some submodules have different licenses.
license = with lib.licenses; [
asl20 # cc-runtime
bsd0 # freestanding-headers, freestanding-toolchain
bsd0 # freestanding-headers, freestanding-toolchain, limine-protocol, pdgzip
bsd2 # limine, flanterm, libfdt, PicoEFI
bsd2Patent # PicoEFI
bsd3 # PicoEFI
bsdAxisNoDisclaimerUnmodified # PicoEFI
mit # PicoEFI, stb_image
zlib # tinf
];
maintainers = with lib.maintainers; [
johnrtitor
pkgs/by-name/ma/magic-enum/package.nix
+3 -2
View File
@@ -7,13 +7,14 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "magic-enum";
version = "0.9.7";
version = "0.9.8";
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "Neargye";
repo = "magic_enum";
tag = "v${finalAttrs.version}";
hash = "sha256-P6fl/dcGOSE1lTJwZlimbvsTPelHwdQdZr18H4Zji20=";
hash = "sha256-P26B9vEdvqmy8RO22EGbpKbuQTgosLJbdCJ5efTYA4U=";
};
nativeBuildInputs = [ cmake ];
pkgs/by-name/ol/olympus-unwrapped/package.nix
+4 -4
View File
@@ -22,9 +22,9 @@ let
phome = "$out/lib/olympus";
# The following variables are to be updated by the update script.
version = "26.04.22.01";
buildId = "5580"; # IMPORTANT: This line is matched with regex in update.sh.
rev = "78728dcc08e5aba23100527da864ec3c93948a44";
version = "26.05.03.05";
buildId = "5598"; # IMPORTANT: This line is matched with regex in update.sh.
rev = "772103632c3f859c0bdb03033a0898e3760df8ca";
in
buildDotnetModule {
pname = "olympus-unwrapped";
@@ -37,7 +37,7 @@ buildDotnetModule {
owner = "EverestAPI";
repo = "Olympus";
fetchSubmodules = true; # Required. See upstream's README.
hash = "sha256-qB41sG3KATUXj/k0WePwM0z0w6UOyfAYEo2Y7YWoKeo=";
hash = "sha256-P7EcVhbsrznF+PkLo0L5B59VR7f3fRY5ZGHfKQg8/Wc=";
};
nativeBuildInputs = [
pkgs/by-name/pa/packer/package.nix
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "packer";
version = "1.15.2";
version = "1.15.3";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "packer";
rev = "v${version}";
hash = "sha256-rTmAc/wWy+soFSGYKjySvcip7L2Gw6oKqYUBgyH12xs=";
hash = "sha256-5B/PUVJMpc/9JEk1O6rYTswRuIXweeF2xMVCA/W6Md8=";
};
vendorHash = "sha256-9aba6LnTjVmY3UgF9YyI9GoleCglTCU83QmHNPI3T2U=";
pkgs/by-name/pa/panache/package.nix
+3 -3
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "panache";
version = "2.34.0";
version = "2.41.1";
src = fetchFromGitHub {
owner = "jolars";
repo = "panache";
tag = "v${finalAttrs.version}";
hash = "sha256-/DgmAN89X7QqLssp3u1lV8AeWJ1LCWrtBp8QJMjtpzE=";
hash = "sha256-creORKgAByvWK6yH1WT/zRlFKStY85eUq8WJottaUCM=";
};
cargoHash = "sha256-1vjx4OAKsSuru0kzuQ9IlG4G99CKQndmM7hLRKH3sOo=";
cargoHash = "sha256-xReCjJ1eLdzw/LyLVU62RKSyjBBrenCR4YTmt52C2ls=";
nativeBuildInputs = [
installShellFiles
pkgs/by-name/pa/pay-respects/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "pay-respects";
version = "0.8.5";
version = "0.8.8";
src = fetchFromCodeberg {
owner = "iff";
repo = "pay-respects";
tag = "v${finalAttrs.version}";
hash = "sha256-rI4cikbZ+J6SSs5l2WroM6862yDe8IFDqpmAV4Od5ng=";
hash = "sha256-z7GQst70KGNTWAd3sb5eoDnMR2RAmw9RNw3qPeoLWSQ=";
};
cargoHash = "sha256-IQMB5bYvP/1u6FItZ34GYkMBe1fVao5CK2OPGaikIbk=";
cargoHash = "sha256-d3RCjCxJXb5YLai1ZqWKifbb2nLG5j1psuvAorNgFGg=";
env = {
_DEF_PR_AI_API_KEY = "";
pkgs/by-name/pl/plasmusic-toolbar/package.nix
+2 -2
View File
@@ -7,13 +7,13 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "plasmusic-toolbar";
version = "4.0.0";
version = "4.1.0";
src = fetchFromGitHub {
owner = "ccatterina";
repo = "plasmusic-toolbar";
tag = "v${finalAttrs.version}";
hash = "sha256-yT3Ftwy30ixFmGhvof49FIOCH97rT03zNL8V2uweyOQ=";
hash = "sha256-26kYd+LzVfscBEp5qpGKxwS9YXzZ+eEveW5GODDXqFg=";
};
installPhase = ''
pkgs/by-name/po/poptracker/package.nix
+2 -2
View File
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
installPhase = ''
runHook preInstall
install -m555 -Dt $out/bin build/linux-x86_64/poptracker
install -m555 -Dt $out/bin build/*/poptracker
install -m444 -Dt $out/share/poptracker assets/*
wrapProgram $out/bin/poptracker --prefix PATH : ${
lib.makeBinPath [
@@ -105,6 +105,6 @@ stdenv.mkDerivation (finalAttrs: {
pyrox0
];
mainProgram = "poptracker";
platforms = [ "x86_64-linux" ];
platforms = lib.platforms.unix;
};
})
pkgs/by-name/py/pyrefly/package.nix
+3 -3
View File
@@ -10,17 +10,17 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "pyrefly";
version = "0.62.0";
version = "0.63.1";
src = fetchFromGitHub {
owner = "facebook";
repo = "pyrefly";
tag = finalAttrs.version;
hash = "sha256-5KGHm4dtpqeabv+Qw2FK4GvE5K6saUfyVInTrd3+MWI=";
hash = "sha256-BP3I+/YUkgURIQBptHieuHPrdkiJ/H08arL2QZ3jhZ4=";
};
buildAndTestSubdir = "pyrefly";
cargoHash = "sha256-MWnz6KGrKduC2CmLcojd7I6C3M8PR9k3FgCWU+X+KCo=";
cargoHash = "sha256-41EaxJ2VsIkAe9OsV5zUfkxGBxACxmWoM1Imqoah8mI=";
buildInputs = [ rust-jemalloc-sys ];
pkgs/by-name/re/readeck/package.nix
+4 -4
View File
@@ -11,13 +11,13 @@
buildGoModule (finalAttrs: {
pname = "readeck";
version = "0.22.2";
version = "0.22.3";
src = fetchFromCodeberg {
owner = "readeck";
repo = "readeck";
tag = finalAttrs.version;
hash = "sha256-0arC5t7FlW5+AyGF9FuIPc+aeF+CMKIzO1vLJ7aisQE=";
hash = "sha256-F4aj+vgCmwCnSBNa72kgCINNtmS6Zk1oeILZVXF5G+Y=";
};
nativeBuildInputs = [
@@ -62,10 +62,10 @@ buildGoModule (finalAttrs: {
npmDeps = fetchNpmDeps {
src = "${finalAttrs.src}/web";
hash = "sha256-80mh7fATUKf9G/JGsfHYHOLjr/je7g0uRdRGqBWapnY=";
hash = "sha256-ysDEkoL0e84udmCmvfTMA5lWS08aSyyTuCq+/8s3FMw=";
};
vendorHash = "sha256-4cLv7eYNzj+YzrinbEg7tT+JkEen+C5ypg3NTQOB6FM=";
vendorHash = "sha256-cfd52pO2uUT5fdqCXM2rreXztb63FzUWv0s5/wbKXDw=";
passthru.updateScript = nix-update-script { };
pkgs/by-name/sn/snx-rs/package.nix
+3 -3
View File
@@ -15,13 +15,13 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "snx-rs";
version = "6.0.1";
version = "6.0.4";
src = fetchFromGitHub {
owner = "ancwrd1";
repo = "snx-rs";
tag = "v${finalAttrs.version}";
hash = "sha256-aXpMrf1gRhbMU8la8mMo/hAYRNVY5VN7DKj/b/KU+GQ=";
hash = "sha256-5kb/3S9KxLBMVDJ1hB7CnHhnYfY484J+5OQ3y6LgIZY=";
};
passthru.updateScript = nix-update-script { };
@@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
versionCheckHook
];
cargoHash = "sha256-j9m4L9zNjfOthYAQporI5atn0nuNjh50VvHp4w0NK2w=";
cargoHash = "sha256-o+s4DJiSBx8NnKHWuclWPNEb4Ci4KgEFnzaLUcJ2ooI=";
doInstallCheck = true;
versionCheckProgram = "${placeholder "out"}/bin/snx-rs";
pkgs/by-name/te/telegraf/package.nix
+7
View File
@@ -29,6 +29,13 @@ buildGoModule (finalAttrs: {
"-w"
"-X=github.com/influxdata/telegraf/internal.Commit=${finalAttrs.src.rev}"
"-X=github.com/influxdata/telegraf/internal.Version=${finalAttrs.version}"
]
# Binary is too large for the default GOT PLT displacments on 32-bit ARM;
# need to use larger encoding otherwise linking fails with:
# BFD (GNU Binutils) 2.46 assertion fail /build/binutils-with-gold-2.46/bfd/elf32-arm.c:9783
++ lib.optionals stdenv.hostPlatform.isAarch32 [
"-extldflags"
"-Wl,--long-plt"
];
passthru.tests = {
pkgs/by-name/xp/xpra/fix-122159.patch
+2 -4
View File
@@ -1,10 +1,8 @@
diff --git a/xpra/scripts/main.py b/xpra/scripts/main.py
index 7806612e05..4c7a0ec2dd 100755
--- a/xpra/scripts/main.py
+++ b/xpra/scripts/main.py
@@ -444,13 +444,7 @@ def run_mode(script_file: str, cmdline, error_cb, options, args, full_mode: str,
"seamless", "desktop", "shadow", "shadow-screen", "expand",
@@ -536,13 +536,7 @@
"upgrade", "upgrade-seamless", "upgrade-desktop",
"encoder", "runner",
) and not display_is_remote and options.daemon and use_systemd_run(options.systemd_run):
- # make sure we run via the same interpreter,
- # inject it into the command line if we have to:
pkgs/by-name/xp/xpra/fix-41106.patch
+3 -5
View File
@@ -1,8 +1,6 @@
diff --git a/xpra/server/util.py b/xpra/server/util.py
index 401a9fb959..678e2ce745 100644
--- a/xpra/server/util.py
+++ b/xpra/server/util.py
@@ -175,6 +175,10 @@ def xpra_env_shell_script(socket_dir: str, env: dict[str, str]) -> str:
--- a/xpra/server/runner_script.py
+++ b/xpra/server/runner_script.py
@@ -74,6 +74,10 @@
def xpra_runner_shell_script(xpra_file: str, starting_dir: str) -> str:
pkgs/by-name/xp/xpra/package.nix
+3 -3
View File
@@ -104,14 +104,14 @@ let
in
effectiveBuildPythonApplication rec {
pname = "xpra";
version = "6.3.6";
version = "6.4.3";
format = "setuptools";
src = fetchFromGitHub {
owner = "Xpra-org";
repo = "xpra";
tag = "v${version}";
hash = "sha256-kXe/Pyjzf6CxYtsYP15hgYnj+qricrlXGqi/G3uQMFM=";
hash = "sha256-TmhMjO1WTF4fT/G0EyRzORI/Q/cd3IipQn0eRwkWYRE=";
};
patches = [
@@ -135,6 +135,7 @@ effectiveBuildPythonApplication rec {
nativeBuildInputs = [
clang
cython
gobject-introspection
pkg-config
wrapGAppsHook3
@@ -168,7 +169,6 @@ effectiveBuildPythonApplication rec {
++ [
atk.out
cairo
cython
ffmpeg
gdk-pixbuf
glib
pkgs/development/lua-modules/generated-packages.nix
+32 -32
View File
@@ -1008,15 +1008,15 @@ final: prev: {
}:
buildLuarocksPackage {
pname = "fzf-lua";
version = "0.0.2629-1";
version = "0.0.2638-1";
knownRockspec =
(fetchurl {
url = "mirror://luarocks/fzf-lua-0.0.2629-1.rockspec";
sha256 = "0n4p78119nir3cbb5ig313nf2mlnzf16kxkbwy1xc7lnhy9czv4q";
url = "mirror://luarocks/fzf-lua-0.0.2638-1.rockspec";
sha256 = "1nlfqaii5sz6dq9hrw0yszb5q03kw03q8kxkpp76if5sqiq9ggys";
}).outPath;
src = fetchzip {
url = "https://github.com/ibhagwan/fzf-lua/archive/1ae863c83e0823225b4e041845f10c918d5fb882.zip";
sha256 = "0hsxklwq6kqvjcpdlwilqk7wmw0pdah5g8skg1iya97fj13imnc6";
url = "https://github.com/ibhagwan/fzf-lua/archive/10c19a5f08bfeed34b930a1efddda3a9a983e6e2.zip";
sha256 = "150srd6vb49m9xklkhdhssx96kbj05qis96nv53dnkw66mvapgsh";
};
disabled = luaOlder "5.1";
@@ -1105,15 +1105,15 @@ final: prev: {
}:
buildLuarocksPackage {
pname = "grug-far.nvim";
version = "1.6.67-1";
version = "1.6.68-1";
knownRockspec =
(fetchurl {
url = "mirror://luarocks/grug-far.nvim-1.6.67-1.rockspec";
sha256 = "1bjkfzi6l7mzsz5345jh0a69rmsk16xmp94dx47iidrflqpqmbd8";
url = "mirror://luarocks/grug-far.nvim-1.6.68-1.rockspec";
sha256 = "1p5cmqb8k1ll8zmkmhf3q6vs73hfmzvmjlj9xxsirm8g697ya3sw";
}).outPath;
src = fetchzip {
url = "https://github.com/MagicDuck/grug-far.nvim/archive/21604255d0e8f9968322f61f2b6c09e5efe1285a.zip";
sha256 = "1vc4c0wdj3il8ig8jdb56870zwkriw3ql306vyjfl5ii7z4jbrnz";
url = "https://github.com/MagicDuck/grug-far.nvim/archive/21790e59dd0109a92a70cb874dd002af186314f5.zip";
sha256 = "1zf9bf6l5069nx0yyv6bfk9y5f9589vxkhw4gy5f0qpn6j60h4qy";
};
disabled = luaOlder "5.1";
@@ -3277,17 +3277,17 @@ final: prev: {
}:
buildLuarocksPackage {
pname = "lualine.nvim";
version = "scm-3";
version = "scm-4";
knownRockspec =
(fetchurl {
url = "mirror://luarocks/lualine.nvim-scm-3.rockspec";
sha256 = "1d2wxz9qvczy9l3rislaiwgiwdsvphws0s5y59gcpdnvfl353scx";
url = "mirror://luarocks/lualine.nvim-scm-4.rockspec";
sha256 = "03yxpng1jmkas8qndq2fygi4jh31y8asibj9c9nsjn5pzbyfxm1f";
}).outPath;
src = fetchFromGitHub {
owner = "nvim-lualine";
repo = "lualine.nvim";
rev = "a905eeebc4e63fdc48b5135d3bf8aea5618fb21c";
hash = "sha256-PHunrG0yd3pDw3c1S9w1AXQx5/1nT68M+mjxT53enmM=";
rev = "131a558e13f9f28b15cd235557150ccb23f89286";
hash = "sha256-5+JKZD4w80QZxnFv+1OxkFVety8fgmcGVOuxfYouxhI=";
};
disabled = luaOlder "5.1";
@@ -4723,15 +4723,15 @@ final: prev: {
}:
buildLuarocksPackage {
pname = "neotest";
version = "5.15.0-1";
version = "5.18.0-1";
knownRockspec =
(fetchurl {
url = "mirror://luarocks/neotest-5.15.0-1.rockspec";
sha256 = "0kp8ybvnrlaisrra9lrwmqk9ll6qs2vddck2449b9k2prjhmfm3q";
url = "mirror://luarocks/neotest-5.18.0-1.rockspec";
sha256 = "1mkxm0bkc3gxi5zac0ai7rd7i4925sa5pqnz4rp46nin07nmf07c";
}).outPath;
src = fetchzip {
url = "https://github.com/nvim-neotest/neotest/archive/fd0b7986dd0ae04e38ec7dc0c78a432e3820839c.zip";
sha256 = "0lkck8pb5d65v2xhbg0hbxinzii9yzg4g10dbanq0j7wbpbwximm";
url = "https://github.com/nvim-neotest/neotest/archive/ad991822b7076b1d940b33a9d6d0d30416d5df81.zip";
sha256 = "1mcq61p5dkxsb4x6f54fy5nypw0xkhbml44b99q20d7ngm6hgzz5";
};
disabled = luaOlder "5.1";
@@ -5411,15 +5411,15 @@ final: prev: {
}:
buildLuarocksPackage {
pname = "rocks.nvim";
version = "2.47.5-1";
version = "2.48.0-1";
knownRockspec =
(fetchurl {
url = "mirror://luarocks/rocks.nvim-2.47.5-1.rockspec";
sha256 = "1zxywv6sa6cwzf072fz7cdhq96zw420kzc7dczrb50r7jh7sczxx";
url = "mirror://luarocks/rocks.nvim-2.48.0-1.rockspec";
sha256 = "125nhf4ncj1hdppy2w1c0c2j7ydhk0ai0caxcyn7qm69d1arqdix";
}).outPath;
src = fetchzip {
url = "https://github.com/lumen-oss/rocks.nvim/archive/v2.47.5.zip";
sha256 = "1a109916ldarqxc1sfi7n0a2ifslhcwlhf6hp6jsisx3gm8v2nv9";
url = "https://github.com/lumen-oss/rocks.nvim/archive/v2.48.0.zip";
sha256 = "061a7xhnvqd2z3mhfpadlg51jsw1h7bb1g615bp07c9465diszcj";
};
disabled = lua.luaversion != "5.1";
@@ -5882,8 +5882,8 @@ final: prev: {
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
rev = "506338434fec5ad19cb1f8d45bf92d66c4917393";
hash = "sha256-ekfqqG44cS13FJ0qQKOCl8bftxF8BSRD5v+wZrCAvb8=";
rev = "ec009610d5d259ec59a6edf0219ef3f7ee4732e5";
hash = "sha256-JPwaWFjW4W5ZKAnKEkMnK41JS4omsKYxmRerGMGALDc=";
};
disabled = lua.luaversion != "5.1";
@@ -6023,17 +6023,17 @@ final: prev: {
}:
buildLuarocksPackage {
pname = "tree-sitter-cli";
version = "0.26.5-1";
version = "0.26.8-1";
knownRockspec =
(fetchurl {
url = "mirror://luarocks/tree-sitter-cli-0.26.5-1.rockspec";
sha256 = "1bd9lz72gvi7djzcy0z6yja045ycm4byiyjpwa3m6zgh1h4mp30r";
url = "mirror://luarocks/tree-sitter-cli-0.26.8-1.rockspec";
sha256 = "01gkqv1nlp8sjlljb7hkj2rq41dc9dfdbamzsg80n6855ynhj8nx";
}).outPath;
src = fetchFromGitHub {
owner = "FourierTransformer";
repo = "tree-sitter-cli";
rev = "d8e1eb4ae406b75db0f50fae8be5dff636dbb4da";
hash = "sha256-J73buMI+DzrQ4Qx7G6rW2xFxiOYJBy4rGVDsnfNEgzQ=";
rev = "2627479cfc38bd0a91ccca02f7e45b8438e8f3bf";
hash = "sha256-QNVZWxd0Lf1N5ahqOvhP9RzvNxC4gGLznbdUK4zzDqM=";
};
nativeBuildInputs = [ luarocks-build-tree-sitter-cli ];
pkgs/development/python-modules/batchspawner/default.nix
+7 -4
View File
@@ -16,15 +16,16 @@
pytestCheckHook,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "batchspawner";
version = "1.3.0";
pyproject = true;
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "jupyterhub";
repo = "batchspawner";
tag = "v${version}";
tag = "v${finalAttrs.version}";
hash = "sha256-Z7kB8b7s11wokTachLI/N+bdUV+FfCRTemL1KYQpzio=";
};
@@ -54,12 +55,14 @@ buildPythonPackage rec {
pythonImportsCheck = [ "batchspawner" ];
__darwinAllowLocalNetworking = true;
meta = {
description = "Spawner for Jupyterhub to spawn notebooks using batch resource managers";
mainProgram = "batchspawner-singleuser";
homepage = "https://github.com/jupyterhub/batchspawner";
changelog = "https://github.com/jupyterhub/batchspawner/blob/v${version}/CHANGELOG.md";
changelog = "https://github.com/jupyterhub/batchspawner/blob/${finalAttrs.src.tag}/CHANGELOG.md";
license = lib.licenses.bsd3;
maintainers = [ ];
};
}
})
pkgs/development/python-modules/jupyterhub/default.nix
+20 -20
View File
@@ -1,5 +1,6 @@
{
lib,
stdenv,
buildPythonPackage,
fetchFromGitHub,
fetchNpmDeps,
@@ -44,22 +45,25 @@
requests-mock,
versionCheckHook,
virtualenv,
# darwin-only
writableTmpDirAsHomeHook,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "jupyterhub";
version = "5.4.4";
version = "5.4.5";
pyproject = true;
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "jupyterhub";
repo = "jupyterhub";
tag = version;
hash = "sha256-c7xbZvq43YT8EE3rnuJDotIsD/pEgnQvJX8U46q6yq0=";
tag = finalAttrs.version;
hash = "sha256-MdwH9IAV12GqmWc0tfCUi2NA5sT0BFlwCr20JVRzduU=";
};
npmDeps = fetchNpmDeps {
inherit src;
inherit (finalAttrs) src;
hash = "sha256-64FRdLHBpnywpCLjsMoXmWp/tK00+QwNIR9yAoQFIbg=";
};
@@ -114,22 +118,16 @@ buildPythonPackage rec {
mock
nbclassic
playwright
# require pytest-asyncio<0.23
# https://github.com/jupyterhub/jupyterhub/pull/4663
(pytest-asyncio.overrideAttrs (
final: prev: {
version = "0.21.2";
src = fetchFromGitHub {
inherit (prev.src) owner repo;
tag = "v${final.version}";
hash = "sha256-AVVvdo/CDF9IU6l779sLc7wKz5h3kzMttdDNTPLYxtQ=";
};
}
))
pytest-asyncio
pytestCheckHook
requests-mock
versionCheckHook
virtualenv
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# PermissionError: [Errno 13] Permission denied:
# '/private/tmp/temp_user_1/Library/Jupyter/runtime/jpserver-45402-open.html'
writableTmpDirAsHomeHook
];
disabledTests = [
@@ -165,15 +163,17 @@ buildPythonPackage rec {
"jupyterhub/tests/test_user.py"
];
__darwinAllowLocalNetworking = true;
meta = {
description = "Serves multiple Jupyter notebook instances";
homepage = "https://github.com/jupyterhub/jupyterhub";
changelog = "https://github.com/jupyterhub/jupyterhub/blob/${version}/docs/source/reference/changelog.md";
changelog = "https://github.com/jupyterhub/jupyterhub/blob/${finalAttrs.src.tag}/docs/source/reference/changelog.md";
license = lib.licenses.bsd3;
teams = [ lib.teams.jupyter ];
badPlatforms = [
# E OSError: dlopen(/nix/store/43zml0mlr17r5jsagxr00xxx91hz9lky-openpam-20170430/lib/libpam.so, 6): image not found
lib.systems.inspect.patterns.isDarwin
# lib.systems.inspect.patterns.isDarwin
];
};
}
})
pkgs/development/python-modules/pamela/default.nix
+21 -8
View File
@@ -1,26 +1,39 @@
{
lib,
stdenv,
buildPythonPackage,
fetchPypi,
pkgs,
# build-system
setuptools,
setuptools-scm,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "pamela";
version = "1.2.0";
format = "setuptools";
pyproject = true;
__structuredAttrs = true;
src = fetchPypi {
inherit pname version;
inherit (finalAttrs) pname version;
hash = "sha256-DqbiqZ3e2Md4OkoG8tMfW9ytiU15EB6PCTIuOHo0qs8=";
};
postUnpack = ''
substituteInPlace $sourceRoot/pamela.py --replace \
'find_library("pam")' \
'"${lib.getLib pkgs.pam}/lib/libpam.so"'
postPatch = ''
substituteInPlace pamela.py \
--replace-fail \
'find_library("pam")' \
'"${lib.getLib pkgs.pam}/lib/libpam${stdenv.hostPlatform.extensions.sharedLibrary}"'
'';
build-system = [
setuptools
setuptools-scm
];
# No tests
doCheck = false;
meta = {
@@ -28,4 +41,4 @@ buildPythonPackage rec {
homepage = "https://github.com/minrk/pamela";
license = lib.licenses.mit;
};
}
})