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

Merge staging-next into staging

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-02-12 00:15:06 +00:00
committed by GitHub
parent 8904f5127f 696a86490d
commit 843c56dc9b
170 changed files with 4966 additions and 9835 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/maintainer-list.nix
+13
View File
@@ -2747,6 +2747,12 @@
githubId = 34620799;
name = "Jacob Bachmann";
};
bcooley = {
email = "bradley.m.cooley@gmail.com";
github = "Bradley-Cooley";
githubId = 5409401;
name = "Bradley Cooley";
};
bcyran = {
email = "bazyli@cyran.dev";
github = "bcyran";
@@ -16672,6 +16678,13 @@
github = "nipeharefa";
githubId = 12620257;
};
niraethm = {
name = "Rémi Akirazar";
email = "randormi@devcpu.co";
matrix = "@lysgonul:bark.lgbt";
github = "niraethm";
githubId = 20865531;
};
NIS = {
name = "NSC IT Solutions";
github = "dev-nis";
maintainers/scripts/kde/generate-sources.py
+24 -14
View File
@@ -5,7 +5,7 @@ import binascii
import json
import pathlib
from typing import Optional
from urllib.parse import urlparse
from urllib.parse import urljoin, urlparse
import bs4
import click
@@ -72,32 +72,42 @@ def main(set: str, version: str, nixpkgs: pathlib.Path, sources_url: Optional[st
if sources_url is None:
set_url = {
"frameworks": "kf",
"gear": "releases",
"plasma": "plasma",
"frameworks": f"frameworks/{version}/",
"gear": f"release-service/{version}/src/",
"plasma": f"plasma/{version}/",
}[set]
sources_url = f"https://kde.org/info/sources/source-{set_url}-{version}/"
sources_url = f"https://download.kde.org/stable/{set_url}"
sources = httpx.get(sources_url)
client = httpx.Client()
sources = client.get(sources_url)
sources.raise_for_status()
bs = bs4.BeautifulSoup(sources.text, features="html.parser")
results = {}
for item in bs.select("tr")[1:]:
link = item.select_one("td:nth-child(1) a")
assert link
for item in bs.select("tr")[3:]:
link = item.select_one("td:nth-child(2) a")
if not link:
continue
hash = item.select_one("td:nth-child(3) tt")
assert hash
project_name, version_and_ext = link.text.rsplit("-", maxsplit=1)
project_name, version = link.text.rsplit("-", maxsplit=1)
if project_name not in metadata.projects_by_name:
print(f"Warning: unknown tarball: {project_name}")
if version_and_ext.endswith(".sig"):
continue
version = version_and_ext.removesuffix(".tar.xz")
url = urljoin(sources_url, link.attrs["href"])
hash = client.get(url + ".sha256").text.split(" ", maxsplit=1)[0]
assert hash
results[project_name] = {
"version": version,
"url": "mirror://kde" + urlparse(link.attrs["href"]).path,
"hash": to_sri(hash.text)
"url": "mirror://kde" + urlparse(url).path,
"hash": to_sri(hash)
}
pkg_dir = set_dir / project_name
nixos/tests/systemd-timesyncd.nix
+12 -7
View File
@@ -26,13 +26,18 @@ import ./make-test-python.nix (
# create the path that should be migrated by our activation script when
# upgrading to a newer nixos version
system.stateVersion = "19.03";
systemd.tmpfiles.settings.systemd-timesyncd-test = {
"/var/lib/systemd/timesync".R = { };
"/var/lib/systemd/timesync".L.argument = "/var/lib/private/systemd/timesync";
"/var/lib/private/systemd/timesync".d = {
user = "systemd-timesync";
group = "systemd-timesync";
};
systemd.services.old-timesync-state-dir = {
requiredBy = [ "sysinit.target" ];
before = [ "systemd-timesyncd.service" ];
after = [ "local-fs.target" ];
unitConfig.DefaultDependencies = false;
serviceConfig.Type = "oneshot";
script = ''
rm -rf /var/lib/systemd/timesync
mkdir -p /var/lib/systemd /var/lib/private/systemd/timesync
ln -s /var/lib/private/systemd/timesync /var/lib/systemd/timesync
chown systemd-timesync: /var/lib/private/systemd/timesync
'';
};
}
);
nixos/tests/teleport.nix
+2 -1
View File
@@ -9,8 +9,9 @@ with import ../lib/testing-python.nix { inherit system pkgs; };
let
packages = with pkgs; {
"default" = teleport;
"15" = teleport_15;
"16" = teleport_16;
"17" = teleport_17;
};
minimal = package: {
pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix
+4 -2
View File
@@ -7,7 +7,7 @@
}:
vimUtils.buildVimPlugin {
pname = "cmp-async-path";
version = "unstable-2024-10-21";
version = "0-unstable-2024-10-21";
src = fetchFromGitea {
domain = "codeberg.org";
@@ -19,7 +19,9 @@ vimUtils.buildVimPlugin {
checkInputs = [ vimPlugins.nvim-cmp ];
passthru.updateScript = nix-update-script { };
passthru.updateScript = nix-update-script {
extraArgs = [ "--version=branch" ];
};
meta = {
description = "Nvim-cmp source for filesystem paths with async processing";
pkgs/applications/editors/vim/plugins/non-generated/nvim-julia-autotest/default.nix
+4 -2
View File
@@ -6,7 +6,7 @@
}:
vimUtils.buildVimPlugin {
pname = "nvim-julia-autotest";
version = "unstable-2022-10-31";
version = "0-unstable-2022-10-31";
src = fetchFromGitLab {
owner = "usmcamp0811";
@@ -15,7 +15,9 @@ vimUtils.buildVimPlugin {
hash = "sha256-IaNsbBe5q7PB9Q/N/Z9nEnP6jlkQ6+xlkC0TCFnJpkk=";
};
passthru.updateScript = nix-update-script { };
passthru.updateScript = nix-update-script {
extraArgs = [ "--version=branch" ];
};
meta = {
description = "Automatically run Julia tests when you save runtest.jl file";
pkgs/applications/editors/vim/plugins/non-generated/vim-stationeers-ic10-syntax/default.nix
+4 -2
View File
@@ -6,7 +6,7 @@
}:
vimUtils.buildVimPlugin {
pname = "vim-ic10";
version = "unstable-2025-01-08";
version = "0-unstable-2025-01-08";
src = fetchFromGitLab {
owner = "LittleMorph";
@@ -15,7 +15,9 @@ vimUtils.buildVimPlugin {
hash = "sha256-4Q1JiDA7PBUWNBNfCIZC6nImhe2FJzOqrslHazAOs18=";
};
passthru.updateScript = nix-update-script { };
passthru.updateScript = nix-update-script {
extraArgs = [ "--version=branch" ];
};
meta = {
description = "Stationeers IC10 syntax highlighting for Vim";
pkgs/applications/editors/vscode/extensions/default.nix
+2
View File
@@ -3126,6 +3126,8 @@ let
};
};
marus25.cortex-debug = callPackage ./marus25.cortex-debug { };
matangover.mypy = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "mypy";
pkgs/applications/editors/vscode/extensions/marus25.cortex-debug/default.nix
+18
View File
@@ -0,0 +1,18 @@
{ lib, vscode-utils }:
vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "cortex-debug";
publisher = "marus25";
version = "1.6.10";
hash = "sha256-6b3JDkX6Xd91VE1h7gYyeukxLsBkn/nNzDQgBm0axRA=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/marus25.cortex-debug/changelog";
description = "Visual Studio Code extension for enhancing debug capabilities for Cortex-M Microcontrollers";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=marus25.cortex-debug";
homepage = "https://github.com/Marus/cortex-debug";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.bcooley ];
};
}
pkgs/applications/networking/instant-messengers/discord/linux.nix
+1
View File
@@ -220,6 +220,7 @@ stdenv.mkDerivation rec {
"InstantMessaging"
];
mimeTypes = [ "x-scheme-handler/discord" ];
startupWMClass = "discord";
};
passthru = {
pkgs/applications/office/libreoffice/default.nix
+7 -5
View File
@@ -527,6 +527,8 @@ in stdenv.mkDerivation (finalAttrs: {
] ++ (if variant == "fresh" 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"
@@ -656,15 +658,15 @@ in stdenv.mkDerivation (finalAttrs: {
requiredSystemFeatures = [ "big-parallel" ];
meta = with lib; {
meta = {
changelog = "https://wiki.documentfoundation.org/ReleaseNotes/${lib.versions.majorMinor version}";
description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org";
homepage = "https://libreoffice.org/";
# at least one jar in dependencies
sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.lgpl3;
maintainers = with maintainers; [ raskin ];
platforms = platforms.linux;
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
license = with lib.licenses; [ mpl20 lgpl3Plus asl20 ];
maintainers = with lib.maintainers; [ raskin ];
platforms = lib.platforms.linux;
mainProgram = "libreoffice";
};
})
pkgs/applications/office/libreoffice/skip-broken-tests-fresh.patch
+60 -57
View File
@@ -43,63 +43,6 @@
createSwDoc("tdf150606-1-min.odt");
SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument*>(mxComponent.get());
--- a/sw/qa/extras/layout/layout3.cxx
+++ b/sw/qa/extras/layout/layout3.cxx
@@ -3354,6 +3354,9 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf104209VertRTL)
CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408LTR)
{
+ return; // requests Noto Sans Hebrew with charset=28, which the font does not have
+ // FIXME: investigate
+
// Verify that line breaking a first bidi portion correctly underflows in LTR text
createSwDoc("tdf56408-ltr.fodt");
auto pXmlDoc = parseLayoutDump();
@@ -3368,6 +3371,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408LTR)
CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408RTL)
{
+ return; // same Noto Sans Hebrew issue
+
// Verify that line breaking a first bidi portion correctly underflows in RTL text
createSwDoc("tdf56408-rtl.fodt");
auto pXmlDoc = parseLayoutDump();
@@ -3382,6 +3387,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408RTL)
CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408NoUnderflow)
{
+ return; // same Noto Sans Hebrew issue
+
// 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.
@@ -3398,6 +3405,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408NoUnderflow)
CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408AfterFieldCrash)
{
+ return; // same Noto Sans Hebrew issue
+
// Verify there is no crash/assertion for underflow after a number field
createSwDoc("tdf56408-after-field.fodt");
}
@@ -3436,6 +3445,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf146081)
CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf157829LTR)
{
+ return; // same Noto Sans Hebrew issue
+
// Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions
createSwDoc("tdf157829-ltr.fodt");
auto pXmlDoc = parseLayoutDump();
@@ -3450,6 +3461,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf157829LTR)
CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf157829RTL)
{
+ return; // same Noto Sans Hebrew issue
+
// 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
@@ -4091,6 +4091,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testRedlineTooltip)
@@ -111,3 +54,63 @@
SwXTextDocument* pXTextDocument = createDoc();
int nView1 = SfxLokHelper::getView();
--- 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 +1532,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 +1547,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 +1563,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");
}
@@ -1612,6 +1614,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf155229RowAtLeast)
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();
@@ -1626,6 +1629,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/vcl/qa/cppunit/pdfexport/pdfexport2.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx
@@ -6079,6 +6079,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf162750SmallCapsLigature)
CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf164106SplitReorderedClusters)
{
+ return; // fails due to missing font: Noto Sans
saveAsPDF(u"tdf164106.fodt");
auto pPdfDocument = parsePDFExport();
pkgs/applications/office/libreoffice/skip-broken-tests-still.patch
+76 -16
View File
@@ -1,14 +1,24 @@
--- a/sc/qa/extras/vba-macro-test.cxx
+++ b/sc/qa/extras/vba-macro-test.cxx
@@ -364,7 +364,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testVba)
@@ -355,7 +355,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testVba)
// Failed: : Test change event for Range.FillRight:
// Tests passed: 4
// Tests failed: 4
-#if !defined(_WIN32)
+#if 0 // flaky, see above
{ OUString("Ranges-3.xls"),
OUString(
"vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") },
{ u"Ranges-3.xls"_ustr,
u"vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"_ustr },
#endif
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -2954,6 +2954,7 @@ CPPUNIT_TEST_FIXTURE(ScTiledRenderingTest, testCommentCellCopyPaste)
CPPUNIT_TEST_FIXTURE(ScTiledRenderingTest, testInvalidEntrySave)
{
+ return; // hangs (forever?)
loadFromFile(u"validity.xlsx");
// .uno:Save modifies the original file, make a copy first
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -1507,6 +1507,8 @@ CPPUNIT_TEST_FIXTURE(TestFormula, testFormulaAnnotateTrimOnDoubleRefs)
@@ -17,13 +27,63 @@
{
+ return; // fails consistently on nixpkgs?
+
m_pDoc->InsertTab(0, "Formula");
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
@@ -685,6 +685,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testSearchAll)
@@ -700,6 +700,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testSearchAll)
CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testSearchAllNotifications)
{
+ return; // flaky on GTK
@@ -31,8 +91,8 @@
SwXTextDocument* pXTextDocument = createDoc("search.odt");
SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell();
setupLibreOfficeKitViewCallback(pWrtShell->GetSfxViewShell());
@@ -949,6 +951,8 @@ namespace {
@@ -970,6 +972,8 @@ namespace {
CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testMissingInvalidation)
{
+ return; // flaky on GTK
@@ -40,8 +100,8 @@
// Create two views.
SwXTextDocument* pXTextDocument = createDoc("dummy.fodt");
ViewCallback aView1;
@@ -982,6 +986,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testMissingInvalidation)
@@ -1003,6 +1007,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testMissingInvalidation)
CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testViewCursors)
{
+ return; // flaky on GTK
@@ -49,8 +109,8 @@
SwXTextDocument* pXTextDocument = createDoc("dummy.fodt");
ViewCallback aView1;
SfxLokHelper::createView();
@@ -3189,6 +3189,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testRedlineNotificationDuringSave)
@@ -3197,6 +3203,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testRedlineNotificationDuringSave)
CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testHyperlink)
{
+ return; // flaky on GTK
@@ -58,12 +118,12 @@
comphelper::LibreOfficeKit::setViewIdForVisCursorInvalidation(true);
SwXTextDocument* pXTextDocument = createDoc("hyperlink.odt");
SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell();
@@ -3399,6 +3401,8 @@ static void lcl_extractHandleParameters(std::string_view selection, sal_Int32& i
@@ -3407,6 +3415,8 @@ static void lcl_extractHandleParameters(std::string_view selection, sal_Int32& i
CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testMoveShapeHandle)
{
+ return; // flaky on GTK
+
comphelper::LibreOfficeKit::setActive();
SwXTextDocument* pXTextDocument = createDoc("shape.fodt");
pkgs/applications/office/libreoffice/skip-broken-tests.patch
+26 -19
View File
@@ -1,7 +1,7 @@
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -600,6 +600,8 @@ void DesktopLOKTest::testGetFilterTypes()
@@ -595,6 +595,8 @@ void DesktopLOKTest::testGetFilterTypes()
void DesktopLOKTest::testSearchCalc()
{
+ return; // flaky
@@ -9,8 +9,8 @@
LibLibreOffice_Impl aOffice;
LibLODocument_Impl* pDocument = loadDoc("search.ods");
pDocument->pClass->initializeForRendering(pDocument, nullptr);
@@ -630,6 +632,8 @@ void DesktopLOKTest::testSearchCalc()
@@ -625,6 +627,8 @@ void DesktopLOKTest::testSearchCalc()
void DesktopLOKTest::testSearchAllNotificationsCalc()
{
+ return; // flaky
@@ -30,8 +30,8 @@
</switch>
--- a/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx
+++ b/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx
@@ -284,6 +284,8 @@ void checkIssuePosition(std::shared_ptr<sfx::AccessibilityIssue> const& pIssue,
@@ -361,6 +361,8 @@ void checkIssuePosition(std::shared_ptr<sfx::AccessibilityIssue> const& pIssue,
CPPUNIT_TEST_FIXTURE(AccessibilityCheckTest, testOnlineNodeSplitAppend)
{
+ return; // flaky?
@@ -41,7 +41,7 @@
// happen on editing all the time.
--- a/sw/qa/core/text/text.cxx
+++ b/sw/qa/core/text/text.cxx
@@ -1577,6 +1577,8 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testParaUpperMarginFlyIntersect)
@@ -1630,6 +1630,8 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testParaUpperMarginFlyIntersect)
CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testTdf129810)
{
@@ -52,7 +52,7 @@
// even when the font is not installed.
--- a/sw/qa/extras/htmlimport/htmlimport.cxx
+++ b/sw/qa/extras/htmlimport/htmlimport.cxx
@@ -306,6 +306,8 @@ CPPUNIT_TEST_FIXTURE(HtmlImportTest, testTableBorder1px)
@@ -308,6 +308,8 @@ CPPUNIT_TEST_FIXTURE(HtmlImportTest, testTableBorder1px)
CPPUNIT_TEST_FIXTURE(HtmlImportTest, testOutlineLevel)
{
@@ -63,18 +63,18 @@
// Heading 1 styles.
--- a/sw/qa/extras/layout/layout3.cxx
+++ b/sw/qa/extras/layout/layout3.cxx
@@ -539,6 +539,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf120287c)
@@ -1038,6 +1038,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf158658c)
CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf155177)
{
+ return; // flaky
+
createSwDoc("tdf155177-1-min.odt");
uno::Reference<beans::XPropertySet> xStyle(getStyles("ParagraphStyles")->getByName("Body Text"),
uno::Reference<beans::XPropertySet> xStyle(
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -601,6 +601,8 @@ CPPUNIT_TEST_FIXTURE(Test, testFdo56272)
@@ -602,6 +602,8 @@ CPPUNIT_TEST_FIXTURE(Test, testFdo56272)
CPPUNIT_TEST_FIXTURE(Test, testIncorrectSum)
{
@@ -94,8 +94,8 @@
SwXTextDocument* pXTextDocument = createDoc("dummy.fodt");
ViewCallback aView1;
int nView1 = SfxLokHelper::getView();
@@ -3187,6 +3187,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testDoubleUnderlineAndStrikeOut)
@@ -3048,6 +3050,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testDoubleUnderlineAndStrikeOut)
CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testTdf43244_SpacesOnMargin)
{
+ return; // fails consistently
@@ -103,14 +103,21 @@
// Load a document where the top left tile contains
// paragraph and line break symbols with redlining.
SwXTextDocument* pXTextDocument = createDoc("tdf43244_SpacesOnMargin.odt");
@@ -4091,6 +4095,7 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testRedlineTooltip)
// toggling Formatting Marks on/off for one view should have no effect on other views
CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testToggleFormattingMarks)
{
+ return; // fails
SwXTextDocument* pXTextDocument = createDoc();
int nView1 = SfxLokHelper::getView();
--- a/sw/qa/extras/uiwriter/uiwriter5.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter5.cxx
@@ -1613,6 +1613,8 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testDateFormFieldCurrentDateHandling)
#if !defined(_WIN32)
CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testDateFormFieldCurrentDateInvalidation)
@@ -1571,6 +1571,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testDateFormFieldContentOperations)
CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testDateFormFieldCurrentDateHandling)
{
+ return; // flaky on KF6
+
createSwDoc();
SwDoc* pDoc = getSwDoc();
CPPUNIT_ASSERT(pDoc);
pkgs/applications/office/libreoffice/src-fresh/deps.nix
Generated
+174 -125
View File
@@ -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";
@@ -56,11 +56,11 @@
md5name = "4eebc4c2bad0402bc3f501db184417094657d111fb6c06f076a82ea191fe1faf-cairo-1.17.6.tar.xz";
}
{
name = "libcdr-0.1.7.tar.xz";
url = "https://dev-www.libreoffice.org/src/libcdr-0.1.7.tar.xz";
sha256 = "5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b8ecdd4";
name = "libcdr-0.1.8.tar.xz";
url = "https://dev-www.libreoffice.org/src/libcdr-0.1.8.tar.xz";
sha256 = "ced677c8300b29c91d3004bb1dddf0b99761bf5544991c26c2ee8f427e87193c";
md5 = "";
md5name = "5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b8ecdd4-libcdr-0.1.7.tar.xz";
md5name = "ced677c8300b29c91d3004bb1dddf0b99761bf5544991c26c2ee8f427e87193c-libcdr-0.1.8.tar.xz";
}
{
name = "clucene-core-2.3.3.4.tar.gz";
@@ -105,11 +105,11 @@
md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz";
}
{
name = "curl-8.11.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/curl-8.11.0.tar.xz";
sha256 = "db59cf0d671ca6e7f5c2c5ec177084a33a79e04c97e71cf183a5cdea235054eb";
name = "curl-8.11.1.tar.xz";
url = "https://dev-www.libreoffice.org/src/curl-8.11.1.tar.xz";
sha256 = "c7ca7db48b0909743eaef34250da02c19bc61d4f1dcedd6603f109409536ab56";
md5 = "";
md5name = "db59cf0d671ca6e7f5c2c5ec177084a33a79e04c97e71cf183a5cdea235054eb-curl-8.11.0.tar.xz";
md5name = "c7ca7db48b0909743eaef34250da02c19bc61d4f1dcedd6603f109409536ab56-curl-8.11.1.tar.xz";
}
{
name = "libe-book-0.1.3.tar.xz";
@@ -140,11 +140,11 @@
md5name = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad-libepubgen-0.1.1.tar.xz";
}
{
name = "libetonyek-0.1.10.tar.xz";
url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.10.tar.xz";
sha256 = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a";
name = "libetonyek-0.1.12.tar.xz";
url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.12.tar.xz";
sha256 = "b9fa82fbeb8cb7a701101060e4f3e1e4ef7c38f574b2859d3ecbe43604c21f83";
md5 = "";
md5name = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a-libetonyek-0.1.10.tar.xz";
md5name = "b9fa82fbeb8cb7a701101060e4f3e1e4ef7c38f574b2859d3ecbe43604c21f83-libetonyek-0.1.12.tar.xz";
}
{
name = "expat-2.6.4.tar.xz";
@@ -224,18 +224,18 @@
md5name = "1b6880e4b8df09c3b9e246d6084bfd94bf32a0ffff60cf2dcffd3622d0e2d79f-NotoKufiArabic-v2.109.zip";
}
{
name = "NotoSans-v2.014.zip";
url = "https://dev-www.libreoffice.org/src/NotoSans-v2.014.zip";
sha256 = "1dffbaf31a0a699ee2c57dfb60c1a628010425301dd076cfb485adbe017352c1";
name = "NotoSans-v2.015.zip";
url = "https://dev-www.libreoffice.org/src/NotoSans-v2.015.zip";
sha256 = "0c34df072a3fa7efbb7cbf34950e1f971a4447cffe365d3a359e2d4089b958f5";
md5 = "";
md5name = "1dffbaf31a0a699ee2c57dfb60c1a628010425301dd076cfb485adbe017352c1-NotoSans-v2.014.zip";
md5name = "0c34df072a3fa7efbb7cbf34950e1f971a4447cffe365d3a359e2d4089b958f5-NotoSans-v2.015.zip";
}
{
name = "NotoSerif-v2.014.zip";
url = "https://dev-www.libreoffice.org/src/NotoSerif-v2.014.zip";
sha256 = "6abce0a80df4ef6d5a944d60c81099364481d6a7015b0721d87bc4c16acc1fd3";
name = "NotoSerif-v2.015.zip";
url = "https://dev-www.libreoffice.org/src/NotoSerif-v2.015.zip";
sha256 = "0e9a43c8a4b94ac76f55069ed1d7385bbcaf6b99527a94deb5619e032b7e76c1";
md5 = "";
md5name = "6abce0a80df4ef6d5a944d60c81099364481d6a7015b0721d87bc4c16acc1fd3-NotoSerif-v2.014.zip";
md5name = "0e9a43c8a4b94ac76f55069ed1d7385bbcaf6b99527a94deb5619e032b7e76c1-NotoSerif-v2.015.zip";
}
{
name = "NotoSerifHebrew-v2.004.zip";
@@ -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";
@@ -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";
@@ -364,18 +413,18 @@
md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz";
}
{
name = "freetype-2.13.2.tar.xz";
url = "https://dev-www.libreoffice.org/src/freetype-2.13.2.tar.xz";
sha256 = "12991c4e55c506dd7f9b765933e62fd2be2e06d421505d7950a132e4f1bb484d";
name = "freetype-2.13.3.tar.xz";
url = "https://dev-www.libreoffice.org/src/freetype-2.13.3.tar.xz";
sha256 = "0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289";
md5 = "";
md5name = "12991c4e55c506dd7f9b765933e62fd2be2e06d421505d7950a132e4f1bb484d-freetype-2.13.2.tar.xz";
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.23.2.tar.bz2";
url = "https://dev-www.libreoffice.org/src/gpgme-1.23.2.tar.bz2";
sha256 = "9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224";
name = "gpgme-1.24.1.tar.bz2";
url = "https://dev-www.libreoffice.org/src/gpgme-1.24.1.tar.bz2";
sha256 = "ea05d0258e71061d61716584ec34cef59330a91340571edc46b78374973ba85f";
md5 = "";
md5name = "9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224-gpgme-1.23.2.tar.bz2";
md5name = "ea05d0258e71061d61716584ec34cef59330a91340571edc46b78374973ba85f-gpgme-1.24.1.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,11 +588,11 @@
md5name = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf-libjpeg-turbo-2.1.5.1.tar.gz";
}
{
name = "language-subtag-registry-2024-06-14.tar.bz2";
url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2024-06-14.tar.bz2";
sha256 = "75bc394dd83ddfd62b172a462db1b66bdb5950f40823ed63b8c7db6b71e37e75";
name = "language-subtag-registry-2025-01-21.tar.bz2";
url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2025-01-21.tar.bz2";
sha256 = "06b37484c2736816e84b8bdd2075011d5961c2316865bc2795831230b925608d";
md5 = "";
md5name = "75bc394dd83ddfd62b172a462db1b66bdb5950f40823ed63b8c7db6b71e37e75-language-subtag-registry-2024-06-14.tar.bz2";
md5name = "06b37484c2736816e84b8bdd2075011d5961c2316865bc2795831230b925608d-language-subtag-registry-2025-01-21.tar.bz2";
}
{
name = "lcms2-2.16.tar.gz";
@@ -581,18 +630,18 @@
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.4.6.tar.gz";
url = "https://dev-www.libreoffice.org/src/libffi-3.4.6.tar.gz";
sha256 = "b0dea9df23c863a7a50e825440f3ebffabd65df1497108e5d437747843895a4e";
md5 = "";
md5name = "d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676-libffi-3.4.4.tar.gz";
md5name = "b0dea9df23c863a7a50e825440f3ebffabd65df1497108e5d437747843895a4e-libffi-3.4.6.tar.gz";
}
{
name = "libgpg-error-1.50.tar.bz2";
url = "https://dev-www.libreoffice.org/src/libgpg-error-1.50.tar.bz2";
sha256 = "69405349e0a633e444a28c5b35ce8f14484684518a508dc48a089992fe93e20a";
name = "libgpg-error-1.51.tar.bz2";
url = "https://dev-www.libreoffice.org/src/libgpg-error-1.51.tar.bz2";
sha256 = "be0f1b2db6b93eed55369cdf79f19f72750c8c7c39fc20b577e724545427e6b2";
md5 = "";
md5name = "69405349e0a633e444a28c5b35ce8f14484684518a508dc48a089992fe93e20a-libgpg-error-1.50.tar.bz2";
md5name = "be0f1b2db6b93eed55369cdf79f19f72750c8c7c39fc20b577e724545427e6b2-libgpg-error-1.51.tar.bz2";
}
{
name = "liblangtag-0.6.7.tar.bz2";
@@ -616,32 +665,32 @@
md5name = "296272d93435991308eb73607600c034b558807a07e829e751142e65ccfa9d08-ltm-1.3.0.tar.xz";
}
{
name = "libwebp-1.4.0.tar.gz";
url = "https://dev-www.libreoffice.org/src/libwebp-1.4.0.tar.gz";
sha256 = "61f873ec69e3be1b99535634340d5bde750b2e4447caa1db9f61be3fd49ab1e5";
name = "libwebp-1.5.0.tar.gz";
url = "https://dev-www.libreoffice.org/src/libwebp-1.5.0.tar.gz";
sha256 = "7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c";
md5 = "";
md5name = "61f873ec69e3be1b99535634340d5bde750b2e4447caa1db9f61be3fd49ab1e5-libwebp-1.4.0.tar.gz";
md5name = "7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c-libwebp-1.5.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.12.9.tar.xz";
url = "https://dev-www.libreoffice.org/src/libxml2-2.12.9.tar.xz";
sha256 = "59912db536ab56a3996489ea0299768c7bcffe57169f0235e7f962a91f483590";
name = "libxml2-2.13.5.tar.xz";
url = "https://dev-www.libreoffice.org/src/libxml2-2.13.5.tar.xz";
sha256 = "74fc163217a3964257d3be39af943e08861263c4231f9ef5b496b6f6d4c7b2b6";
md5 = "";
md5name = "59912db536ab56a3996489ea0299768c7bcffe57169f0235e7f962a91f483590-libxml2-2.12.9.tar.xz";
md5name = "74fc163217a3964257d3be39af943e08861263c4231f9ef5b496b6f6d4c7b2b6-libxml2-2.13.5.tar.xz";
}
{
name = "libxslt-1.1.41.tar.xz";
url = "https://dev-www.libreoffice.org/src/libxslt-1.1.41.tar.xz";
sha256 = "3ad392af91115b7740f7b50d228cc1c5fc13afc1da7f16cb0213917a37f71bda";
name = "libxslt-1.1.42.tar.xz";
url = "https://dev-www.libreoffice.org/src/libxslt-1.1.42.tar.xz";
sha256 = "85ca62cac0d41fc77d3f6033da9df6fd73d20ea2fc18b0a3609ffb4110e1baeb";
md5 = "";
md5name = "3ad392af91115b7740f7b50d228cc1c5fc13afc1da7f16cb0213917a37f71bda-libxslt-1.1.41.tar.xz";
md5name = "85ca62cac0d41fc77d3f6033da9df6fd73d20ea2fc18b0a3609ffb4110e1baeb-libxslt-1.1.42.tar.xz";
}
{
name = "lp_solve_5.5.tar.gz";
@@ -651,18 +700,18 @@
md5name = "26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz";
}
{
name = "lxml-5.2.2.tar.gz";
url = "https://dev-www.libreoffice.org/src/lxml-5.2.2.tar.gz";
sha256 = "bb2dc4898180bea79863d5487e5f9c7c34297414bad54bcd0f0852aee9cfdb87";
name = "lxml-5.3.0.tar.gz";
url = "https://dev-www.libreoffice.org/src/lxml-5.3.0.tar.gz";
sha256 = "4e109ca30d1edec1ac60cdbe341905dc3b8f55b16855e03a54aaf59e51ec8c6f";
md5 = "";
md5name = "bb2dc4898180bea79863d5487e5f9c7c34297414bad54bcd0f0852aee9cfdb87-lxml-5.2.2.tar.gz";
md5name = "4e109ca30d1edec1ac60cdbe341905dc3b8f55b16855e03a54aaf59e51ec8c6f-lxml-5.3.0.tar.gz";
}
{
name = "mariadb-connector-c-3.3.11-src.tar.gz";
url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.11-src.tar.gz";
sha256 = "f7ba02f70aa2ae2b13e9ee5acc78423f6bede38998afb91326a62be46cf5956a";
name = "mariadb-connector-c-3.3.13-src.tar.gz";
url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.13-src.tar.gz";
sha256 = "1c03c30b394871ab354dbdb47574beae19e2657da21a911ecc9e33e9388a3bef";
md5 = "";
md5name = "f7ba02f70aa2ae2b13e9ee5acc78423f6bede38998afb91326a62be46cf5956a-mariadb-connector-c-3.3.11-src.tar.gz";
md5name = "1c03c30b394871ab354dbdb47574beae19e2657da21a911ecc9e33e9388a3bef-mariadb-connector-c-3.3.13-src.tar.gz";
}
{
name = "mdds-2.1.1.tar.xz";
@@ -735,11 +784,11 @@
md5name = "37206cf981e8409d048b59ac5839621ea107ff49af72beb9d7769a2f41da8d90-onlineupdate-c003be8b9727672e7d30972983b375f4c200233f-2.tar.xz";
}
{
name = "openldap-2.6.8.tgz";
url = "https://dev-www.libreoffice.org/src/openldap-2.6.8.tgz";
sha256 = "48969323e94e3be3b03c6a132942dcba7ef8d545f2ad35401709019f696c3c4e";
name = "openldap-2.6.9.tgz";
url = "https://dev-www.libreoffice.org/src/openldap-2.6.9.tgz";
sha256 = "2cb7dc73e9c8340dff0d99357fbaa578abf30cc6619f0521972c555681e6b2ff";
md5 = "";
md5name = "48969323e94e3be3b03c6a132942dcba7ef8d545f2ad35401709019f696c3c4e-openldap-2.6.8.tgz";
md5name = "2cb7dc73e9c8340dff0d99357fbaa578abf30cc6619f0521972c555681e6b2ff-openldap-2.6.9.tgz";
}
{
name = "openssl-3.0.15.tar.gz";
@@ -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.44.tar.xz";
url = "https://dev-www.libreoffice.org/src/libpng-1.6.44.tar.xz";
sha256 = "60c4da1d5b7f0aa8d158da48e8f8afa9773c1c8baa5d21974df61f1886b8ce8e";
name = "libpng-1.6.45.tar.xz";
url = "https://dev-www.libreoffice.org/src/libpng-1.6.45.tar.xz";
sha256 = "926485350139ffb51ef69760db35f78846c805fef3d59bfdcb2fba704663f370";
md5 = "";
md5name = "60c4da1d5b7f0aa8d158da48e8f8afa9773c1c8baa5d21974df61f1886b8ce8e-libpng-1.6.44.tar.xz";
md5name = "926485350139ffb51ef69760db35f78846c805fef3d59bfdcb2fba704663f370-libpng-1.6.45.tar.xz";
}
{
name = "tiff-4.7.0.tar.xz";
@@ -791,11 +840,11 @@
md5name = "273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017-tiff-4.7.0.tar.xz";
}
{
name = "poppler-24.08.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/poppler-24.08.0.tar.xz";
sha256 = "97453fbddf0c9a9eafa0ea45ac710d3d49bcf23a62e864585385d3c0b4403174";
name = "poppler-25.01.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/poppler-25.01.0.tar.xz";
sha256 = "7eefc122207bbbd72a303c5e0743f4941e8ae861e24dcf0501e18ce1d1414112";
md5 = "";
md5name = "97453fbddf0c9a9eafa0ea45ac710d3d49bcf23a62e864585385d3c0b4403174-poppler-24.08.0.tar.xz";
md5name = "7eefc122207bbbd72a303c5e0743f4941e8ae861e24dcf0501e18ce1d1414112-poppler-25.01.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.16.tar.bz2";
url = "https://dev-www.libreoffice.org/src/postgresql-13.16.tar.bz2";
sha256 = "c9cbbb6129f02328204828066bb3785c00a85c8ca8fd329c2a8a53c1f5cd8865";
name = "postgresql-14.15.tar.bz2";
url = "https://dev-www.libreoffice.org/src/postgresql-14.15.tar.bz2";
sha256 = "02e891e314b4e9ee24cbd78028dab7c73f9c1ba3e30835bcbef71fe220401fc5";
md5 = "";
md5name = "c9cbbb6129f02328204828066bb3785c00a85c8ca8fd329c2a8a53c1f5cd8865-postgresql-13.16.tar.bz2";
md5name = "02e891e314b4e9ee24cbd78028dab7c73f9c1ba3e30835bcbef71fe220401fc5-postgresql-14.15.tar.bz2";
}
{
name = "Python-3.9.20.tar.xz";
url = "https://dev-www.libreoffice.org/src/Python-3.9.20.tar.xz";
sha256 = "6b281279efd85294d2d6993e173983a57464c0133956fbbb5536ec9646beaf0c";
name = "Python-3.10.16.tar.xz";
url = "https://dev-www.libreoffice.org/src/Python-3.10.16.tar.xz";
sha256 = "bfb249609990220491a1b92850a07135ed0831e41738cf681d63cf01b2a8fbd1";
md5 = "";
md5name = "6b281279efd85294d2d6993e173983a57464c0133956fbbb5536ec9646beaf0c-Python-3.9.20.tar.xz";
md5name = "bfb249609990220491a1b92850a07135ed0831e41738cf681d63cf01b2a8fbd1-Python-3.10.16.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";
pkgs/applications/office/libreoffice/src-fresh/help.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ fetchurl, ... }:
fetchurl {
sha256 = "04z77jzn816r19ig54fhl0p1arh3fpamn5bh2wc2v17rz73chp8y";
url = "https://download.documentfoundation.org/libreoffice/src/24.8.3/libreoffice-help-24.8.3.2.tar.xz";
sha256 = "1pfkmv9ad9n4w0yic0l3kqx9qs7v6vjakslrqr7laa2pxyl04zsz";
url = "https://download.documentfoundation.org/libreoffice/src/25.2.0/libreoffice-help-25.2.0.3.tar.xz";
}
pkgs/applications/office/libreoffice/src-fresh/main.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ fetchurl, ... }:
fetchurl {
sha256 = "1sa7bxxh7v26p77vj1mspynhn2l2b1vnz1mpyczhnmcxcan9nw2x";
url = "https://download.documentfoundation.org/libreoffice/src/24.8.3/libreoffice-24.8.3.2.tar.xz";
sha256 = "1d15sn9zq40qfjxwm9cqgj7big8mk4mviz6i825qbfzq6vblh94q";
url = "https://download.documentfoundation.org/libreoffice/src/25.2.0/libreoffice-25.2.0.3.tar.xz";
}
pkgs/applications/office/libreoffice/src-fresh/translations.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ fetchurl, ... }:
fetchurl {
sha256 = "11qwbkn2i84g439ya5fw5by7wf4c8rs7is4k2v7yijpngrp9370a";
url = "https://download.documentfoundation.org/libreoffice/src/24.8.3/libreoffice-translations-24.8.3.2.tar.xz";
sha256 = "1sxcmkclwbzbq34mjxwkjj58qj8xf4vgnlzpyfxnmawwhnsq9x9f";
url = "https://download.documentfoundation.org/libreoffice/src/25.2.0/libreoffice-translations-25.2.0.3.tar.xz";
}
pkgs/applications/office/libreoffice/src-fresh/version.nix
+1 -1
View File
@@ -1 +1 @@
"24.8.3.2"
"25.2.0.3"
pkgs/applications/office/libreoffice/src-still/deps.nix
Generated
+162 -169
View File
@@ -14,11 +14,11 @@
md5name = "daf972a89577f8772602bf2eb38b6a3dd3d922bf5724d45e7f9589b5e830442c-phc-winner-argon2-20190702.tar.gz";
}
{
name = "boost_1_82_0.tar.xz";
url = "https://dev-www.libreoffice.org/src/boost_1_82_0.tar.xz";
sha256 = "e48ab6953fbd68ba47234bea5173e62427e9f6a7894e152305142895cfe955de";
name = "boost_1_85_0.tar.xz";
url = "https://dev-www.libreoffice.org/src/boost_1_85_0.tar.xz";
sha256 = "4e23218ff5036d57afd20f7cdab2e94cdbf6ba9c509d656ace643a81c40a985a";
md5 = "";
md5name = "e48ab6953fbd68ba47234bea5173e62427e9f6a7894e152305142895cfe955de-boost_1_82_0.tar.xz";
md5name = "4e23218ff5036d57afd20f7cdab2e94cdbf6ba9c509d656ace643a81c40a985a-boost_1_85_0.tar.xz";
}
{
name = "box2d-2.4.1.tar.gz";
@@ -35,11 +35,11 @@
md5name = "c44a2e898895cfc13b42d2371ba4b88b0777d7782214d6cdc91c33720f3b0d91-breakpad-b324760c7f53667af128a6b77b790323da04fcb9.tar.xz";
}
{
name = "bsh-2.0b6-src.zip";
url = "https://dev-www.libreoffice.org/src/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip";
sha256 = "9e93c73e23aff644b17dfff656444474c14150e7f3b38b19635e622235e01c96";
md5 = "beeca87be45ec87d241ddd0e1bad80c1";
md5name = "beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip";
name = "bsh-2.1.1-src.zip";
url = "https://dev-www.libreoffice.org/src/bsh-2.1.1-src.zip";
sha256 = "2248387ceaa319840434a3547a8b2fec12f95a8418ee039ce5ff5726053a139c";
md5 = "";
md5name = "2248387ceaa319840434a3547a8b2fec12f95a8418ee039ce5ff5726053a139c-bsh-2.1.1-src.zip";
}
{
name = "bzip2-1.0.8.tar.gz";
@@ -56,11 +56,11 @@
md5name = "4eebc4c2bad0402bc3f501db184417094657d111fb6c06f076a82ea191fe1faf-cairo-1.17.6.tar.xz";
}
{
name = "libcdr-0.1.7.tar.xz";
url = "https://dev-www.libreoffice.org/src/libcdr-0.1.7.tar.xz";
sha256 = "5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b8ecdd4";
name = "libcdr-0.1.8.tar.xz";
url = "https://dev-www.libreoffice.org/src/libcdr-0.1.8.tar.xz";
sha256 = "ced677c8300b29c91d3004bb1dddf0b99761bf5544991c26c2ee8f427e87193c";
md5 = "";
md5name = "5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b8ecdd4-libcdr-0.1.7.tar.xz";
md5name = "ced677c8300b29c91d3004bb1dddf0b99761bf5544991c26c2ee8f427e87193c-libcdr-0.1.8.tar.xz";
}
{
name = "clucene-core-2.3.3.4.tar.gz";
@@ -84,11 +84,11 @@
md5name = "0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4-dtoa-20180411.tgz";
}
{
name = "libcmis-0.6.1.tar.xz";
url = "https://dev-www.libreoffice.org/src/libcmis-0.6.1.tar.xz";
sha256 = "d54d19d86153dbc88e2d468f7136269a2cfe71b73227e12fded01d29ac268074";
name = "libcmis-0.6.2.tar.xz";
url = "https://dev-www.libreoffice.org/src/libcmis-0.6.2.tar.xz";
sha256 = "1b5c2d7258ff93eb5f9958ff0e4dfd7332dc75a071bb717dde2217a26602a644";
md5 = "";
md5name = "d54d19d86153dbc88e2d468f7136269a2cfe71b73227e12fded01d29ac268074-libcmis-0.6.1.tar.xz";
md5name = "1b5c2d7258ff93eb5f9958ff0e4dfd7332dc75a071bb717dde2217a26602a644-libcmis-0.6.2.tar.xz";
}
{
name = "CoinMP-1.8.4.tgz";
@@ -105,11 +105,11 @@
md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz";
}
{
name = "curl-8.10.1.tar.xz";
url = "https://dev-www.libreoffice.org/src/curl-8.10.1.tar.xz";
sha256 = "73a4b0e99596a09fa5924a4fb7e4b995a85fda0d18a2c02ab9cf134bebce04ee";
name = "curl-8.11.1.tar.xz";
url = "https://dev-www.libreoffice.org/src/curl-8.11.1.tar.xz";
sha256 = "c7ca7db48b0909743eaef34250da02c19bc61d4f1dcedd6603f109409536ab56";
md5 = "";
md5name = "73a4b0e99596a09fa5924a4fb7e4b995a85fda0d18a2c02ab9cf134bebce04ee-curl-8.10.1.tar.xz";
md5name = "c7ca7db48b0909743eaef34250da02c19bc61d4f1dcedd6603f109409536ab56-curl-8.11.1.tar.xz";
}
{
name = "libe-book-0.1.3.tar.xz";
@@ -140,18 +140,18 @@
md5name = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad-libepubgen-0.1.1.tar.xz";
}
{
name = "libetonyek-0.1.10.tar.xz";
url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.10.tar.xz";
sha256 = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a";
name = "libetonyek-0.1.12.tar.xz";
url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.12.tar.xz";
sha256 = "b9fa82fbeb8cb7a701101060e4f3e1e4ef7c38f574b2859d3ecbe43604c21f83";
md5 = "";
md5name = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a-libetonyek-0.1.10.tar.xz";
md5name = "b9fa82fbeb8cb7a701101060e4f3e1e4ef7c38f574b2859d3ecbe43604c21f83-libetonyek-0.1.12.tar.xz";
}
{
name = "expat-2.6.3.tar.xz";
url = "https://dev-www.libreoffice.org/src/expat-2.6.3.tar.xz";
sha256 = "274db254a6979bde5aad404763a704956940e465843f2a9bd9ed7af22e2c0efc";
name = "expat-2.6.4.tar.xz";
url = "https://dev-www.libreoffice.org/src/expat-2.6.4.tar.xz";
sha256 = "a695629dae047055b37d50a0ff4776d1d45d0a4c842cf4ccee158441f55ff7ee";
md5 = "";
md5name = "274db254a6979bde5aad404763a704956940e465843f2a9bd9ed7af22e2c0efc-expat-2.6.3.tar.xz";
md5name = "a695629dae047055b37d50a0ff4776d1d45d0a4c842cf4ccee158441f55ff7ee-expat-2.6.4.tar.xz";
}
{
name = "Firebird-3.0.7.33374-0.tar.bz2";
@@ -161,11 +161,11 @@
md5name = "acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76-Firebird-3.0.7.33374-0.tar.bz2";
}
{
name = "fontconfig-2.14.2.tar.xz";
url = "https://dev-www.libreoffice.org/src/fontconfig-2.14.2.tar.xz";
sha256 = "dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b";
name = "fontconfig-2.15.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/fontconfig-2.15.0.tar.xz";
sha256 = "63a0658d0e06e0fa886106452b58ef04f21f58202ea02a94c39de0d3335d7c0e";
md5 = "";
md5name = "dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b-fontconfig-2.14.2.tar.xz";
md5name = "63a0658d0e06e0fa886106452b58ef04f21f58202ea02a94c39de0d3335d7c0e-fontconfig-2.15.0.tar.xz";
}
{
name = "crosextrafonts-20130214.tar.gz";
@@ -203,11 +203,11 @@
md5name = "8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3-liberation-narrow-fonts-ttf-1.07.6.tar.gz";
}
{
name = "liberation-fonts-ttf-2.1.4.tar.gz";
url = "https://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.1.4.tar.gz";
sha256 = "26f85412dd0aa9d061504a1cc8aaf0aa12a70710e8d47d8b65a1251757c1a5ef";
name = "liberation-fonts-ttf-2.1.5.tar.gz";
url = "https://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.1.5.tar.gz";
sha256 = "7191c669bf38899f73a2094ed00f7b800553364f90e2637010a69c0e268f25d0";
md5 = "";
md5name = "26f85412dd0aa9d061504a1cc8aaf0aa12a70710e8d47d8b65a1251757c1a5ef-liberation-fonts-ttf-2.1.4.tar.gz";
md5name = "7191c669bf38899f73a2094ed00f7b800553364f90e2637010a69c0e268f25d0-liberation-fonts-ttf-2.1.5.tar.gz";
}
{
name = "LinLibertineG-20120116.zip";
@@ -224,18 +224,18 @@
md5name = "1b6880e4b8df09c3b9e246d6084bfd94bf32a0ffff60cf2dcffd3622d0e2d79f-NotoKufiArabic-v2.109.zip";
}
{
name = "NotoSans-v2.012.zip";
url = "https://dev-www.libreoffice.org/src/NotoSans-v2.012.zip";
sha256 = "efef2f66ed2c5e005472cba156bd2afb68063a51bb628c6ee14143edc019d293";
name = "NotoSans-v2.015.zip";
url = "https://dev-www.libreoffice.org/src/NotoSans-v2.015.zip";
sha256 = "0c34df072a3fa7efbb7cbf34950e1f971a4447cffe365d3a359e2d4089b958f5";
md5 = "";
md5name = "efef2f66ed2c5e005472cba156bd2afb68063a51bb628c6ee14143edc019d293-NotoSans-v2.012.zip";
md5name = "0c34df072a3fa7efbb7cbf34950e1f971a4447cffe365d3a359e2d4089b958f5-NotoSans-v2.015.zip";
}
{
name = "NotoSerif-v2.012.zip";
url = "https://dev-www.libreoffice.org/src/NotoSerif-v2.012.zip";
sha256 = "3d4566a0e51e7fc14528f5a1eecc6f12e5ffbbec6484470d3da48b0d8ead345a";
name = "NotoSerif-v2.015.zip";
url = "https://dev-www.libreoffice.org/src/NotoSerif-v2.015.zip";
sha256 = "0e9a43c8a4b94ac76f55069ed1d7385bbcaf6b99527a94deb5619e032b7e76c1";
md5 = "";
md5name = "3d4566a0e51e7fc14528f5a1eecc6f12e5ffbbec6484470d3da48b0d8ead345a-NotoSerif-v2.012.zip";
md5name = "0e9a43c8a4b94ac76f55069ed1d7385bbcaf6b99527a94deb5619e032b7e76c1-NotoSerif-v2.015.zip";
}
{
name = "NotoSerifHebrew-v2.004.zip";
@@ -280,11 +280,11 @@
md5name = "b21c198a4c76ae598a304decefb3b5c2a4c2d4c3ae226728eff359185f291c6f-NotoSerifArmenian-v2.008.zip";
}
{
name = "NotoSansGeorgian-v2.003.zip";
url = "https://dev-www.libreoffice.org/src/NotoSansGeorgian-v2.003.zip";
sha256 = "bd75d1f0b9ef619b5ded0018d6258eeab2f9e976d8f8074bb7890f4e301648bf";
name = "NotoSansGeorgian-v2.005.zip";
url = "https://dev-www.libreoffice.org/src/NotoSansGeorgian-v2.005.zip";
sha256 = "10e85011008108308e6feab0408242acb07804da61ede3d3ff236461ae07ab1b";
md5 = "";
md5name = "bd75d1f0b9ef619b5ded0018d6258eeab2f9e976d8f8074bb7890f4e301648bf-NotoSansGeorgian-v2.003.zip";
md5name = "10e85011008108308e6feab0408242acb07804da61ede3d3ff236461ae07ab1b-NotoSansGeorgian-v2.005.zip";
}
{
name = "NotoSerifGeorgian-v2.003.zip";
@@ -343,11 +343,11 @@
md5name = "926fe1bd7dfde8e55178281f645258bfced6420c951c6f2fd532fd21691bca30-Amiri-1.000.zip";
}
{
name = "ReemKufi-1.2.zip";
url = "https://dev-www.libreoffice.org/src/ReemKufi-1.2.zip";
sha256 = "c4fd68a23c0ea471cc084ae7efe888da372b925cb208eeb0322c26792d2ef413";
name = "ReemKufi-1.7.zip";
url = "https://dev-www.libreoffice.org/src/ReemKufi-1.7.zip";
sha256 = "2359f036c7bddeb4d5529d7b3c9139c3288c920cc26053d417cdbb563eafe0a4";
md5 = "";
md5name = "c4fd68a23c0ea471cc084ae7efe888da372b925cb208eeb0322c26792d2ef413-ReemKufi-1.2.zip";
md5name = "2359f036c7bddeb4d5529d7b3c9139c3288c920cc26053d417cdbb563eafe0a4-ReemKufi-1.7.zip";
}
{
name = "Scheherazade-2.100.zip";
@@ -364,11 +364,11 @@
md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz";
}
{
name = "freetype-2.13.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/freetype-2.13.0.tar.xz";
sha256 = "5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c";
name = "freetype-2.13.2.tar.xz";
url = "https://dev-www.libreoffice.org/src/freetype-2.13.2.tar.xz";
sha256 = "12991c4e55c506dd7f9b765933e62fd2be2e06d421505d7950a132e4f1bb484d";
md5 = "";
md5name = "5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c-freetype-2.13.0.tar.xz";
md5name = "12991c4e55c506dd7f9b765933e62fd2be2e06d421505d7950a132e4f1bb484d-freetype-2.13.2.tar.xz";
}
{
name = "frozen-1.1.1.tar.gz";
@@ -378,18 +378,18 @@
md5name = "f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45-frozen-1.1.1.tar.gz";
}
{
name = "glm-0.9.9.8.zip";
url = "https://dev-www.libreoffice.org/src/glm-0.9.9.8.zip";
sha256 = "6bba5f032bed47c73ad9397f2313b9acbfb56253d0d0576b5873d3dcb25e99ad";
name = "glm-1.0.1.zip";
url = "https://dev-www.libreoffice.org/src/glm-1.0.1.zip";
sha256 = "09c5716296787e1f7fcb87b1cbdbf26814ec1288ed6259ccd30d5d9795809fa5";
md5 = "";
md5name = "6bba5f032bed47c73ad9397f2313b9acbfb56253d0d0576b5873d3dcb25e99ad-glm-0.9.9.8.zip";
md5name = "09c5716296787e1f7fcb87b1cbdbf26814ec1288ed6259ccd30d5d9795809fa5-glm-1.0.1.zip";
}
{
name = "gpgme-1.23.2.tar.bz2";
url = "https://dev-www.libreoffice.org/src/gpgme-1.23.2.tar.bz2";
sha256 = "9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224";
name = "gpgme-1.24.0.tar.bz2";
url = "https://dev-www.libreoffice.org/src/gpgme-1.24.0.tar.bz2";
sha256 = "61e3a6ad89323fecfaff176bc1728fb8c3312f2faa83424d9d5077ba20f5f7da";
md5 = "";
md5name = "9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224-gpgme-1.23.2.tar.bz2";
md5name = "61e3a6ad89323fecfaff176bc1728fb8c3312f2faa83424d9d5077ba20f5f7da-gpgme-1.24.0.tar.bz2";
}
{
name = "graphite2-minimal-1.3.14.tgz";
@@ -399,11 +399,11 @@
md5name = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc-graphite2-minimal-1.3.14.tgz";
}
{
name = "harfbuzz-8.2.2.tar.xz";
url = "https://dev-www.libreoffice.org/src/harfbuzz-8.2.2.tar.xz";
sha256 = "e433ad85fbdf57f680be29479b3f964577379aaf319f557eb76569f0ecbc90f3";
name = "harfbuzz-8.5.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/harfbuzz-8.5.0.tar.xz";
sha256 = "77e4f7f98f3d86bf8788b53e6832fb96279956e1c3961988ea3d4b7ca41ddc27";
md5 = "";
md5name = "e433ad85fbdf57f680be29479b3f964577379aaf319f557eb76569f0ecbc90f3-harfbuzz-8.2.2.tar.xz";
md5name = "77e4f7f98f3d86bf8788b53e6832fb96279956e1c3961988ea3d4b7ca41ddc27-harfbuzz-8.5.0.tar.xz";
}
{
name = "hsqldb_1_8_0.zip";
@@ -434,25 +434,25 @@
md5name = "0e279003f5199f80031c6dcd08f79d6f65a0505139160e7df0d09b226bff4023-IAccessible2-1.3+git20231013.3d8c7f0.tar.gz";
}
{
name = "icu4c-73_2-src.tgz";
url = "https://dev-www.libreoffice.org/src/icu4c-73_2-src.tgz";
sha256 = "818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1";
name = "icu4c-74_2-src.tgz";
url = "https://dev-www.libreoffice.org/src/icu4c-74_2-src.tgz";
sha256 = "68db082212a96d6f53e35d60f47d38b962e9f9d207a74cfac78029ae8ff5e08c";
md5 = "";
md5name = "818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1-icu4c-73_2-src.tgz";
md5name = "68db082212a96d6f53e35d60f47d38b962e9f9d207a74cfac78029ae8ff5e08c-icu4c-74_2-src.tgz";
}
{
name = "icu4c-73_2-data.zip";
url = "https://dev-www.libreoffice.org/src/icu4c-73_2-data.zip";
sha256 = "ca1ee076163b438461e484421a7679fc33a64cd0a54f9d4b401893fa1eb42701";
name = "icu4c-74_2-data.zip";
url = "https://dev-www.libreoffice.org/src/icu4c-74_2-data.zip";
sha256 = "c28c3ca5f4ba3384781797138a294ca360988d4322674ad4d51e52f5d9b0a2b6";
md5 = "";
md5name = "ca1ee076163b438461e484421a7679fc33a64cd0a54f9d4b401893fa1eb42701-icu4c-73_2-data.zip";
md5name = "c28c3ca5f4ba3384781797138a294ca360988d4322674ad4d51e52f5d9b0a2b6-icu4c-74_2-data.zip";
}
{
name = "Java-WebSocket-1.5.4.tar.gz";
url = "https://dev-www.libreoffice.org/src/Java-WebSocket-1.5.4.tar.gz";
sha256 = "a6828b35d1f938fee2335945f3d3c563cbbfa58ce7eb0bf72778d0fa7a550720";
name = "Java-WebSocket-1.5.6.tar.gz";
url = "https://dev-www.libreoffice.org/src/Java-WebSocket-1.5.6.tar.gz";
sha256 = "167e86561cd7b5ed21b67d7543536134edcb14b373892739b28c417566a3832f";
md5 = "";
md5name = "a6828b35d1f938fee2335945f3d3c563cbbfa58ce7eb0bf72778d0fa7a550720-Java-WebSocket-1.5.4.tar.gz";
md5name = "167e86561cd7b5ed21b67d7543536134edcb14b373892739b28c417566a3832f-Java-WebSocket-1.5.6.tar.gz";
}
{
name = "flow-engine-0.9.4.zip";
@@ -539,11 +539,11 @@
md5name = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf-libjpeg-turbo-2.1.5.1.tar.gz";
}
{
name = "language-subtag-registry-2024-06-14.tar.bz2";
url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2024-06-14.tar.bz2";
sha256 = "75bc394dd83ddfd62b172a462db1b66bdb5950f40823ed63b8c7db6b71e37e75";
name = "language-subtag-registry-2024-11-19.tar.bz2";
url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2024-11-19.tar.bz2";
sha256 = "121f27bd1fabac9a74fb042cf68396b6df74cdf5d1ccc30f4c9b78584cc13864";
md5 = "";
md5name = "75bc394dd83ddfd62b172a462db1b66bdb5950f40823ed63b8c7db6b71e37e75-language-subtag-registry-2024-06-14.tar.bz2";
md5name = "121f27bd1fabac9a74fb042cf68396b6df74cdf5d1ccc30f4c9b78584cc13864-language-subtag-registry-2024-11-19.tar.bz2";
}
{
name = "lcms2-2.16.tar.gz";
@@ -553,18 +553,18 @@
md5name = "d873d34ad8b9b4cea010631f1a6228d2087475e4dc5e763eb81acc23d9d45a51-lcms2-2.16.tar.gz";
}
{
name = "libassuan-2.5.7.tar.bz2";
url = "https://dev-www.libreoffice.org/src/libassuan-2.5.7.tar.bz2";
sha256 = "0103081ffc27838a2e50479153ca105e873d3d65d8a9593282e9c94c7e6afb76";
name = "libassuan-3.0.1.tar.bz2";
url = "https://dev-www.libreoffice.org/src/libassuan-3.0.1.tar.bz2";
sha256 = "c8f0f42e6103dea4b1a6a483cb556654e97302c7465308f58363778f95f194b1";
md5 = "";
md5name = "0103081ffc27838a2e50479153ca105e873d3d65d8a9593282e9c94c7e6afb76-libassuan-2.5.7.tar.bz2";
md5name = "c8f0f42e6103dea4b1a6a483cb556654e97302c7465308f58363778f95f194b1-libassuan-3.0.1.tar.bz2";
}
{
name = "libatomic_ops-7.8.0.tar.gz";
url = "https://dev-www.libreoffice.org/src/libatomic_ops-7.8.0.tar.gz";
sha256 = "15676e7674e11bda5a7e50a73f4d9e7d60452271b8acf6fd39a71fefdf89fa31";
name = "libatomic_ops-7.8.2.tar.gz";
url = "https://dev-www.libreoffice.org/src/libatomic_ops-7.8.2.tar.gz";
sha256 = "d305207fe207f2b3fb5cb4c019da12b44ce3fcbc593dfd5080d867b1a2419b51";
md5 = "";
md5name = "15676e7674e11bda5a7e50a73f4d9e7d60452271b8acf6fd39a71fefdf89fa31-libatomic_ops-7.8.0.tar.gz";
md5name = "d305207fe207f2b3fb5cb4c019da12b44ce3fcbc593dfd5080d867b1a2419b51-libatomic_ops-7.8.2.tar.gz";
}
{
name = "libeot-0.01.tar.bz2";
@@ -574,11 +574,11 @@
md5name = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a-libeot-0.01.tar.bz2";
}
{
name = "libexttextcat-3.4.6.tar.xz";
url = "https://dev-www.libreoffice.org/src/libexttextcat-3.4.6.tar.xz";
sha256 = "6d77eace20e9ea106c1330e268ede70c9a4a89744ddc25715682754eca3368df";
name = "libexttextcat-3.4.7.tar.xz";
url = "https://dev-www.libreoffice.org/src/libexttextcat-3.4.7.tar.xz";
sha256 = "df0a59d413a5b202573d8d4f5159e33a8538da4f8e8e60979facc64d6290cebd";
md5 = "";
md5name = "6d77eace20e9ea106c1330e268ede70c9a4a89744ddc25715682754eca3368df-libexttextcat-3.4.6.tar.xz";
md5name = "df0a59d413a5b202573d8d4f5159e33a8538da4f8e8e60979facc64d6290cebd-libexttextcat-3.4.7.tar.xz";
}
{
name = "libffi-3.4.4.tar.gz";
@@ -588,11 +588,11 @@
md5name = "d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676-libffi-3.4.4.tar.gz";
}
{
name = "libgpg-error-1.48.tar.bz2";
url = "https://dev-www.libreoffice.org/src/libgpg-error-1.48.tar.bz2";
sha256 = "89ce1ae893e122924b858de84dc4f67aae29ffa610ebf668d5aa539045663d6f";
name = "libgpg-error-1.51.tar.bz2";
url = "https://dev-www.libreoffice.org/src/libgpg-error-1.51.tar.bz2";
sha256 = "be0f1b2db6b93eed55369cdf79f19f72750c8c7c39fc20b577e724545427e6b2";
md5 = "";
md5name = "89ce1ae893e122924b858de84dc4f67aae29ffa610ebf668d5aa539045663d6f-libgpg-error-1.48.tar.bz2";
md5name = "be0f1b2db6b93eed55369cdf79f19f72750c8c7c39fc20b577e724545427e6b2-libgpg-error-1.51.tar.bz2";
}
{
name = "liblangtag-0.6.7.tar.bz2";
@@ -616,18 +616,18 @@
md5name = "296272d93435991308eb73607600c034b558807a07e829e751142e65ccfa9d08-ltm-1.3.0.tar.xz";
}
{
name = "libwebp-1.3.2.tar.gz";
url = "https://dev-www.libreoffice.org/src/libwebp-1.3.2.tar.gz";
sha256 = "2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4";
name = "libwebp-1.4.0.tar.gz";
url = "https://dev-www.libreoffice.org/src/libwebp-1.4.0.tar.gz";
sha256 = "61f873ec69e3be1b99535634340d5bde750b2e4447caa1db9f61be3fd49ab1e5";
md5 = "";
md5name = "2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4-libwebp-1.3.2.tar.gz";
md5name = "61f873ec69e3be1b99535634340d5bde750b2e4447caa1db9f61be3fd49ab1e5-libwebp-1.4.0.tar.gz";
}
{
name = "xmlsec1-1.3.2.tar.gz";
url = "https://dev-www.libreoffice.org/src/xmlsec1-1.3.2.tar.gz";
sha256 = "4003c56b3d356d21b1db7775318540fad6bfedaf5f117e8f7c010811219be3cf";
name = "xmlsec1-1.3.5.tar.gz";
url = "https://dev-www.libreoffice.org/src/xmlsec1-1.3.5.tar.gz";
sha256 = "2ffd4ad1f860ec93e47a680310ab2bc94968bd07566e71976bd96133d9504917";
md5 = "";
md5name = "4003c56b3d356d21b1db7775318540fad6bfedaf5f117e8f7c010811219be3cf-xmlsec1-1.3.2.tar.gz";
md5name = "2ffd4ad1f860ec93e47a680310ab2bc94968bd07566e71976bd96133d9504917-xmlsec1-1.3.5.tar.gz";
}
{
name = "libxml2-2.12.9.tar.xz";
@@ -637,11 +637,11 @@
md5name = "59912db536ab56a3996489ea0299768c7bcffe57169f0235e7f962a91f483590-libxml2-2.12.9.tar.xz";
}
{
name = "libxslt-1.1.39.tar.xz";
url = "https://dev-www.libreoffice.org/src/libxslt-1.1.39.tar.xz";
sha256 = "2a20ad621148339b0759c4d4e96719362dee64c9a096dbba625ba053846349f0";
name = "libxslt-1.1.41.tar.xz";
url = "https://dev-www.libreoffice.org/src/libxslt-1.1.41.tar.xz";
sha256 = "3ad392af91115b7740f7b50d228cc1c5fc13afc1da7f16cb0213917a37f71bda";
md5 = "";
md5name = "2a20ad621148339b0759c4d4e96719362dee64c9a096dbba625ba053846349f0-libxslt-1.1.39.tar.xz";
md5name = "3ad392af91115b7740f7b50d228cc1c5fc13afc1da7f16cb0213917a37f71bda-libxslt-1.1.41.tar.xz";
}
{
name = "lp_solve_5.5.tar.gz";
@@ -651,18 +651,18 @@
md5name = "26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz";
}
{
name = "lxml-4.9.2.tgz";
url = "https://dev-www.libreoffice.org/src/lxml-4.9.2.tgz";
sha256 = "2455cfaeb7ac70338b3257f41e21f0724f4b5b0c0e7702da67ee6c3640835b67";
name = "lxml-5.2.2.tar.gz";
url = "https://dev-www.libreoffice.org/src/lxml-5.2.2.tar.gz";
sha256 = "bb2dc4898180bea79863d5487e5f9c7c34297414bad54bcd0f0852aee9cfdb87";
md5 = "";
md5name = "2455cfaeb7ac70338b3257f41e21f0724f4b5b0c0e7702da67ee6c3640835b67-lxml-4.9.2.tgz";
md5name = "bb2dc4898180bea79863d5487e5f9c7c34297414bad54bcd0f0852aee9cfdb87-lxml-5.2.2.tar.gz";
}
{
name = "mariadb-connector-c-3.3.11-src.tar.gz";
url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.11-src.tar.gz";
sha256 = "f7ba02f70aa2ae2b13e9ee5acc78423f6bede38998afb91326a62be46cf5956a";
name = "mariadb-connector-c-3.3.13-src.tar.gz";
url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.13-src.tar.gz";
sha256 = "1c03c30b394871ab354dbdb47574beae19e2657da21a911ecc9e33e9388a3bef";
md5 = "";
md5name = "f7ba02f70aa2ae2b13e9ee5acc78423f6bede38998afb91326a62be46cf5956a-mariadb-connector-c-3.3.11-src.tar.gz";
md5name = "1c03c30b394871ab354dbdb47574beae19e2657da21a911ecc9e33e9388a3bef-mariadb-connector-c-3.3.13-src.tar.gz";
}
{
name = "mdds-2.1.1.tar.xz";
@@ -686,11 +686,11 @@
md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz";
}
{
name = "libmwaw-0.3.21.tar.xz";
url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.21.tar.xz";
sha256 = "e8750123a78d61b943cef78b7736c8a7f20bb0a649aa112402124fba794fc21c";
name = "libmwaw-0.3.22.tar.xz";
url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.22.tar.xz";
sha256 = "a1a39ffcea3ff2a7a7aae0c23877ddf4918b554bf82b0de5d7ce8e7f61ea8e32";
md5 = "";
md5name = "e8750123a78d61b943cef78b7736c8a7f20bb0a649aa112402124fba794fc21c-libmwaw-0.3.21.tar.xz";
md5name = "a1a39ffcea3ff2a7a7aae0c23877ddf4918b554bf82b0de5d7ce8e7f61ea8e32-libmwaw-0.3.22.tar.xz";
}
{
name = "mythes-1.2.5.tar.xz";
@@ -700,11 +700,11 @@
md5name = "19279f70707bbe5ffa619f2dc319f888cec0c4a8d339dc0a21330517bd6f521d-mythes-1.2.5.tar.xz";
}
{
name = "nss-3.101.2-with-nspr-4.35.tar.gz";
url = "https://dev-www.libreoffice.org/src/nss-3.101.2-with-nspr-4.35.tar.gz";
sha256 = "ff602c1fa86a4f841b27109918dfff60f41582e1caf6dbd651cfa72bdc8a64aa";
name = "nss-3.102.1-with-nspr-4.35.tar.gz";
url = "https://dev-www.libreoffice.org/src/nss-3.102.1-with-nspr-4.35.tar.gz";
sha256 = "ddfdec73fb4b0eedce5fc4de09de9ba14d2ddbfbf67e42372903e1510f2d3d65";
md5 = "";
md5name = "ff602c1fa86a4f841b27109918dfff60f41582e1caf6dbd651cfa72bdc8a64aa-nss-3.101.2-with-nspr-4.35.tar.gz";
md5name = "ddfdec73fb4b0eedce5fc4de09de9ba14d2ddbfbf67e42372903e1510f2d3d65-nss-3.102.1-with-nspr-4.35.tar.gz";
}
{
name = "libodfgen-0.1.8.tar.xz";
@@ -735,11 +735,11 @@
md5name = "37206cf981e8409d048b59ac5839621ea107ff49af72beb9d7769a2f41da8d90-onlineupdate-c003be8b9727672e7d30972983b375f4c200233f-2.tar.xz";
}
{
name = "openldap-2.6.7.tgz";
url = "https://dev-www.libreoffice.org/src/openldap-2.6.7.tgz";
sha256 = "cd775f625c944ed78a3da18a03b03b08eea73c8aabc97b41bb336e9a10954930";
name = "openldap-2.6.9.tgz";
url = "https://dev-www.libreoffice.org/src/openldap-2.6.9.tgz";
sha256 = "2cb7dc73e9c8340dff0d99357fbaa578abf30cc6619f0521972c555681e6b2ff";
md5 = "";
md5name = "cd775f625c944ed78a3da18a03b03b08eea73c8aabc97b41bb336e9a10954930-openldap-2.6.7.tgz";
md5name = "2cb7dc73e9c8340dff0d99357fbaa578abf30cc6619f0521972c555681e6b2ff-openldap-2.6.9.tgz";
}
{
name = "openssl-3.0.15.tar.gz";
@@ -763,11 +763,11 @@
md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz";
}
{
name = "pdfium-6179.tar.bz2";
url = "https://dev-www.libreoffice.org/src/pdfium-6179.tar.bz2";
sha256 = "4d3f08fe0e2fda86246832085426616826dcca0912202874428bfbc24d13d95c";
name = "pdfium-6425.tar.bz2";
url = "https://dev-www.libreoffice.org/src/pdfium-6425.tar.bz2";
sha256 = "fe0291b96d7352bac530d13ef2e5fd63ad9980e0128911f88b957b5992508f1c";
md5 = "";
md5name = "4d3f08fe0e2fda86246832085426616826dcca0912202874428bfbc24d13d95c-pdfium-6179.tar.bz2";
md5name = "fe0291b96d7352bac530d13ef2e5fd63ad9980e0128911f88b957b5992508f1c-pdfium-6425.tar.bz2";
}
{
name = "pixman-0.42.2.tar.gz";
@@ -805,18 +805,18 @@
md5name = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74-poppler-data-0.4.12.tar.gz";
}
{
name = "postgresql-13.16.tar.bz2";
url = "https://dev-www.libreoffice.org/src/postgresql-13.16.tar.bz2";
sha256 = "c9cbbb6129f02328204828066bb3785c00a85c8ca8fd329c2a8a53c1f5cd8865";
name = "postgresql-13.18.tar.bz2";
url = "https://dev-www.libreoffice.org/src/postgresql-13.18.tar.bz2";
sha256 = "ceea92abee2a8c19408d278b68de6a78b6bd3dbb4fa2d653fa7ca745d666aab1";
md5 = "";
md5name = "c9cbbb6129f02328204828066bb3785c00a85c8ca8fd329c2a8a53c1f5cd8865-postgresql-13.16.tar.bz2";
md5name = "ceea92abee2a8c19408d278b68de6a78b6bd3dbb4fa2d653fa7ca745d666aab1-postgresql-13.18.tar.bz2";
}
{
name = "Python-3.8.20.tar.xz";
url = "https://dev-www.libreoffice.org/src/Python-3.8.20.tar.xz";
sha256 = "6fb89a7124201c61125c0ab4cf7f6894df339a40c02833bfd28ab4d7691fafb4";
name = "Python-3.9.21.tar.xz";
url = "https://dev-www.libreoffice.org/src/Python-3.9.21.tar.xz";
sha256 = "3126f59592c9b0d798584755f2bf7b081fa1ca35ce7a6fea980108d752a05bb1";
md5 = "";
md5name = "6fb89a7124201c61125c0ab4cf7f6894df339a40c02833bfd28ab4d7691fafb4-Python-3.8.20.tar.xz";
md5name = "3126f59592c9b0d798584755f2bf7b081fa1ca35ce7a6fea980108d752a05bb1-Python-3.9.21.tar.xz";
}
{
name = "libqxp-0.0.2.tar.xz";
@@ -847,18 +847,18 @@
md5name = "e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz";
}
{
name = "librevenge-0.0.4.tar.bz2";
url = "https://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2";
sha256 = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf";
name = "librevenge-0.0.5.tar.bz2";
url = "https://dev-www.libreoffice.org/src/librevenge-0.0.5.tar.bz2";
sha256 = "5892ca6796f7a2a93d580832e907e849b19d980b40d326a283b18877ab6de0c5";
md5 = "";
md5name = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf-librevenge-0.0.4.tar.bz2";
md5name = "5892ca6796f7a2a93d580832e907e849b19d980b40d326a283b18877ab6de0c5-librevenge-0.0.5.tar.bz2";
}
{
name = "rhino1_5R5.zip";
url = "https://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip";
sha256 = "1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753";
md5 = "798b2ffdc8bcfe7bca2cf92b62caf685";
md5name = "798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip";
name = "rhino-1.7.14.zip";
url = "https://dev-www.libreoffice.org/src/rhino-1.7.14.zip";
sha256 = "bf4d2d0c5ff8889fd494486db09291cb7965f0bf2f93ef005d3b08070a5a4f5c";
md5 = "";
md5name = "bf4d2d0c5ff8889fd494486db09291cb7965f0bf2f93ef005d3b08070a5a4f5c-rhino-1.7.14.zip";
}
{
name = "skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz";
@@ -874,13 +874,6 @@
md5 = "";
md5name = "f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db-libstaroffice-0.0.7.tar.xz";
}
{
name = "swingExSrc.zip";
url = "https://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip";
sha256 = "64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1";
md5 = "35c94d2df8893241173de1d16b6034c0";
md5name = "35c94d2df8893241173de1d16b6034c0-swingExSrc.zip";
}
{
name = "twaindsm_2.4.1.orig.tar.gz";
url = "https://dev-www.libreoffice.org/src/twaindsm_2.4.1.orig.tar.gz";
@@ -889,11 +882,11 @@
md5name = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6-twaindsm_2.4.1.orig.tar.gz";
}
{
name = "libvisio-0.1.7.tar.xz";
url = "https://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz";
sha256 = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c";
name = "libvisio-0.1.8.tar.xz";
url = "https://dev-www.libreoffice.org/src/libvisio-0.1.8.tar.xz";
sha256 = "b4098ffbf4dcb9e71213fa0acddbd928f27bed30db2d80234813b15d53d0405b";
md5 = "";
md5name = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c-libvisio-0.1.7.tar.xz";
md5name = "b4098ffbf4dcb9e71213fa0acddbd928f27bed30db2d80234813b15d53d0405b-libvisio-0.1.8.tar.xz";
}
{
name = "libwpd-0.10.3.tar.xz";
@@ -945,10 +938,10 @@
md5name = "77d6c6ecb35952a8d8ce7f736b7a2bf466275c48210e309b73782d6b7e84dffd-zxcvbn-c-2.5.tar.gz";
}
{
name = "zxing-cpp-2.1.0.tar.gz";
url = "https://dev-www.libreoffice.org/src/zxing-cpp-2.1.0.tar.gz";
sha256 = "6d54e403592ec7a143791c6526c1baafddf4c0897bb49b1af72b70a0f0c4a3fe";
name = "zxing-cpp-2.2.1.tar.gz";
url = "https://dev-www.libreoffice.org/src/zxing-cpp-2.2.1.tar.gz";
sha256 = "02078ae15f19f9d423a441f205b1d1bee32349ddda7467e2c84e8f08876f8635";
md5 = "";
md5name = "6d54e403592ec7a143791c6526c1baafddf4c0897bb49b1af72b70a0f0c4a3fe-zxing-cpp-2.1.0.tar.gz";
md5name = "02078ae15f19f9d423a441f205b1d1bee32349ddda7467e2c84e8f08876f8635-zxing-cpp-2.2.1.tar.gz";
}
]
pkgs/applications/office/libreoffice/src-still/help.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ fetchurl, ... }:
fetchurl {
sha256 = "0g31xfmmxjd5c1xg203gflzvq2d2jlgfi9gmg1wxl18l9gjk4hds";
url = "https://download.documentfoundation.org/libreoffice/src/24.2.7/libreoffice-help-24.2.7.2.tar.xz";
sha256 = "0z09pif1xmivmrnf5rjbcqc72khj0sg44905qrphp8cgvbx4n3ph";
url = "https://download.documentfoundation.org/libreoffice/src/24.8.4/libreoffice-help-24.8.4.2.tar.xz";
}
pkgs/applications/office/libreoffice/src-still/main.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ fetchurl, ... }:
fetchurl {
sha256 = "1r8h8g5fs7z0fvf7f6fq44rw90q4v2z23kkwzdh1s8gaxlnb3sgm";
url = "https://download.documentfoundation.org/libreoffice/src/24.2.7/libreoffice-24.2.7.2.tar.xz";
sha256 = "05qs12z0xkpqy3yl7378d99y82rswic101aw65k1macslcpdwr0m";
url = "https://download.documentfoundation.org/libreoffice/src/24.8.4/libreoffice-24.8.4.2.tar.xz";
}
pkgs/applications/office/libreoffice/src-still/translations.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ fetchurl, ... }:
fetchurl {
sha256 = "0g2wp8s3gxhy3l685jv3h63gzaljfclgcah437922dl60kpm9yjq";
url = "https://download.documentfoundation.org/libreoffice/src/24.2.7/libreoffice-translations-24.2.7.2.tar.xz";
sha256 = "0z84m2q5c9zjbb491m84s8sf2dgaxvvx03dl3f1qyajvpf1mnlld";
url = "https://download.documentfoundation.org/libreoffice/src/24.8.4/libreoffice-translations-24.8.4.2.tar.xz";
}
pkgs/applications/office/libreoffice/src-still/version.nix
+1 -1
View File
@@ -1 +1 @@
"24.2.7.2"
"24.8.4.2"
pkgs/by-name/an/anarch/package.nix
+55
View File
@@ -0,0 +1,55 @@
{
lib,
stdenv,
fetchFromGitLab,
SDL2,
xorg,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "anarch";
version = "1.0-unstable-2023-09-08";
src = fetchFromGitLab {
owner = "drummyfish";
repo = "anarch";
rev = "6f90562161200682459e772f1dacb747f23c5f95";
hash = "sha256-KmuJruzQRFunhwUGz3bHhXgtD2m4+5Vk0n7xhzVBMWs=";
};
buildInputs = [
SDL2
xorg.libXcursor
xorg.libXrandr
xorg.libXfixes
xorg.libXext
xorg.libXi
xorg.libXScrnSaver
];
# upstream is an error-prone make/build script
buildPhase = ''
runHook preBuild
$CC -O3 -o anarch main_sdl.c $(sdl2-config --cflags --libs)
runHook postBuild
'';
installPhase = ''
runHook preInstall
install -Dm755 anarch $out/bin/anarch
runHook postInstall
'';
meta = {
homepage = "https://drummyfish.gitlab.io/anarch/";
description = "Suckless FPS game";
maintainers = with lib.maintainers; [ ethancedwards8 ];
license = lib.licenses.cc0;
platforms = lib.platforms.unix;
mainProgram = "anarch";
};
})
pkgs/by-name/an/anytype/anytype-heart/default.nix
+89
View File
@@ -0,0 +1,89 @@
{
stdenv,
lib,
callPackage,
fetchFromGitHub,
buildGoModule,
protoc-gen-grpc-web,
protoc-gen-js,
protobuf,
}:
let
tantivy-go = callPackage ../tantivy-go { };
pname = "anytype-heart";
version = "0.38.9";
src = fetchFromGitHub {
owner = "anyproto";
repo = "anytype-heart";
tag = "v${version}";
hash = "sha256-0MRtzPSUxbCBJQLJbHsdEpf6GEFoS4ud1S6j9GZWzAE=";
};
arch =
{
# https://github.com/anyproto/anytype-heart/blob/f33a6b09e9e4e597f8ddf845fc4d6fe2ef335622/pkg/lib/localstore/ftsearch/ftsearchtantivy.go#L3
x86_64-linux = "linux-amd64-musl";
aarch64-linux = "linux-arm64-musl";
x86_64-darwin = "darwin-amd64";
aarch64-darwin = "darwin-arm64";
}
.${stdenv.hostPlatform.system};
in
buildGoModule {
inherit pname version src;
vendorHash = "sha256-8QN7SipgkoJ9yRCl1Hv8ZIkeEwbWcFS6QiumXIIN1Bg=";
subPackages = [ "cmd/grpcserver" ];
tags = [
"nosigar"
"nowatchdog"
];
env.CGO_ENABLED = 1;
proxyVendor = true;
nativeBuildInputs = [
protoc-gen-grpc-web
protoc-gen-js
protobuf
];
preBuild = ''
mkdir -p deps/libs/${arch}
cp ${tantivy-go}/lib/libtantivy_go.a deps/libs/${arch}
'';
postBuild = ''
protoc -I ./ --js_out=import_style=commonjs,binary:./dist/js/pb pb/protos/service/*.proto pb/protos/*.proto pkg/lib/pb/model/protos/*.proto
protoc -I ./ --grpc-web_out=import_style=commonjs+dts,mode=grpcwebtext:./dist/js/pb pb/protos/service/*.proto pb/protos/*.proto pkg/lib/pb/model/protos/*.proto
'';
postInstall = ''
mv $out/bin/grpcserver $out/bin/anytypeHelper
mkdir -p $out/lib
cp -r dist/js/pb/* $out/lib
cp -r dist/js/pb/* $out/lib
mkdir -p $out/lib/json/generated
cp pkg/lib/bundle/system*.json $out/lib/json/generated
cp pkg/lib/bundle/internal*.json $out/lib/json/generated
mkdir -p $out/share
cp LICENSE.md $out/share
'';
meta = {
description = "Shared library for Anytype clients";
homepage = "https://anytype.io/";
license = lib.licenses.unfreeRedistributable;
maintainers = with lib.maintainers; [ autrimpo ];
platforms = [
"x86_64-linux"
"aarch64-linux"
"x86_64-darwin"
"aarch64-darwin"
];
};
}
pkgs/by-name/an/anytype/package.nix
+99 -27
View File
@@ -1,42 +1,106 @@
{
lib,
fetchurl,
appimageTools,
makeWrapper,
nix-update-script,
callPackage,
fetchFromGitHub,
buildNpmPackage,
pkg-config,
libsecret,
electron,
makeDesktopItem,
copyDesktopItems,
commandLineArgs ? "",
nix-update-script,
}:
let
anytype-heart = callPackage ./anytype-heart { };
pname = "anytype";
version = "0.44.0";
name = "Anytype-${version}";
src = fetchurl {
url = "https://github.com/anyproto/anytype-ts/releases/download/v${version}/${name}.AppImage";
hash = "sha256-+Ae0xH6ipNZgIVrrAmgeG8bibm/I3NLiDMzS+fwf9RQ=";
src = fetchFromGitHub {
owner = "anyproto";
repo = "anytype-ts";
tag = "v${version}";
hash = "sha256-a2ZnTEAFzzTb+lxtQkC6QLG5SP1+gDSjI9dqUNZWfCg=";
};
description = "P2P note-taking tool";
locales = fetchFromGitHub {
owner = "anyproto";
repo = "l10n-anytype-ts";
rev = "a5c81ad55383c4e6e9bb7893ecfcb879bac87bea";
hash = "sha256-evSB0ohHm++tZiazXRMR4vj34IfW3HIkfZ2gwsi/2dk=";
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };
in
appimageTools.wrapType2 {
buildNpmPackage {
inherit pname version src;
nativeBuildInputs = [ makeWrapper ];
npmDepsHash = "sha256-DDVsrXgijYYOeCc1gIe2nVb+oL8v4Hqq80d7l5b6MR0=";
extraPkgs = pkgs: [ pkgs.libsecret ];
env = {
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
};
extraInstallCommands = ''
wrapProgram $out/bin/${pname} \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
--add-flags ${lib.escapeShellArg commandLineArgs}
install -m 444 -D ${appimageContents}/anytype.desktop -t $out/share/applications
substituteInPlace $out/share/applications/anytype.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'
for size in 16 32 64 128 256 512 1024; do
install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/''${size}x''${size}/apps/anytype.png \
$out/share/icons/hicolor/''${size}x''${size}/apps/anytype.png
nativeBuildInputs = [
pkg-config
copyDesktopItems
];
buildInputs = [ libsecret ];
buildPhase = ''
runHook preBuild
cp -r ${anytype-heart}/lib dist/
cp -r ${anytype-heart}/bin/anytypeHelper dist/
for lang in ${locales}/locales/*; do
cp "$lang" "dist/lib/json/lang/$(basename $lang)"
done
npm run build
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/lib/node_modules/anytype
cp -r electron.js electron dist node_modules package.json $out/lib/node_modules/anytype/
for icon in $out/lib/node_modules/anytype/electron/img/icons/*.png; do
mkdir -p "$out/share/icons/hicolor/$(basename $icon .png)/apps"
ln -s "$icon" "$out/share/icons/hicolor/$(basename $icon .png)/apps/anytype.png"
done
cp LICENSE.md $out/share
makeWrapper '${lib.getExe electron}' $out/bin/anytype \
--set-default ELECTRON_IS_DEV 0 \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
--add-flags $out/lib/node_modules/anytype/ \
--add-flags ${lib.escapeShellArg commandLineArgs}
runHook postInstall
'';
desktopItems = [
(makeDesktopItem {
name = "Anytype";
exec = "anytype";
icon = "anytype";
desktopName = "Anytype";
comment = description;
categories = [
"Utility"
"Office"
"Calendar"
"ProjectManagement"
];
startupWMClass = "anytype";
})
];
passthru.updateScript = nix-update-script {
# Prevent updating to versions with '-' in them.
# Necessary since Anytype uses Electron-based 'MAJOR.MINOR.PATCH(-{alpha,beta})?' versioning scheme where each
@@ -48,12 +112,20 @@ appimageTools.wrapType2 {
];
};
meta = with lib; {
description = "P2P note-taking tool";
meta = {
inherit description;
homepage = "https://anytype.io/";
license = licenses.unfree;
license = lib.licenses.unfreeRedistributable;
mainProgram = "anytype";
maintainers = with maintainers; [ running-grass ];
platforms = [ "x86_64-linux" ];
maintainers = with lib.maintainers; [
running-grass
autrimpo
];
platforms = [
"x86_64-linux"
"aarch64-linux"
"x86_64-darwin"
"aarch64-darwin"
];
};
}
pkgs/by-name/an/anytype/tantivy-go/add-Cargo.lock.patch
+1615
View File
File diff suppressed because it is too large Load Diff
pkgs/by-name/an/anytype/tantivy-go/default.nix
+34
View File
@@ -0,0 +1,34 @@
{
lib,
fetchFromGitHub,
rustPlatform,
}:
rustPlatform.buildRustPackage rec {
pname = "tantivy-go";
version = "0.3.1";
src = fetchFromGitHub {
owner = "anyproto";
repo = "tantivy-go";
tag = "v${version}";
hash = "sha256-IlGtyTjOAvmrbgmvy4NelTOgOWopxNta3INq2QcMEqY=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-3+HtZ7SAnvTNXtYlokX/Z9VD1lDw+nh6R/njYOZeGoE=";
cargoPatches = [
./add-Cargo.lock.patch
];
cargoRoot = "rust";
buildAndTestSubdir = cargoRoot;
meta = {
description = "Tantivy go bindings";
homepage = "https://github.com/anyproto/tantivy-go";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ autrimpo ];
};
}
pkgs/by-name/as/asusctl/package.nix
+3 -3
View File
@@ -17,17 +17,17 @@
}:
rustPlatform.buildRustPackage rec {
pname = "asusctl";
version = "6.1.1";
version = "6.1.2";
src = fetchFromGitLab {
owner = "asus-linux";
repo = "asusctl";
rev = version;
hash = "sha256-E2c4KhwLGAgorq4cHdPt/j45ebL0k+A/ktkXh71utxA=";
hash = "sha256-nhhlimr1w0tgfzPQTr/Opey2Hviy1YAdSVUe5YINnZE=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-o+u4k6yGVThBO9Chv4EwVpkDZzZj64RN9iNZyAy0LHs=";
cargoHash = "sha256-qgnMPICq7K3UT5l2T/nEvvWfEeNBpxwJburVJeAhQSs=";
postPatch = ''
files="
pkgs/by-name/ca/cargo-hack/package.nix
+3 -3
View File
@@ -6,15 +6,15 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-hack";
version = "0.6.34";
version = "0.6.35";
src = fetchCrate {
inherit pname version;
hash = "sha256-FAcKzLr835FxgcnWmAe1JirzlRc3fvxGXMKxnSmgCzA=";
hash = "sha256-6C3YiPgoszEvJBkaOg7URYxnEl17oGLYzl0P+m3VAAI=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-3M+UK0+lvnRH7j1vbqMgpE7mnz8YnPO3MEjQWnPRy8c=";
cargoHash = "sha256-pRZ6mmCQCaio7aW55dKSAEHeGNJoFJNUnnUGoBlmZ6w=";
# some necessary files are absent in the crate version
doCheck = false;
pkgs/by-name/ca/cargo-spellcheck/package.nix
+5 -14
View File
@@ -2,32 +2,21 @@
lib,
rustPlatform,
fetchFromGitHub,
fetchpatch2,
}:
rustPlatform.buildRustPackage rec {
pname = "cargo-spellcheck";
version = "0.15.1";
version = "0.15.2";
src = fetchFromGitHub {
owner = "drahnr";
repo = pname;
tag = "v${version}";
hash = "sha256-o4gvTF9Zb6bZ9443zos4bz37w3bXKumW2x425MM5/FY=";
hash = "sha256-KiulbQhSg5CCZlts8FLsfOrN7nz16u3gRnQrWTFAzdc=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-wEcHMzeSj/JO/ZBPmQAiHaixtOTCT2+rTd1LDCY9wqc=";
patches = [
# fixes compilation of tests
# https://github.com/drahnr/cargo-spellcheck/pull/342
(fetchpatch2 {
name = "fix-test-compilation.patch";
url = "https://github.com/drahnr/cargo-spellcheck/pull/342/commits/aed8f3ca7a50fae38a5c6e0b974ed9773cd6c659.patch";
hash = "sha256-840t8uPg0EiiVppmMT38C1P16vps7F+g0o313tzghjE=";
})
];
cargoHash = "sha256-iDulfKsw3Ui5b1v7QakIcf7HXNEBlMbhbzqLekuSsUU=";
nativeBuildInputs = [ rustPlatform.bindgenHook ];
@@ -35,6 +24,8 @@ rustPlatform.buildRustPackage rec {
checkFlags = [
"--skip=checker::hunspell::tests::hunspell_binding_is_sane"
# requires dictionaries
"--skip=tests::e2e::issue_226"
];
meta = with lib; {
pkgs/by-name/ch/charmcraft/package.nix
+6 -2
View File
@@ -8,7 +8,7 @@
python3Packages.buildPythonApplication rec {
pname = "charmcraft";
version = "3.2.2";
version = "3.4.2";
pyproject = true;
@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec {
owner = "canonical";
repo = "charmcraft";
tag = version;
hash = "sha256-2MI2cbAohfTgbilxZcFvmxt/iVjR6zJ2o0gequB//hg=";
hash = "sha256-6ucF0iQxQrFFz7jlaktYsB538W8jbX+Sw5hP0/VoYsk=";
};
postPatch = ''
@@ -35,6 +35,7 @@ python3Packages.buildPythonApplication rec {
humanize
jinja2
jsonschema
pip
pydantic
python-dateutil
pyyaml
@@ -51,11 +52,14 @@ python3Packages.buildPythonApplication rec {
pythonRelaxDeps = [
"urllib3"
"craft-application"
"pip"
"pydantic"
];
nativeCheckInputs =
with python3Packages;
[
freezegun
hypothesis
pyfakefs
pytest-check
pkgs/by-name/cl/cloudlist/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "cloudlist";
version = "1.1.0";
version = "1.2.0";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "cloudlist";
tag = "v${version}";
hash = "sha256-HV4qhQgeLKwkyrRFzRQibqjWRyjLBtoWVdliJ+iyyBc=";
hash = "sha256-6XgqhCL8ehK8k3k8fKLFZSmUz8G3MwqXhjEpA99F0K4=";
};
vendorHash = "sha256-6J9AWONLP/FvR0dXt5Zx4n+kTpmnxF79HcWVFp9OZ0g=";
vendorHash = "sha256-4vR03dC8ZfBM7Jw3JqGxZ/DGxfTx8279j7CzSOQKPkQ=";
subPackages = [ "cmd/cloudlist/" ];
pkgs/by-name/cu/cue/package.nix
+4 -4
View File
@@ -11,16 +11,16 @@
buildGoModule rec {
pname = "cue";
version = "0.11.2";
version = "0.12.0";
src = fetchFromGitHub {
owner = "cue-lang";
repo = "cue";
rev = "v${version}";
hash = "sha256-OSsDgwjtjQw5YRuXi1K/HQtHyLh1aHtYDlQDAtdYeZM=";
tag = "v${version}";
hash = "sha256-/2oVu1zij+8/qdDl4gApsNqdKwb1O7q5Xcdc3/djGn8=";
};
vendorHash = "sha256-jl8TR1kxame30l7DkfOEioWA9wK/ACTNofiTi++vjuI=";
vendorHash = "sha256-vkfXT8mAomQml/kQRb2VIi+D+jpc0qgE2AsJ8jK6LRQ=";
subPackages = [ "cmd/*" ];
pkgs/by-name/de/devenv/package.nix
+3 -3
View File
@@ -27,7 +27,7 @@ let
doInstallCheck = false;
});
version = "1.3.1";
version = "1.4";
in
rustPlatform.buildRustPackage {
pname = "devenv";
@@ -37,11 +37,11 @@ rustPlatform.buildRustPackage {
owner = "cachix";
repo = "devenv";
rev = "v${version}";
hash = "sha256-FhlknassIb3rKEucqnfFAzgny1ANmenJcTyRaXYwbA0=";
hash = "sha256-ax0264nOyPcTJvIJAnPKGfkfXQ8Oe8ZVFziKf3UV26o=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-8FuRxs4wRdMT/0ZGD1Cj12f0igzlAx3G5OW4IhB9hYk=";
cargoHash = "sha256-K06D4tD3IOCA7/iqQ7fhybsgcSmMxPUcoUi+VNPtgAY=";
buildAndTestSubdir = "devenv";
pkgs/by-name/er/ergo/package.nix
+2 -2
View File
@@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "ergo";
version = "5.0.24";
version = "5.0.25";
src = fetchurl {
url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";
sha256 = "sha256-+dpSgqJGHUNzIBQBbfbeclB5t+NyaluGRTCZ4OESZu8=";
sha256 = "sha256-4Eoo1f9oLxYdFC1M46Bq1D9RbIeOoWh0qECzcBbv3KA=";
};
nativeBuildInputs = [ makeWrapper ];
pkgs/by-name/fa/fastfetch/package.nix
+2 -2
View File
@@ -45,13 +45,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "fastfetch";
version = "2.36.0";
version = "2.36.1";
src = fetchFromGitHub {
owner = "fastfetch-cli";
repo = "fastfetch";
tag = finalAttrs.version;
hash = "sha256-pSPXSvomvQBps8ctF/PXaOP+7xBIRxNlRVIFVy8nxwY=";
hash = "sha256-gvhhYZ6wp3t+GNL8lyKaC6IHZXxu+CQo40rsJARNKY0=";
};
outputs = [
pkgs/by-name/fi/firefly-iii/package.nix
+4 -4
View File
@@ -13,13 +13,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "firefly-iii";
version = "6.2.4";
version = "6.2.5";
src = fetchFromGitHub {
owner = "firefly-iii";
repo = "firefly-iii";
tag = "v${finalAttrs.version}";
hash = "sha256-IBf34RPpQUH3U0tl8ljJpL9of6QNDOTyBg7Hc1ae+W8=";
hash = "sha256-EHxvp5L2/erFgXC9YkecWdMLP4KnTDbXzduFnED/6f0=";
};
buildInputs = [ php84 ];
@@ -38,12 +38,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
composerStrictValidation = true;
strictDeps = true;
vendorHash = "sha256-LRcgWQPDLNCMbaJhaySDrcw95fXF4yVUc03SFnrteeM=";
vendorHash = "sha256-rhN5YMlzoGFZNYCNhG3OXFnGEPpGrbVAxCg4maF5/+c=";
npmDeps = fetchNpmDeps {
inherit (finalAttrs) src;
name = "${finalAttrs.pname}-npm-deps";
hash = "sha256-K8zoX4UsD/hOpMZ5JCH3G9WBTUpJcXAertEaXaUGcys=";
hash = "sha256-PAAauxUJDDinGa2yQJmunyLMbDO2a3Whi2N7mEXyJ1s=";
};
composerRepository = php84.mkComposerRepository {
pkgs/by-name/fl/flet-client-flutter/git_hashes.json
+13
View File
@@ -0,0 +1,13 @@
{
"flet_ads": "sha256-uvfhwfuhw0by5CN9Z9VAUKrH9s2S4ltOf/93PDdGGKM=",
"flet_audio": "sha256-3xr0pYUylBNvswNvRath10A/EuCr4mTrTFjvlUAVgJQ=",
"flet_audio_recorder": "sha256-gOgd+6XZ0KJUG7bvxqyr5IjsNL/dy9RsJ0wbtMVr3bM=",
"flet_flashlight": "sha256-a/WnJdrSjM0FrYm/HghbocyGTMpT2xfa90z/Zv+Bp1Y=",
"flet_geolocator": "sha256-ZXt9rYWHr27FBzlQT1uxg5/l2E7JX1tDI3WgChx9DAs=",
"flet_lottie": "sha256-tpoMiI+rpD5HSqIsDvo0QNkwN4nifG3rJkUlVSHWNzM=",
"flet_map": "sha256-k42GK37MGdMI/QM04GuF0LQ6AAaL7mrZ6z9IGObYhYM=",
"flet_permission_handler": "sha256-Lj0bHcERjdfgUAbvPW7z58fAWT/BfKEJkBhNUrNVG9o=",
"flet_rive": "sha256-X8MRlnktjd5v0dfi9wvPvgl8lTgexfocgf5/ja7UpWk=",
"flet_video": "sha256-IfUkld4TZgtkIL1l1vmWFoCAzgVOEtALosmvkBZVq1M=",
"flet_webview": "sha256-wvypCJx5OuNYWcJMiW3L05PQI9ZY1tONebujI+EJu4E="
}
pkgs/by-name/fl/flet-client-flutter/package.nix
+13 -15
View File
@@ -1,35 +1,37 @@
{ lib
, fetchFromGitHub
, pkg-config
, flutter324
, flutter327
, gst_all_1
, libunwind
, makeWrapper
, mimalloc
, orc
, yq
, runCommand
, python3
, nix
, gitUpdater
, nix-prefetch-git
, mpv-unwrapped
, libplacebo
, _experimental-update-script-combinators
, flet-client-flutter
, fletTarget ? "linux"
}:
flutter324.buildFlutterApplication rec {
flutter327.buildFlutterApplication rec {
pname = "flet-client-flutter";
version = "0.25.2";
version = "0.26.0";
src = fetchFromGitHub {
owner = "flet-dev";
repo = "flet";
tag = "v${version}";
hash = "sha256-bD44MCRZPXB/xuw2vBCzNbRNSVgdc4GyyWg3F2adxKk=";
hash = "sha256-KmZ13QiZeZ6jljs2wibetbACfNODGJ47II8XcRAxoX4=";
};
sourceRoot = "${src.name}/client";
gitHashes = lib.importJSON ./git_hashes.json;
cmakeFlags = [
"-DMIMALLOC_LIB=${mimalloc}/lib/mimalloc.o"
];
@@ -59,16 +61,12 @@ flutter324.buildFlutterApplication rec {
;
passthru = {
pubspecSource = runCommand "pubspec.lock.json" {
buildInputs = [ yq ];
inherit (flet-client-flutter) src;
} ''
cat $src/client/pubspec.lock | yq > $out
'';
updateScript = _experimental-update-script-combinators.sequence [
(gitUpdater { rev-prefix = "v"; })
(_experimental-update-script-combinators.copyAttrOutputToFile "flet-client-flutter.pubspecSource" ./pubspec.lock.json)
{
command = ["env" "PATH=${lib.makeBinPath [(python3.withPackages (p: [p.pyyaml])) nix-prefetch-git nix]}" "python3" ./update-lockfiles.py ];
supportedFeatures = ["silent"];
}
];
};
pkgs/by-name/fl/flet-client-flutter/pubspec.lock.json
+119 -67
View File
@@ -154,11 +154,11 @@
"dependency": "transitive",
"description": {
"name": "collection",
"sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a",
"sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.18.0"
"version": "1.19.0"
},
"cross_file": {
"dependency": "transitive",
@@ -210,6 +210,26 @@
"source": "hosted",
"version": "0.7.10"
},
"device_info_plus": {
"dependency": "transitive",
"description": {
"name": "device_info_plus",
"sha256": "b37d37c2f912ad4e8ec694187de87d05de2a3cb82b465ff1f65f65a2d05de544",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "11.2.1"
},
"device_info_plus_platform_interface": {
"dependency": "transitive",
"description": {
"name": "device_info_plus_platform_interface",
"sha256": "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "7.0.2"
},
"dio": {
"dependency": "transitive",
"description": {
@@ -301,112 +321,134 @@
"version": "0.69.0"
},
"flet": {
"dependency": "direct main",
"dependency": "direct overridden",
"description": {
"path": "../packages/flet",
"relative": true
},
"source": "path",
"version": "0.25.1"
"version": "0.26.0"
},
"flet_ads": {
"dependency": "direct main",
"description": {
"path": "../packages/flet_ads",
"relative": true
"path": "src/flutter/flet_ads",
"ref": "0.1.0",
"resolved-ref": "01e7065fcbebb1317b3f16951e6cf0c5fcff658b",
"url": "https://github.com/flet-dev/flet-ads.git"
},
"source": "path",
"version": "0.25.1"
"source": "git",
"version": "0.1.0"
},
"flet_audio": {
"dependency": "direct main",
"description": {
"path": "../packages/flet_audio",
"relative": true
"path": "src/flutter/flet_audio",
"ref": "0.1.0",
"resolved-ref": "a146bf580a211c6d1f5c45070d15532ea2e92af7",
"url": "https://github.com/flet-dev/flet-audio.git"
},
"source": "path",
"version": "0.25.1"
"source": "git",
"version": "0.1.0"
},
"flet_audio_recorder": {
"dependency": "direct main",
"description": {
"path": "../packages/flet_audio_recorder",
"relative": true
"path": "src/flutter/flet_audio_recorder",
"ref": "0.1.0",
"resolved-ref": "eb186cd49fde3136f65d0d074bca5ca688260e53",
"url": "https://github.com/flet-dev/flet-audio-recorder.git"
},
"source": "path",
"version": "0.25.1"
"source": "git",
"version": "0.1.0"
},
"flet_flashlight": {
"dependency": "direct main",
"description": {
"path": "../packages/flet_flashlight",
"relative": true
"path": "src/flutter/flet_flashlight",
"ref": "0.1.0",
"resolved-ref": "a12a12259eaac801ee99d465727ec4a9fe50121e",
"url": "https://github.com/flet-dev/flet-flashlight.git"
},
"source": "path",
"version": "0.25.1"
"source": "git",
"version": "0.1.0"
},
"flet_geolocator": {
"dependency": "direct main",
"description": {
"path": "../packages/flet_geolocator",
"relative": true
"path": "src/flutter/flet_geolocator",
"ref": "0.1.0",
"resolved-ref": "7b17d7aab169a7488da90fd73b3acd8e568f4f03",
"url": "https://github.com/flet-dev/flet-geolocator.git"
},
"source": "path",
"version": "0.25.1"
"source": "git",
"version": "0.25.2"
},
"flet_lottie": {
"dependency": "direct main",
"description": {
"path": "../packages/flet_lottie",
"relative": true
"path": "src/flutter/flet_lottie",
"ref": "0.1.0",
"resolved-ref": "f28c767b5d43de650155a5a97e2d971fb833c9f8",
"url": "https://github.com/flet-dev/flet-lottie.git"
},
"source": "path",
"version": "0.25.1"
"source": "git",
"version": "0.1.0"
},
"flet_map": {
"dependency": "direct main",
"description": {
"path": "../packages/flet_map",
"relative": true
"path": "src/flutter/flet_map",
"ref": "0.1.0",
"resolved-ref": "dfa3cf6776b0dc5f238227d5f378cda7be190eaf",
"url": "https://github.com/flet-dev/flet-map.git"
},
"source": "path",
"version": "0.25.1"
"source": "git",
"version": "0.1.0"
},
"flet_permission_handler": {
"dependency": "direct main",
"description": {
"path": "../packages/flet_permission_handler",
"relative": true
"path": "src/flutter/flet_permission_handler",
"ref": "0.1.0",
"resolved-ref": "4ead86b6c7e54b914215b6087fcb17b7e921d75c",
"url": "https://github.com/flet-dev/flet-permission-handler.git"
},
"source": "path",
"version": "0.25.1"
"source": "git",
"version": "0.1.0"
},
"flet_rive": {
"dependency": "direct main",
"description": {
"path": "../packages/flet_rive",
"relative": true
"path": "src/flutter/flet_rive",
"ref": "0.1.0",
"resolved-ref": "089f7ad923f747ad764aa2781eca9a36382bb912",
"url": "https://github.com/flet-dev/flet-rive.git"
},
"source": "path",
"version": "0.25.1"
"source": "git",
"version": "0.1.0"
},
"flet_video": {
"dependency": "direct main",
"description": {
"path": "../packages/flet_video",
"relative": true
"path": "src/flutter/flet_video",
"ref": "0.1.0",
"resolved-ref": "76f3f76f04c7573e047204648378ee2f31db7a15",
"url": "https://github.com/flet-dev/flet-video.git"
},
"source": "path",
"version": "0.25.1"
"source": "git",
"version": "0.1.0"
},
"flet_webview": {
"dependency": "direct main",
"description": {
"path": "../packages/flet_webview",
"relative": true
"path": "src/flutter/flet_webview",
"ref": "0.1.0",
"resolved-ref": "b1cfb3155469bc0a9a7578afcd58e7f32669b164",
"url": "https://github.com/flet-dev/flet-webview.git"
},
"source": "path",
"version": "0.25.1"
"source": "git",
"version": "0.1.0"
},
"flutter": {
"dependency": "direct main",
@@ -714,21 +756,21 @@
"dependency": "transitive",
"description": {
"name": "leak_tracker",
"sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05",
"sha256": "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "10.0.5"
"version": "10.0.7"
},
"leak_tracker_flutter_testing": {
"dependency": "transitive",
"description": {
"name": "leak_tracker_flutter_testing",
"sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806",
"sha256": "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.0.5"
"version": "3.0.8"
},
"leak_tracker_testing": {
"dependency": "transitive",
@@ -1234,21 +1276,21 @@
"dependency": "transitive",
"description": {
"name": "rive",
"sha256": "b44b62feb908610ca6c85e05f4573a66118a23867425926cf06152d171236141",
"sha256": "2551a44fa766a7ed3f52aa2b94feda6d18d00edc25dee5f66e72e9b365bb6d6c",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.13.17"
"version": "0.13.20"
},
"rive_common": {
"dependency": "transitive",
"description": {
"name": "rive_common",
"sha256": "a3e5786f8d85c89977062b9ceeb3b72a7c28f81e32fb68497744042ce20bee2f",
"sha256": "2ba42f80d37a4efd0696fb715787c4785f8a13361e8aea9227c50f1e78cf763a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.4.12"
"version": "0.4.15"
},
"safe_local_storage": {
"dependency": "transitive",
@@ -1464,7 +1506,7 @@
"dependency": "transitive",
"description": "flutter",
"source": "sdk",
"version": "0.0.99"
"version": "0.0.0"
},
"source_span": {
"dependency": "transitive",
@@ -1490,11 +1532,11 @@
"dependency": "transitive",
"description": {
"name": "stack_trace",
"sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b",
"sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.11.1"
"version": "1.12.0"
},
"stream_channel": {
"dependency": "transitive",
@@ -1510,11 +1552,11 @@
"dependency": "transitive",
"description": {
"name": "string_scanner",
"sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde",
"sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.2.0"
"version": "1.3.0"
},
"sync_http": {
"dependency": "transitive",
@@ -1550,11 +1592,11 @@
"dependency": "transitive",
"description": {
"name": "test_api",
"sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb",
"sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.7.2"
"version": "0.7.3"
},
"torch_light": {
"dependency": "transitive",
@@ -1750,11 +1792,11 @@
"dependency": "transitive",
"description": {
"name": "vm_service",
"sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d",
"sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "14.2.5"
"version": "14.3.0"
},
"volume_controller": {
"dependency": "transitive",
@@ -1810,11 +1852,11 @@
"dependency": "transitive",
"description": {
"name": "webdriver",
"sha256": "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e",
"sha256": "3d773670966f02a646319410766d3b5e1037efb7f07cc68f844d5e06cd4d61c8",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.0.3"
"version": "3.0.4"
},
"webview_flutter": {
"dependency": "transitive",
@@ -1876,6 +1918,16 @@
"source": "hosted",
"version": "5.5.3"
},
"win32_registry": {
"dependency": "transitive",
"description": {
"name": "win32_registry",
"sha256": "723b7f851e5724c55409bb3d5a32b203b3afe8587eaf5dafb93a5fed8ecda0d6",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.4"
},
"window_manager": {
"dependency": "transitive",
"description": {
pkgs/by-name/fl/flet-client-flutter/update-lockfiles.py
+42
View File
@@ -0,0 +1,42 @@
from argparse import ArgumentParser
from pathlib import Path
import json
import subprocess
import yaml
THIS_FOLDER = Path(__file__).parent
FLAKE_DIR = THIS_FOLDER
while True:
assert str(FLAKE_DIR) != '/'
if (FLAKE_DIR / "flake.nix").exists():
break
FLAKE_DIR = FLAKE_DIR.parent
source = Path(subprocess.run(['nix-build', FLAKE_DIR, '-A', 'flet-client-flutter.src', '--no-out-link'], stdout=subprocess.PIPE).stdout.decode('utf-8').strip())
assert source.is_absolute()
source_pubspec_lock = source / "client" / "pubspec.lock"
output_pubspec = THIS_FOLDER / "pubspec.lock.json"
output_git_hashes = THIS_FOLDER / "git_hashes.json"
data = yaml.safe_load(source_pubspec_lock.open('r'))
output_pubspec.write_text(json.dumps(data, indent=2) + "\n")
output_data = {}
def hash_git(package):
print(package)
resolved_ref = package['resolved-ref']
url = package['url']
full_output = subprocess.run(['nix-prefetch-git', '--url', url, '--rev', resolved_ref], stdout=subprocess.PIPE).stdout.decode('utf-8')
json_output = json.loads(full_output)
return json_output['hash']
for name, package in data['packages'].items():
if package['source'] != 'git':
continue
hash = hash_git(package['description'])
output_data[name] = hash
output_git_hashes.write_text(json.dumps(output_data, indent=2) + "\n")
pkgs/by-name/fl/flow-editor/build.zig.zon.nix
+26 -18
View File
@@ -97,19 +97,19 @@ linkFarm name [
};
}
{
name = "1220a2c8f8db1b5265458ac967ea1f7cc0a8ddcd1d774df3b73d86c4f529aadbfb94";
name = "1220d0fb2bff7b453dbb39d1db3eb472b6680e2564f2b23b0e947671be47bbdd188f";
path = fetchZigArtifact {
name = "tracy";
url = "https://github.com/neurocyte/zig-tracy/archive/58999b786089e5319dd0707f6afbfca04c6340e7.tar.gz";
hash = "sha256-4q1UD2hRtp9mUPL5wIKzk8AhnAoVkl9xpaUN5sp4mWA=";
url = "https://github.com/neurocyte/zig-tracy/archive/e04e31c64498149a324491b8534758e6af43a5c2.tar.gz";
hash = "sha256-otvs9tKc8zMRFng0VJDn5iNf7lvbozjrtH0q8IFnP0w=";
};
}
{
name = "12202aac930cebaf2b57f443cacc2483478580a72f1316b4f0a720ddd91246fce69d";
name = "122051b30656170b4628580e571d98b1fe45d7c0d581bc2d45e894c75c6376294ede";
path = fetchZigArtifact {
name = "tracy_src";
url = "https://github.com/wolfpld/tracy/archive/refs/tags/v0.10.tar.gz";
hash = "sha256-p2AX2Sjz8nJ1QPuVDt07c2yql7Etu05e3OZlQsvqZgA=";
url = "https://github.com/neurocyte/tracy/archive/0ff0a1b324f497cf313a445637b7df25aabefb47.tar.gz";
hash = "sha256-dzMilJsOSdjNyvhyDb1v5dPWcR5uvhnQmsBynAJH74I=";
};
}
{
@@ -121,11 +121,11 @@ linkFarm name [
};
}
{
name = "1220f6fdc977fff899aaf624afc8cf01e29a0e100dbb52860902a3bc256f4ddd687b";
name = "1220bbfd147f41fa49d2e5406096f3529c62e9335f4d2a89ae381e679a76ce398f1f";
path = fetchZigArtifact {
name = "thespian";
url = "https://github.com/neurocyte/thespian/archive/9df7beb192dd0db647e55fe44272b77ca687f6cd.tar.gz";
hash = "sha256-b8PPqmiURT9bOaa2ubz/v0J2WEyRmtL6iL4nBDkvgeQ=";
url = "https://github.com/neurocyte/thespian/archive/db3ad5f45e707a04eaa51aa657995abe43ce967a.tar.gz";
hash = "sha256-La5pv08xPAnkNxBHjpTmLpKxrcifRFWcqm8NYp92iRA=";
};
}
{
@@ -137,11 +137,11 @@ linkFarm name [
};
}
{
name = "1220b2109e0aadf85e4ac5e1cd084e321fe50f1e59cea690c022a7a8f7eb6021eadb";
name = "1220e4f3baf09dc23e48616f7dbf00bd45c3034faa2eddede7bb45ef4c23a19b962b";
path = fetchZigArtifact {
name = "themes";
url = "https://github.com/neurocyte/flow-themes/releases/download/master-0c2a187c604c63031225847a966b6ca279b2be91/flow-themes.tar.gz";
hash = "sha256-8zumZneeSPVrpw2wAQwKoEOXCLYqkKQFVXQ8oum08Hw=";
url = "https://github.com/neurocyte/flow-themes/releases/download/master-8b79cf6d79373c142393ec26a81b19f4701f4372/flow-themes.tar.gz";
hash = "sha256-xy0cTVc85U6JpI+oca2XKXE7GAs0EId21DeQCDa8+n0=";
};
}
{
@@ -153,11 +153,11 @@ linkFarm name [
};
}
{
name = "12202ee9842d28927674e552f1ea41e2c41e59f6b4b5d290de9b6fd626fd332ac627";
name = "12207e33747072d878fce61f587c133124dc95f4ae8aab7d2b3f467699586af07c77";
path = fetchZigArtifact {
name = "vaxis";
url = "https://github.com/neurocyte/libvaxis/archive/ffe35b4342bd2913efd46c35c0ccd15544ac87e6.tar.gz";
hash = "sha256-AQpYS1WnHLzcUMhD8BaCd+Dh+nqY5umL6KCBTuVlSQw=";
url = "https://github.com/neurocyte/libvaxis/archive/d899244bc0a3775b59c18e90eb41acee11675f96.tar.gz";
hash = "sha256-8bK0zM6rD/mqTaHDZKMgS3+qV1VviImM9jr9D0lkPdw=";
};
}
{
@@ -185,11 +185,19 @@ linkFarm name [
};
}
{
name = "12204c99c6093230023380068f386f7eb32ab83df9a8eb8b586ffe5aa44afa34ff0e";
name = "1220925614447b54ccc9894bbba8b202c6a8b750267890edab7732064867e46f3217";
path = fetchZigArtifact {
name = "win32";
url = "https://github.com/marlersoft/zigwin32/archive/259b6f353a48968d7e3171573db4fd898b046188.tar.gz";
hash = "sha256-N9Jp2vmq1+xPWByb+VZkbS2lm9FCrUW4UBAPhSP+dUw=";
};
}
{
name = "1220f9702ca6257f5464b31e576b1e92b0f441bf0e61733c4a2fbf95b7c0c55a3e22";
path = fetchZigArtifact {
name = "tree-sitter";
url = "https://github.com/neurocyte/tree-sitter/releases/download/master-aea6072c6178d5cd0c97fff33e130f632f355bc2/source.tar.gz";
hash = "sha256-eqJc3lx+tnbiqcD8R0u4+sH7wKOr4McYiZNUfPTNbRc=";
url = "https://github.com/neurocyte/tree-sitter/releases/download/master-69775ce3ba8a5e331bba9feb760d1ba31394eea7/source.tar.gz";
hash = "sha256-0ZLcPuhUV6Z3EsXfU7gXRrG/nRP9zuLRSL00Q5OGnus=";
};
}
]
pkgs/by-name/fl/flow-editor/package.nix
+4 -2
View File
@@ -8,13 +8,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "flow";
version = "0.2.1";
version = "0.3.2";
src = fetchFromGitHub {
owner = "neurocyte";
repo = "flow";
tag = "v${finalAttrs.version}";
hash = "sha256-dXWqxV66BwtjOvmreq4+u5+xBI+1v1PAep8RQBK3rlA=";
hash = "sha256-D1pFP5tw323UJgWvLvh2sTiZG1hq5DP0FakdXEISRxs=";
};
postPatch = ''
ln -s ${callPackage ./build.zig.zon.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
@@ -24,6 +24,8 @@ stdenv.mkDerivation (finalAttrs: {
zig_0_13.hook
];
passthru.updateScript = ./update.sh;
env.VERSION = finalAttrs.version;
meta = {
pkgs/by-name/fl/flow-editor/update.sh
Executable
+19
View File
@@ -0,0 +1,19 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p bash common-updater-scripts gnused nixfmt-rfc-style
latest_tag=$(list-git-tags --url=https://github.com/neurocyte/flow | sed 's/^v//' | tail -n 1)
update-source-version flow-editor "$latest_tag"
mkdir -p src/syntax
wget "https://raw.githubusercontent.com/neurocyte/flow/v${latest_tag}/build.zig.zon"
wget -P src/syntax "https://raw.githubusercontent.com/neurocyte/flow/v${latest_tag}/src/syntax/build.zig.zon"
nix --extra-experimental-features 'nix-command flakes' run github:Cloudef/zig2nix#zon2nix -- build.zig.zon >pkgs/by-name/fl/flow-editor/build.zig.zon.nix
# strip file protocol
sed -i '\|file = unpackZigArtifact { inherit name; artifact = /. + path; };|d' pkgs/by-name/fl/flow-editor/build.zig.zon.nix
nixfmt pkgs/by-name/fl/flow-editor/build.zig.zon.nix
rm -rf build.zig.zon build.zig.zon2json-lock src/
pkgs/by-name/gi/git-upstream/package.nix
+3 -3
View File
@@ -6,7 +6,7 @@
}:
let
pname = "git-upstream";
version = "1.2.0";
version = "1.5.0";
in
rustPlatform.buildRustPackage {
inherit pname version;
@@ -15,11 +15,11 @@ rustPlatform.buildRustPackage {
owner = "9999years";
repo = pname;
tag = "v${version}";
hash = "sha256-GnsqZSztDLXMO4T16nfcOKMKXap88CJzJ5nObzGwhMA=";
hash = "sha256-ooqz2Xp/nljx2+zQsc/RjVbGG/5YTeggU6pB8lGK0o8=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-DzRiRUCsTslldnSNByaCr5eQGKxyTSifL2duZnMTmNk=";
cargoHash = "sha256-oIrUjb+yJgDR5GYrG3hPLpXYJynR9eeX00emcrcjmZY=";
meta = {
homepage = "https://github.com/9999years/git-upstream";
pkgs/by-name/go/goreleaser/package.nix
+3 -3
View File
@@ -10,16 +10,16 @@
}:
buildGoModule rec {
pname = "goreleaser";
version = "2.6.1";
version = "2.7.0";
src = fetchFromGitHub {
owner = "goreleaser";
repo = "goreleaser";
rev = "v${version}";
hash = "sha256-MlI76xiHT+JZAaL7LnEqHOgt6UypVoBjZHTmQXrnNxs=";
hash = "sha256-tpUnoW2Hx/A+bmhAn0GctllILEx9QCfgpscJWJTxJUU=";
};
vendorHash = "sha256-fYYPpf/Hnci5DCvhbWkmenTL+95PvqPtn1RdoRby+jI=";
vendorHash = "sha256-coO4Y+/ELu4yRusxop/Xc4cTlc+6HYAVIfiUbC2bLTw=";
ldflags = [
"-s"
pkgs/by-name/hy/hyprland-workspaces-tui/package.nix
+15 -4
View File
@@ -4,27 +4,38 @@
fetchFromGitHub,
makeWrapper,
hyprland-workspaces,
installShellFiles,
nix-update-script,
}:
rustPlatform.buildRustPackage rec {
pname = "hyprland-workspaces-tui";
version = "1.0.2";
version = "1.1.0";
src = fetchFromGitHub {
owner = "Levizor";
repo = "hyprland-workspaces-tui";
tag = version;
hash = "sha256-3QmqoyWmtC4ps8dtIWEoLjzdzKAXOujyz+GgOlo172Q=";
hash = "sha256-QMwiBQGAybdL8FaUil6tFzSFg4nN/9mGVoqiDFwGZec=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-VjYLqRXJhR8MZD+qcwqgw36Xh0RafJeAnuHzO+pab4s=";
cargoHash = "sha256-aT8LfBVOEVUvzgPlBIOXTgT+WXEt3vHMDyCcl9jT5/E=";
nativeBuildInputs = [ makeWrapper ];
nativeBuildInputs = [
makeWrapper
installShellFiles
];
buildInputs = [ hyprland-workspaces ];
postInstall = ''
installShellCompletion --cmd hyprland-workspaces-tui \
--bash <($out/bin/hyprland-workspaces-tui --completions bash) \
--zsh <($out/bin/hyprland-workspaces-tui --completions zsh) \
--fish <($out/bin/hyprland-workspaces-tui --completions fish)
'';
postFixup = ''
wrapProgram $out/bin/hyprland-workspaces-tui \
--suffix PATH : ${lib.makeBinPath [ hyprland-workspaces ]}
pkgs/by-name/ka/kanidm/1_5.nix
+6
View File
@@ -0,0 +1,6 @@
import ./generic.nix {
version = "1.5.0";
hash = "sha256-swrqyjA7Wgq17vd+753LDFcXrSFixVNLhTvj1bhG3DU=";
cargoHash = "sha256-72IwS8Nk1y6xDH9y8JW2LpbhFWaq0tpORx7JQSCF5/M=";
patchDir = ./patches/1_5;
}
pkgs/by-name/ka/kanidm/README.md
+47
View File
@@ -0,0 +1,47 @@
# Kanidm release guide
Kanidm supports one release at any given time, with a 30-day overlap to allow for upgrades from old to new version.
Version upgrades are only supported on adjacent releases, with no support for jumping versions.
To ensure we provide sufficient coverage for upgrading, we will aim to have two or three releases in tree at any given time.
Unsupported versions will be marked as vulnerable (lacking an "unsupported" mechanism), but built by hydra to avoid pushing the very large rebuild on users.
The default version will be updated with each new version, but the default will not be backported.
It is expected that stable users will have to manually specify the version, and update that version, throughout the lifecycle of a NixOS release.
## New release
For example, when upgrading from 1.4 -> 1.5
### Init new version
1. `cp pkgs/by-name/ka/kanidm/1_4.nix pkgs/by-name/ka/kanidm/1_5.nix`
1. `cp -r pkgs/by-name/ka/kanidm/patches/1_4 pkgs/by-name/ka/kanidm/patches/1_5`
1. Update `1_5.nix` hashes/paths, and as needed for upstream changes, `generic.nix`
1. Update `all-packages.nix` to add `kanidm_1_5` and `kanidmWithSecretProvisioning_1_5`, leave default
1. Create commit, `kanidm_1_5: init at 1.5.0` - this is the only commit that will be backported
### Mark previous version deprecated
1. Update `pkgs/by-name/ka/kanidm/1_4.nix` by adding `deprecated = true;`
1. Create commit `kanidm_1_4: update default to 1.5.0, deprecate 1.4.0`
### Update default and mark deprecation
1. `sed -i 's/1_4/1_5/' pkgs/by-name/ka/kanidm/package.nix`
1. Update `all-packages.nix` and set `kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_5;`
1. Create commit `kanidm: update default to 1.5.0`
### Backport to stable
1. Manually create a backport using _only_ the init commit
## Remove release
Kanidm versions are supported for 30 days after the release of new versions. Following the example above, 1.5.x superseding 1.4.x in 30 days, do the following near the end of the 30 day window
1. Update `pkgs/top-level/release.nix` and add `kanidm_1_4-1.4.6` to `permittedInsecurePackages`
1. Update `pkgs/top-level/release.nix` and remove `kanidm_1_3-1.3.3` from `permittedInsecurePackages`
1. Remove the third oldest release from `all-packages.nix`, e.g. 1.3.x continuing the example. Remove `kanidm_1_3` and `kanidmWithSecretProvisioning_1_3`
1. Update `pkgs/by-name/ka/kanidm/1_4.nix` by adding `unsupported = true;`
1. Open a PR and backport it to stable
pkgs/by-name/ka/kanidm/generic.nix
+20 -1
View File
@@ -4,6 +4,7 @@
cargoHash,
patchDir,
extraMeta ? { },
unsupported ? false,
}:
{
@@ -60,8 +61,18 @@ rustPlatform.buildRustPackage rec {
format = (formats.toml { }).generate "${KANIDM_BUILD_PROFILE}.toml";
profile =
{
admin_bind_path = "/run/kanidmd/sock";
cpu_flags = if stdenv.hostPlatform.isx86_64 then "x86_64_legacy" else "none";
}
// lib.optionalAttrs (lib.versionAtLeast version "1.5") {
client_config_path = "/etc/kanidm/config";
resolver_config_path = "/etc/kanidm/unixd";
resolver_unix_shell_path = "${lib.getBin bashInteractive}/bin/bash";
server_admin_bind_path = "/run/kanidmd/sock";
server_config_path = "/etc/kanidm/server.toml";
server_ui_pkg_path = "@htmx_ui_pkg_path@";
}
// lib.optionalAttrs (lib.versionOlder version "1.5") {
admin_bind_path = "/run/kanidmd/sock";
default_config_path = "/etc/kanidm/server.toml";
default_unix_shell_path = "${lib.getBin bashInteractive}/bin/bash";
htmx_ui_pkg_path = "@htmx_ui_pkg_path@";
@@ -160,6 +171,14 @@ rustPlatform.buildRustPackage rec {
adamcstephens
Flakebi
];
knownVulnerabilities = lib.optionals unsupported [
''
kanidm ${version} has reached EOL.
Please upgrade by verifying `kanidmd domain upgrade-check` and choosing the next version with `services.kanidm.package = pkgs.kanidm_1_x;`
See upgrade guide at https://kanidm.github.io/kanidm/master/server_updates.html
''
];
}
// extraMeta;
}
pkgs/by-name/ka/kanidm/package.nix
+1 -1
View File
@@ -1 +1 @@
import ./1_4.nix
import ./1_5.nix
pkgs/by-name/ka/kanidm/patches/1_5/oauth2-basic-secret-modify.patch
+308
View File
@@ -0,0 +1,308 @@
From e9dfca73e6fb80faf6fc106e7aee6b93c0908525 Mon Sep 17 00:00:00 2001
From: oddlama <oddlama@oddlama.org>
Date: Fri, 1 Nov 2024 12:26:17 +0100
Subject: [PATCH 1/2] oauth2 basic secret modify
---
server/core/src/actors/v1_write.rs | 42 ++++++++++++++++++++++++++++++
server/core/src/https/v1.rs | 6 ++++-
server/core/src/https/v1_oauth2.rs | 29 +++++++++++++++++++++
server/lib/src/constants/acp.rs | 6 +++++
4 files changed, 82 insertions(+), 1 deletion(-)
diff --git a/server/core/src/actors/v1_write.rs b/server/core/src/actors/v1_write.rs
index 732e826c8..0fe66503f 100644
--- a/server/core/src/actors/v1_write.rs
+++ b/server/core/src/actors/v1_write.rs
@@ -317,20 +317,62 @@ impl QueryServerWriteV1 {
};
trace!(?del, "Begin delete event");
idms_prox_write
.qs_write
.delete(&del)
.and_then(|_| idms_prox_write.commit().map(|_| ()))
}
+ #[instrument(
+ level = "info",
+ skip_all,
+ fields(uuid = ?eventid)
+ )]
+ pub async fn handle_oauth2_basic_secret_write(
+ &self,
+ client_auth_info: ClientAuthInfo,
+ filter: Filter<FilterInvalid>,
+ new_secret: String,
+ eventid: Uuid,
+ ) -> Result<(), OperationError> {
+ // Given a protoEntry, turn this into a modification set.
+ let ct = duration_from_epoch_now();
+ let mut idms_prox_write = self.idms.proxy_write(ct).await?;
+ let ident = idms_prox_write
+ .validate_client_auth_info_to_ident(client_auth_info, ct)
+ .map_err(|e| {
+ admin_error!(err = ?e, "Invalid identity");
+ e
+ })?;
+
+ let modlist = ModifyList::new_purge_and_set(
+ Attribute::OAuth2RsBasicSecret,
+ Value::SecretValue(new_secret),
+ );
+
+ let mdf =
+ ModifyEvent::from_internal_parts(ident, &modlist, &filter, &idms_prox_write.qs_write)
+ .map_err(|e| {
+ admin_error!(err = ?e, "Failed to begin modify during handle_oauth2_basic_secret_write");
+ e
+ })?;
+
+ trace!(?mdf, "Begin modify event");
+
+ idms_prox_write
+ .qs_write
+ .modify(&mdf)
+ .and_then(|_| idms_prox_write.commit())
+ }
+
#[instrument(
level = "info",
skip_all,
fields(uuid = ?eventid)
)]
pub async fn handle_reviverecycled(
&self,
client_auth_info: ClientAuthInfo,
filter: Filter<FilterInvalid>,
eventid: Uuid,
diff --git a/server/core/src/https/v1.rs b/server/core/src/https/v1.rs
index c410a4b5d..cc67cac6c 100644
--- a/server/core/src/https/v1.rs
+++ b/server/core/src/https/v1.rs
@@ -1,17 +1,17 @@
//! The V1 API things!
use axum::extract::{Path, State};
use axum::http::{HeaderMap, HeaderValue};
use axum::middleware::from_fn;
use axum::response::{IntoResponse, Response};
-use axum::routing::{delete, get, post, put};
+use axum::routing::{delete, get, post, put, patch};
use axum::{Extension, Json, Router};
use axum_extra::extract::cookie::{Cookie, CookieJar, SameSite};
use compact_jwt::{Jwk, Jws, JwsSigner};
use kanidm_proto::constants::uri::V1_AUTH_VALID;
use std::net::IpAddr;
use uuid::Uuid;
use kanidm_proto::internal::{
ApiToken, AppLink, CUIntentToken, CURequest, CUSessionToken, CUStatus, CreateRequest,
CredentialStatus, DeleteRequest, IdentifyUserRequest, IdentifyUserResponse, ModifyRequest,
@@ -3120,20 +3120,24 @@ pub(crate) fn route_setup(state: ServerState) -> Router<ServerState> {
)
.route(
"/v1/oauth2/:rs_name/_image",
post(super::v1_oauth2::oauth2_id_image_post)
.delete(super::v1_oauth2::oauth2_id_image_delete),
)
.route(
"/v1/oauth2/:rs_name/_basic_secret",
get(super::v1_oauth2::oauth2_id_get_basic_secret),
)
+ .route(
+ "/v1/oauth2/:rs_name/_basic_secret",
+ patch(super::v1_oauth2::oauth2_id_patch_basic_secret),
+ )
.route(
"/v1/oauth2/:rs_name/_scopemap/:group",
post(super::v1_oauth2::oauth2_id_scopemap_post)
.delete(super::v1_oauth2::oauth2_id_scopemap_delete),
)
.route(
"/v1/oauth2/:rs_name/_sup_scopemap/:group",
post(super::v1_oauth2::oauth2_id_sup_scopemap_post)
.delete(super::v1_oauth2::oauth2_id_sup_scopemap_delete),
)
diff --git a/server/core/src/https/v1_oauth2.rs b/server/core/src/https/v1_oauth2.rs
index d3966a7ad..f89c02c69 100644
--- a/server/core/src/https/v1_oauth2.rs
+++ b/server/core/src/https/v1_oauth2.rs
@@ -144,20 +144,49 @@ pub(crate) async fn oauth2_id_get_basic_secret(
) -> Result<Json<Option<String>>, WebError> {
let filter = oauth2_id(&rs_name);
state
.qe_r_ref
.handle_oauth2_basic_secret_read(client_auth_info, filter, kopid.eventid)
.await
.map(Json::from)
.map_err(WebError::from)
}
+#[utoipa::path(
+ patch,
+ path = "/v1/oauth2/{rs_name}/_basic_secret",
+ request_body=ProtoEntry,
+ responses(
+ DefaultApiResponse,
+ ),
+ security(("token_jwt" = [])),
+ tag = "v1/oauth2",
+ operation_id = "oauth2_id_patch_basic_secret"
+)]
+/// Overwrite the basic secret for a given OAuth2 Resource Server.
+#[instrument(level = "info", skip(state, new_secret))]
+pub(crate) async fn oauth2_id_patch_basic_secret(
+ State(state): State<ServerState>,
+ Extension(kopid): Extension<KOpId>,
+ VerifiedClientInformation(client_auth_info): VerifiedClientInformation,
+ Path(rs_name): Path<String>,
+ Json(new_secret): Json<String>,
+) -> Result<Json<()>, WebError> {
+ let filter = oauth2_id(&rs_name);
+ state
+ .qe_w_ref
+ .handle_oauth2_basic_secret_write(client_auth_info, filter, new_secret, kopid.eventid)
+ .await
+ .map(Json::from)
+ .map_err(WebError::from)
+}
+
#[utoipa::path(
patch,
path = "/v1/oauth2/{rs_name}",
request_body=ProtoEntry,
responses(
DefaultApiResponse,
),
security(("token_jwt" = [])),
tag = "v1/oauth2",
operation_id = "oauth2_id_patch"
diff --git a/server/lib/src/constants/acp.rs b/server/lib/src/constants/acp.rs
index be1836345..ebf4445be 100644
--- a/server/lib/src/constants/acp.rs
+++ b/server/lib/src/constants/acp.rs
@@ -658,36 +658,38 @@ lazy_static! {
Attribute::Image,
],
modify_present_attrs: vec![
Attribute::Description,
Attribute::DisplayName,
Attribute::OAuth2RsName,
Attribute::OAuth2RsOrigin,
Attribute::OAuth2RsOriginLanding,
Attribute::OAuth2RsSupScopeMap,
Attribute::OAuth2RsScopeMap,
+ Attribute::OAuth2RsBasicSecret,
Attribute::OAuth2AllowInsecureClientDisablePkce,
Attribute::OAuth2JwtLegacyCryptoEnable,
Attribute::OAuth2PreferShortUsername,
Attribute::OAuth2AllowLocalhostRedirect,
Attribute::OAuth2RsClaimMap,
Attribute::Image,
],
create_attrs: vec![
Attribute::Class,
Attribute::Description,
Attribute::DisplayName,
Attribute::OAuth2RsName,
Attribute::OAuth2RsOrigin,
Attribute::OAuth2RsOriginLanding,
Attribute::OAuth2RsSupScopeMap,
Attribute::OAuth2RsScopeMap,
+ Attribute::OAuth2RsBasicSecret,
Attribute::OAuth2AllowInsecureClientDisablePkce,
Attribute::OAuth2JwtLegacyCryptoEnable,
Attribute::OAuth2PreferShortUsername,
Attribute::OAuth2AllowLocalhostRedirect,
Attribute::OAuth2RsClaimMap,
Attribute::Image,
],
create_classes: vec![
EntryClass::Object,
EntryClass::OAuth2ResourceServer,
@@ -759,37 +761,39 @@ lazy_static! {
Attribute::Image,
],
modify_present_attrs: vec![
Attribute::Description,
Attribute::DisplayName,
Attribute::Name,
Attribute::OAuth2RsOrigin,
Attribute::OAuth2RsOriginLanding,
Attribute::OAuth2RsSupScopeMap,
Attribute::OAuth2RsScopeMap,
+ Attribute::OAuth2RsBasicSecret,
Attribute::OAuth2AllowInsecureClientDisablePkce,
Attribute::OAuth2JwtLegacyCryptoEnable,
Attribute::OAuth2PreferShortUsername,
Attribute::OAuth2AllowLocalhostRedirect,
Attribute::OAuth2RsClaimMap,
Attribute::Image,
],
create_attrs: vec![
Attribute::Class,
Attribute::Description,
Attribute::Name,
Attribute::DisplayName,
Attribute::OAuth2RsName,
Attribute::OAuth2RsOrigin,
Attribute::OAuth2RsOriginLanding,
Attribute::OAuth2RsSupScopeMap,
Attribute::OAuth2RsScopeMap,
+ Attribute::OAuth2RsBasicSecret,
Attribute::OAuth2AllowInsecureClientDisablePkce,
Attribute::OAuth2JwtLegacyCryptoEnable,
Attribute::OAuth2PreferShortUsername,
Attribute::OAuth2AllowLocalhostRedirect,
Attribute::OAuth2RsClaimMap,
Attribute::Image,
],
create_classes: vec![
EntryClass::Object,
EntryClass::Account,
@@ -864,38 +868,40 @@ lazy_static! {
Attribute::OAuth2StrictRedirectUri,
],
modify_present_attrs: vec![
Attribute::Description,
Attribute::DisplayName,
Attribute::Name,
Attribute::OAuth2RsOrigin,
Attribute::OAuth2RsOriginLanding,
Attribute::OAuth2RsSupScopeMap,
Attribute::OAuth2RsScopeMap,
+ Attribute::OAuth2RsBasicSecret,
Attribute::OAuth2AllowInsecureClientDisablePkce,
Attribute::OAuth2JwtLegacyCryptoEnable,
Attribute::OAuth2PreferShortUsername,
Attribute::OAuth2AllowLocalhostRedirect,
Attribute::OAuth2RsClaimMap,
Attribute::Image,
Attribute::OAuth2StrictRedirectUri,
],
create_attrs: vec![
Attribute::Class,
Attribute::Description,
Attribute::Name,
Attribute::DisplayName,
Attribute::OAuth2RsName,
Attribute::OAuth2RsOrigin,
Attribute::OAuth2RsOriginLanding,
Attribute::OAuth2RsSupScopeMap,
Attribute::OAuth2RsScopeMap,
+ Attribute::OAuth2RsBasicSecret,
Attribute::OAuth2AllowInsecureClientDisablePkce,
Attribute::OAuth2JwtLegacyCryptoEnable,
Attribute::OAuth2PreferShortUsername,
Attribute::OAuth2AllowLocalhostRedirect,
Attribute::OAuth2RsClaimMap,
Attribute::Image,
Attribute::OAuth2StrictRedirectUri,
],
create_classes: vec![
EntryClass::Object,
--
2.46.1
pkgs/by-name/ka/kanidm/patches/1_5/recover-account.patch
+173
View File
@@ -0,0 +1,173 @@
From c8ed69efe3f702b19834c2659be1dd3ec2d41c17 Mon Sep 17 00:00:00 2001
From: oddlama <oddlama@oddlama.org>
Date: Fri, 1 Nov 2024 12:27:43 +0100
Subject: [PATCH 2/2] recover account
---
server/core/src/actors/internal.rs | 3 ++-
server/core/src/admin.rs | 6 +++---
server/daemon/src/main.rs | 14 +++++++++++++-
server/daemon/src/opt.rs | 4 ++++
4 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/server/core/src/actors/internal.rs b/server/core/src/actors/internal.rs
index 420e72c6c..5c4353116 100644
--- a/server/core/src/actors/internal.rs
+++ b/server/core/src/actors/internal.rs
@@ -171,25 +171,26 @@ impl QueryServerWriteV1 {
}
#[instrument(
level = "info",
skip(self, eventid),
fields(uuid = ?eventid)
)]
pub(crate) async fn handle_admin_recover_account(
&self,
name: String,
+ password: Option<String>,
eventid: Uuid,
) -> Result<String, OperationError> {
let ct = duration_from_epoch_now();
let mut idms_prox_write = self.idms.proxy_write(ct).await?;
- let pw = idms_prox_write.recover_account(name.as_str(), None)?;
+ let pw = idms_prox_write.recover_account(name.as_str(), password.as_deref())?;
idms_prox_write.commit().map(|()| pw)
}
#[instrument(
level = "info",
skip_all,
fields(uuid = ?eventid)
)]
pub(crate) async fn handle_domain_raise(&self, eventid: Uuid) -> Result<u32, OperationError> {
diff --git a/server/core/src/admin.rs b/server/core/src/admin.rs
index 90ccb1927..85e31ddef 100644
--- a/server/core/src/admin.rs
+++ b/server/core/src/admin.rs
@@ -17,21 +17,21 @@ use tokio_util::codec::{Decoder, Encoder, Framed};
use tracing::{span, Instrument, Level};
use uuid::Uuid;
pub use kanidm_proto::internal::{
DomainInfo as ProtoDomainInfo, DomainUpgradeCheckReport as ProtoDomainUpgradeCheckReport,
DomainUpgradeCheckStatus as ProtoDomainUpgradeCheckStatus,
};
#[derive(Serialize, Deserialize, Debug)]
pub enum AdminTaskRequest {
- RecoverAccount { name: String },
+ RecoverAccount { name: String, password: Option<String> },
ShowReplicationCertificate,
RenewReplicationCertificate,
RefreshReplicationConsumer,
DomainShow,
DomainUpgradeCheck,
DomainRaise,
DomainRemigrate { level: Option<u32> },
}
#[derive(Serialize, Deserialize, Debug)]
@@ -302,22 +302,22 @@ async fn handle_client(
let mut reqs = Framed::new(sock, ServerCodec);
trace!("Waiting for requests ...");
while let Some(Ok(req)) = reqs.next().await {
// Setup the logging span
let eventid = Uuid::new_v4();
let nspan = span!(Level::INFO, "handle_admin_client_request", uuid = ?eventid);
let resp = async {
match req {
- AdminTaskRequest::RecoverAccount { name } => {
- match server_rw.handle_admin_recover_account(name, eventid).await {
+ AdminTaskRequest::RecoverAccount { name, password } => {
+ match server_rw.handle_admin_recover_account(name, password, eventid).await {
Ok(password) => AdminTaskResponse::RecoverAccount { password },
Err(e) => {
error!(err = ?e, "error during recover-account");
AdminTaskResponse::Error
}
}
}
AdminTaskRequest::ShowReplicationCertificate => match repl_ctrl_tx.as_mut() {
Some(ctrl_tx) => show_replication_certificate(ctrl_tx).await,
None => {
diff --git a/server/daemon/src/main.rs b/server/daemon/src/main.rs
index 7486d34a8..784106352 100644
--- a/server/daemon/src/main.rs
+++ b/server/daemon/src/main.rs
@@ -903,27 +903,39 @@ async fn kanidm_main(
} else {
let output_mode: ConsoleOutputMode = commonopts.output_mode.to_owned().into();
submit_admin_req(
config.adminbindpath.as_str(),
AdminTaskRequest::RefreshReplicationConsumer,
output_mode,
)
.await;
}
}
- KanidmdOpt::RecoverAccount { name, commonopts } => {
+ KanidmdOpt::RecoverAccount { name, from_environment, commonopts } => {
info!("Running account recovery ...");
let output_mode: ConsoleOutputMode = commonopts.output_mode.to_owned().into();
+ let password = if *from_environment {
+ match std::env::var("KANIDM_RECOVER_ACCOUNT_PASSWORD") {
+ Ok(val) => Some(val),
+ _ => {
+ error!("Environment variable KANIDM_RECOVER_ACCOUNT_PASSWORD not set");
+ return ExitCode::FAILURE;
+ }
+ }
+ } else {
+ None
+ };
submit_admin_req(
config.adminbindpath.as_str(),
AdminTaskRequest::RecoverAccount {
name: name.to_owned(),
+ password,
},
output_mode,
)
.await;
}
KanidmdOpt::Database {
commands: DbCommands::Reindex(_copt),
} => {
info!("Running in reindex mode ...");
reindex_server_core(&config).await;
diff --git a/server/daemon/src/opt.rs b/server/daemon/src/opt.rs
index f1b45a5b3..9c013e32e 100644
--- a/server/daemon/src/opt.rs
+++ b/server/daemon/src/opt.rs
@@ -229,20 +229,24 @@ enum KanidmdOpt {
/// Create a self-signed ca and tls certificate in the locations listed from the
/// configuration. These certificates should *not* be used in production, they
/// are for testing and evaluation only!
CertGenerate(CommonOpt),
#[clap(name = "recover-account")]
/// Recover an account's password
RecoverAccount {
#[clap(value_parser)]
/// The account name to recover credentials for.
name: String,
+ /// Use the password given in the environment variable
+ /// `KANIDM_RECOVER_ACCOUNT_PASSWORD` instead of generating one.
+ #[clap(long = "from-environment")]
+ from_environment: bool,
#[clap(flatten)]
commonopts: CommonOpt,
},
/// Display this server's replication certificate
ShowReplicationCertificate {
#[clap(flatten)]
commonopts: CommonOpt,
},
/// Renew this server's replication certificate
RenewReplicationCertificate {
--
2.46.1
pkgs/by-name/ke/keycloak/package.nix
+2 -2
View File
@@ -24,11 +24,11 @@ let
in
stdenv.mkDerivation rec {
pname = "keycloak";
version = "26.1.1";
version = "26.1.2";
src = fetchzip {
url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip";
hash = "sha256-glBfG/j9J3ZjTTmMrNIbJhHUUIOV0Kardc5P3ohT98Y=";
hash = "sha256-U9g3SIh6qAQBWqIUfv1GQRqmRVzNImwCHAzfQFEFNOk=";
};
nativeBuildInputs = [
pkgs/by-name/ma/martian-mono/package.nix
+2 -2
View File
@@ -6,11 +6,11 @@
stdenvNoCC.mkDerivation rec {
pname = "martian-mono";
version = "1.0.0";
version = "1.1.0";
src = fetchzip {
url = "https://github.com/evilmartians/mono/releases/download/v${version}/martian-mono-${version}-otf.zip";
sha256 = "sha256-hC08IHWqg+x3qoEf4EL98ZbGeqdwjnMpDovEiWrWPpI=";
sha256 = "sha256-L+T9XxTH7+yFJwhZ8UXAlq3rAkPFn/8dRBoGfbiHuGA=";
stripRoot = false;
};
pkgs/by-name/ms/msnake/package.nix
+37
View File
@@ -0,0 +1,37 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
ncurses,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "msnake";
# last release tag was 13 years ago
version = "0.1.1-unstable-2020-02-01";
src = fetchFromGitHub {
owner = "mogria";
repo = "msnake";
rev = "830967fc8195216120fedcac1574113b367a0f9a";
hash = "sha256-5q3yT7amPF+SSvO6/eUU7IiK0k6f3nme9YYBUobSuuo=";
};
nativeBuildInputs = [
cmake
];
buildInputs = [
ncurses
];
meta = {
description = "Multiplatform command line snake game";
homepage = "https://github.com/mogria/msnake";
license = lib.licenses.mit;
platforms = lib.platforms.unix;
mainProgram = "msnake";
maintainers = with lib.maintainers; [ ethancedwards8 ];
};
})
pkgs/by-name/nd/ndpi/package.nix
+2 -2
View File
@@ -12,13 +12,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ndpi";
version = "4.12";
version = "4.10";
src = fetchFromGitHub {
owner = "ntop";
repo = "nDPI";
tag = finalAttrs.version;
hash = "sha256-jdyKvM/Tb9pRWQPxpB/UQOOKamWrTS24Ofc3M5M1Zso=";
hash = "sha256-iXqvDMJsOXcg9YkqKFgInLLfH6j/HEp4bEaIl6dpVtc=";
};
nativeBuildInputs = [
pkgs/by-name/nk/nkeys/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "nkeys";
version = "0.4.9";
version = "0.4.10";
src = fetchFromGitHub {
owner = "nats-io";
repo = pname;
tag = "v${version}";
hash = "sha256-5HmtCzY2EmlnBqg36JcjaaM2ivrM5f719bkWqpxekVI=";
hash = "sha256-vSjIqeGWS9sDGyrPD11u4ngiZrW6gZfYd08kKXUDXdU=";
};
vendorHash = "sha256-AJrfHMNjuGO8LbuP4cAVClKWHkqkG+nPzQw+B+nRpxM=";
vendorHash = "sha256-TtplWIDLUsFXhT5OQVhW3KTfxh1MVY8Hssejy8GBYVQ=";
meta = with lib; {
description = "Public-key signature system for NATS";
pkgs/by-name/nt/ntopng/package.nix
+10
View File
@@ -81,6 +81,16 @@ stdenv.mkDerivation (finalAttrs: {
-i include/ntop_defines.h
'';
# Upstream build system makes
# $out/share/ntopng/httpdocs/geoip/README.geolocation.md a dangling symlink
# to ../../doc/README.geolocation.md. Copying the whole doc/ tree adds over
# 70 MiB to the output size, so only copy the files we need for now.
# (Ref. noBrokenSymlinks.)
postInstall = ''
mkdir -p "$out/share/ntopng/doc"
cp -r doc/README.geolocation.md "$out/share/ntopng/doc/"
'';
enableParallelBuilding = true;
meta = with lib; {
pkgs/by-name/or/orchard/package.nix
+3 -3
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "orchard";
version = "0.26.4";
version = "0.27.1";
src = fetchFromGitHub {
owner = "cirruslabs";
repo = pname;
rev = version;
hash = "sha256-XA4cu7Jou5kGYovGgIpRvpMFBSha0d8sk4WMbp7GpGc=";
hash = "sha256-2FaB+f2aXEDfqa50EkBo6GN6mStrBnij9+cpLXWIKIg=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@@ -24,7 +24,7 @@ buildGoModule rec {
'';
};
vendorHash = "sha256-R4KsR00VAq0fUxHM48212GWy8KJoIOM0R8ycVjjjMO4=";
vendorHash = "sha256-J0gCkH7B4JxZBQkr1cUvXWuaz7QDQhKPNARZtxq3uDw=";
nativeBuildInputs = [ installShellFiles ];
pkgs/by-name/pa/patch2pr/package.nix
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "patch2pr";
version = "0.31.0";
version = "0.32.0";
src = fetchFromGitHub {
owner = "bluekeyes";
repo = "patch2pr";
rev = "v${version}";
hash = "sha256-DiPgfpXXp8uB3PTjtSIN+1eKLBqy0AcNVQDnBmHM2u4=";
hash = "sha256-WYNvHwikY6ULEar2ZBvsALEgHuZarrwBjk3ZaGhvlk8=";
};
vendorHash = "sha256-nn/jCMLw77KOegcEOLCdZVc9wcmrMnVkEkmSUkNan2s=";
vendorHash = "sha256-Y7WpJ6h76+5BJonmDldXYzUxLH6YYl9zlitoqX3H/mk=";
ldflags = [
"-X main.version=${version}"
pkgs/by-name/pi/pik/package.nix
+3 -3
View File
@@ -8,17 +8,17 @@
rustPlatform.buildRustPackage rec {
pname = "pik";
version = "0.15.0";
version = "0.16.0";
src = fetchFromGitHub {
owner = "jacek-kurlit";
repo = "pik";
rev = version;
hash = "sha256-iXLAV4VWJczdxrfevxaRxYTAL+d/VRQ61zc0B4UNbPM=";
hash = "sha256-L5r8ds5Avh6WqiYYg/0hVDjdp/TBGgCZgKnJoDzs7Rw=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-nTx44lQFd1GSVNyCtiShml4+ho4k+o0m8zmMV9xLVSs=";
cargoHash = "sha256-d2I4RDo/U+69WwXjxHRsRNUxY2ymxzHqObR6X68xXRo=";
passthru.tests.version = testers.testVersion { package = pik; };
pkgs/by-name/pr/probe-rs-tools/package.nix
+3 -3
View File
@@ -10,17 +10,17 @@
rustPlatform.buildRustPackage rec {
pname = "probe-rs-tools";
version = "0.26.0";
version = "0.27.0";
src = fetchFromGitHub {
owner = "probe-rs";
repo = "probe-rs";
tag = "v${version}";
hash = "sha256-cVRa5idgAi6UoQkEFvhFd27Mp9AVkfzEuGnWrThm9+Q=";
hash = "sha256-xtUaGJyzr0uQUb/A+7RmOVVgrXIctr2I9gLPU2/rXso=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-HTYpSm6Q/ZLQRxD1a9Xky3tFOadp8iJnPXAhwjcxfnM=";
cargoHash = "sha256-acGLTbWI0SHspFISWw5Lj+sqn5HE4du5jTC3NS5zzh8=";
buildAndTestSubdir = pname;
pkgs/by-name/ra/rapidfuzz-cpp/package.nix
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "rapidfuzz-cpp";
version = "3.3.1";
version = "3.3.2";
src = fetchFromGitHub {
owner = "rapidfuzz";
repo = "rapidfuzz-cpp";
rev = "v${finalAttrs.version}";
hash = "sha256-m8VSqvKF7oRZeVJHRebPePc9iOreXhdmV2rAtB3frKI=";
hash = "sha256-AuH0Vq0Le5T9vDCpEviEjfNpwJFnFtqj/taFJy+YoMY=";
};
nativeBuildInputs = [
pkgs/by-name/re/reposilite/package.nix
+2 -2
View File
@@ -17,11 +17,11 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "Reposilite";
version = "3.5.20";
version = "3.5.21";
src = fetchurl {
url = "https://maven.reposilite.com/releases/com/reposilite/reposilite/${finalAttrs.version}/reposilite-${finalAttrs.version}-all.jar";
hash = "sha256-IdUHtulkSKvXatAs+BmzXgwv9oJz1XeRVtpEyIZ7BY4=";
hash = "sha256-jE9wCShscLp3rUbybd35kBL4UvvENExuUlJXr55qnow=";
};
dontUnpack = true;
pkgs/by-name/re/reposilite/plugins.nix
+5 -5
View File
@@ -40,10 +40,10 @@ makeScopeWithSplicing' {
) { };
}
// builtins.mapAttrs (name: hash: self.fetchPlugin { inherit name hash; }) {
checksum = "sha256-k9JWyDj7wMB8kLihqR7gB5N//NKxTrDWoFQ4Jt422I0=";
groovy = "sha256-iwlLMHh9A6WIHYo4sN2TIISif9pWbe6i1Hofd4D3BsI=";
migration = "sha256-0p4DQeaCH/i2e8MESPIbOgaSPF0pHIbs1rXiZcSCJso=";
prometheus = "sha256-bCJvTQPXW3mydOqz5Tug6MyIEonrRiJ9NkIYy9OviDc=";
swagger = "sha256-akKRMibzA4UtGpwcHvmjXKPLzpA2pcGPpaBkDsdvcK0=";
checksum = "sha256-s7GADQqFsoEDM2vtJFE/C/F5jGyQeYlT3BntvHS4DtQ=";
groovy = "sha256-8HWMqZZNIqCBpkMuCjKxqTLcQ2dYaOAAYON9QrXYEyo=";
migration = "sha256-Xv0+RsXZzyGV/4v0IT3hfNANiC1OWVYFoTZHDxduKh0=";
prometheus = "sha256-F5fSUo6wt7L3R/xCike0SlfG3CyxHKrlrg+SNrUYtm4=";
swagger = "sha256-wyXKrYBhigHVtxq/RZiJhnigc3Z/UCbYotrF6VLLTGA=";
};
}
pkgs/by-name/ro/roadrunner/package.nix
+3 -3
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "roadrunner";
version = "2024.3.2";
version = "2024.3.3";
src = fetchFromGitHub {
repo = "roadrunner";
owner = "roadrunner-server";
tag = "v${version}";
hash = "sha256-KkwJ/977PHp8mKMJYDohRCi4PY9Q/LsRvsIBMyElZKc=";
hash = "sha256-5AB+fGyQa5+/fGqqNSYu0KnFbIZwL/ZjXyYHYk00cV8=";
};
nativeBuildInputs = [
@@ -46,7 +46,7 @@ buildGoModule rec {
--replace "127.0.0.1:0" "127.0.0.1:55554"
'';
vendorHash = "sha256-vvO67zi3Zod7Kf/yEXlk9aSRpLPzf+kWmNnDFaGdCzA=";
vendorHash = "sha256-BsIZxeSTz7wv4VJKffpOACXo7dm/qwZ/MYbmNogtMvg=";
meta = {
changelog = "https://github.com/roadrunner-server/roadrunner/blob/v${version}/CHANGELOG.md";
pkgs/by-name/ro/rockcraft/package.nix
+2 -2
View File
@@ -11,13 +11,13 @@
python3Packages.buildPythonApplication rec {
pname = "rockcraft";
version = "1.7.0";
version = "1.8.0";
src = fetchFromGitHub {
owner = "canonical";
repo = "rockcraft";
rev = version;
hash = "sha256-2Bo3qtpSSfNvqszlt9cCc9/rurDNDMySAaqLbvRmjjw=";
hash = "sha256-v7biDGgJoQO6cKRXG8xosCgd/mlOUEwHrqcgtL2R5L4=";
};
pyproject = true;
pkgs/by-name/rs/rshim-user-space/package.nix
+5 -3
View File
@@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "rshim-user-space";
version = "2.1.5";
version = "2.2.4";
src = fetchFromGitHub {
owner = "Mellanox";
repo = pname;
rev = "rshim-${version}";
hash = "sha256-moU6XxBVSAZiiR/usFfxse2CHk6+003Jb9t62szk1fk=";
hash = "sha256-z0Uk520vsBERbeVtxBqXPXSWhO0sLD5GCQy1dQsJdEg=";
};
nativeBuildInputs = [
@@ -76,6 +76,8 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/Mellanox/rshim-user-space";
license = licenses.gpl2Only;
platforms = platforms.linux;
maintainers = with maintainers; [ nikstur ];
maintainers = with maintainers; [
thillux
];
};
}
pkgs/by-name/sa/sasquatch/package.nix
+2 -2
View File
@@ -14,13 +14,13 @@
let
drv = stdenv.mkDerivation (finalAttrs: {
pname = "sasquatch";
version = "4.5.1-4";
version = "4.5.1-5";
src = fetchFromGitHub {
owner = "onekey-sec";
repo = "sasquatch";
rev = "sasquatch-v${finalAttrs.version}";
hash = "sha256-0itva+j5WMKvueiUaO253UQ1S6W29xgtFvV4i3yvMtU=";
hash = "sha256-4Mltt0yFt4oh9hsrHL8/ch5n7nZYiXIJ1UgLktPvlKQ=";
};
patches = lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch;
pkgs/by-name/se/searxng/package.nix
+37 -8
View File
@@ -4,17 +4,46 @@
fetchFromGitHub,
nixosTests,
}:
let
python = python3.override {
packageOverrides = final: prev: {
httpx = prev.httpx.overridePythonAttrs (old: rec {
version = "0.27.2";
src = old.src.override {
tag = version;
hash = "sha256-N0ztVA/KMui9kKIovmOfNTwwrdvSimmNkSvvC+3gpck=";
};
});
python3.pkgs.toPythonModule (
python3.pkgs.buildPythonApplication rec {
httpx-socks = prev.httpx-socks.overridePythonAttrs (old: rec {
version = "0.9.2";
src = old.src.override {
tag = "v${version}";
hash = "sha256-PUiciSuDCO4r49st6ye5xPLCyvYMKfZY+yHAkp5j3ZI=";
};
});
starlette = prev.starlette.overridePythonAttrs (old: {
disabledTests = old.disabledTests or [ ] ++ [
# fails in assertion with spacing issue
"test_request_body"
"test_request_stream"
"test_wsgi_post"
];
});
};
};
in
python.pkgs.toPythonModule (
python.pkgs.buildPythonApplication rec {
pname = "searxng";
version = "0-unstable-2025-01-10";
version = "0-unstable-2025-02-09";
src = fetchFromGitHub {
owner = "searxng";
repo = "searxng";
rev = "94a0b415ef587e013df9e7350667b752a3822e90";
hash = "sha256-ZeFHsoQXmG2sZXhPY7aRTsAXmFGHNT5ig0c2Hy344vw=";
rev = "a1e2b254677a22f1f8968a06564661ac6203c162";
hash = "sha256-DrSj1wQUWq9xVuQqt0BZ79JgyRS9qJqg1cdYTIBb1A8=";
};
postPatch = ''
@@ -41,7 +70,7 @@ python3.pkgs.toPythonModule (
'';
dependencies =
with python3.pkgs;
with python.pkgs;
[
babel
brotli
@@ -73,10 +102,10 @@ python3.pkgs.toPythonModule (
postInstall = ''
# Create a symlink for easier access to static data
mkdir -p $out/share
ln -s ../${python3.sitePackages}/searx/static $out/share/
ln -s ../${python.sitePackages}/searx/static $out/share/
# copy config schema for the limiter
cp searx/limiter.toml $out/${python3.sitePackages}/searx/limiter.toml
cp searx/limiter.toml $out/${python.sitePackages}/searx/limiter.toml
'';
passthru = {
pkgs/by-name/si/sing-box/package.nix
+3 -3
View File
@@ -12,16 +12,16 @@
buildGoModule rec {
pname = "sing-box";
version = "1.11.1";
version = "1.11.3";
src = fetchFromGitHub {
owner = "SagerNet";
repo = pname;
rev = "v${version}";
hash = "sha256-W/b3pAyeTQiBZ5T8u74JITlAfJ5fmWn8DUUTw9tAZTk=";
hash = "sha256-TaCz3IS+t4v7p/gT19DCP5ARM3nvFqDPGtMv/Vvwmtk=";
};
vendorHash = "sha256-NWHDEN7aQWR3DXp9nFNhxDXFMeBsCk8/ZzCcT/zgwmI=";
vendorHash = "sha256-Ix4Pzq+yGfaJNPJnhLGgcCzZ85hGjSU24NffMR3ZSxQ=";
tags = [
"with_quic"
pkgs/by-name/sl/slirp4netns/package.nix
+2 -2
View File
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "slirp4netns";
version = "1.3.1";
version = "1.3.2";
src = fetchFromGitHub {
owner = "rootless-containers";
repo = "slirp4netns";
rev = "v${version}";
sha256 = "sha256-dXz5gNALrVjaFGUgEFp0k47c7aWDzwLMflphe6R6GaM=";
sha256 = "sha256-1OiomraQ4wfrBPihGrf9sq8hPJUB45gvf7Y5j7iN8/E=";
};
nativeBuildInputs = [
pkgs/by-name/sl/slskd/package.nix
+2 -2
View File
@@ -19,13 +19,13 @@ let
in
buildDotnetModule rec {
pname = "slskd";
version = "0.22.1";
version = "0.22.2";
src = fetchFromGitHub {
owner = "slskd";
repo = "slskd";
tag = version;
hash = "sha256-2IMEkNc7LqevTwsW6r6WR+2xH760wFYT5/S8dvjOz4o=";
hash = "sha256-Arf/QOq0wYely+CYwb4sJXsxB2BbEHZ2bUNyqeGbFdg=";
};
nativeBuildInputs = [
pkgs/by-name/sn/snapcraft/os-platform.patch
-13
View File
@@ -1,13 +0,0 @@
diff --git a/snapcraft/utils.py b/snapcraft/utils.py
index 999a64ec..4f38b4cd 100644
--- a/snapcraft/utils.py
+++ b/snapcraft/utils.py
@@ -94,7 +94,7 @@ def get_os_platform(
release = platform.release()
machine = platform.machine()
- if system == "Linux":
+ if system == "Linux" and "NixOS" not in platform.version():
try:
with filepath.open("rt", encoding="utf-8") as release_file:
lines = release_file.readlines()
pkgs/by-name/sn/snapcraft/package.nix
+3 -7
View File
@@ -13,7 +13,7 @@
python3Packages.buildPythonApplication rec {
pname = "snapcraft";
version = "8.5.1";
version = "8.6.1";
pyproject = true;
@@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
owner = "canonical";
repo = "snapcraft";
tag = version;
hash = "sha256-7kIVWbVj5qse3JIdlCvRtVUfSa/rSjn4e8HJdVY3sOA=";
hash = "sha256-SbxsgvDptkUl8gHAIrJvnzIPOh0/R81n8cgJWBH7BXQ=";
};
patches = [
@@ -29,11 +29,6 @@ python3Packages.buildPythonApplication rec {
# path for LXD must be adjusted so that it's at the correct location for LXD
# on NixOS. This patch will likely never be accepted upstream.
./lxd-socket-path.patch
# In certain places, Snapcraft expects an /etc/os-release file to determine
# host info which doesn't exist in our test environment. This is a
# relatively naive patch which helps the test suite pass - without it *many*
# of the tests fail. This patch will likely never be accepted upstream.
./os-platform.patch
# Snapcraft will try to inject itself as a snap *from the host system* into
# the build system. This patch short-circuits that logic and ensures that
# Snapcraft is installed on the build system from the snap store - because
@@ -118,6 +113,7 @@ python3Packages.buildPythonApplication rec {
build-system = with python3Packages; [ setuptools ];
pythonRelaxDeps = [
"craft-parts"
"docutils"
"jsonschema"
"pygit2"
pkgs/by-name/te/telegraf/package.nix
+3 -3
View File
@@ -10,7 +10,7 @@
buildGoModule rec {
pname = "telegraf";
version = "1.33.1";
version = "1.33.2";
subPackages = [ "cmd/telegraf" ];
@@ -18,10 +18,10 @@ buildGoModule rec {
owner = "influxdata";
repo = "telegraf";
rev = "v${version}";
hash = "sha256-35L83l1aa7TDis0bZss4xBrciK1QEofkKY04JInmRmo=";
hash = "sha256-DOsjECXi2OEhSFd+eDXGN0kIZgZdpng6hkNMh6cOQ88=";
};
vendorHash = "sha256-JGG+IIYC0JKjetkrgTS6gwhk0/ehvSIxZi6ts234Gi4=";
vendorHash = "sha256-6valHYL2A4+rw1oMw4APT05O9gmj3+zUJQf226GDBaw=";
proxyVendor = true;
ldflags = [
pkgs/by-name/tp/tpnote/package.nix
+3 -3
View File
@@ -14,17 +14,17 @@
rustPlatform.buildRustPackage rec {
pname = "tpnote";
version = "1.25.1";
version = "1.25.2";
src = fetchFromGitHub {
owner = "getreu";
repo = "tp-note";
rev = "v${version}";
hash = "sha256-TT34+r4f3TaurLwyXxQa5AZT1xPOKkDYPra/bgchoTc=";
hash = "sha256-8AUPNjrT4/Vu8ykTHuDSdnCteih3i61CrfRBfPMwCfY=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-1uqUB+65sMjjp4LJbvHehg9hMcrjun3/1cEmPPnrx3Y=";
cargoHash = "sha256-+qtphGkypyVY8SZsEmejikhnu18WIuvABlYGNA3GDUw=";
nativeBuildInputs = [
cmake
pkgs/by-name/uv/uv/package.nix
+3 -3
View File
@@ -17,17 +17,17 @@
rustPlatform.buildRustPackage rec {
pname = "uv";
version = "0.5.29";
version = "0.5.30";
src = fetchFromGitHub {
owner = "astral-sh";
repo = "uv";
tag = version;
hash = "sha256-EWm1sjmDAmMQoGoRqgtFMlXwi8n/iCdahsoRERhhulc=";
hash = "sha256-a56y7sf2Os5ygTSu+iNZFjWwKi3HQ9VKo7p7e6LXmUc=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-gBygAspjCzZqDnjHH4J1WUsrIjpiB55Vr33qj1nv+FM=";
cargoHash = "sha256-rodzLpaCuokvHWvwXLB2qgPnDJaP+Qff1T4LfNCQsYM=";
nativeBuildInputs = [
cmake
pkgs/by-name/va/vale/package.nix
+3 -3
View File
@@ -11,7 +11,7 @@
buildGoModule rec {
pname = "vale";
version = "3.9.4";
version = "3.9.5";
subPackages = [ "cmd/vale" ];
@@ -19,10 +19,10 @@ buildGoModule rec {
owner = "errata-ai";
repo = "vale";
rev = "v${version}";
hash = "sha256-F677sYL49U7egbseDdcWtMRomMkZV7NBeOvEKmz2LwE=";
hash = "sha256-l8B2nhMJ6C9Oattp6PYKEzG4ZpAiw0flkTMTE6CPMYU=";
};
vendorHash = "sha256-zjJICe3T3fmyqf3HJbUOaOXOb2GdhAufSFiJTjxauZY=";
vendorHash = "sha256-ivHOUkX9a4mRsw/ruYr3CzVbAovYMGQI+ExmaB+lP5E=";
ldflags = [
"-s"
pkgs/by-name/vi/vintagestory/package.nix
+1
View File
@@ -100,6 +100,7 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [
artturin
gigglesquid
niraethm
];
};
}
pkgs/by-name/wa/waypaper/package.nix
+2 -3
View File
@@ -9,14 +9,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "waypaper";
version = "2.4";
version = "2.5";
pyproject = true;
src = fetchFromGitHub {
owner = "anufrievroman";
repo = "waypaper";
tag = version;
hash = "sha256-bNh8WWSLgCV8PLFvDn/+AEcNOazxMEKEYv7n+L9ABTA=";
hash = "sha256-g1heJUBVJzRZXcNQCwRcqp6cTUaroKVpcTjG0KldlxU=";
};
nativeBuildInputs = [
@@ -29,7 +29,6 @@ python3.pkgs.buildPythonApplication rec {
dependencies = [
python3.pkgs.pygobject3
python3.pkgs.platformdirs
python3.pkgs.importlib-metadata
python3.pkgs.pillow
python3.pkgs.imageio
python3.pkgs.imageio-ffmpeg
pkgs/by-name/wx/wxsqlite3/package.nix
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "wxsqlite3";
version = "4.10.2";
version = "4.10.3";
src = fetchFromGitHub {
owner = "utelle";
repo = "wxsqlite3";
rev = "v${version}";
hash = "sha256-i9f6rzydsdh5wIkSUp1ZSzH1z08B9S8kpWLdElaAv9M=";
hash = "sha256-XoGysM5Btm9MdeaS2eAOEn7j/Do0+1sqC/tGIkWnkxw=";
};
nativeBuildInputs = [
pkgs/by-name/xe/xeol/package.nix
+2 -3
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "xeol";
version = "0.10.3";
version = "0.10.4";
src = fetchFromGitHub {
owner = "xeol-io";
repo = "xeol";
tag = "v${version}";
hash = "sha256-zpggEl1tyzuxo/EcHMeupEVJ5/ALY51wYrw7eKEaMEw=";
hash = "sha256-zm8PIYWFLEiWuZGt5Fev35d8EYOfzduIXX6SmJZ27o0=";
};
vendorHash = "sha256-hPWjXTxk/jRkzvLYNgVlgj0hjzfikwel1bxSqWquVhk=";
@@ -22,7 +22,6 @@ buildGoModule rec {
subPackages = [ "cmd/xeol/" ];
ldflags = [
"-w"
"-s"
"-X=main.version=${version}"
"-X=main.gitCommit=${src.rev}"
pkgs/by-name/xw/xwayland-satellite/package.nix
+3 -3
View File
@@ -13,13 +13,13 @@
rustPlatform.buildRustPackage rec {
pname = "xwayland-satellite";
version = "0.5";
version = "0.5.1";
src = fetchFromGitHub {
owner = "Supreeeme";
repo = "xwayland-satellite";
tag = "v${version}";
hash = "sha256-nq7bouXQXaaPPo/E+Jbq+wNHnatD4dY8OxSrRqzvy6s=";
hash = "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=";
};
postPatch = ''
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
'';
useFetchCargoVendor = true;
cargoHash = "sha256-1IsKt+OfezILaDklHts74TnS0/FVogu6Ds/7JG+ataY=";
cargoHash = "sha256-1tt7YNornw9U9FRdsRkdWx3Al3FZtvtCBXn9Pln+gk4=";
nativeBuildInputs = [
makeBinaryWrapper
pkgs/by-name/ya/yamlfmt/package.nix
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "yamlfmt";
version = "0.15.0";
version = "0.16.0";
src = fetchFromGitHub {
owner = "google";
repo = "yamlfmt";
tag = "v${version}";
hash = "sha256-eAcHl4h7c3HU901cuqzAPs49qRldxKQDxrWBmccmwos=";
hash = "sha256-4PCwMLwFtCK55k7b6CgpPOKsxLdeU55DxYEDbYDWVYg=";
};
vendorHash = "sha256-za95/Zj8MXJqt9tW6csaRlXFs+5ET/D4CUsCnGqcLQQ=";
vendorHash = "sha256-eOuLgNCxrI2HIFBwLAYRl6PwW/1hihQ0QsTtG1sxCL8=";
ldflags = [
"-s"
pkgs/by-name/ya/yazi-unwrapped/package.nix
+4 -4
View File
@@ -11,21 +11,21 @@
rustPlatform.buildRustPackage rec {
pname = "yazi";
version = "25.2.7";
version = "25.2.11";
src = fetchFromGitHub {
owner = "sxyazi";
repo = "yazi";
rev = "v${version}";
hash = "sha256-f8+C+L8eOugnyx4Zm2y3qAXH33BsI5F1JWecigPKuMg=";
hash = "sha256-yVpSoEmEA+/XF/jlJqKdkj86m8IZLAbrxDxz5ZnmP78=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-7ARj5TNZm//CfkOczqaaoY1KjpXpr5dtSvdUNygpL6U=";
cargoHash = "sha256-AfXi68PNrYj6V6CYIPZT0t2l5KYTYrIzJgrcEPLW8FM=";
env.YAZI_GEN_COMPLETIONS = true;
env.VERGEN_GIT_SHA = "Nixpkgs";
env.VERGEN_BUILD_DATE = "2025-02-07";
env.VERGEN_BUILD_DATE = "2025-02-11";
nativeBuildInputs = [ installShellFiles ];
buildInputs = [ rust-jemalloc-sys ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ];
pkgs/by-name/zs/zsh-abbr/package.nix
+2 -2
View File
@@ -6,13 +6,13 @@
}:
stdenv.mkDerivation rec {
pname = "zsh-abbr";
version = "6.0.1";
version = "6.1.0";
src = fetchFromGitHub {
owner = "olets";
repo = "zsh-abbr";
rev = "v${version}";
hash = "sha256-PWr8o0so2ZfQJkinkLRa4bFxZtw0Lgs7UXVWvd/rWF0";
hash = "sha256-M2HBVC72RA0OUBUz8AaJMEsGMNrRzS2Kz8QLSplxP9o=";
fetchSubmodules = true;
};
pkgs/desktops/expidus/default.nix
+2 -2
View File
@@ -1,10 +1,10 @@
{ callPackage, flutterPackages }:
{
calculator = callPackage ./calculator {
flutter = flutterPackages.v3_19;
flutter = flutterPackages.v3_24;
};
file-manager = callPackage ./file-manager {
flutter = flutterPackages.v3_19;
flutter = flutterPackages.v3_24;
};
}
pkgs/desktops/xfce/core/thunar/default.nix
+2 -2
View File
@@ -26,9 +26,9 @@
let unwrapped = mkXfceDerivation {
category = "xfce";
pname = "thunar";
version = "4.20.1";
version = "4.20.2";
sha256 = "sha256-+Iz9tkP8foEtor1HFBB1/fyMXdLm3mXCoP9j9bug8po=";
sha256 = "sha256-tuINIJ5r1BXAUJxlmLiYe2z3AFGkXqbITJBskSx5D4s=";
nativeBuildInputs = [
docbook_xsl
pkgs/development/compilers/flutter/versions/3_19/data.json
-1002
View File
File diff suppressed because it is too large Load Diff
pkgs/development/compilers/flutter/versions/3_19/engine/patches/flutter-140969.patch
-41
View File
@@ -1,41 +0,0 @@
From dd74740ddceac81e748a7e7834c28135abc59454 Mon Sep 17 00:00:00 2001
From: Brandon DeRosier <bdero@google.com>
Date: Tue, 16 Jan 2024 11:00:34 -0800
Subject: [PATCH] [Flutter GPU] Fix playground shader paths. (#49790)
Resolves https://github.com/flutter/flutter/issues/140969.
Makes the shader paths absolute to prevent issues caused by the working
directory differing across build environments.
---
impeller/fixtures/BUILD.gn | 3 ++-
impeller/tools/impeller.gni | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/impeller/fixtures/BUILD.gn b/impeller/fixtures/BUILD.gn
index 9165f06542a2a..5ea90ab3969f3 100644
--- a/impeller/fixtures/BUILD.gn
+++ b/impeller/fixtures/BUILD.gn
@@ -131,7 +131,8 @@
"flutter_gpu_texture.vert",
]
shader_target_flags = [ "--runtime-stage-metal" ]
- shader_bundle = "{\"UnlitFragment\": {\"type\": \"fragment\", \"file\": \"../../flutter/impeller/fixtures/flutter_gpu_unlit.frag\"}, \"UnlitVertex\": {\"type\": \"vertex\", \"file\": \"../../flutter/impeller/fixtures/flutter_gpu_unlit.vert\"}, \"TextureFragment\": {\"type\": \"fragment\", \"file\": \"../../flutter/impeller/fixtures/flutter_gpu_texture.frag\"}, \"TextureVertex\": {\"type\": \"vertex\", \"file\": \"../../flutter/impeller/fixtures/flutter_gpu_texture.vert\"}}"
+ fixtures = rebase_path("//flutter/impeller/fixtures")
+ shader_bundle = "{\"UnlitFragment\": {\"type\": \"fragment\", \"file\": \"${fixtures}/flutter_gpu_unlit.frag\"}, \"UnlitVertex\": {\"type\": \"vertex\", \"file\": \"${fixtures}/flutter_gpu_unlit.vert\"}, \"TextureFragment\": {\"type\": \"fragment\", \"file\": \"${fixtures}/flutter_gpu_texture.frag\"}, \"TextureVertex\": {\"type\": \"vertex\", \"file\": \"${fixtures}/flutter_gpu_texture.vert\"}}"
shader_bundle_output = "playground.shaderbundle"
}
diff --git a/impeller/tools/impeller.gni b/impeller/tools/impeller.gni
index 6541c3b12173b..2ab7ec0f0b07a 100644
--- a/impeller/tools/impeller.gni
+++ b/impeller/tools/impeller.gni
@@ -313,7 +313,7 @@
if (defined(invoker.shader_bundle)) {
assert(
defined(invoker.shader_bundle_output),
- "When shader_bundle is specified, shader_output_bundle must also be specified.")
+ "When shader_bundle is specified, shader_bundle_output must also be specified.")
}
sksl = false
pkgs/development/compilers/flutter/versions/3_19/patches/deregister-pub-dependencies-artifact.patch
-19
View File
@@ -1,19 +0,0 @@
diff --git a/packages/flutter_tools/lib/src/flutter_cache.dart b/packages/flutter_tools/lib/src/flutter_cache.dart
index 252021cf78..e50ef0885d 100644
--- a/packages/flutter_tools/lib/src/flutter_cache.dart
+++ b/packages/flutter_tools/lib/src/flutter_cache.dart
@@ -51,14 +51,6 @@ class FlutterCache extends Cache {
registerArtifact(IosUsbArtifacts(artifactName, this, platform: platform));
}
registerArtifact(FontSubsetArtifacts(this, platform: platform));
- registerArtifact(PubDependencies(
- logger: logger,
- // flutter root and pub must be lazily initialized to avoid accessing
- // before the version is determined.
- flutterRoot: () => Cache.flutterRoot!,
- pub: () => pub,
- projectFactory: projectFactory,
- ));
}
}
pkgs/development/compilers/flutter/versions/3_19/patches/disable-auto-update-shared.patch
-13
View File
@@ -1,13 +0,0 @@
diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh
index 75d9d3013e..657ad3cb78 100644
--- a/bin/internal/shared.sh
+++ b/bin/internal/shared.sh
@@ -245,7 +245,7 @@ function shared::execute() {
# and will corrupt each others' downloads.
#
# SHARED_NAME itself is prepared by the caller script.
- upgrade_flutter 7< "$SHARED_NAME"
+ # upgrade_flutter 7< "$SHARED_NAME"
BIN_NAME="$(basename "$PROG_NAME")"
case "$BIN_NAME" in
pkgs/development/compilers/flutter/versions/3_19/patches/disable-auto-update.patch
-37
View File
@@ -1,37 +0,0 @@
diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart
index b7e624b4e2..edfdde118b 100644
--- a/packages/flutter_tools/lib/src/runner/flutter_command.dart
+++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart
@@ -1554,7 +1554,7 @@ Run 'flutter -h' (or 'flutter <command> -h') for available flutter commands and
// Populate the cache. We call this before pub get below so that the
// sky_engine package is available in the flutter cache for pub to find.
- if (shouldUpdateCache) {
+ if (false) {
// First always update universal artifacts, as some of these (e.g.
// ios-deploy on macOS) are required to determine `requiredArtifacts`.
final bool offline;
diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
index 5d6d78639f..90a4dfa555 100644
--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
+++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
@@ -297,7 +297,6 @@ class FlutterCommandRunner extends CommandRunner<void> {
globals.flutterUsage.suppressAnalytics = true;
}
- globals.flutterVersion.ensureVersionFile();
final bool machineFlag = topLevelResults[FlutterGlobalOptions.kMachineFlag] as bool? ?? false;
final bool ci = await globals.botDetector.isRunningOnBot;
final bool redirectedCompletion = !globals.stdio.hasTerminal &&
@@ -306,11 +305,6 @@ class FlutterCommandRunner extends CommandRunner<void> {
final bool versionCheckFlag = topLevelResults[FlutterGlobalOptions.kVersionCheckFlag] as bool? ?? false;
final bool explicitVersionCheckPassed = topLevelResults.wasParsed(FlutterGlobalOptions.kVersionCheckFlag) && versionCheckFlag;
- if (topLevelResults.command?.name != 'upgrade' &&
- (explicitVersionCheckPassed || (versionCheckFlag && !isMachine))) {
- await globals.flutterVersion.checkFlutterVersionFreshness();
- }
-
// See if the user specified a specific device.
final String? specifiedDeviceId = topLevelResults[FlutterGlobalOptions.kDeviceIdOption] as String?;
if (specifiedDeviceId != null) {
pkgs/development/compilers/flutter/versions/3_19/patches/gradle-flutter-tools-wrapper.patch
-44
View File
@@ -1,44 +0,0 @@
This patch introduces an intermediate Gradle build step to alter the behavior
of flutter_tools' Gradle project, specifically moving the creation of `build`
and `.gradle` directories from within the Nix Store to somewhere in `$HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev`.
Without this patch, flutter_tools' Gradle project tries to generate `build` and `.gradle`
directories within the Nix Store. Resulting in read-only errors when trying to build a
Flutter Android app at runtime.
This patch takes advantage of the fact settings.gradle takes priority over settings.gradle.kts to build the intermediate Gradle project
when a Flutter app runs `includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")`
`rootProject.buildFileName = "/dev/null"` so that the intermediate project doesn't use `build.gradle.kts` that's in the same directory.
The intermediate project makes a `settings.gradle` file in `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/` and `includeBuild`s it.
This Gradle project will build the actual `packages/flutter_tools/gradle` project by setting
`rootProject.projectDir = new File("$settingsDir")` and `apply from: new File("$settingsDir/settings.gradle.kts")`.
Now the `.gradle` will be built in `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/`, but `build` doesn't.
To move `build` to `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/` as well, we need to set `buildDirectory`.
diff --git a/packages/flutter_tools/gradle/settings.gradle b/packages/flutter_tools/gradle/settings.gradle
new file mode 100644
index 0000000000..b2485c94b4
--- /dev/null
+++ b/packages/flutter_tools/gradle/settings.gradle
@@ -0,0 +1,19 @@
+rootProject.buildFileName = "/dev/null"
+
+def engineShortRev = (new File("$settingsDir/../../../bin/internal/engine.version")).text.take(10)
+def dir = new File("$System.env.HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev")
+dir.mkdirs()
+def file = new File(dir, "settings.gradle")
+
+file.text = """
+rootProject.projectDir = new File("$settingsDir")
+apply from: new File("$settingsDir/settings.gradle.kts")
+
+gradle.allprojects { project ->
+ project.beforeEvaluate {
+ project.layout.buildDirectory = new File("$dir/build")
+ }
+}
+"""
+
+includeBuild(dir)
pkgs/development/compilers/gleam/default.nix
+3 -3
View File
@@ -14,13 +14,13 @@
rustPlatform.buildRustPackage rec {
pname = "gleam";
version = "1.8.0";
version = "1.8.1";
src = fetchFromGitHub {
owner = "gleam-lang";
repo = pname;
tag = "v${version}";
hash = "sha256-gBVr4kAec8hrDBiRXa/sQUNYvgSX3nTVMwFGYRFCbSA=";
hash = "sha256-Qt2VQhbiNNORrGUR5LHeBb0q/EIqPNPz/adljj6xpS4=";
};
nativeBuildInputs = [
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec {
];
useFetchCargoVendor = true;
cargoHash = "sha256-tYSqE+bn0GUQe/xVBZTh37XsMyzFnmxgVCL0II2/3jQ=";
cargoHash = "sha256-7oawxv1s8BJsOxGuADKjf4XqJ/UT+zYOrPQCbQljArM=";
passthru.updateScript = nix-update-script { };
pkgs/development/ocaml-modules/multipart_form/default.nix
+45
View File
@@ -0,0 +1,45 @@
{
lib,
buildDunePackage,
fetchurl,
angstrom,
base64,
bigstringaf,
fmt,
ke,
logs,
pecu,
prettym,
unstrctrd,
uutf,
}:
buildDunePackage rec {
pname = "multipart_form";
version = "0.6.0";
src = fetchurl {
url = "https://github.com/dinosaure/multipart_form/releases/download/v${version}/multipart_form-${version}.tbz";
hash = "sha256-oOMpwyPP+q1BZ81a+HpooeaglUZgDxdz2MDNLygGIRY=";
};
propagatedBuildInputs = [
angstrom
base64
bigstringaf
fmt
ke
logs
pecu
prettym
unstrctrd
uutf
];
meta = {
description = "Implementation of RFC7578 in OCaml";
homepage = "https://github.com/dinosaure/multipart_form";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.vbgl ];
};
}

Some files were not shown because too many files have changed in this diff Show More