diff --git a/doc/packages/index.md b/doc/packages/index.md index 623fbe357d54..dbfe60ca3227 100644 --- a/doc/packages/index.md +++ b/doc/packages/index.md @@ -22,6 +22,7 @@ lhapdf.section.md locales.section.md etc-files.section.md nginx.section.md +nrfutil.section.md opengl.section.md shell-helpers.section.md python-tree-sitter.section.md diff --git a/doc/packages/nrfutil.section.md b/doc/packages/nrfutil.section.md new file mode 100644 index 000000000000..5767b0e0b946 --- /dev/null +++ b/doc/packages/nrfutil.section.md @@ -0,0 +1,13 @@ +# nrfutil {#sec-nrfutil} + +nrfutil can be built with its installables as following: + +```nix +(nrfutil.withExtensions [ + "nrfutil-completion" + "nrfutil-device" + "nrfutil-trace" +]) +``` + +Keep in mind that all installables might not be available for every supported platform. diff --git a/doc/redirects.json b/doc/redirects.json index 9828b36fc2d8..6a3d3e5138c8 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -325,6 +325,9 @@ "sec-nixpkgs-release-25.05-notable-changes": [ "release-notes.html#sec-nixpkgs-release-25.05-notable-changes" ], + "sec-nrfutil": [ + "index.html#sec-nrfutil" + ], "sec-overlays-install": [ "index.html#sec-overlays-install" ], diff --git a/nixos/modules/programs/kdeconnect.nix b/nixos/modules/programs/kdeconnect.nix index 2024c831821a..c1029c46b4ce 100644 --- a/nixos/modules/programs/kdeconnect.nix +++ b/nixos/modules/programs/kdeconnect.nix @@ -25,7 +25,7 @@ cfg = config.programs.kdeconnect; in lib.mkIf cfg.enable { - environment.systemPackages = lib.optional (cfg.package != null) [ + environment.systemPackages = lib.optionals (cfg.package != null) [ cfg.package ]; networking.firewall = rec { diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 11d1711c0ed7..2130a31f6e59 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -315,7 +315,7 @@ stdenv.mkDerivation (finalAttrs: { ./readd-explicit-zlib-link.patch ] - ++ lib.optionals (lib.versionOlder version "25.8") [ + ++ lib.optionals (variant == "collabora") [ # Backport patch to fix build with Poppler 25.05 (fetchpatch2 { url = "https://github.com/LibreOffice/core/commit/0ee2636304ac049f21415c67e92040f7d6c14d35.patch"; @@ -323,13 +323,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-8yipl5ln1yCNfVM8SuWowsw1Iy/SXIwbdT1ZfNw4cJA="; }) ] - ++ lib.optionals (lib.versionOlder version "24.8") [ - (fetchpatch2 { - name = "icu74-compat.patch"; - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-fresh/-/raw/main/libreoffice-7.5.8.2-icu-74-compatibility.patch?ref_type=heads.patch"; - hash = "sha256-OGBPIVQj8JTYlkKywt4QpH7ULAzKmet5jTLztGpIS0Y="; - }) - ] ++ lib.optionals (variant == "collabora") [ ./fix-unpack-collabora.patch ]; @@ -594,6 +587,11 @@ stdenv.mkDerivation (finalAttrs: { # cannot find headers, no idea why "--without-system-boost" + + "--with-system-rhino" + "--with-rhino-jar=${rhino}/share/java/js.jar" + + "--without-system-java-websocket" ] ++ optionals kdeIntegration [ "--enable-kf6" @@ -603,21 +601,7 @@ stdenv.mkDerivation (finalAttrs: { "--with-system-beanshell" "--with-ant-home=${ant.home}" "--with-beanshell-jar=${bsh}" - ] - ++ ( - if variant == "fresh" || variant == "collabora" then - [ - "--with-system-rhino" - "--with-rhino-jar=${rhino}/share/java/js.jar" - - "--without-system-java-websocket" - ] - else - [ - # our Rhino is too new for older versions - "--without-system-rhino" - ] - ); + ]; env = { # FIXME: this is a hack, because the right cflags are not being picked up diff --git a/pkgs/applications/office/libreoffice/skip-broken-tests-still.patch b/pkgs/applications/office/libreoffice/skip-broken-tests-still.patch index 43bb332be8cf..13606bac50fc 100644 --- a/pkgs/applications/office/libreoffice/skip-broken-tests-still.patch +++ b/pkgs/applications/office/libreoffice/skip-broken-tests-still.patch @@ -38,66 +38,16 @@ m_pDoc->InsertTab(0, u"Formula"_ustr); sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn auto calc on. ---- a/sw/qa/extras/layout/layout3.cxx -+++ b/sw/qa/extras/layout/layout3.cxx -@@ -3640,6 +3642,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf104209VertRTL) - - CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, 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(); -@@ -3654,6 +3656,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408LTR) - - CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, 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(); -@@ -3671,6 +3671,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408RTL) - - CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, 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. -@@ -3684,6 +3687,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408NoUnderflow) - - CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, 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"); - } -@@ -3722,6 +3722,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf146081) - - CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, 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(); -@@ -3736,6 +3740,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf157829LTR) - - CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf157829RTL) - { -+ return; // fails due to missing Noto Sans Hebrew - // Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions - createSwDoc("tdf157829-rtl.fodt"); - auto pXmlDoc = parseLayoutDump(); --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx -@@ -700,6 +700,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testSearchAll) +@@ -447,6 +447,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testSearchAll) CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testSearchAllNotifications) { + return; // flaky on GTK + - SwXTextDocument* pXTextDocument = createDoc("search.odt"); - SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell(); + createDoc("search.odt"); + SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell(); setupLibreOfficeKitViewCallback(pWrtShell->GetSfxViewShell()); @@ -970,6 +972,8 @@ namespace { @@ -132,9 +82,9 @@ { + return; // flaky on GTK + - comphelper::LibreOfficeKit::setActive(); - SwXTextDocument* pXTextDocument = createDoc("shape.fodt"); + createDoc("shape.fodt"); + SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell(); --- a/sw/qa/extras/odfexport/odfexport2.cxx +++ b/sw/qa/extras/odfexport/odfexport2.cxx @@ -1711,6 +1711,7 @@ CPPUNIT_TEST_FIXTURE(Test, testMidnightRedlineDatetime) @@ -165,3 +115,84 @@ aMediaDescriptor[u"FilterName"_ustr] <<= u"writer_pdf_Export"_ustr; saveAsPDF(u"tdf164106.fodt"); +--- a/sw/qa/extras/layout/layout4.cxx ++++ b/sw/qa/extras/layout/layout4.cxx +@@ -1518,6 +1518,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(); +@@ -1532,6 +1533,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(); +@@ -1546,6 +1548,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. +@@ -1562,6 +1565,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"); + } +@@ -1619,6 +1623,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(); +@@ -1633,6 +1638,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(); +--- a/sw/qa/extras/layout/layout5.cxx ++++ b/sw/qa/extras/layout/layout5.cxx +@@ -1544,6 +1544,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTdf144450) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTdf166152) + { ++ return; // fails due to missing font: Noto Sans ++ + createSwDoc("tdf166152.fodt"); + + auto* pWrtShell = getSwDocShell()->GetWrtShell(); +--- a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx ++++ b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx +@@ -6077,6 +6077,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(); +--- i/sc/qa/extras/scsolverobj.cxx ++++ w/sc/qa/extras/scsolverobj.cxx +@@ -74,6 +74,7 @@ void ScSolverSettingsObj::testCellRangeAddress(const uno::Any& rExpected, const + // Creates a model using the XSolverSettings API checks if it is accessible via the API + void ScSolverSettingsObj::testXSolverSettings() + { ++ return; + uno::Reference xDoc(mxComponent, uno::UNO_QUERY_THROW); + uno::Reference xIndex(xDoc->getSheets(), uno::UNO_QUERY_THROW); + uno::Reference xSheet(xIndex->getByIndex(0), uno::UNO_QUERY_THROW); diff --git a/pkgs/applications/office/libreoffice/src-fresh/deps.nix b/pkgs/applications/office/libreoffice/src-fresh/deps.nix index 6e808a0b2496..a0a96f5a26e3 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/deps.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/deps.nix @@ -147,11 +147,11 @@ md5name = "b9fa82fbeb8cb7a701101060e4f3e1e4ef7c38f574b2859d3ecbe43604c21f83-libetonyek-0.1.12.tar.xz"; } { - name = "expat-2.7.1.tar.xz"; - url = "https://dev-www.libreoffice.org/src/expat-2.7.1.tar.xz"; - sha256 = "354552544b8f99012e5062f7d570ec77f14b412a3ff5c7d8d0dae62c0d217c30"; + name = "expat-2.7.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/expat-2.7.2.tar.xz"; + sha256 = "21b778b34ec837c2ac285aef340f9fb5fa063a811b21ea4d2412a9702c88995c"; md5 = ""; - md5name = "354552544b8f99012e5062f7d570ec77f14b412a3ff5c7d8d0dae62c0d217c30-expat-2.7.1.tar.xz"; + md5name = "21b778b34ec837c2ac285aef340f9fb5fa063a811b21ea4d2412a9702c88995c-expat-2.7.2.tar.xz"; } { name = "Firebird-3.0.7.33374-0.tar.bz2"; @@ -413,11 +413,11 @@ md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz"; } { - name = "freetype-2.13.3.tar.xz"; - url = "https://dev-www.libreoffice.org/src/freetype-2.13.3.tar.xz"; - sha256 = "0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289"; + name = "freetype-2.14.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/freetype-2.14.1.tar.xz"; + sha256 = "32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc"; md5 = ""; - md5name = "0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289-freetype-2.13.3.tar.xz"; + md5name = "32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc-freetype-2.14.1.tar.xz"; } { name = "frozen-1.2.0.tar.gz"; @@ -448,11 +448,11 @@ md5name = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc-graphite2-minimal-1.3.14.tgz"; } { - name = "harfbuzz-11.4.3.tar.xz"; - url = "https://dev-www.libreoffice.org/src/harfbuzz-11.4.3.tar.xz"; - sha256 = "6660415ad48fa1a46e4fa75fcdb70ff819c452153f08677d34ffb29eda66415d"; + name = "harfbuzz-11.5.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/harfbuzz-11.5.1.tar.xz"; + sha256 = "972a60a8d274d49e70361da6920c3a73dfb0fb4387f6c6811906a47ba634d8a1"; md5 = ""; - md5name = "6660415ad48fa1a46e4fa75fcdb70ff819c452153f08677d34ffb29eda66415d-harfbuzz-11.4.3.tar.xz"; + md5name = "972a60a8d274d49e70361da6920c3a73dfb0fb4387f6c6811906a47ba634d8a1-harfbuzz-11.5.1.tar.xz"; } { name = "hsqldb_1_8_0.zip"; @@ -581,18 +581,18 @@ md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; } { - name = "libjpeg-turbo-3.1.1.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-3.1.1.tar.gz"; - sha256 = "304165ae11e64ab752e9cfc07c37bfdc87abd0bfe4bc699e59f34036d9c84f72"; + name = "libjpeg-turbo-3.1.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-3.1.2.tar.gz"; + sha256 = "560f6338b547544c4f9721b18d8b87685d433ec78b3c644c70d77adad22c55e6"; md5 = ""; - md5name = "304165ae11e64ab752e9cfc07c37bfdc87abd0bfe4bc699e59f34036d9c84f72-libjpeg-turbo-3.1.1.tar.gz"; + md5name = "560f6338b547544c4f9721b18d8b87685d433ec78b3c644c70d77adad22c55e6-libjpeg-turbo-3.1.2.tar.gz"; } { - name = "language-subtag-registry-2025-07-15.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2025-07-15.tar.bz2"; - sha256 = "2689f0a9a1fc21442d8097951fbca6d7013f9f9847f0b5e87144bd8e1355e052"; + name = "language-subtag-registry-2025-08-25.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2025-08-25.tar.bz2"; + sha256 = "9b008d21f97bbf37c5aefd07805ff5500524bccbe8c39d623e184b1ed425ff39"; md5 = ""; - md5name = "2689f0a9a1fc21442d8097951fbca6d7013f9f9847f0b5e87144bd8e1355e052-language-subtag-registry-2025-07-15.tar.bz2"; + md5name = "9b008d21f97bbf37c5aefd07805ff5500524bccbe8c39d623e184b1ed425ff39-language-subtag-registry-2025-08-25.tar.bz2"; } { name = "lcms2-2.17.tar.gz"; @@ -609,11 +609,11 @@ md5name = "d2931cdad266e633510f9970e1a2f346055e351bb19f9b78912475b8074c36f6-libassuan-3.0.2.tar.bz2"; } { - name = "libatomic_ops-7.8.2.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libatomic_ops-7.8.2.tar.gz"; - sha256 = "d305207fe207f2b3fb5cb4c019da12b44ce3fcbc593dfd5080d867b1a2419b51"; + name = "libatomic_ops-7.8.4.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libatomic_ops-7.8.4.tar.gz"; + sha256 = "2356e002e80ef695875e971d6a4fd8c61ca5c6fa4fd1bf31cce54a269c8bfcd5"; md5 = ""; - md5name = "d305207fe207f2b3fb5cb4c019da12b44ce3fcbc593dfd5080d867b1a2419b51-libatomic_ops-7.8.2.tar.gz"; + md5name = "2356e002e80ef695875e971d6a4fd8c61ca5c6fa4fd1bf31cce54a269c8bfcd5-libatomic_ops-7.8.4.tar.gz"; } { name = "libeot-0.01.tar.bz2"; @@ -679,11 +679,11 @@ md5name = "d82e93b69b8aa205a616b62917a269322bf63a3eaafb3775014e61752b2013ea-xmlsec1-1.3.7.tar.gz"; } { - name = "libxml2-2.14.5.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxml2-2.14.5.tar.xz"; - sha256 = "03d006f3537616833c16c53addcdc32a0eb20e55443cba4038307e3fa7d8d44b"; + name = "libxml2-2.14.6.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.14.6.tar.xz"; + sha256 = "7ce458a0affeb83f0b55f1f4f9e0e55735dbfc1a9de124ee86fb4a66b597203a"; md5 = ""; - md5name = "03d006f3537616833c16c53addcdc32a0eb20e55443cba4038307e3fa7d8d44b-libxml2-2.14.5.tar.xz"; + md5name = "7ce458a0affeb83f0b55f1f4f9e0e55735dbfc1a9de124ee86fb4a66b597203a-libxml2-2.14.6.tar.xz"; } { name = "libxslt-1.1.43.tar.xz"; @@ -700,18 +700,18 @@ md5name = "26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; } { - name = "lxml-6.0.1.tar.gz"; - url = "https://dev-www.libreoffice.org/src/lxml-6.0.1.tar.gz"; - sha256 = "2b3a882ebf27dd026df3801a87cf49ff791336e0f94b0fad195db77e01240690"; + name = "lxml-6.0.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/lxml-6.0.2.tar.gz"; + sha256 = "cd79f3367bd74b317dda655dc8fcfa304d9eb6e4fb06b7168c5cf27f96e0cd62"; md5 = ""; - md5name = "2b3a882ebf27dd026df3801a87cf49ff791336e0f94b0fad195db77e01240690-lxml-6.0.1.tar.gz"; + md5name = "cd79f3367bd74b317dda655dc8fcfa304d9eb6e4fb06b7168c5cf27f96e0cd62-lxml-6.0.2.tar.gz"; } { - name = "mariadb-connector-c-3.3.15-src.tar.gz"; - url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.15-src.tar.gz"; - sha256 = "b593fdd3d5b8964a9feec2bf57a13e6cc8f178a4fe948e89f60ede9c53d621fe"; + name = "mariadb-connector-c-3.3.17-src.tar.gz"; + url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.17-src.tar.gz"; + sha256 = "a5abb7331508988f7287b481c1839bd929261ce38352cd0fde6c002c300e0c01"; md5 = ""; - md5name = "b593fdd3d5b8964a9feec2bf57a13e6cc8f178a4fe948e89f60ede9c53d621fe-mariadb-connector-c-3.3.15-src.tar.gz"; + md5name = "a5abb7331508988f7287b481c1839bd929261ce38352cd0fde6c002c300e0c01-mariadb-connector-c-3.3.17-src.tar.gz"; } { name = "mdds-3.1.0.tar.xz"; @@ -728,11 +728,11 @@ md5name = "e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0-mDNSResponder-878.200.35.tar.gz"; } { - name = "meson-1.8.0.tar.gz"; - url = "https://dev-www.libreoffice.org/src/meson-1.8.0.tar.gz"; - sha256 = "0a9b23311271519bd03dca12d7d8b0eab582c3a2c5da433d465b6e519dc88e2f"; + name = "meson-1.8.3.tar.gz"; + url = "https://dev-www.libreoffice.org/src/meson-1.8.3.tar.gz"; + sha256 = "f118aa910fc0a137cc2dd0122232dbf82153d9a12fb5b0f5bb64896f6a157abf"; md5 = ""; - md5name = "0a9b23311271519bd03dca12d7d8b0eab582c3a2c5da433d465b6e519dc88e2f-meson-1.8.0.tar.gz"; + md5name = "f118aa910fc0a137cc2dd0122232dbf82153d9a12fb5b0f5bb64896f6a157abf-meson-1.8.3.tar.gz"; } { name = "libmspub-0.1.4.tar.xz"; @@ -756,11 +756,11 @@ md5name = "19279f70707bbe5ffa619f2dc319f888cec0c4a8d339dc0a21330517bd6f521d-mythes-1.2.5.tar.xz"; } { - name = "nss-3.115.1-with-nspr-4.37.tar.gz"; - url = "https://dev-www.libreoffice.org/src/nss-3.115.1-with-nspr-4.37.tar.gz"; - sha256 = "5ff67daaa778ff302ccacdd00e665ce71da59f05dcdaab62bcdab6e23c90d320"; + name = "nss-3.116-with-nspr-4.37.tar.gz"; + url = "https://dev-www.libreoffice.org/src/nss-3.116-with-nspr-4.37.tar.gz"; + sha256 = "af6f21bae9f16534988842597871754450fd6cdbd786750e7cd069f8d231ce10"; md5 = ""; - md5name = "5ff67daaa778ff302ccacdd00e665ce71da59f05dcdaab62bcdab6e23c90d320-nss-3.115.1-with-nspr-4.37.tar.gz"; + md5name = "af6f21bae9f16534988842597871754450fd6cdbd786750e7cd069f8d231ce10-nss-3.116-with-nspr-4.37.tar.gz"; } { name = "libodfgen-0.1.8.tar.xz"; @@ -798,11 +798,11 @@ md5name = "c065f04aad42737aebd60b2fe4939704ac844266bc0aeaa1609f0cad987be516-openldap-2.6.10.tgz"; } { - name = "openssl-3.0.17.tar.gz"; - url = "https://dev-www.libreoffice.org/src/openssl-3.0.17.tar.gz"; - sha256 = "dfdd77e4ea1b57ff3a6dbde6b0bdc3f31db5ac99e7fdd4eaf9e1fbb6ec2db8ce"; + name = "openssl-3.0.18.tar.gz"; + url = "https://dev-www.libreoffice.org/src/openssl-3.0.18.tar.gz"; + sha256 = "d80c34f5cf902dccf1f1b5df5ebb86d0392e37049e5d73df1b3abae72e4ffe8b"; md5 = ""; - md5name = "dfdd77e4ea1b57ff3a6dbde6b0bdc3f31db5ac99e7fdd4eaf9e1fbb6ec2db8ce-openssl-3.0.17.tar.gz"; + md5name = "d80c34f5cf902dccf1f1b5df5ebb86d0392e37049e5d73df1b3abae72e4ffe8b-openssl-3.0.18.tar.gz"; } { name = "liborcus-0.20.1.tar.xz"; @@ -840,18 +840,18 @@ md5name = "4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307-libpng-1.6.50.tar.xz"; } { - name = "tiff-4.7.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/tiff-4.7.0.tar.xz"; - sha256 = "273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017"; + name = "tiff-4.7.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/tiff-4.7.1.tar.xz"; + sha256 = "b92017489bdc1db3a4c97191aa4b75366673cb746de0dce5d7a749d5954681ba"; md5 = ""; - md5name = "273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017-tiff-4.7.0.tar.xz"; + md5name = "b92017489bdc1db3a4c97191aa4b75366673cb746de0dce5d7a749d5954681ba-tiff-4.7.1.tar.xz"; } { - name = "poppler-25.08.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/poppler-25.08.0.tar.xz"; - sha256 = "425ed4d4515a093bdcdbbaac6876f20617451edc710df6a4fd6c45dd67eb418d"; + name = "poppler-25.09.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/poppler-25.09.1.tar.xz"; + sha256 = "0c1091d01d3dd1664a13816861e812d02b29201e96665454b81b52d261fad658"; md5 = ""; - md5name = "425ed4d4515a093bdcdbbaac6876f20617451edc710df6a4fd6c45dd67eb418d-poppler-25.08.0.tar.xz"; + md5name = "0c1091d01d3dd1664a13816861e812d02b29201e96665454b81b52d261fad658-poppler-25.09.1.tar.xz"; } { name = "poppler-data-0.4.12.tar.gz"; diff --git a/pkgs/applications/office/libreoffice/src-fresh/help.nix b/pkgs/applications/office/libreoffice/src-fresh/help.nix index f699007bc73b..314832020879 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/help.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/help.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "1dghyg96daa9iff7njanfy8v0lqql3i9vy6cqysdq141rgdbglql"; - url = "https://download.documentfoundation.org/libreoffice/src/25.8.1/libreoffice-help-25.8.1.1.tar.xz"; + sha256 = "0pzb8xaiqzwqs0l3pdb857vk3z26n2zwqicmyj0paxaw0cndx7xv"; + url = "https://download.documentfoundation.org/libreoffice/src/25.8.2/libreoffice-help-25.8.2.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/main.nix b/pkgs/applications/office/libreoffice/src-fresh/main.nix index da90604b5aab..ec1097e528fb 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/main.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/main.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "0gig194j66rxf678n236r7wnqv12w1bknm1kkjj8155y59n2qkjv"; - url = "https://download.documentfoundation.org/libreoffice/src/25.8.1/libreoffice-25.8.1.1.tar.xz"; + sha256 = "0pn1swdy3vpi5phh4br1q3mly6b349qbanmwalv8v0fzqgpa4b00"; + url = "https://download.documentfoundation.org/libreoffice/src/25.8.2/libreoffice-25.8.2.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/translations.nix b/pkgs/applications/office/libreoffice/src-fresh/translations.nix index 27f4cc4d4aeb..396afcb84eb3 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/translations.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/translations.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "0x1vx27w8kw4qfjhhdmh5zx68svh27yiy43f057qd61rbnds0p85"; - url = "https://download.documentfoundation.org/libreoffice/src/25.8.1/libreoffice-translations-25.8.1.1.tar.xz"; + sha256 = "0c184wz9c55q7q87wnf0jy87cws01rwqsqc2cyilv2r5sy7ih0gv"; + url = "https://download.documentfoundation.org/libreoffice/src/25.8.2/libreoffice-translations-25.8.2.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/version.nix b/pkgs/applications/office/libreoffice/src-fresh/version.nix index 2f0e9dc54fed..84598b00df3b 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/version.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/version.nix @@ -1 +1 @@ -"25.8.1.1" +"25.8.2.2" diff --git a/pkgs/applications/office/libreoffice/src-still/deps.nix b/pkgs/applications/office/libreoffice/src-still/deps.nix index 9301730b3521..a81ab062be11 100644 --- a/pkgs/applications/office/libreoffice/src-still/deps.nix +++ b/pkgs/applications/office/libreoffice/src-still/deps.nix @@ -14,11 +14,11 @@ md5name = "daf972a89577f8772602bf2eb38b6a3dd3d922bf5724d45e7f9589b5e830442c-phc-winner-argon2-20190702.tar.gz"; } { - name = "boost_1_85_0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/boost_1_85_0.tar.xz"; - sha256 = "4e23218ff5036d57afd20f7cdab2e94cdbf6ba9c509d656ace643a81c40a985a"; + name = "boost_1_86_0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/boost_1_86_0.tar.xz"; + sha256 = "efd6d4ce7e8571ba86f77a30bee2d3dd8dccd306721351464fc6998dd00b0c8c"; md5 = ""; - md5name = "4e23218ff5036d57afd20f7cdab2e94cdbf6ba9c509d656ace643a81c40a985a-boost_1_85_0.tar.xz"; + md5name = "efd6d4ce7e8571ba86f77a30bee2d3dd8dccd306721351464fc6998dd00b0c8c-boost_1_86_0.tar.xz"; } { name = "box2d-2.4.1.tar.gz"; @@ -105,11 +105,11 @@ md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz"; } { - name = "curl-8.12.1.tar.xz"; - url = "https://dev-www.libreoffice.org/src/curl-8.12.1.tar.xz"; - sha256 = "0341f1ed97a26c811abaebd37d62b833956792b7607ea3f15d001613c76de202"; + name = "curl-8.14.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/curl-8.14.1.tar.xz"; + sha256 = "f4619a1e2474c4bbfedc88a7c2191209c8334b48fa1f4e53fd584cc12e9120dd"; md5 = ""; - md5name = "0341f1ed97a26c811abaebd37d62b833956792b7607ea3f15d001613c76de202-curl-8.12.1.tar.xz"; + md5name = "f4619a1e2474c4bbfedc88a7c2191209c8334b48fa1f4e53fd584cc12e9120dd-curl-8.14.1.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -161,11 +161,11 @@ md5name = "acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76-Firebird-3.0.7.33374-0.tar.bz2"; } { - name = "fontconfig-2.15.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/fontconfig-2.15.0.tar.xz"; - sha256 = "63a0658d0e06e0fa886106452b58ef04f21f58202ea02a94c39de0d3335d7c0e"; + name = "fontconfig-2.16.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/fontconfig-2.16.2.tar.xz"; + sha256 = "165b8fd2a119864c87464b233986c4a1bc09efb09c65de1ca40cc1e85ffb77e2"; md5 = ""; - md5name = "63a0658d0e06e0fa886106452b58ef04f21f58202ea02a94c39de0d3335d7c0e-fontconfig-2.15.0.tar.xz"; + md5name = "165b8fd2a119864c87464b233986c4a1bc09efb09c65de1ca40cc1e85ffb77e2-fontconfig-2.16.2.tar.xz"; } { name = "crosextrafonts-20130214.tar.gz"; @@ -315,11 +315,11 @@ md5name = "b12a1ff762680681b7ce4d98dd29a7f54d90f5bcadd10c955afc640a27b3a268-NotoSansLisu-v2.102.zip"; } { - name = "culmus-0.133.tar.gz"; - url = "https://dev-www.libreoffice.org/src/culmus-0.133.tar.gz"; - sha256 = "c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05"; + name = "culmus-0.140.tar.gz"; + url = "https://dev-www.libreoffice.org/src/culmus-0.140.tar.gz"; + sha256 = "6daed104481007752a76905000e71c0093c591c8ef3017d1b18222c277fc52e3"; md5 = ""; - md5name = "c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05-culmus-0.133.tar.gz"; + md5name = "6daed104481007752a76905000e71c0093c591c8ef3017d1b18222c277fc52e3-culmus-0.140.tar.gz"; } { name = "libre-hebrew-1.0.tar.gz"; @@ -343,11 +343,11 @@ md5name = "cae999a9fc5638cb69cf0812e8bca1437ef1ebbf094f8b3c5b3f0a3ea2ef8c3a-Amiri-1.001.zip"; } { - name = "ReemKufi-1.7.zip"; - url = "https://dev-www.libreoffice.org/src/ReemKufi-1.7.zip"; - sha256 = "2359f036c7bddeb4d5529d7b3c9139c3288c920cc26053d417cdbb563eafe0a4"; + name = "ReemKufi-1.8.zip"; + url = "https://dev-www.libreoffice.org/src/ReemKufi-1.8.zip"; + sha256 = "6bf586b0473edaaca19dbd594c25e2bf6111952b8643a262976b7fa75ef345dc"; md5 = ""; - md5name = "2359f036c7bddeb4d5529d7b3c9139c3288c920cc26053d417cdbb563eafe0a4-ReemKufi-1.7.zip"; + md5name = "6bf586b0473edaaca19dbd594c25e2bf6111952b8643a262976b7fa75ef345dc-ReemKufi-1.8.zip"; } { name = "Scheherazade-2.100.zip"; @@ -356,6 +356,55 @@ md5 = ""; md5name = "251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5-Scheherazade-2.100.zip"; } + { + name = "Agdasima-2.002.zip"; + url = "https://dev-www.libreoffice.org/src/Agdasima-2.002.zip"; + sha256 = "b4c17499f8bc183320ffdcf1f8491c778dd68a237adc056dc08e1fcb2da488f3"; + md5 = ""; + md5name = "b4c17499f8bc183320ffdcf1f8491c778dd68a237adc056dc08e1fcb2da488f3-Agdasima-2.002.zip"; + } + { + name = "Bacasime_Antique-2.000.zip"; + url = "https://dev-www.libreoffice.org/src/Bacasime_Antique-2.000.zip"; + sha256 = "81127cebc97d4ee0b950c2bc2d6be0ed29abfe0d5988435eb9a39e382557250a"; + md5 = ""; + md5name = "81127cebc97d4ee0b950c2bc2d6be0ed29abfe0d5988435eb9a39e382557250a-Bacasime_Antique-2.000.zip"; + } + { + name = "Belanosima-2.000.zip"; + url = "https://dev-www.libreoffice.org/src/Belanosima-2.000.zip"; + sha256 = "9c30e9e7cdb0797b651113a77f6b789659b8d8598a466b2ba92754e9dec30449"; + md5 = ""; + md5name = "9c30e9e7cdb0797b651113a77f6b789659b8d8598a466b2ba92754e9dec30449-Belanosima-2.000.zip"; + } + { + name = "Caprasimo-1.001.zip"; + url = "https://dev-www.libreoffice.org/src/Caprasimo-1.001.zip"; + sha256 = "f066d27cfc99b6601083be102d08b4039da8d2834e2795aabd890f16c6fd1b9b"; + md5 = ""; + md5name = "f066d27cfc99b6601083be102d08b4039da8d2834e2795aabd890f16c6fd1b9b-Caprasimo-1.001.zip"; + } + { + name = "Lugrasimo-1.001.zip"; + url = "https://dev-www.libreoffice.org/src/Lugrasimo-1.001.zip"; + sha256 = "db24dff31e8ddf6a113556c947a219f9534b072852e9ce2079a08c94854a7503"; + md5 = ""; + md5name = "db24dff31e8ddf6a113556c947a219f9534b072852e9ce2079a08c94854a7503-Lugrasimo-1.001.zip"; + } + { + name = "Lumanosimo-1.010.zip"; + url = "https://dev-www.libreoffice.org/src/Lumanosimo-1.010.zip"; + sha256 = "d4545ad6afded9a55d9a7728cfc7453cf5637861db87aafe0a730676a0cb960f"; + md5 = ""; + md5name = "d4545ad6afded9a55d9a7728cfc7453cf5637861db87aafe0a730676a0cb960f-Lumanosimo-1.010.zip"; + } + { + name = "Lunasima-2.009.zip"; + url = "https://dev-www.libreoffice.org/src/Lunasima-2.009.zip"; + sha256 = "4302809cf4b95b481bec53de87484d919b391c90a518d065f6c775fd435a5393"; + md5 = ""; + md5name = "4302809cf4b95b481bec53de87484d919b391c90a518d065f6c775fd435a5393-Lunasima-2.009.zip"; + } { name = "libfreehand-0.1.2.tar.xz"; url = "https://dev-www.libreoffice.org/src/libfreehand-0.1.2.tar.xz"; @@ -371,11 +420,11 @@ md5name = "0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289-freetype-2.13.3.tar.xz"; } { - name = "frozen-1.1.1.tar.gz"; - url = "https://dev-www.libreoffice.org/src/frozen-1.1.1.tar.gz"; - sha256 = "f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45"; + name = "frozen-1.2.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/frozen-1.2.0.tar.gz"; + sha256 = "ed8339c017d7c5fe019ac2c642477f435278f0dc643c1d69d3f3b1e95915e823"; md5 = ""; - md5name = "f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45-frozen-1.1.1.tar.gz"; + md5name = "ed8339c017d7c5fe019ac2c642477f435278f0dc643c1d69d3f3b1e95915e823-frozen-1.2.0.tar.gz"; } { name = "glm-1.0.1.zip"; @@ -385,11 +434,11 @@ md5name = "09c5716296787e1f7fcb87b1cbdbf26814ec1288ed6259ccd30d5d9795809fa5-glm-1.0.1.zip"; } { - name = "gpgme-1.24.2.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/gpgme-1.24.2.tar.bz2"; - sha256 = "e11b1a0e361777e9e55f48a03d89096e2abf08c63d84b7017cfe1dce06639581"; + name = "gpgme-1.24.3.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/gpgme-1.24.3.tar.bz2"; + sha256 = "bfc17f5bd1b178c8649fdd918956d277080f33df006a2dc40acdecdce68c50dd"; md5 = ""; - md5name = "e11b1a0e361777e9e55f48a03d89096e2abf08c63d84b7017cfe1dce06639581-gpgme-1.24.2.tar.bz2"; + md5name = "bfc17f5bd1b178c8649fdd918956d277080f33df006a2dc40acdecdce68c50dd-gpgme-1.24.3.tar.bz2"; } { name = "graphite2-minimal-1.3.14.tgz"; @@ -434,25 +483,25 @@ md5name = "0e279003f5199f80031c6dcd08f79d6f65a0505139160e7df0d09b226bff4023-IAccessible2-1.3+git20231013.3d8c7f0.tar.gz"; } { - name = "icu4c-74_2-src.tgz"; - url = "https://dev-www.libreoffice.org/src/icu4c-74_2-src.tgz"; - sha256 = "68db082212a96d6f53e35d60f47d38b962e9f9d207a74cfac78029ae8ff5e08c"; + name = "icu4c-75_1-src.tgz"; + url = "https://dev-www.libreoffice.org/src/icu4c-75_1-src.tgz"; + sha256 = "cb968df3e4d2e87e8b11c49a5d01c787bd13b9545280fc6642f826527618caef"; md5 = ""; - md5name = "68db082212a96d6f53e35d60f47d38b962e9f9d207a74cfac78029ae8ff5e08c-icu4c-74_2-src.tgz"; + md5name = "cb968df3e4d2e87e8b11c49a5d01c787bd13b9545280fc6642f826527618caef-icu4c-75_1-src.tgz"; } { - name = "icu4c-74_2-data.zip"; - url = "https://dev-www.libreoffice.org/src/icu4c-74_2-data.zip"; - sha256 = "c28c3ca5f4ba3384781797138a294ca360988d4322674ad4d51e52f5d9b0a2b6"; + name = "icu4c-75_1-data.zip"; + url = "https://dev-www.libreoffice.org/src/icu4c-75_1-data.zip"; + sha256 = "a5104212dc317a64f9b035723ea706f2f4fd5a0f37b7923fae7aeb9d1d0061b1"; md5 = ""; - md5name = "c28c3ca5f4ba3384781797138a294ca360988d4322674ad4d51e52f5d9b0a2b6-icu4c-74_2-data.zip"; + md5name = "a5104212dc317a64f9b035723ea706f2f4fd5a0f37b7923fae7aeb9d1d0061b1-icu4c-75_1-data.zip"; } { - name = "Java-WebSocket-1.5.6.tar.gz"; - url = "https://dev-www.libreoffice.org/src/Java-WebSocket-1.5.6.tar.gz"; - sha256 = "167e86561cd7b5ed21b67d7543536134edcb14b373892739b28c417566a3832f"; + name = "Java-WebSocket-1.6.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/Java-WebSocket-1.6.0.tar.gz"; + sha256 = "f3ce29efde338707241d47ab4784b19a1e3658bfa0564b5bc5f80c27e5118728"; md5 = ""; - md5name = "167e86561cd7b5ed21b67d7543536134edcb14b373892739b28c417566a3832f-Java-WebSocket-1.5.6.tar.gz"; + md5name = "f3ce29efde338707241d47ab4784b19a1e3658bfa0564b5bc5f80c27e5118728-Java-WebSocket-1.6.0.tar.gz"; } { name = "flow-engine-0.9.4.zip"; @@ -539,18 +588,18 @@ md5name = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf-libjpeg-turbo-2.1.5.1.tar.gz"; } { - name = "language-subtag-registry-2025-03-10.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2025-03-10.tar.bz2"; - sha256 = "555968dd413c69fe2c072a29e0f1a2a48856533d923ffd8377ff86f6ea701b39"; + name = "language-subtag-registry-2025-08-25.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2025-08-25.tar.bz2"; + sha256 = "9b008d21f97bbf37c5aefd07805ff5500524bccbe8c39d623e184b1ed425ff39"; md5 = ""; - md5name = "555968dd413c69fe2c072a29e0f1a2a48856533d923ffd8377ff86f6ea701b39-language-subtag-registry-2025-03-10.tar.bz2"; + md5name = "9b008d21f97bbf37c5aefd07805ff5500524bccbe8c39d623e184b1ed425ff39-language-subtag-registry-2025-08-25.tar.bz2"; } { - name = "lcms2-2.16.tar.gz"; - url = "https://dev-www.libreoffice.org/src/lcms2-2.16.tar.gz"; - sha256 = "d873d34ad8b9b4cea010631f1a6228d2087475e4dc5e763eb81acc23d9d45a51"; + name = "lcms2-2.17.tar.gz"; + url = "https://dev-www.libreoffice.org/src/lcms2-2.17.tar.gz"; + sha256 = "d11af569e42a1baa1650d20ad61d12e41af4fead4aa7964a01f93b08b53ab074"; md5 = ""; - md5name = "d873d34ad8b9b4cea010631f1a6228d2087475e4dc5e763eb81acc23d9d45a51-lcms2-2.16.tar.gz"; + md5name = "d11af569e42a1baa1650d20ad61d12e41af4fead4aa7964a01f93b08b53ab074-lcms2-2.17.tar.gz"; } { name = "libassuan-3.0.2.tar.bz2"; @@ -581,11 +630,11 @@ md5name = "df0a59d413a5b202573d8d4f5159e33a8538da4f8e8e60979facc64d6290cebd-libexttextcat-3.4.7.tar.xz"; } { - name = "libffi-3.4.4.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libffi-3.4.4.tar.gz"; - sha256 = "d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676"; + name = "libffi-3.5.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libffi-3.5.2.tar.gz"; + sha256 = "f3a3082a23b37c293a4fcd1053147b371f2ff91fa7ea1b2a52e335676bac82dc"; md5 = ""; - md5name = "d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676-libffi-3.4.4.tar.gz"; + md5name = "f3a3082a23b37c293a4fcd1053147b371f2ff91fa7ea1b2a52e335676bac82dc-libffi-3.5.2.tar.gz"; } { name = "libgpg-error-1.55.tar.bz2"; @@ -616,25 +665,25 @@ md5name = "296272d93435991308eb73607600c034b558807a07e829e751142e65ccfa9d08-ltm-1.3.0.tar.xz"; } { - name = "libwebp-1.5.0.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libwebp-1.5.0.tar.gz"; - sha256 = "7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c"; + name = "libwebp-1.6.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libwebp-1.6.0.tar.gz"; + sha256 = "e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564"; md5 = ""; - md5name = "7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c-libwebp-1.5.0.tar.gz"; + md5name = "e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564-libwebp-1.6.0.tar.gz"; } { - name = "xmlsec1-1.3.5.tar.gz"; - url = "https://dev-www.libreoffice.org/src/xmlsec1-1.3.5.tar.gz"; - sha256 = "2ffd4ad1f860ec93e47a680310ab2bc94968bd07566e71976bd96133d9504917"; + name = "xmlsec1-1.3.6.tar.gz"; + url = "https://dev-www.libreoffice.org/src/xmlsec1-1.3.6.tar.gz"; + sha256 = "952b626ad3f3be1a4598622dab52fdab2a8604d0837c1b00589f3637535af92f"; md5 = ""; - md5name = "2ffd4ad1f860ec93e47a680310ab2bc94968bd07566e71976bd96133d9504917-xmlsec1-1.3.5.tar.gz"; + md5name = "952b626ad3f3be1a4598622dab52fdab2a8604d0837c1b00589f3637535af92f-xmlsec1-1.3.6.tar.gz"; } { - name = "libxml2-2.13.8.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxml2-2.13.8.tar.xz"; - sha256 = "277294cb33119ab71b2bc81f2f445e9bc9435b893ad15bb2cd2b0e859a0ee84a"; + name = "libxml2-2.14.5.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.14.5.tar.xz"; + sha256 = "03d006f3537616833c16c53addcdc32a0eb20e55443cba4038307e3fa7d8d44b"; md5 = ""; - md5name = "277294cb33119ab71b2bc81f2f445e9bc9435b893ad15bb2cd2b0e859a0ee84a-libxml2-2.13.8.tar.xz"; + md5name = "03d006f3537616833c16c53addcdc32a0eb20e55443cba4038307e3fa7d8d44b-libxml2-2.14.5.tar.xz"; } { name = "libxslt-1.1.43.tar.xz"; @@ -735,18 +784,18 @@ md5name = "37206cf981e8409d048b59ac5839621ea107ff49af72beb9d7769a2f41da8d90-onlineupdate-c003be8b9727672e7d30972983b375f4c200233f-2.tar.xz"; } { - name = "openldap-2.6.9.tgz"; - url = "https://dev-www.libreoffice.org/src/openldap-2.6.9.tgz"; - sha256 = "2cb7dc73e9c8340dff0d99357fbaa578abf30cc6619f0521972c555681e6b2ff"; + name = "openldap-2.6.10.tgz"; + url = "https://dev-www.libreoffice.org/src/openldap-2.6.10.tgz"; + sha256 = "c065f04aad42737aebd60b2fe4939704ac844266bc0aeaa1609f0cad987be516"; md5 = ""; - md5name = "2cb7dc73e9c8340dff0d99357fbaa578abf30cc6619f0521972c555681e6b2ff-openldap-2.6.9.tgz"; + md5name = "c065f04aad42737aebd60b2fe4939704ac844266bc0aeaa1609f0cad987be516-openldap-2.6.10.tgz"; } { - name = "openssl-3.0.16.tar.gz"; - url = "https://dev-www.libreoffice.org/src/openssl-3.0.16.tar.gz"; - sha256 = "57e03c50feab5d31b152af2b764f10379aecd8ee92f16c985983ce4a99f7ef86"; + name = "openssl-3.0.17.tar.gz"; + url = "https://dev-www.libreoffice.org/src/openssl-3.0.17.tar.gz"; + sha256 = "dfdd77e4ea1b57ff3a6dbde6b0bdc3f31db5ac99e7fdd4eaf9e1fbb6ec2db8ce"; md5 = ""; - md5name = "57e03c50feab5d31b152af2b764f10379aecd8ee92f16c985983ce4a99f7ef86-openssl-3.0.16.tar.gz"; + md5name = "dfdd77e4ea1b57ff3a6dbde6b0bdc3f31db5ac99e7fdd4eaf9e1fbb6ec2db8ce-openssl-3.0.17.tar.gz"; } { name = "liborcus-0.19.2.tar.xz"; @@ -763,11 +812,11 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-6425.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/pdfium-6425.tar.bz2"; - sha256 = "fe0291b96d7352bac530d13ef2e5fd63ad9980e0128911f88b957b5992508f1c"; + name = "pdfium-6764.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/pdfium-6764.tar.bz2"; + sha256 = "59d5df3b38312b069d96a8de9d4f8d7f44a29835c9dc82bd792ea02be86c4e49"; md5 = ""; - md5name = "fe0291b96d7352bac530d13ef2e5fd63ad9980e0128911f88b957b5992508f1c-pdfium-6425.tar.bz2"; + md5name = "59d5df3b38312b069d96a8de9d4f8d7f44a29835c9dc82bd792ea02be86c4e49-pdfium-6764.tar.bz2"; } { name = "pixman-0.42.2.tar.gz"; @@ -777,11 +826,11 @@ md5name = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e-pixman-0.42.2.tar.gz"; } { - name = "libpng-1.6.47.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libpng-1.6.47.tar.xz"; - sha256 = "b213cb381fbb1175327bd708a77aab708a05adde7b471bc267bd15ac99893631"; + name = "libpng-1.6.50.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libpng-1.6.50.tar.xz"; + sha256 = "4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307"; md5 = ""; - md5name = "b213cb381fbb1175327bd708a77aab708a05adde7b471bc267bd15ac99893631-libpng-1.6.47.tar.xz"; + md5name = "4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307-libpng-1.6.50.tar.xz"; } { name = "tiff-4.7.0.tar.xz"; @@ -791,11 +840,11 @@ md5name = "273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017-tiff-4.7.0.tar.xz"; } { - name = "poppler-25.04.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/poppler-25.04.0.tar.xz"; - sha256 = "b010c596dce127fba88532fd2f1043e55ea30601767952d0f2c0a80e7dc0da3d"; + name = "poppler-25.08.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/poppler-25.08.0.tar.xz"; + sha256 = "425ed4d4515a093bdcdbbaac6876f20617451edc710df6a4fd6c45dd67eb418d"; md5 = ""; - md5name = "b010c596dce127fba88532fd2f1043e55ea30601767952d0f2c0a80e7dc0da3d-poppler-25.04.0.tar.xz"; + md5name = "425ed4d4515a093bdcdbbaac6876f20617451edc710df6a4fd6c45dd67eb418d-poppler-25.08.0.tar.xz"; } { name = "poppler-data-0.4.12.tar.gz"; @@ -805,18 +854,18 @@ md5name = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74-poppler-data-0.4.12.tar.gz"; } { - name = "postgresql-13.19.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/postgresql-13.19.tar.bz2"; - sha256 = "482cce0a9f8d24c2447cfc7b2817e55f86d51afe5f7f1a85214bf93644e774ea"; + name = "postgresql-14.19.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/postgresql-14.19.tar.bz2"; + sha256 = "727e9e334bc1a31940df808259f69fe47a59f6d42174b22ae62d67fe7a01ad80"; md5 = ""; - md5name = "482cce0a9f8d24c2447cfc7b2817e55f86d51afe5f7f1a85214bf93644e774ea-postgresql-13.19.tar.bz2"; + md5name = "727e9e334bc1a31940df808259f69fe47a59f6d42174b22ae62d67fe7a01ad80-postgresql-14.19.tar.bz2"; } { - name = "Python-3.9.22.tar.xz"; - url = "https://dev-www.libreoffice.org/src/Python-3.9.22.tar.xz"; - sha256 = "8c136d199d3637a1fce98a16adc809c1d83c922d02d41f3614b34f8b6e7d38ec"; + name = "Python-3.10.18.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.10.18.tar.xz"; + sha256 = "ae665bc678abd9ab6a6e1573d2481625a53719bc517e9a634ed2b9fefae3817f"; md5 = ""; - md5name = "8c136d199d3637a1fce98a16adc809c1d83c922d02d41f3614b34f8b6e7d38ec-Python-3.9.22.tar.xz"; + md5name = "ae665bc678abd9ab6a6e1573d2481625a53719bc517e9a634ed2b9fefae3817f-Python-3.10.18.tar.xz"; } { name = "libqxp-0.0.2.tar.xz"; @@ -826,11 +875,11 @@ md5name = "e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c-libqxp-0.0.2.tar.xz"; } { - name = "raptor2-2.0.15.tar.gz"; - url = "https://dev-www.libreoffice.org/src/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz"; - sha256 = "ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed"; - md5 = "a39f6c07ddb20d7dd2ff1f95fa21e2cd"; - md5name = "a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz"; + name = "raptor2-2.0.16.tar.gz"; + url = "https://dev-www.libreoffice.org/src/raptor2-2.0.16.tar.gz"; + sha256 = "089db78d7ac982354bdbf39d973baf09581e6904ac4c92a98c5caadb3de44680"; + md5 = ""; + md5name = "089db78d7ac982354bdbf39d973baf09581e6904ac4c92a98c5caadb3de44680-raptor2-2.0.16.tar.gz"; } { name = "rasqal-0.9.33.tar.gz"; @@ -854,18 +903,18 @@ md5name = "5892ca6796f7a2a93d580832e907e849b19d980b40d326a283b18877ab6de0c5-librevenge-0.0.5.tar.bz2"; } { - name = "rhino-1.7.14.zip"; - url = "https://dev-www.libreoffice.org/src/rhino-1.7.14.zip"; - sha256 = "bf4d2d0c5ff8889fd494486db09291cb7965f0bf2f93ef005d3b08070a5a4f5c"; + name = "rhino-1.7.15.zip"; + url = "https://dev-www.libreoffice.org/src/rhino-1.7.15.zip"; + sha256 = "42fce6baf1bf789b62bf938b8e8ec18a1ac92c989dd6e7221e9531454cbd97fa"; md5 = ""; - md5name = "bf4d2d0c5ff8889fd494486db09291cb7965f0bf2f93ef005d3b08070a5a4f5c-rhino-1.7.14.zip"; + md5name = "42fce6baf1bf789b62bf938b8e8ec18a1ac92c989dd6e7221e9531454cbd97fa-rhino-1.7.15.zip"; } { - name = "skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz"; - url = "https://dev-www.libreoffice.org/src/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz"; - sha256 = "2223ebce534458a37826e8fe4f24635b0712cde7ed1bd3208f089f6fdd796e01"; + name = "skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz"; + url = "https://dev-www.libreoffice.org/src/skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz"; + sha256 = "53f55303821158b6de9e6b90f1cc3a548611a7e430c1a0883ff159a8db89677d"; md5 = ""; - md5name = "2223ebce534458a37826e8fe4f24635b0712cde7ed1bd3208f089f6fdd796e01-skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz"; + md5name = "53f55303821158b6de9e6b90f1cc3a548611a7e430c1a0883ff159a8db89677d-skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz"; } { name = "libstaroffice-0.0.7.tar.xz"; @@ -931,11 +980,11 @@ md5name = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22-libzmf-0.0.2.tar.xz"; } { - name = "zxcvbn-c-2.5.tar.gz"; - url = "https://dev-www.libreoffice.org/src/zxcvbn-c-2.5.tar.gz"; - sha256 = "77d6c6ecb35952a8d8ce7f736b7a2bf466275c48210e309b73782d6b7e84dffd"; + name = "zxcvbn-c-2.6.tar.gz"; + url = "https://dev-www.libreoffice.org/src/zxcvbn-c-2.6.tar.gz"; + sha256 = "11e39f6776f9c82c68b2acb94336e32697d4ab6cdb4ac16f9583ccbdd735113a"; md5 = ""; - md5name = "77d6c6ecb35952a8d8ce7f736b7a2bf466275c48210e309b73782d6b7e84dffd-zxcvbn-c-2.5.tar.gz"; + md5name = "11e39f6776f9c82c68b2acb94336e32697d4ab6cdb4ac16f9583ccbdd735113a-zxcvbn-c-2.6.tar.gz"; } { name = "zxing-cpp-2.2.1.tar.gz"; diff --git a/pkgs/applications/office/libreoffice/src-still/help.nix b/pkgs/applications/office/libreoffice/src-still/help.nix index dc23461a2d8d..7ded287747c9 100644 --- a/pkgs/applications/office/libreoffice/src-still/help.nix +++ b/pkgs/applications/office/libreoffice/src-still/help.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "0139rsgny1n554qycwmwsxyirr4afbw2q0r326s2mz6bxfg817qm"; - url = "https://download.documentfoundation.org/libreoffice/src/24.8.7/libreoffice-help-24.8.7.2.tar.xz"; + sha256 = "0spbylki80y5ny45hrjmhjfax7m1pps0k4blyjbi8knpxr2cnak4"; + url = "https://download.documentfoundation.org/libreoffice/src/25.2.6/libreoffice-help-25.2.6.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-still/main.nix b/pkgs/applications/office/libreoffice/src-still/main.nix index cec518b7d4df..1bc471ec7b52 100644 --- a/pkgs/applications/office/libreoffice/src-still/main.nix +++ b/pkgs/applications/office/libreoffice/src-still/main.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "1swl16qznhzbchjzx6rp0a388s1ndwpdqswjpz1mxga514dlgpzh"; - url = "https://download.documentfoundation.org/libreoffice/src/24.8.7/libreoffice-24.8.7.2.tar.xz"; + sha256 = "0ix7d20qa396cf8gvzicma9l257js97840hvkavrdk2pyznq5286"; + url = "https://download.documentfoundation.org/libreoffice/src/25.2.6/libreoffice-25.2.6.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-still/translations.nix b/pkgs/applications/office/libreoffice/src-still/translations.nix index 878b8f3ae73b..f0330ed0a9de 100644 --- a/pkgs/applications/office/libreoffice/src-still/translations.nix +++ b/pkgs/applications/office/libreoffice/src-still/translations.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "0r4zvy4xlhz23bk4vmh03qa1d5qdrcjg4fppy0q92yclxkrnzlgh"; - url = "https://download.documentfoundation.org/libreoffice/src/24.8.7/libreoffice-translations-24.8.7.2.tar.xz"; + sha256 = "1kgqfk59qs4lqlgw32csh0wgyyqi3hzy1wv3dl7rm960n0im7xqh"; + url = "https://download.documentfoundation.org/libreoffice/src/25.2.6/libreoffice-translations-25.2.6.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-still/version.nix b/pkgs/applications/office/libreoffice/src-still/version.nix index 1ca4acb8d8c9..fb516bd04a58 100644 --- a/pkgs/applications/office/libreoffice/src-still/version.nix +++ b/pkgs/applications/office/libreoffice/src-still/version.nix @@ -1 +1 @@ -"24.8.7.2" +"25.2.6.2" diff --git a/pkgs/by-name/ar/argpp/package.nix b/pkgs/by-name/ar/argpp/package.nix new file mode 100644 index 000000000000..131a31a75a89 --- /dev/null +++ b/pkgs/by-name/ar/argpp/package.nix @@ -0,0 +1,38 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + gtest, + tinycmmc, +}: + +stdenv.mkDerivation { + pname = "argpp"; + version = "0-unstable-2022-08-14"; + + src = fetchFromGitHub { + owner = "Grumbel"; + repo = "argpp"; + rev = "9e1d54f8ed20af0aa5857e6653ab605b2ab63d5c"; + sha256 = "sha256-unfAFxgvv1BOUEqrYYMFfouGe2xIcKJ3ithCel1P9sc="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ + gtest + tinycmmc + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)" + ''; + + meta = { + description = "Argument Parser for C++"; + maintainers = [ lib.maintainers.SchweGELBin ]; + platforms = lib.platforms.linux; + license = lib.licenses.free; + }; +} diff --git a/pkgs/by-name/bi/bitrise/package.nix b/pkgs/by-name/bi/bitrise/package.nix index 95a4bd90acba..09139984a44e 100644 --- a/pkgs/by-name/bi/bitrise/package.nix +++ b/pkgs/by-name/bi/bitrise/package.nix @@ -6,13 +6,13 @@ }: buildGoModule rec { pname = "bitrise"; - version = "2.34.3"; + version = "2.34.5"; src = fetchFromGitHub { owner = "bitrise-io"; repo = "bitrise"; rev = "v${version}"; - hash = "sha256-Px4u3Jc3HbTN9NRGFYwTVL0/g+PsFw+JxEyOuTSTQbc="; + hash = "sha256-QsGF5lDnY55OGdFagGJfXcq9/2P6qzmoHx64ijOkRfo="; }; # many tests rely on writable $HOME/.bitrise and require network access diff --git a/pkgs/by-name/cd/cdk/package.nix b/pkgs/by-name/cd/cdk/package.nix index 157c0d4e7ac0..e948031c33a2 100644 --- a/pkgs/by-name/cd/cdk/package.nix +++ b/pkgs/by-name/cd/cdk/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "cdk"; - version = "5.0-20251001"; + version = "5.0-20251014"; src = fetchurl { url = "https://invisible-mirror.net/archives/cdk/cdk-${finalAttrs.version}.tgz"; - hash = "sha256-GLGW5gGmVTPQ3/MmJvu4h1FNhojng9f2CYtLTrxk2FM="; + hash = "sha256-DtRpScaApfQuNCzEiizmC8/CzIue67F2h3takfgpQ1w="; }; buildInputs = [ diff --git a/pkgs/by-name/co/codebook/package.nix b/pkgs/by-name/co/codebook/package.nix index fc04d5d9194e..be7ee8b049cb 100644 --- a/pkgs/by-name/co/codebook/package.nix +++ b/pkgs/by-name/co/codebook/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "codebook"; - version = "0.3.13"; + version = "0.3.14"; src = fetchFromGitHub { owner = "blopker"; repo = "codebook"; tag = "v${finalAttrs.version}"; - hash = "sha256-46RSHbr9vVyVYXAV/+A6PSz2qokDwQjY51jnIQ11Dls="; + hash = "sha256-XS4neGqi0tLzs53jV37mDsfC8bAXwpqinoe3gT8GYZw="; }; buildAndTestSubdir = "crates/codebook-lsp"; - cargoHash = "sha256-/7ci8of8KfD7ne3XjXA+tVq1x3HmQWKWh1wO4zA0Elg="; + cargoHash = "sha256-39ROafYvaTL3wZCUyycGV0PCnR/mr+rJK3/lrvfqKIM="; # Integration tests require internet access for dictionaries doCheck = false; diff --git a/pkgs/by-name/fi/firezone-headless-client/package.nix b/pkgs/by-name/fi/firezone-headless-client/package.nix index 04005009e9c8..b141c4e925c4 100644 --- a/pkgs/by-name/fi/firezone-headless-client/package.nix +++ b/pkgs/by-name/fi/firezone-headless-client/package.nix @@ -6,15 +6,15 @@ }: rustPlatform.buildRustPackage rec { pname = "firezone-headless-client"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "firezone"; repo = "firezone"; tag = "headless-client-${version}"; - hash = "sha256-Tu0Bq/Axj05dCRCd1eB7CiOXQ5n4i8hnE3ZiGCQ5ZdY="; + hash = "sha256-dVqZs5Xie9lc3F6wVMdxRHeoM7y/e9TvwjzfikenQ6w="; }; - cargoHash = "sha256-wlf+TtrRG7hHNav7WqLn2DSX9QkKFVzyiKP5CRdXlNY="; + cargoHash = "sha256-J2IqqFBuoTkbO0nMJbY680G2HTAtC1To/nMra2PCopY="; sourceRoot = "${src.name}/rust"; buildAndTestSubdir = "headless-client"; RUSTFLAGS = "--cfg system_certs"; diff --git a/pkgs/by-name/fr/fractal/package.nix b/pkgs/by-name/fr/fractal/package.nix index cd4432b931fa..1f182654142c 100644 --- a/pkgs/by-name/fr/fractal/package.nix +++ b/pkgs/by-name/fr/fractal/package.nix @@ -15,6 +15,7 @@ gtksourceview5, lcms2, libadwaita, + libglycin, gst_all_1, desktop-file-utils, appstream-glib, @@ -62,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { # We should eventually use a cargo vendor patch hook instead preConfigure = '' pushd ../$(stripHash $cargoDeps)/glycin-2.* - patch -p3 < ${glycin-loaders.passthru.glycinPathsPatch} + patch -p3 < ${libglycin.passthru.glycinPathsPatch} popd ''; diff --git a/pkgs/by-name/ge/geomcpp/package.nix b/pkgs/by-name/ge/geomcpp/package.nix new file mode 100644 index 000000000000..8b6f70498e80 --- /dev/null +++ b/pkgs/by-name/ge/geomcpp/package.nix @@ -0,0 +1,47 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + glm, + gtest, + tinycmmc, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "geomcpp"; + version = "0.0.0-unstable-2025-06-11"; + + src = fetchFromGitHub { + owner = "Grumbel"; + repo = "geomcpp"; + rev = "282e3710fbe6dacee630391e4af8ffe03181f8a9"; + sha256 = "sha256-M4a6P6J/PBDklpOiR81Nah0STlXFI48+mQkNqMBicKQ="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ + gtest + tinycmmc + ]; + propagatedBuildInputs = [ glm ]; + + cmakeFlags = [ + "-DWARNINGS=ON" + "-DWERROR=ON" + "-DBUILD_TESTS=ON" + ]; + + doCheck = true; + + postPatch = '' + echo $version > VERSION + ''; + + meta = { + description = "Collection of point, size and rect classes"; + maintainers = [ lib.maintainers.SchweGELBin ]; + platforms = lib.platforms.linux; + license = lib.licenses.free; + }; +}) diff --git a/pkgs/by-name/gi/gitify/package.nix b/pkgs/by-name/gi/gitify/package.nix index 33b42d89cc49..d42d4d3f82eb 100644 --- a/pkgs/by-name/gi/gitify/package.nix +++ b/pkgs/by-name/gi/gitify/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gitify"; - version = "6.9.1"; + version = "6.10.0"; src = fetchFromGitHub { owner = "gitify-app"; repo = "gitify"; tag = "v${finalAttrs.version}"; - hash = "sha256-Bd2Yy2wpO0ksAv3O19QhKFSbX+QjFaYZ4iE1b7lc6VI="; + hash = "sha256-bTkKZc3KlclUO0XFUT1lRjPsL9AGg5u4w+8AfOXG7ao="; }; nativeBuildInputs = [ @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 2; - hash = "sha256-/iNKeHjVQhkpm0lXZ6WBcm5Y0HOktsMQR1G4KEHYJCE="; + hash = "sha256-Ol8/SSVJ4RXLK1F9cztQODkq+zAxJtbKyPzMVBjluLY="; }; env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1; diff --git a/pkgs/by-name/gl/glycin-loaders/package.nix b/pkgs/by-name/gl/glycin-loaders/package.nix index a3588b6628a9..b8df7fcaba32 100644 --- a/pkgs/by-name/gl/glycin-loaders/package.nix +++ b/pkgs/by-name/gl/glycin-loaders/package.nix @@ -2,8 +2,6 @@ stdenv, lib, fetchurl, - replaceVars, - bubblewrap, cairo, cargo, gettext, @@ -32,14 +30,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-OAqv4r+07KDEW0JmDr/0SWANAKQ7YJ1bHIP3lfXI+zw="; }; - patches = [ - # Fix paths in glycin library. - # Not actually needed for this package since we are only building loaders - # and this patch is relevant just to apps that use the loaders - # but apply it here to ensure the patch continues to apply. - finalAttrs.passthru.glycinPathsPatch - ]; - cargoVendorDir = "vendor"; nativeBuildInputs = [ @@ -84,10 +74,6 @@ stdenv.mkDerivation (finalAttrs: { attrPath = "glycin-loaders"; packageName = "glycin"; }; - - glycinPathsPatch = replaceVars ./fix-glycin-paths.patch { - bwrap = "${bubblewrap}/bin/bwrap"; - }; }; meta = with lib; { diff --git a/pkgs/by-name/go/gocheat/package.nix b/pkgs/by-name/go/gocheat/package.nix new file mode 100644 index 000000000000..2812b11318c7 --- /dev/null +++ b/pkgs/by-name/go/gocheat/package.nix @@ -0,0 +1,35 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule (finalAttrs: { + pname = "gocheat"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "Achno"; + repo = "gocheat"; + tag = "v${finalAttrs.version}"; + hash = "sha256-9Xw1GVfqk0Se8pLx3vzqR+f9GgX4LDo/H3iq1fzoTRs="; + }; + + vendorHash = "sha256-CByVf4+WWUlFGJcqt7aq5bHXiLMjdHTKvv6PQYEbLqc="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = { + description = "TUI Cheatsheet for keybindings, hotkeys and more"; + homepage = "https://github.com/Achno/gocheat"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + adamperkowski + sebaguardian + ]; + mainProgram = "gocheat"; + }; +}) diff --git a/pkgs/by-name/gl/glycin-loaders/fix-glycin-paths.patch b/pkgs/by-name/li/libglycin/fix-glycin-paths.patch similarity index 100% rename from pkgs/by-name/gl/glycin-loaders/fix-glycin-paths.patch rename to pkgs/by-name/li/libglycin/fix-glycin-paths.patch diff --git a/pkgs/by-name/li/libglycin/package.nix b/pkgs/by-name/li/libglycin/package.nix index 220d59e878a1..74f78c18fa7a 100644 --- a/pkgs/by-name/li/libglycin/package.nix +++ b/pkgs/by-name/li/libglycin/package.nix @@ -15,6 +15,8 @@ gtk4, gobject-introspection, gnome, + replaceVars, + bubblewrap, common-updater-scripts, _experimental-update-script-combinators, buildPackages, @@ -72,6 +74,10 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonBool "capi_docs" withIntrospection) ]; + postPatch = '' + patch -p2 < ${finalAttrs.passthru.glycinPathsPatch} + ''; + passthru = { updateScript = let @@ -100,6 +106,10 @@ stdenv.mkDerivation (finalAttrs: { updateSource updateLockfile ]; + + glycinPathsPatch = replaceVars ./fix-glycin-paths.patch { + bwrap = "${bubblewrap}/bin/bwrap"; + }; }; meta = { @@ -111,6 +121,7 @@ stdenv.mkDerivation (finalAttrs: { lgpl21Plus ]; maintainers = with lib.maintainers; [ normalcea ]; + teams = [ lib.teams.gnome ]; platforms = lib.platforms.linux; pkgConfigModules = [ "glycin-1" diff --git a/pkgs/by-name/li/libosmoabis/package.nix b/pkgs/by-name/li/libosmoabis/package.nix index ad13ba6ad468..376ea6a18a69 100644 --- a/pkgs/by-name/li/libosmoabis/package.nix +++ b/pkgs/by-name/li/libosmoabis/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "libosmoabis"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "osmocom"; repo = "libosmo-abis"; rev = version; - hash = "sha256-TxK+r+GhqPjvFYA3AX3JXjRwhEyjoLcPTR1lpkgSlUo="; + hash = "sha256-OdmegQXdbpwNBepY+7MeUjaEguVo2q9b8lSkRmlXHEc="; }; configureFlags = [ "enable_dahdi=false" ]; diff --git a/pkgs/by-name/li/libosmocore/package.nix b/pkgs/by-name/li/libosmocore/package.nix index 4b21695d7546..334e153a7826 100644 --- a/pkgs/by-name/li/libosmocore/package.nix +++ b/pkgs/by-name/li/libosmocore/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libosmocore"; - version = "1.11.1"; + version = "1.11.2"; src = fetchFromGitHub { owner = "osmocom"; repo = "libosmocore"; rev = version; - hash = "sha256-JR1L2ffVqvhylrYWPnWKQ/iihx6in7B3iP6Mo0MHbpw="; + hash = "sha256-cEMPz5xmvaBnm+U7G1PttfhR6TXsT2PN2hk2FXHbXpg="; }; postPatch = '' diff --git a/pkgs/by-name/lo/logmich/package.nix b/pkgs/by-name/lo/logmich/package.nix new file mode 100644 index 000000000000..b334e503b549 --- /dev/null +++ b/pkgs/by-name/lo/logmich/package.nix @@ -0,0 +1,31 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + tinycmmc, + fmt, +}: + +stdenv.mkDerivation { + pname = "logmich"; + version = "0.1.0-unstable-2025-07-21"; + + src = fetchFromGitHub { + owner = "logmich"; + repo = "logmich"; + rev = "c73c7b7d6cd050d1bcc42d522ce80a2eb86da5c8"; + sha256 = "sha256-e8k/ZzPAfLgNF30wmXHDX5ovK/msTH6sgzxWKzZhtOY="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ tinycmmc ]; + propagatedBuildInputs = [ fmt ]; + + meta = { + description = "A trivial logging library"; + maintainers = [ lib.maintainers.SchweGELBin ]; + platforms = lib.platforms.linux; + license = lib.licenses.zlib; + }; +} diff --git a/pkgs/by-name/lo/loupe/package.nix b/pkgs/by-name/lo/loupe/package.nix index cf5a039ba465..a43aae827f4a 100644 --- a/pkgs/by-name/lo/loupe/package.nix +++ b/pkgs/by-name/lo/loupe/package.nix @@ -15,6 +15,7 @@ libadwaita, libgweather, libseccomp, + libglycin, glycin-loaders, gnome, common-updater-scripts, @@ -67,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { # Dirty approach to add patches after cargoSetupPostUnpackHook # We should eventually use a cargo vendor patch hook instead pushd ../$(stripHash $cargoDeps)/glycin-2.* - patch -p3 < ${glycin-loaders.passthru.glycinPathsPatch} + patch -p3 < ${libglycin.passthru.glycinPathsPatch} popd ''; diff --git a/pkgs/by-name/nr/nrfutil/package.nix b/pkgs/by-name/nr/nrfutil/package.nix index 926dcd030251..0001d94b374c 100644 --- a/pkgs/by-name/nr/nrfutil/package.nix +++ b/pkgs/by-name/nr/nrfutil/package.nix @@ -2,69 +2,148 @@ lib, stdenvNoCC, fetchurl, + + xz, zlib, libusb1, segger-jlink-headless, gcc, + autoPatchelfHook, versionCheckHook, + makeWrapper, + installShellFiles, + + symlinkJoin, + extensions ? [ ], + nrfutil, }: let - source = import ./source.nix; - supported = removeAttrs source [ "version" ]; + sources = import ./source.nix; + platformSources = + sources.${stdenvNoCC.system} or (throw "unsupported platform ${stdenvNoCC.system}"); - platform = supported.${stdenvNoCC.system} or (throw "unsupported platform ${stdenvNoCC.system}"); - -in -stdenvNoCC.mkDerivation (finalAttrs: { - pname = "nrfutil"; - inherit (source) version; - - src = fetchurl { - url = "https://files.nordicsemi.com/artifactory/swtools/external/nrfutil/packages/nrfutil/nrfutil-${platform.name}-${finalAttrs.version}.tar.gz"; - inherit (platform) hash; - }; - - nativeBuildInputs = [ - autoPatchelfHook - ]; - - buildInputs = [ - zlib - libusb1 - gcc.cc.lib - segger-jlink-headless - ]; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out - mv data/* $out/ - - runHook postInstall - ''; - - doInstallCheck = true; - nativeInstallCheckInputs = [ - versionCheckHook - ]; - passthru.updateScript = ./update.sh; - - meta = with lib; { + sharedMeta = with lib; { description = "CLI tool for managing Nordic Semiconductor devices"; homepage = "https://www.nordicsemi.com/Products/Development-tools/nRF-Util"; changelog = "https://docs.nordicsemi.com/bundle/nrfutil/page/guides/revision_history.html"; license = licenses.unfree; - platforms = lib.attrNames supported; + platforms = lib.attrNames sources; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ h7x4 ezrizhu ]; + }; + + packages = + map + ( + name: + let + package = platformSources.packages.${name}; + in + stdenvNoCC.mkDerivation (finalAttrs: { + pname = name; + inherit (package) version; + + src = fetchurl { + url = "https://files.nordicsemi.com/artifactory/swtools/external/nrfutil/packages/${name}/${name}-${platformSources.triplet}-${package.version}.tar.gz"; + inherit (package) hash; + }; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + buildInputs = [ + xz + zlib + libusb1 + gcc.cc.lib + segger-jlink-headless + ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out + mv data/* $out/ + + runHook postInstall + ''; + + doInstallCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + + meta = sharedMeta // { + mainProgram = name; + }; + }) + ) + ( + [ + "nrfutil" + "nrfutil-completion" + ] + ++ extensions + ); + +in +symlinkJoin { + pname = "nrfutil"; + inherit (platformSources.packages.nrfutil) version; + + paths = packages; + + nativeBuildInputs = [ + makeWrapper + installShellFiles + ]; + + postBuild = + let + wrapProgramArgs = lib.concatStringsSep " " ( + [ + ''--prefix PATH : "$out/bin"'' + ''--prefix PATH : "$out"/lib/nrfutil-npm'' + ''--prefix PATH : "$out"/lib/nrfutil-nrf5sdk-tools'' + ''--set NRF_JLINK_DLL_PATH '${segger-jlink-headless}'/lib/libjlinkarm.so'' + ''--set NRFUTIL_BLE_SNIFFER_SHIM_BIN_ENV "$out"/lib/nrfutil-ble-sniffer/wireshark-shim'' + ''--set NRFUTIL_BLE_SNIFFER_HCI_SHIM_BIN_ENV "$out"/lib/nrfutil-ble-sniffer/wireshark-hci-shim'' + ] + ++ ( + let + # These are the extensions with the probe-plugin-worker executable vendored. + relevantExtensions = lib.intersectLists [ "nrfutil-device" "nrfutil-trace" ] extensions; + in + lib.optionals (relevantExtensions != [ ]) [ + ''--set NRF_PROBE_PATH "$out"/lib/${lib.head relevantExtensions}'' + ] + ) + ); + in + '' + wrapProgram "$out"/bin/nrfutil ${wrapProgramArgs} + + installShellCompletion --cmd nrfutil \ + --bash $(realpath "$out"/share/nrfutil-completion/scripts/bash/setup.bash) \ + --zsh $(realpath "$out"/share/nrfutil-completion/scripts/zsh/_nrfutil) + ''; + + passthru = { + updateScript = ./update.sh; + withExtensions = extensions: nrfutil.override { inherit extensions; }; + }; + + meta = sharedMeta // { mainProgram = "nrfutil"; }; -}) +} diff --git a/pkgs/by-name/nr/nrfutil/source.nix b/pkgs/by-name/nr/nrfutil/source.nix index ba5df8b720a5..e5663ff78268 100644 --- a/pkgs/by-name/nr/nrfutil/source.nix +++ b/pkgs/by-name/nr/nrfutil/source.nix @@ -1,7 +1,84 @@ { - version = "7.13.0"; + aarch64-linux = { + triplet = "aarch64-unknown-linux-gnu"; + packages = { + nrfutil = { + version = "8.1.1"; + hash = "sha256-y7ywCr9Ze3Uz1JQh0hNg2BOPKW2yEftYDaD8WzHWSxY="; + }; + nrfutil-ble-sniffer = { + version = "0.16.2"; + hash = "sha256-vCpSs9oUcqKPDKVoEtrqqY9Jy0AtbMwK8s398xvQ7Us="; + }; + nrfutil-device = { + version = "2.15.1"; + hash = "sha256-u8JlM7bxkR5x0fhTQRIkElpxot6jpKyL2SljFfoKj54="; + }; + nrfutil-mcu-manager = { + version = "0.8.0"; + hash = "sha256-jLsLN/Ny5zL4MSaKS3cb2L4WBCKZHVLiR2RkPAL8JnY="; + }; + nrfutil-sdk-manager = { + version = "1.8.0"; + hash = "sha256-DsGuOQ6rzwit5oeG4ZLObCOaxMt8WB+YYnuXRYtqq4U="; + }; + nrfutil-trace = { + version = "4.0.1"; + hash = "sha256-IR4P1tK/0P3d96Wnwciq7b3TJurENF2pYKaHu2yZIPk="; + }; + }; + }; x86_64-linux = { - name = "x86_64-unknown-linux-gnu"; - hash = "sha256-R3OF/340xEab+0zamfwvejY16fjy/3TrzMvQaBlVxHw="; + triplet = "x86_64-unknown-linux-gnu"; + packages = { + nrfutil = { + version = "8.1.1"; + hash = "sha256-asX1UbAE6X03lLC3l9e/9G2WgVRezfmRD6dyXJKb18Y="; + }; + nrfutil-91 = { + version = "0.5.0"; + hash = "sha256-ACQ+csYVIoANKV+CyAAD+drXQSb7CVUdvDYe76LELqs="; + }; + nrfutil-ble-sniffer = { + version = "0.16.2"; + hash = "sha256-4TGbn0HdlER5k76Hc5rCSVvyx89VdLQ56fMiGgWUvrU="; + }; + nrfutil-completion = { + version = "1.5.0"; + hash = "sha256-KA5h9/hJA66nkAAW1Tui+m60E/Iv9wzVPdeQqIQWpxc="; + }; + nrfutil-device = { + version = "2.15.1"; + hash = "sha256-zH/QtM1vM6BIiZHPLM23TRt2LCRUdJvmYN9oveotsH0="; + }; + nrfutil-mcu-manager = { + version = "0.8.0"; + hash = "sha256-ItU3kys1HMd06srLTzPtRoAW1YxwOt39LqjIQPMvmaI="; + }; + nrfutil-npm = { + version = "0.3.1"; + hash = "sha256-kQ63fVWR8RdGTQLA27Sg7jegYhtlkvXvLJsucifH4I0="; + }; + nrfutil-nrf5sdk-tools = { + version = "1.1.0"; + hash = "sha256-hLQhTEa5F2lrFxppKmVrD5PnIA3JPcP/M/r9bYizHk8="; + }; + nrfutil-sdk-manager = { + version = "1.8.0"; + hash = "sha256-+Z1xfEdTAcvYj+hjsW0z/dHRoIzVGWXjD6lSqoQvOPg="; + }; + nrfutil-suit = { + version = "0.9.0"; + hash = "sha256-uwbUgjpJNC27bSINyhfzTrOXIUi7GjFnPebg38apRKc="; + }; + nrfutil-toolchain-manager = { + version = "0.15.0"; + hash = "sha256-/bQx4yu1ybCO2TBd7MctxCANiYO5c1qCDYSjXm7hLcE="; + }; + nrfutil-trace = { + version = "4.0.1"; + hash = "sha256-YmsMQOD1vylaRwMWOhOA9xXePJR779P8im4Lcs7EcWk="; + }; + }; }; } diff --git a/pkgs/by-name/nr/nrfutil/update.sh b/pkgs/by-name/nr/nrfutil/update.sh index 199983e4aabb..72bb4763a361 100755 --- a/pkgs/by-name/nr/nrfutil/update.sh +++ b/pkgs/by-name/nr/nrfutil/update.sh @@ -12,23 +12,60 @@ set -euo pipefail declare -A architectures declare -A versions declare -A hashes +declare -a packages architectures["x86_64-linux"]="x86_64-unknown-linux-gnu" +architectures["aarch64-linux"]="aarch64-unknown-linux-gnu" +# NOTE: segger-jlink is not yet packaged for darwin +# architectures["x86_64-darwin"]="x86_64-apple-darwin" +# architectures["aarch64-darwin"]="aarch64-apple-darwin" + +packages=( + "nrfutil" + "nrfutil-91" + "nrfutil-ble-sniffer" + "nrfutil-completion" + "nrfutil-device" + "nrfutil-mcu-manager" + "nrfutil-npm" + "nrfutil-nrf5sdk-tools" + "nrfutil-sdk-manager" + "nrfutil-suit" + "nrfutil-toolchain-manager" + "nrfutil-trace" +) + BASE_URL="https://files.nordicsemi.com/artifactory/swtools/external/nrfutil" -for a in ${!architectures[@]}; do - versions["$a"]=$(curl "$BASE_URL/index/${architectures[${a}]}/index.json" | jq -r '.packages.nrfutil.latest_version') - hashes["$a"]=$(narhash "$BASE_URL/packages/nrfutil/nrfutil-${architectures[${a}]}-${versions[${a}]}.tar.gz") +for a in "${!architectures[@]}"; do + ARCH="${architectures["${a}"]}" + INDEX=$(curl "$BASE_URL/index/${ARCH}/index.json") + for p in "${!packages[@]}"; do + PKG="${packages["${p}"]}" + + jq -e -r ".packages.\"${PKG}\"" <<< "$INDEX" 1>/dev/null && { + versions["$a-$p"]=$(jq -r ".packages.\"${PKG}\".latest_version" <<< "$INDEX") + hashes["$a-$p"]=$(narhash "$BASE_URL/packages/${PKG}/${PKG}-${ARCH}-${versions["$a-$p"]}.tar.gz") + } + done done { printf "{\n" - printf " version = \"${versions["x86_64-linux"]}\";\n" - for a in ${!architectures[@]}; do - printf " ${a} = {\n" - printf " name = \"${architectures[${a}]}\";\n" - printf " hash = \"${hashes[${a}]}\";\n" + for a in "${!architectures[@]}"; do + printf " %s = {\n" "$a" + printf " triplet = \"%s\";\n" "${architectures["${a}"]}" + printf " packages = {\n" + for p in "${!packages[@]}"; do + test ${versions["$a-$p"]+_} && { + printf " %s = {\n" "${packages["${p}"]}" + printf " version = \"%s\";\n" "${versions["$a-$p"]}" + printf " hash = \"%s\";\n" "${hashes["$a-$p"]}" + printf " };\n" + } + done + printf " };\n" printf " };\n" done printf "}\n" diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index 0fc029c214c1..3bb160cf6bc2 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -3,8 +3,7 @@ buildGoModule, fetchFromGitHub, buildEnv, - linkFarm, - makeWrapper, + makeBinaryWrapper, stdenv, addDriverRunpath, nix-update-script, @@ -20,9 +19,11 @@ autoAddDriverRunpath, apple-sdk_15, + versionCheckHook, + writableTmpDirAsHomeHook, + # passthru nixosTests, - testers, ollama, ollama-rocm, ollama-cuda, @@ -117,13 +118,13 @@ in goBuild (finalAttrs: { pname = "ollama"; # don't forget to invalidate all hashes each update - version = "0.12.3"; + version = "0.12.5"; src = fetchFromGitHub { owner = "ollama"; repo = "ollama"; tag = "v${finalAttrs.version}"; - hash = "sha256-ooDGwTklGJ/wzDlAY3uJiqpZUxT1cCsqVNJKU8BAPbQ="; + hash = "sha256-X5xxM53DfN8EW29hfJiAeADKLvKdmdNYE2NBa05T82k="; }; vendorHash = "sha256-SlaDsu001TUW+t9WRp7LqxUSQSGDF1Lqu9M1bgILoX4="; @@ -148,7 +149,7 @@ goBuild (finalAttrs: { ] ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ] ++ lib.optionals (enableRocm || enableCuda) [ - makeWrapper + makeBinaryWrapper autoAddDriverRunpath ]; @@ -214,8 +215,6 @@ goBuild (finalAttrs: { ''; ldflags = [ - "-s" - "-w" "-X=github.com/ollama/ollama/version.Version=${finalAttrs.version}" "-X=github.com/ollama/ollama/server.mode=release" ]; @@ -237,13 +236,17 @@ goBuild (finalAttrs: { in [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; + doInstallCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + writableTmpDirAsHomeHook + ]; + versionCheckKeepEnvironment = "HOME"; + versionCheckProgramArg = "--version"; + passthru = { tests = { inherit ollama; - version = testers.testVersion { - inherit (finalAttrs) version; - package = ollama; - }; } // lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit ollama-rocm ollama-cuda; diff --git a/pkgs/by-name/pi/pingus/package.nix b/pkgs/by-name/pi/pingus/package.nix index f47e64d08b7f..f1795ee2a9aa 100644 --- a/pkgs/by-name/pi/pingus/package.nix +++ b/pkgs/by-name/pi/pingus/package.nix @@ -1,55 +1,86 @@ { lib, stdenv, - fetchgit, + fetchFromGitHub, cmake, + pkg-config, + makeWrapper, + libGL, + libGLU, SDL2, SDL2_image, - boost, + fmt, + gtest, libpng, - SDL2_mixer, - pkg-config, - libGLU, - libGL, - git, - jsoncpp, + libsigcxx, + argpp, + geomcpp, + logmich, + priocpp, + strutcpp, + tinycmmc, + tinygettext, + uitest, + wstsound, + xdgcpp, }: + stdenv.mkDerivation { pname = "pingus"; - version = "unstable-0.7.6.0.20191104"; + version = "0.7.6-unstable-2025-07-21"; + + src = fetchFromGitHub { + owner = "Pingus"; + repo = "pingus"; + rev = "b0ceeeeb95428c73b1b81208211535c61acfc5d0"; + sha256 = "sha256-jQYZM7VLqbl9/+QXyswEXdGmwOq/nxRzWARvcDqNM9M="; + }; nativeBuildInputs = [ cmake pkg-config - git + makeWrapper ]; + buildInputs = [ + libGL + libGLU SDL2 SDL2_image - boost + fmt + gtest libpng - SDL2_mixer - libGLU - libGL - jsoncpp + libsigcxx + argpp + geomcpp + logmich + priocpp + strutcpp + tinycmmc + tinygettext + uitest + wstsound + xdgcpp ]; - src = fetchgit { - url = "https://gitlab.com/pingus/pingus/"; - rev = "709546d9b9c4d6d5f45fc9112b45ac10c7f9417d"; - sha256 = "11mmzk0766riaw5qyd1r5i7s7vczbbzfccm92bvgrm99iy1sj022"; - fetchSubmodules = true; - }; - postPatch = '' - # Fix missing gcc-13 headers - sed -e '1i #include ' -i src/util/pathname.hpp - ''; + cmakeFlags = [ + "-DWARNINGS=ON" + "-DWERROR=ON" + "-DBUILD_EXTRA=OFF" + "-DBUILD_TESTS=OFF" + ]; + + doCheck = true; meta = { description = "Puzzle game with mechanics similar to Lemmings"; + homepage = "https://pingus.seul.org/"; mainProgram = "pingus"; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.raskin ]; + maintainers = with lib.maintainers; [ + raskin + SchweGELBin + ]; license = lib.licenses.gpl3; }; } diff --git a/pkgs/by-name/pr/priocpp/package.nix b/pkgs/by-name/pr/priocpp/package.nix new file mode 100644 index 000000000000..d2518f9bee89 --- /dev/null +++ b/pkgs/by-name/pr/priocpp/package.nix @@ -0,0 +1,54 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + fmt, + gtest, + logmich, + tinycmmc, + jsoncpp, + sexp-cpp, +}: + +stdenv.mkDerivation { + pname = "priocpp"; + version = "0.0.0-unstable-2025-07-21"; + + src = fetchFromGitHub { + owner = "Grumbel"; + repo = "priocpp"; + rev = "b2664449adcaed93f609e3ea1fb68f8295390ce9"; + sha256 = "sha256-tn0UNK+rQQPpSgTexOKyROOvX6ynEHFUj+gk11dlh/8="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + propagatedBuildInputs = [ + fmt + gtest + logmich + tinycmmc + jsoncpp + sexp-cpp + ]; + + cmakeFlags = [ + "-DBUILD_EXTRA=ON" + "-DBUILD_TESTS=ON" + "-DPRIO_USE_JSONCPP=ON" + "-DPRIO_USE_SEXPCPP=ON" + ]; + + doCheck = true; + + meta = { + description = "Property I/O for C++"; + maintainers = [ lib.maintainers.SchweGELBin ]; + platforms = lib.platforms.linux; + license = lib.licenses.free; + }; +} diff --git a/pkgs/by-name/ra/ratpoints/package.nix b/pkgs/by-name/ra/ratpoints/package.nix index 8caba2276334..0481b3935aef 100644 --- a/pkgs/by-name/ra/ratpoints/package.nix +++ b/pkgs/by-name/ra/ratpoints/package.nix @@ -2,25 +2,33 @@ lib, stdenv, fetchurl, - fetchpatch, + texliveSmall, + writableTmpDirAsHomeHook, gmp, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ratpoints"; - version = "2.1.3.p4"; + version = "2.2.2"; src = fetchurl { - url = "http://www.mathe2.uni-bayreuth.de/stoll/programs/ratpoints-${version}.tar.gz"; - sha256 = "0zhad84sfds7izyksbqjmwpfw4rvyqk63yzdjd3ysd32zss5bgf4"; + url = "https://www.mathe2.uni-bayreuth.de/stoll/programs/ratpoints-${finalAttrs.version}.tar.gz"; + hash = "sha256-2A4VIhkKHhIvey3i78Je+qyQf1XzdjXY2t3Q0Yqv/ZM="; }; enableParallelBuilding = true; - patches = [ - (fetchpatch { - url = "https://raw.githubusercontent.com/sagemath/sage/1615f58890e8f9881c4228c78a6b39b9aab1303a/build/pkgs/ratpoints/patches/sturm_and_rp_private.patch"; - sha256 = "0q3wajncyfr3gahd8gwk9x7g56zw54lpywrl63lqk7drkf60mrcl"; - }) + nativeBuildInputs = [ + (texliveSmall.withPackages ( + ps: with ps; [ + charter + comment + cyrillic + preprint + titlesec + xypic + ] + )) + writableTmpDirAsHomeHook ]; buildInputs = [ gmp ]; @@ -42,4 +50,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; homepage = "http://www.mathe2.uni-bayreuth.de/stoll/programs/"; }; -} +}) diff --git a/pkgs/by-name/re/recordbox/package.nix b/pkgs/by-name/re/recordbox/package.nix index cc5f6b7c69b3..0678773dacd5 100644 --- a/pkgs/by-name/re/recordbox/package.nix +++ b/pkgs/by-name/re/recordbox/package.nix @@ -8,6 +8,7 @@ desktop-file-utils, fetchFromGitea, glib, + libglycin, glycin-loaders, gst_all_1, gtk4, @@ -90,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { # Dirty approach to add patches after cargoSetupPostUnpackHook # We should eventually use a cargo vendor patch hook instead pushd ../$(stripHash $cargoDeps)/glycin-2.* - patch -p3 < ${glycin-loaders.passthru.glycinPathsPatch} + patch -p3 < ${libglycin.passthru.glycinPathsPatch} popd ''; preFixup = '' diff --git a/pkgs/by-name/re/remind/package.nix b/pkgs/by-name/re/remind/package.nix index e85db23b014b..8aa302b99f8a 100644 --- a/pkgs/by-name/re/remind/package.nix +++ b/pkgs/by-name/re/remind/package.nix @@ -16,14 +16,14 @@ tcl.mkTclDerivation rec { pname = "remind"; - version = "06.01.04"; + version = "06.01.05"; src = fetchFromGitea { domain = "git.skoll.ca"; owner = "Skollsoft-Public"; repo = "Remind"; rev = version; - hash = "sha256-DNqwG/HsBEfu1kkRJVkFEWjc+EKY7rdQPcaw3k1HuDk="; + hash = "sha256-5S6s3PylXNGxxzYII2bwT59TFg8sIEUjENkRUDFTuFM="; }; propagatedBuildInputs = lib.optionals withGui [ diff --git a/pkgs/by-name/se/seagoat/package.nix b/pkgs/by-name/se/seagoat/package.nix index 44440b7881ec..2d0550823c09 100644 --- a/pkgs/by-name/se/seagoat/package.nix +++ b/pkgs/by-name/se/seagoat/package.nix @@ -30,6 +30,7 @@ python3Packages.buildPythonApplication rec { "chromadb" "psutil" "setuptools" + "ollama" ]; dependencies = with python3Packages; [ @@ -46,6 +47,7 @@ python3Packages.buildPythonApplication rec { ollama psutil pygments + python-dotenv requests stop-words waitress diff --git a/pkgs/by-name/se/sexp-cpp/package.nix b/pkgs/by-name/se/sexp-cpp/package.nix new file mode 100644 index 000000000000..52b915243d36 --- /dev/null +++ b/pkgs/by-name/se/sexp-cpp/package.nix @@ -0,0 +1,45 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + gtest, + tinycmmc, +}: + +stdenv.mkDerivation { + pname = "sexp-cpp"; + version = "0.1.0-unstable-2025-07-21"; + + src = fetchFromGitHub { + owner = "lispparser"; + repo = "sexp-cpp"; + rev = "677b6f3ecd54e92339d33062084b081ebb9f14a6"; + sha256 = "sha256-/wH9Cgo+4eyYRyUcYRNkYR38rLRv/mJq87dpE9wCPlw="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ + gtest + tinycmmc + ]; + + cmakeFlags = [ + "-DBUILD_TESTS=ON" + "-DUSE_CXX17=ON" + ]; + + doCheck = true; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)" + ''; + + meta = { + description = "S-Expression parser for C++"; + maintainers = [ lib.maintainers.SchweGELBin ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl3; + }; +} diff --git a/pkgs/by-name/si/sillytavern/package.nix b/pkgs/by-name/si/sillytavern/package.nix index 90a0168c361f..570e3d45fd8e 100644 --- a/pkgs/by-name/si/sillytavern/package.nix +++ b/pkgs/by-name/si/sillytavern/package.nix @@ -5,15 +5,15 @@ }: buildNpmPackage (finalAttrs: { pname = "sillytavern"; - version = "1.13.4"; + version = "1.13.5"; src = fetchFromGitHub { owner = "SillyTavern"; repo = "SillyTavern"; tag = finalAttrs.version; - hash = "sha256-C1VWyowuk4w1F5u88Xcp9m3UgNmcDKEn/NSojuLGAd8="; + hash = "sha256-kYTma8+GIXCwFrKB0EnU4nLMPi+HOayBioz1z+xNa+0="; }; - npmDepsHash = "sha256-lVG00oUzrMxIVoKqTRtkMYUmS45YEOkcepXJl4vth2w="; + npmDepsHash = "sha256-BBB+mKuG9cm9Rpa7kPneqK0gSA09hEvszWoWML78eSQ="; dontNpmBuild = true; diff --git a/pkgs/by-name/sn/snapshot/package.nix b/pkgs/by-name/sn/snapshot/package.nix index edb440b1cab7..9bc4466f3252 100644 --- a/pkgs/by-name/sn/snapshot/package.nix +++ b/pkgs/by-name/sn/snapshot/package.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchurl, + libglycin, glycin-loaders, cargo, desktop-file-utils, @@ -34,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # Fix paths in glycin library - glycin-loaders.passthru.glycinPathsPatch + libglycin.passthru.glycinPathsPatch ]; cargoVendorDir = "vendor"; diff --git a/pkgs/by-name/sq/squid/package.nix b/pkgs/by-name/sq/squid/package.nix index 7d33a4abff0d..efd5c86fd16e 100644 --- a/pkgs/by-name/sq/squid/package.nix +++ b/pkgs/by-name/sq/squid/package.nix @@ -19,13 +19,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "squid"; - version = "7.1"; + version = "7.2"; src = fetchurl { url = "https://github.com/squid-cache/squid/releases/download/SQUID_${ builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version }/squid-${finalAttrs.version}.tar.xz"; - hash = "sha256-djtaeFYc7cTkdjT6QrjmuNRsh8lJoVG056wjltL5feo="; + hash = "sha256-Xgd74dg6nmls6NDZ5yOxJzFSIHoJFAS+aKS5qeGMcAM="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/st/strutcpp/package.nix b/pkgs/by-name/st/strutcpp/package.nix new file mode 100644 index 000000000000..f15f2bfaa1be --- /dev/null +++ b/pkgs/by-name/st/strutcpp/package.nix @@ -0,0 +1,39 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + gtest, + tinycmmc, +}: + +stdenv.mkDerivation { + pname = "strutcpp"; + version = "0-unstable-2025-07-21"; + + src = fetchFromGitHub { + owner = "Grumbel"; + repo = "strutcpp"; + rev = "3c9cbf6cd0e09b34e464a0ff01aca99290d79870"; + sha256 = "sha256-pyLNbjvhGjEOGcj4Krtcm/Rms2rvBfWD1lqrEmm7gnI="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ + gtest + tinycmmc + ]; + + cmakeFlags = [ + "-DBUILD_TESTS=ON" + ]; + + doCheck = true; + + meta = { + description = "Collection of string utilities"; + maintainers = [ lib.maintainers.SchweGELBin ]; + platforms = lib.platforms.linux; + license = lib.licenses.free; + }; +} diff --git a/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix index dfe8a6633d64..ff2cf9437eff 100644 --- a/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix +++ b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix @@ -1,23 +1,23 @@ { - version = "1.22.6"; + version = "1.23.0"; x86_64-linux = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.6/linux/amd64/sysdig-cli-scanner"; - hash = "sha256-aOwvxIxq1h66YKJGnFVIFTcA/tq0CseeNLe6pfLobkI="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.23.0/linux/amd64/sysdig-cli-scanner"; + hash = "sha256-7J2hz9p5QphMtC1PNVsicLuDnubjs26siT+Yctf5P9A="; }; aarch64-linux = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.6/linux/arm64/sysdig-cli-scanner"; - hash = "sha256-m79OVmW+9D+941BX9xBwBxrZrDBBrFBDyjS8T6sE3m4="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.23.0/linux/arm64/sysdig-cli-scanner"; + hash = "sha256-EZS+p9/CAaeDJTCkW5Cr2hVcBzG4HDv4zwt7LuOrXrc="; }; x86_64-darwin = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.6/darwin/amd64/sysdig-cli-scanner"; - hash = "sha256-RGc+ZHkX4y6kDwzaZeGWpB3TLRvThUbPkriMDK7U3cQ="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.23.0/darwin/amd64/sysdig-cli-scanner"; + hash = "sha256-PNhdZsC1uhG8KQHEAKeqECBuObfGpflVShikaCojapk="; }; aarch64-darwin = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.6/darwin/arm64/sysdig-cli-scanner"; - hash = "sha256-mFHxETd96ZGJUYDXi6mjhfJDlozDAo4IHaoisbNhwwc="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.23.0/darwin/arm64/sysdig-cli-scanner"; + hash = "sha256-dZ9Fyk6UqJobZbSmEpIxvT1oZhfExaI/lSu4K/0eHI4="; }; } diff --git a/pkgs/by-name/ti/tinycmmc/package.nix b/pkgs/by-name/ti/tinycmmc/package.nix new file mode 100644 index 000000000000..796639ee45b3 --- /dev/null +++ b/pkgs/by-name/ti/tinycmmc/package.nix @@ -0,0 +1,27 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, +}: + +stdenv.mkDerivation { + pname = "tinycmmc"; + version = "0.1.0-unstable-2025-07-21"; + + src = fetchFromGitHub { + owner = "Grumbel"; + repo = "tinycmmc"; + rev = "caf1af301e388e97dca31ee7fdc12f17cff34f82"; + sha256 = "sha256-62ykvAIfOCXH+3bF1IkR+WukeJBLcYC/4Mv3ptqAxEM="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = { + description = "Tiny CMake Module Collections"; + maintainers = [ lib.maintainers.SchweGELBin ]; + platforms = lib.platforms.linux; + license = lib.licenses.zlib; + }; +} diff --git a/pkgs/by-name/ti/tinygettext/package.nix b/pkgs/by-name/ti/tinygettext/package.nix new file mode 100644 index 000000000000..7ea1ea0fc1b9 --- /dev/null +++ b/pkgs/by-name/ti/tinygettext/package.nix @@ -0,0 +1,31 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + tinycmmc, + libiconv, +}: + +stdenv.mkDerivation { + pname = "tinygettext"; + version = "0.1.0-unstable-2025-05-07"; + + src = fetchFromGitHub { + owner = "tinygettext"; + repo = "tinygettext"; + rev = "ef4164639004d7de5bf8ab28ed0e85ea521b7c5e"; + sha256 = "sha256-if+uiVzDA3J+0HM6bVcXvm4lk82TmQmFHG4MtaxIFCk="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ tinycmmc ]; + propagatedBuildInputs = [ libiconv ]; + + meta = { + description = "A simple gettext replacement that works directly on .po files"; + maintainers = [ lib.maintainers.SchweGELBin ]; + platforms = lib.platforms.linux; + license = lib.licenses.zlib; + }; +} diff --git a/pkgs/by-name/tr/trezor-suite/package.nix b/pkgs/by-name/tr/trezor-suite/package.nix index 6b460db45daf..17682c637a59 100644 --- a/pkgs/by-name/tr/trezor-suite/package.nix +++ b/pkgs/by-name/tr/trezor-suite/package.nix @@ -10,7 +10,7 @@ let pname = "trezor-suite"; - version = "25.9.3"; + version = "25.10.1"; suffix = { @@ -24,8 +24,8 @@ let hash = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/download/v${version}/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/' - aarch64-linux = "sha512-mDEqlIxDKHD2xcwcnvehMJExytNBmvhp5iDIKBb/FfxY44We6SAknsocbeWPqq5XLkUbFjjG07IWGtZzdqTj7A=="; - x86_64-linux = "sha512-rxCTYvi+I5ymlS9N4Y2ffIt5ZSgXf6U24mNKe1FNo5++6NfCXFf4vMWJreQ2TNUHsa8V0IixXrtar7AdWCpYQQ=="; + aarch64-linux = "sha512-dqtnWxybR+QTc1cvh72Nm7zkDh7zy6qbAh36b4IGGjARb8X/cEkGMIR2t9E/5pylW6z5gBC7ZpthvdjsiKi1dg=="; + x86_64-linux = "sha512-NBja0kDi43DQ/nJKfAR5+vwbDG/JLr1NKi2OT8CQ5PNeV7Q+4vW5NjsQ9eZyaFwDwSxMPlSzYE3nKcjW0XSiWA=="; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/by-name/tr/trustymail/package.nix b/pkgs/by-name/tr/trustymail/package.nix index 38c1ae1066d3..7bf821b7025e 100644 --- a/pkgs/by-name/tr/trustymail/package.nix +++ b/pkgs/by-name/tr/trustymail/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "trustymail"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; src = fetchFromGitHub { owner = "cisagov"; repo = "trustymail"; tag = "v${version}"; - hash = "sha256-t8Z/jMCqxqCpurQWejT7tnW9l0xMkgsD6Dfe5PZ9OqA="; + hash = "sha256-EA8RomXREDAHZIuq8x+t6w7V1ErUOuuo0TUyaxIgdR8="; }; build-system = with python3.pkgs; [ setuptools ]; diff --git a/pkgs/by-name/ts/tslib/package.nix b/pkgs/by-name/ts/tslib/package.nix index b4e4a575dd01..ec21279b1272 100644 --- a/pkgs/by-name/ts/tslib/package.nix +++ b/pkgs/by-name/ts/tslib/package.nix @@ -17,6 +17,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-2YJDADh/WCksAEIjngAdji98YGmwjpvxSBZkxAwFc7k="; }; + patches = [ + # CMake 4 dropped support of versions lower than 3.5 + ./tslib-1.23-cmake4.patch + ]; + nativeBuildInputs = [ cmake ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ts/tslib/tslib-1.23-cmake4.patch b/pkgs/by-name/ts/tslib/tslib-1.23-cmake4.patch new file mode 100644 index 000000000000..d9f6b3ce0c5d --- /dev/null +++ b/pkgs/by-name/ts/tslib/tslib-1.23-cmake4.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,7 +8,7 @@ + # + # + +-cmake_minimum_required(VERSION 3.3) ++cmake_minimum_required(VERSION 3.10) + + project(tslib LANGUAGES C) + \ No newline at end of file diff --git a/pkgs/by-name/ub/ubus/package.nix b/pkgs/by-name/ub/ubus/package.nix index 5c28c5aab3a5..ae59682cff6f 100644 --- a/pkgs/by-name/ub/ubus/package.nix +++ b/pkgs/by-name/ub/ubus/package.nix @@ -9,12 +9,12 @@ stdenv.mkDerivation { pname = "ubus"; - version = "unstable-2023-12-18"; + version = "unstable-202-10-17"; src = fetchgit { url = "https://git.openwrt.org/project/ubus.git"; - rev = "65bb027054def3b94a977229fd6ad62ddd32345b"; - hash = "sha256-n82Ub0IiuvWbnlDCoN+0hjo/1PbplEbc56kuOYMrHxQ="; + rev = "60e04048a0e2f3e33651c19e62861b41be4c290f"; + hash = "sha256-fjxO77z+do5gZ7nLwHbC14UnP9cmZ5eANNn4X6Sudn0="; }; cmakeFlags = [ "-DBUILD_LUA=OFF" ]; diff --git a/pkgs/by-name/uc/uci/package.nix b/pkgs/by-name/uc/uci/package.nix index d6318106a3fe..1e7eaf22700b 100644 --- a/pkgs/by-name/uc/uci/package.nix +++ b/pkgs/by-name/uc/uci/package.nix @@ -9,12 +9,12 @@ stdenv.mkDerivation { pname = "uci"; - version = "unstable-2023-08-10"; + version = "unstable-2025-10-12"; src = fetchgit { url = "https://git.openwrt.org/project/uci.git"; - rev = "5781664d5087ccc4b5ab58505883231212dbedbc"; - hash = "sha256-8MyFaZdAMh5oMPO/5QyNT+Or57eBL3mamJLblGGoF9g="; + rev = "57c1e8cd2c051d755ca861a9ab38a8049d2e3f95"; + hash = "sha256-/Ian7WoBvm9nmniHdVTEIyRW1BPTmOe3O0v59aDaXc0="; }; hardeningDisable = [ "all" ]; diff --git a/pkgs/by-name/uc/uclient/package.nix b/pkgs/by-name/uc/uclient/package.nix index a80896b15c92..af69a84ab72e 100644 --- a/pkgs/by-name/uc/uclient/package.nix +++ b/pkgs/by-name/uc/uclient/package.nix @@ -5,23 +5,29 @@ cmake, pkg-config, libubox, + ucode, + json_c, }: stdenv.mkDerivation { pname = "uclient"; - version = "unstable-2023-04-13"; + version = "unstable-2025-10-03"; src = fetchgit { url = "https://git.openwrt.org/project/uclient.git"; - rev = "007d945467499f43656b141171d31f5643b83a6c"; - hash = "sha256-A47dyVc2MtOL6aImZ0b3SMWH2vzjfAXzRAOF4nfH6S0="; + rev = "dc909ca71bc884c0e5362e1d7cc7808696cb2add"; + hash = "sha256-jrhLBB3Mb7FvxMtKxG7e7D/hcyygTjx868POGtF+Dcc="; }; nativeBuildInputs = [ cmake pkg-config ]; - buidInputs = [ libubox ]; + buildInputs = [ + libubox + ucode + json_c + ]; preConfigure = '' sed -e 's|ubox_include_dir libubox/ustream-ssl.h|ubox_include_dir libubox/ustream-ssl.h HINTS ${libubox}/include|g' \ @@ -36,6 +42,5 @@ stdenv.mkDerivation { maintainers = with maintainers; [ mkg20001 ]; mainProgram = "uclient-fetch"; platforms = platforms.all; - broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/uc/ucode/package.nix b/pkgs/by-name/uc/ucode/package.nix index d3e1c4e603a2..30fb32cbcb2f 100644 --- a/pkgs/by-name/uc/ucode/package.nix +++ b/pkgs/by-name/uc/ucode/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "JavaScript-like language with optional templating"; homepage = "https://github.com/jow-/ucode"; license = licenses.isc; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ mkg20001 ]; }; } diff --git a/pkgs/by-name/ud/udebug/package.nix b/pkgs/by-name/ud/udebug/package.nix index eb21aab56c84..ab8f9c99bb8a 100644 --- a/pkgs/by-name/ud/udebug/package.nix +++ b/pkgs/by-name/ud/udebug/package.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation { pname = "udebug"; - version = "unstable-2023-12-06"; + version = "unstable-2025-09-28"; src = fetchgit { url = "https://git.openwrt.org/project/udebug.git"; - rev = "6d3f51f9fda706f0cf4732c762e4dbe8c21e12cf"; - hash = "sha256-5dowoFZn9I2IXMQ3Pz+2Eo3rKfihLzjca84MytQIXcU="; + rev = "5327524e715332daaebf6b04c155d2880d230979"; + hash = "sha256-Zcbbo7Jo7JxNSjUlbB2m2Id8crdxzKc/QFeduPGvows="; }; buildInputs = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation { mainProgram = "udebugd"; homepage = "https://git.openwrt.org/?p=project/udebug.git;a=summary"; license = licenses.free; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ mkg20001 ]; }; } diff --git a/pkgs/by-name/ui/uitest/package.nix b/pkgs/by-name/ui/uitest/package.nix new file mode 100644 index 000000000000..9eff2ef5b47f --- /dev/null +++ b/pkgs/by-name/ui/uitest/package.nix @@ -0,0 +1,34 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + tinycmmc, +}: + +stdenv.mkDerivation { + pname = "uitest"; + version = "0-unstable-2024-05-26"; + + src = fetchFromGitHub { + owner = "Grumbel"; + repo = "uitest"; + rev = "d845427140cbcbce99bb6c72919199ac5f033784"; + sha256 = "sha256-xD2Ecs9hW3lcQW6RNcjVhGX/eor2RbCHHXohTafC9y0="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ tinycmmc ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)" + ''; + + meta = { + description = "Simple testing framework for interactive tests"; + maintainers = [ lib.maintainers.SchweGELBin ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl3; + }; +} diff --git a/pkgs/by-name/uq/uqmi/package.nix b/pkgs/by-name/uq/uqmi/package.nix index 6ee2d0f28f04..f4706afbf70d 100644 --- a/pkgs/by-name/uq/uqmi/package.nix +++ b/pkgs/by-name/uq/uqmi/package.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation { pname = "uqmi"; - version = "unstable-2024-01-16"; + version = "unstable-2025-07-30"; src = fetchgit { url = "https://git.openwrt.org/project/uqmi.git"; - rev = "c3488b831ce6285c8107704156b9b8ed7d59deb3"; - hash = "sha256-O5CeLk0WYuBs3l5xBUk9kXDRMzFvYSRoqP28KJ5Ztos="; + rev = "7914da43cddaaf6cfba116260c81e6e9adffd5ab"; + hash = "sha256-Ny5Jd/6N1nTcv2GGP1YLFe+ljn15sUQJVAEVPvYtz3M="; }; postPatch = '' @@ -33,13 +33,9 @@ stdenv.mkDerivation { ]; env.NIX_CFLAGS_COMPILE = toString ( - lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ - # Needed with GCC 12 but breaks on darwin (with clang) or older gcc - "-Wno-error=dangling-pointer" - "-Wno-error=maybe-uninitialized" - ] - ++ lib.optionals stdenv.cc.isClang [ - "-Wno-error=sometimes-uninitialized" + lib.optionals stdenv.cc.isClang [ + # error: unknown warning option '-Wno-dangling-pointer' [-Werror,-Wunknown-warning-option] + "-Wno-error=unknown-warning-option" ] ); diff --git a/pkgs/by-name/vi/viber/package.nix b/pkgs/by-name/vi/viber/package.nix index a2847e7d5206..158bde24d1cb 100644 --- a/pkgs/by-name/vi/viber/package.nix +++ b/pkgs/by-name/vi/viber/package.nix @@ -1,11 +1,13 @@ { - fetchurl, lib, stdenv, + fetchurl, dpkg, makeWrapper, alsa-lib, + bintools, brotli, + cairo, cups, curl, dbus, @@ -13,53 +15,73 @@ fontconfig, freetype, glib, + gsm, gst_all_1, harfbuzz, lcms, + libbluray, libcap, + libdrm, libevent, + libgbm, libGL, libGLU, libkrb5, + libmng, + libopenmpt, libopus, libpulseaudio, + librsvg, + libtheora, + libtiff, + libva, + libvdpau, + libwebp, libxkbcommon, libxkbfile, libxml2, libxslt, - libwebp, - libgbm, + mtdev, nspr, nss, + numactl, + ocl-icd, + openjpeg, openssl, snappy, - systemd, + speex, + systemdLibs, + tslib, + twolame, + wavpack, wayland, xorg, + xvidcore, zlib, zstd, + zvbi, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "viber"; - version = "23.2.0.3"; + version = "24.9.0.3"; src = fetchurl { # Taking Internet Archive snapshot of a specific version to avoid breakage # on new versions - url = "https://web.archive.org/web/20240824071651/https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb"; - hash = "sha256-9WHiI2WlsgEhCPkrQoAunmF6lSb2n5RgQJ2+sdnSShM="; + url = "https://web.archive.org/web/20250830135453/https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb"; + hash = "sha256-i7fG8Sdl/v5QAyTsCh6OKe4BDYnQ0jBJgSdqMOrkLNo="; }; - nativeBuildInputs = [ makeWrapper ]; - - buildInputs = [ dpkg ]; - - dontUnpack = true; + nativeBuildInputs = [ + dpkg + makeWrapper + ]; libPath = lib.makeLibraryPath [ alsa-lib brotli + cairo cups curl dbus @@ -67,37 +89,53 @@ stdenv.mkDerivation { fontconfig freetype glib + gsm + gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good gst_all_1.gstreamer harfbuzz lcms + libbluray libcap + libdrm libevent - libGLU + libgbm libGL + libGLU libkrb5 + libmng + libopenmpt libopus libpulseaudio + librsvg + libtheora + libtiff + libva + libvdpau + libwebp libxkbcommon libxkbfile libxml2 libxslt - libwebp - libgbm + mtdev nspr nss + numactl + ocl-icd + openjpeg openssl snappy + speex stdenv.cc.cc - systemd + systemdLibs + tslib + twolame + wavpack wayland - zlib - zstd - xorg.libICE xorg.libSM xorg.libX11 - xorg.libxcb xorg.libXcomposite xorg.libXcursor xorg.libXdamage @@ -108,44 +146,45 @@ stdenv.mkDerivation { xorg.libXrender xorg.libXScrnSaver xorg.libXtst + xorg.libxcb xorg.xcbutilimage xorg.xcbutilkeysyms xorg.xcbutilrenderutil xorg.xcbutilwm + xvidcore + zlib + zstd + zvbi ]; installPhase = '' - dpkg-deb -x $src $out - mkdir -p $out/bin + runHook preInstall - # Soothe nix-build "suspicions" - chmod -R g-w $out + cp -r . $out for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true - patchelf --set-rpath $libPath:$out/opt/viber/lib:$out/lib $file || true + patchelf --set-interpreter ${bintools.dynamicLinker} "$file" || true + patchelf --set-rpath ${finalAttrs.libPath}:$out/opt/viber/lib $file || true done + mkdir $out/bin # qt.conf is not working, so override everything using environment variables - wrapProgram $out/opt/viber/Viber \ + makeWrapper $out/opt/viber/Viber $out/bin/viber \ --set QT_QPA_PLATFORM "xcb" \ --set QT_PLUGIN_PATH "$out/opt/viber/plugins" \ --set QT_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" \ --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" \ --set QML2_IMPORT_PATH "$out/opt/viber/qml" - ln -s $out/opt/viber/Viber $out/bin/viber mv $out/usr/share $out/share rm -rf $out/usr - # Fix the desktop link substituteInPlace $out/share/applications/viber.desktop \ - --replace /opt/viber/Viber $out/opt/viber/Viber \ - --replace /usr/share/ $out/share/ - + --replace-fail "/opt/viber/" "$out/opt/viber/" # Fix libxml2 breakage. See https://github.com/NixOS/nixpkgs/pull/396195#issuecomment-2881757108 - mkdir -p "$out/lib" ln -s "${lib.getLib libxml2}/lib/libxml2.so" "$out/opt/viber/lib/libxml2.so.2" + + runHook postInstall ''; dontStrip = true; @@ -159,5 +198,4 @@ stdenv.mkDerivation { platforms = [ "x86_64-linux" ]; maintainers = with lib.maintainers; [ jagajaga ]; }; - -} +}) diff --git a/pkgs/by-name/ws/wstsound/package.nix b/pkgs/by-name/ws/wstsound/package.nix new file mode 100644 index 000000000000..2464faaf69ed --- /dev/null +++ b/pkgs/by-name/ws/wstsound/package.nix @@ -0,0 +1,64 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + gtest, + tinycmmc, + libmodplug, + libogg, + libvorbis, + mpg123, + openal, + opusfile, + libopus, +}: + +stdenv.mkDerivation { + pname = "wstsound"; + version = "0.3.0-unstable-2025-07-21"; + + src = fetchFromGitHub { + owner = "WindstilleTeam"; + repo = "wstsound"; + rev = "2c7b00dc1af52432185dc28c4ae87c09c9f4f444"; + sha256 = "sha256-fus1ydypnDDHsQwMkYyZuRikZLbZXLlc/cY8Qol5Hwo="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ + gtest + tinycmmc + ]; + propagatedBuildInputs = [ + libmodplug + libogg + libvorbis + mpg123 + openal + opusfile + libopus + ]; + + cmakeFlags = [ + "-DWARNINGS=ON" + "-DWERROR=ON" + "-DBUILD_TESTS=ON" + "-DBUILD_EXTRA=ON" + ]; + + # Test "openal_info fails" + doCheck = false; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "COMMAND openal_info" "COMMAND openal-info" + ''; + + meta = { + description = "Windstille Sound Library"; + maintainers = [ lib.maintainers.SchweGELBin ]; + platforms = lib.platforms.linux; + license = lib.licenses.free; + }; +} diff --git a/pkgs/by-name/xd/xdgcpp/package.nix b/pkgs/by-name/xd/xdgcpp/package.nix new file mode 100644 index 000000000000..ef8162e9fa15 --- /dev/null +++ b/pkgs/by-name/xd/xdgcpp/package.nix @@ -0,0 +1,27 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, +}: + +stdenv.mkDerivation { + pname = "xdgcpp"; + version = "0-unstable-2024-05-26"; + + src = fetchFromGitHub { + owner = "Grumbel"; + repo = "xdgcpp"; + rev = "e2c40c081e2ee2d315d1d0b3ae5981d5fd77260e"; + sha256 = "sha256-eujYRUw8UpDFgEvjHUPsJ/QJN+A+hzcebfgteM9kvXM="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = { + description = "Implementation of the XDG Base Directory Specification in C++"; + maintainers = [ lib.maintainers.SchweGELBin ]; + platforms = lib.platforms.linux; + license = lib.licenses.lgpl3; + }; +} diff --git a/pkgs/development/libraries/libubox/default.nix b/pkgs/development/libraries/libubox/default.nix index 86aef1036258..1804f4587546 100644 --- a/pkgs/development/libraries/libubox/default.nix +++ b/pkgs/development/libraries/libubox/default.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation { pname = "libubox"; - version = "0-unstable-2025-07-23"; + version = "0-unstable-2025-10-14"; src = fetchgit { url = "https://git.openwrt.org/project/libubox.git"; - rev = "49056d178f42da98048a5d4c23f83a6f6bc6dd80"; - hash = "sha256-sk5r18M0hJ+8CrC2G/rb+XqUmUGer2VBrVbuReHj1dM="; + rev = "7d6b9d98d0bdd4e14aedeb7908c28e4b318c8191"; + hash = "sha256-SBw83zT/tMvmndo4bZ19sLWc493G2jefMhrvqjQ6WJc="; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/ustream-ssl/default.nix b/pkgs/development/libraries/ustream-ssl/default.nix index e618431bb01c..28d42d6fd27b 100644 --- a/pkgs/development/libraries/ustream-ssl/default.nix +++ b/pkgs/development/libraries/ustream-ssl/default.nix @@ -11,12 +11,12 @@ stdenv.mkDerivation { pname = "ustream-ssl"; - version = "0-unstable-2024-03-26"; + version = "0-unstable-2025-10-03"; src = fetchgit { url = "https://git.openwrt.org/project/ustream-ssl.git"; - rev = "7621339d7694abef5da5e5353ac440f2d39dcecb"; - hash = "sha256-No0Pk8KbkT7W4Rav7W3rMKEJISbp7RRoRx7t6LPMxlk="; + rev = "5a81c108d20e24724ed847cc4be033f2a74e6635"; + hash = "sha256-IC5740+1YT3TDayath3Md3hdjuml1S1A/OWYd0GxbDc="; }; preConfigure = '' diff --git a/pkgs/development/python-modules/aioairq/default.nix b/pkgs/development/python-modules/aioairq/default.nix index 9ea35440fe9f..d5c84610f1fc 100644 --- a/pkgs/development/python-modules/aioairq/default.nix +++ b/pkgs/development/python-modules/aioairq/default.nix @@ -21,6 +21,8 @@ buildPythonPackage rec { hash = "sha256-CliY2MfkRfpOmWM70vDRxG6tY2eoaPiRFHb0qt2Kmyw="; }; + __darwinAllowLocalNetworking = true; + build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/automower-ble/default.nix b/pkgs/development/python-modules/automower-ble/default.nix index 4c335e0f52dd..e266da0ae2ed 100644 --- a/pkgs/development/python-modules/automower-ble/default.nix +++ b/pkgs/development/python-modules/automower-ble/default.nix @@ -1,6 +1,7 @@ { lib, bleak, + bleak-retry-connector, buildPythonPackage, fetchFromGitHub, setuptools, @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "automower-ble"; - version = "0.2.7"; + version = "0.2.8"; pyproject = true; disabled = pythonOlder "3.10"; @@ -19,12 +20,15 @@ buildPythonPackage rec { owner = "alistair23"; repo = "AutoMower-BLE"; tag = version; - hash = "sha256-oOwSbGzTGXWm3Vmsui4k1lPRnT8+aIs6sk1DK/aRxzs="; + hash = "sha256-GawjNtk2mEBo9Xe1k1z0tk1RWU0N0JddeC6NZbnLpxc="; }; build-system = [ setuptools ]; - dependencies = [ bleak ]; + dependencies = [ + bleak + bleak-retry-connector + ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -33,6 +37,7 @@ buildPythonPackage rec { meta = { description = "Module to connect to Husqvarna Automower Connect"; homepage = "https://github.com/alistair23/AutoMower-BLE"; + changelog = "https://github.com/alistair23/AutoMower-BLE/releases/tag/${src.tag}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/nox/default.nix b/pkgs/development/python-modules/nox/default.nix index 7d5dc73a56e5..614c5717a237 100644 --- a/pkgs/development/python-modules/nox/default.nix +++ b/pkgs/development/python-modules/nox/default.nix @@ -12,6 +12,7 @@ argcomplete, colorlog, dependency-groups, + humanize, jinja2, packaging, tomli, @@ -28,7 +29,7 @@ buildPythonPackage rec { pname = "nox"; - version = "2025.05.01"; + version = "2025.10.16"; pyproject = true; disabled = pythonOlder "3.12"; @@ -37,7 +38,7 @@ buildPythonPackage rec { owner = "wntrblm"; repo = "nox"; tag = version; - hash = "sha256-qH8oh7tmiJkXOobyDZMRZ62w2sRHJF8sh4PX+6s7M70="; + hash = "sha256-oRVDGHw/0HkHLtzcSZL2Aj1uxuRS/ms66cBPDQjJ17I="; }; build-system = [ hatchling ]; @@ -47,6 +48,7 @@ buildPythonPackage rec { attrs colorlog dependency-groups + humanize packaging virtualenv ] @@ -65,7 +67,8 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook writableTmpDirAsHomeHook - ]; + ] + ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "nox" ]; diff --git a/pkgs/development/python-modules/pylacus/default.nix b/pkgs/development/python-modules/pylacus/default.nix index e75298bb7a8c..10551ce6489e 100644 --- a/pkgs/development/python-modules/pylacus/default.nix +++ b/pkgs/development/python-modules/pylacus/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pylacus"; - version = "1.18.0"; + version = "1.19.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "ail-project"; repo = "PyLacus"; tag = "v${version}"; - hash = "sha256-N0FGjT/Jq5n2J2omk/W1tsjiAZY4WlsEs33ErKOuCl4="; + hash = "sha256-Ezp/aFTETvU1bOZZvMlZn0XmaLWoOd6l8s0n5lIqV2w="; }; build-system = [ poetry-core ]; diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix index df62ae38885a..670a974307b6 100644 --- a/pkgs/servers/nosql/apache-jena/binary.nix +++ b/pkgs/servers/nosql/apache-jena/binary.nix @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { pname = "apache-jena"; - version = "5.5.0"; + version = "5.6.0"; src = fetchurl { url = "mirror://apache/jena/binaries/apache-jena-${version}.tar.gz"; - hash = "sha256-atRcW9U3PjX/E3QhTa6dBfvb19Rb3n6ROpLeGinGD1U="; + hash = "sha256-s5qmzKBrED7U1Qm0Lu5RI5QIiFnfK1NnqFiSe/H85yg="; }; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/tools/filesystems/ceph/arrow-cpp-19.nix b/pkgs/tools/filesystems/ceph/arrow-cpp-19.nix index d4226feffb52..eb2d7ecc628c 100644 --- a/pkgs/tools/filesystems/ceph/arrow-cpp-19.nix +++ b/pkgs/tools/filesystems/ceph/arrow-cpp-19.nix @@ -106,6 +106,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-WTpe/eT3himlCHN/R78w1sF0HG859mE2ZN70U+9N8Ag="; stripLen = 1; }) + (fetchpatch2 { + name = "cmake-fix.patch"; + url = "https://github.com/apache/arrow/commit/48c0bbbd4a2eedcca518caeb7f7547c7988dc740.patch?full_index=1"; + hash = "sha256-i/vZy/61VYP+mo1AxfoiBSjTip04vhFOh3hGjHCJy6g="; + stripLen = 1; # applying patch from within `cpp/` subdirectory + }) ]; # versions are all taken from diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 11e7fff175a6..5e8bc57366ed 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -386,6 +386,12 @@ rec { # * # * ./boost-1.86-PyModule.patch + + (fetchpatch2 { + name = "ceph-cmake-4.patch"; + url = "https://gitlab.alpinelinux.org/ashpool/aports/-/raw/d22b70eafe33c3daabe4eea6913c5be87d9463ad/community/ceph19/cpp_redis.patch"; + hash = "sha256-wxPIsYt25CjXhJ6kmr/MXwFD58Sl4y4W+r9jAMND+uw="; + }) ]; nativeBuildInputs = [