From a81011bcc19db1982c28ae207fbc48ec68bcdea8 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Sun, 24 Nov 2024 13:14:18 +0200 Subject: [PATCH 01/34] gradle: add udev to the JNA library path Running `gradle build --scan` results in this warning: Did not find udev library in operating system. Some features may not work. The udev library is looked up using JNA, which searches `jna.library.path` in addition to the standard locations. Adding `udev` to the lookup path in the wrapper ensures that Gradle can find the library. Fixes: #358166. --- pkgs/development/tools/build-managers/gradle/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 5f34894e8dc37..80724fff7b789 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -37,6 +37,7 @@ rec { , unzip , ncurses5 , ncurses6 + , udev , testers , runCommand , writeText @@ -91,6 +92,7 @@ rec { }; varDefs = concatStringsSep "\n" (map (x: " --set ${x} \\") ([ "JAVA_HOME ${java}" ] ++ toolchain.varDefs)); + jnaLibraryPath = lib.makeLibraryPath [ udev ]; in '' mkdir -pv $out/lib/gradle/ cp -rv lib/ $out/lib/gradle/ @@ -99,6 +101,7 @@ rec { test -f $gradle_launcher_jar makeWrapper ${java}/bin/java $out/bin/gradle \ ${varDefs} + --add-flags "-Djna.library.path=${jnaLibraryPath}" \ --add-flags "-classpath $gradle_launcher_jar org.gradle.launcher.GradleMain${toolchain.property}" ''; @@ -129,6 +132,7 @@ rec { # Gradle will refuse to start without _both_ 5 and 6 versions of ncurses. echo ${ncurses5} >> $out/nix-support/manual-runtime-dependencies echo ${ncurses6} >> $out/nix-support/manual-runtime-dependencies + echo ${udev} >> $out/nix-support/manual-runtime-dependencies ''; passthru.tests = { From 327ecdcdbe09bbd589ab86da3dc3e1a5f7e6f994 Mon Sep 17 00:00:00 2001 From: illustris Date: Mon, 6 Jan 2025 09:45:52 +0530 Subject: [PATCH 02/34] spark: 3.5.1 -> 3.5.4, 3.4.3 -> 3.4.4 --- pkgs/applications/networking/cluster/spark/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index f6dab13a787f0..7749c9ef9a503 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -97,12 +97,12 @@ in # a new NixOS release. spark_3_5 = spark rec { pname = "spark"; - version = "3.5.1"; - hash = "sha256-ez6Hm8Ss3nl4mxOHyh67ugYH81/thNRMCja6MQ+9Tpg="; + version = "3.5.4"; + hash = "sha256-rSr7UH1dZIkUYW6ehc/dYxlmN9yVjEKwrwLMT+uMd/0="; }; spark_3_4 = spark rec { pname = "spark"; - version = "3.4.3"; - hash = "sha256-ifeytk08oaEyiEawwWbUWWuoynGTJNvnrkOW/CjeaSk="; + version = "3.4.4"; + hash = "sha256-GItHmthLhG7y0XSF3QINCyE7wYFb0+lPZmYLUuMa4Ww="; }; } From 2e6b296ba3eef76ad58f1147c3b7f309dc18cf04 Mon Sep 17 00:00:00 2001 From: linsui <36977733+linsui@users.noreply.github.com> Date: Tue, 7 Jan 2025 11:44:45 +0800 Subject: [PATCH 03/34] wownero: 0.11.0.1 -> 0.11.3.0 --- pkgs/by-name/wo/wownero/package.nix | 36 ++++++++++++++--------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/wo/wownero/package.nix b/pkgs/by-name/wo/wownero/package.nix index 04efa59e6d430..9b658084b87b5 100644 --- a/pkgs/by-name/wo/wownero/package.nix +++ b/pkgs/by-name/wo/wownero/package.nix @@ -2,8 +2,9 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, + fetchFromGitea, cmake, + python3, boost, libsodium, openssl, @@ -28,36 +29,35 @@ let rev = "633500ad8c8759995049ccd022107d1fa8a1bbc9"; hash = "sha256-26UmESotSWnQ21VbAYEappLpkEMyl0jiuCaezRYd/sE="; }; - randomwow = fetchFromGitHub { - owner = "wownero-project"; + randomwow = fetchFromGitea { + domain = "codeberg.org"; + owner = "wownero"; repo = "RandomWOW"; - rev = "607bad48f3687c2490d90f8c55efa2dcd7cbc195"; - hash = "sha256-CJv96TbPv1k/C7MQWEntE6khIRX1iIEiF9wEdsQGiFQ="; + rev = "27b099b6dd6fef6e17f58c6dfe00009e9c5df587"; + hash = "sha256-imiXr4irXeKiQ6VMd6f3MJ46zvdvymnRdHGgnEvkT+o="; }; in stdenv.mkDerivation rec { pname = "wownero"; - version = "0.11.0.1"; + version = "0.11.3.0"; - src = fetchFromGitHub { - owner = "wownero-project"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "wownero"; repo = "wownero"; - rev = "v${version}"; - fetchSubmodules = false; - hash = "sha256-zmGsSbPpVwL0AhCQkdMKORruM5kYrrLe/BYfMphph8c="; + tag = "v${version}"; + hash = "sha256-EioXFfUQ+CV6+Ipef1wbmc+taKI98I420J7eqzz15Ss="; }; - patches = [ - # Fix gcc-13 build due to missing neaders - (fetchpatch { - name = "gcc-13.patch"; - url = "https://git.wownero.com/wownero/wownero/commit/f983ac77805a494ea4a05a00398c553e1359aefd.patch"; - hash = "sha256-9acQ4bHAKFR+lMgrpQyBmb+9YZYi1ywHoo1jBcIgmGs="; - }) + env.NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=cast-user-defined" + "-Wno-error=implicit-function-declaration" + "-Wno-error=int-conversion" ]; nativeBuildInputs = [ cmake + python3 ]; buildInputs = From 42094aaba76e32c8d526d5f32940aec692de3e9e Mon Sep 17 00:00:00 2001 From: Ethan Carter Edwards Date: Tue, 7 Jan 2025 19:57:45 -0500 Subject: [PATCH 04/34] radio-cli: add Darwin support Signed-off-by: Ethan Carter Edwards --- pkgs/by-name/ra/radio-cli/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ra/radio-cli/package.nix b/pkgs/by-name/ra/radio-cli/package.nix index 655e416b554af..ccc444553ec81 100644 --- a/pkgs/by-name/ra/radio-cli/package.nix +++ b/pkgs/by-name/ra/radio-cli/package.nix @@ -39,6 +39,6 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ luftmensch-luftmensch ]; mainProgram = "radio-cli"; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } From 2c2962083d86b5689e59b899b0c2b077bbb7ac85 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Jan 2025 13:05:46 +0000 Subject: [PATCH 05/34] tshark: 4.4.2 -> 4.4.3 --- pkgs/applications/networking/sniffers/wireshark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index bedcb6c1d8e3d..fd61993b5543f 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -58,7 +58,7 @@ assert withQt -> qt6 != null; stdenv.mkDerivation rec { pname = "wireshark-${if withQt then "qt" else "cli"}"; - version = "4.4.2"; + version = "4.4.3"; outputs = [ "out" @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { repo = "wireshark"; owner = "wireshark"; rev = "v${version}"; - hash = "sha256-qeMaj8kRGG1NlDb5j4M/Za2M2Ohh2qhXbzBtQGjrCSo="; + hash = "sha256-QTDOwJXo9+A2J/uXdyTtK5D5DVYLUAaUKT8desQGvd4="; }; patches = [ From e7a505fa83781129bcc185d63527fc4b89af3f36 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 Jan 2025 20:05:51 +0000 Subject: [PATCH 06/34] tracexec: 0.8.0 -> 0.8.2 --- pkgs/by-name/tr/tracexec/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tr/tracexec/package.nix b/pkgs/by-name/tr/tracexec/package.nix index fde7d0b8d5aba..5c800fa9d1c9b 100644 --- a/pkgs/by-name/tr/tracexec/package.nix +++ b/pkgs/by-name/tr/tracexec/package.nix @@ -14,7 +14,7 @@ }: let pname = "tracexec"; - version = "0.8.0"; + version = "0.8.2"; in rustPlatform.buildRustPackage { inherit pname version; @@ -23,10 +23,10 @@ rustPlatform.buildRustPackage { owner = "kxxt"; repo = "tracexec"; tag = "v${version}"; - hash = "sha256-ZoYqmjqY9eAHGDIbFX9FY1yGF210C60UWcHi0lxzL7g="; + hash = "sha256-qLvox7ef9eU1Vvg4gZGCKkic4+mcOIz9BZWTi/Q2grk="; }; - cargoHash = "sha256-mZSj45im5b25mt8mGYLq03blvFCyS02kVK7yV3bIlUg="; + cargoHash = "sha256-yagXxTEWsR7FkLVo9DZHxmlXD/L6R+IoateUUQxn77E="; hardeningDisable = [ "zerocallusedregs" ]; From 40c99f2bb988ce75cbc4433b2fd5b2bba81cd25e Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 14 Jan 2025 09:49:41 +0000 Subject: [PATCH 07/34] pocketsphinx: 5.0.3 -> 5.0.4 --- pkgs/by-name/po/pocketsphinx/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/pocketsphinx/package.nix b/pkgs/by-name/po/pocketsphinx/package.nix index 3904bee236b51..582230eb6a571 100644 --- a/pkgs/by-name/po/pocketsphinx/package.nix +++ b/pkgs/by-name/po/pocketsphinx/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pocketsphinx"; - version = "5.0.3"; + version = "5.0.4"; src = fetchFromGitHub { owner = "cmusphinx"; repo = "pocketsphinx"; tag = "v${finalAttrs.version}"; - hash = "sha256-aCQpRmGHX08rA8UIt6Xf37XM34HysEzvcucLhL355k8="; + hash = "sha256-DUK3zPPtv+sQhC1dfJXDmwtt3UV6DGacb3mMQUpvVpk="; }; nativeBuildInputs = [ From 0da0d93fe056b25f2b231e095df911c3a0c18113 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 4 Jan 2025 21:30:52 +0100 Subject: [PATCH 08/34] lomiri.lomiri-schemas: 0.1.5 -> 0.1.6 --- .../lomiri/data/lomiri-schemas/default.nix | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/lomiri/data/lomiri-schemas/default.nix b/pkgs/desktops/lomiri/data/lomiri-schemas/default.nix index 31d9638848777..11a16f224d83c 100644 --- a/pkgs/desktops/lomiri/data/lomiri-schemas/default.nix +++ b/pkgs/desktops/lomiri/data/lomiri-schemas/default.nix @@ -1,7 +1,8 @@ { - stdenv, + stdenvNoCC, lib, fetchFromGitLab, + fetchpatch, gitUpdater, testers, cmake, @@ -12,17 +13,26 @@ validatePkgConfig, }: -stdenv.mkDerivation (finalAttrs: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "lomiri-schemas"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-schemas"; rev = finalAttrs.version; - hash = "sha256-OjSMt9XKqGoStF5O2zJTh3drHWe7Vk2cM94OYMSQmoU="; + hash = "sha256-hCKsjZ2xW+Jimm8IT6E6ZaPGwXydiNTxyaHxY0gOEpg="; }; + patches = [ + # Remove when version > 0.1.6 + (fetchpatch { + name = "0001-lomiri-schemas-Declare-no-compilers-needed.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-schemas/-/commit/6eec0513d2348dcfe49ce5969a091584888a79e5.patch"; + hash = "sha256-pbHNeP28WQ9wDdRkgsS8WY24ZKLS3G3h4gEd22DPuH8="; + }) + ]; + strictDeps = true; nativeBuildInputs = [ @@ -48,13 +58,13 @@ stdenv.mkDerivation (finalAttrs: { updateScript = gitUpdater { }; }; - meta = with lib; { + meta = { description = "GSettings / AccountsService schema files for Lomiri"; homepage = "https://gitlab.com/ubports/development/core/lomiri-schemas"; changelog = "https://gitlab.com/ubports/development/core/lomiri-schemas/-/blob/${finalAttrs.version}/ChangeLog"; - license = licenses.lgpl21Plus; - maintainers = teams.lomiri.members; - platforms = platforms.linux; + license = lib.licenses.lgpl21Plus; + maintainers = lib.teams.lomiri.members; + platforms = lib.platforms.linux; pkgConfigModules = [ "lomiri-schemas" ]; From cc3a613c5a01b83842f7cae051256e74842f7f69 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 5 Jan 2025 12:43:39 +0100 Subject: [PATCH 09/34] lomiri.lomiri-app-launch: Fix crash on Lomiri startup when resolving relative icons for pinned apps --- .../lomiri/development/lomiri-app-launch/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix b/pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix index a095aee3d0928..71a233beb1811 100644 --- a/pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix +++ b/pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix @@ -58,6 +58,13 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-11pEhFi39Cvqb9Hg47kT8+5hq+bz6WmySqaIdwt1MVk="; }) + # Remove when version > 0.1.9 + (fetchpatch { + name = "0002-lomiri-app-launch-Fix-parallel-access-to-_iconFinders.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-app-launch/-/commit/74da7db2d59e91d95129dcaa5f6d8960fbc32eca.patch"; + hash = "sha256-3r12eS9uLJIoBqSiKE2xnkfrJ7uPhyvYxXsxXs0cykg="; + }) + # Use /run/current-system/sw/bin fallback for desktop file Exec= lookups, propagate to launched applications ./2001-Inject-current-system-PATH.patch ]; From f2ce8e7d79460ad9d3fc7e87f789feda1151fd5b Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 5 Jan 2025 14:19:49 +0100 Subject: [PATCH 10/34] lomiri.morph-browser: Drop workaround for LAL crash on Lomiri startup --- pkgs/desktops/lomiri/applications/morph-browser/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/desktops/lomiri/applications/morph-browser/default.nix b/pkgs/desktops/lomiri/applications/morph-browser/default.nix index dd1390ce54750..ce8a0c73ab6da 100644 --- a/pkgs/desktops/lomiri/applications/morph-browser/default.nix +++ b/pkgs/desktops/lomiri/applications/morph-browser/default.nix @@ -52,12 +52,8 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace src/{Morph,Ubuntu}/CMakeLists.txt \ --replace '/usr/lib/''${CMAKE_LIBRARY_ARCHITECTURE}/qt5/qml' "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" - # We normally don't want to use absolute paths in desktop file, but this one is special - # There appears to be some issue in lomiri-app-launch's lookup of relative Icon entries (while lomiri is starting up?) - # that makes the session segfault. - # As a compromise, hardcode /run/current-system substituteInPlace src/app/webbrowser/morph-browser.desktop.in.in \ - --replace 'Icon=@CMAKE_INSTALL_FULL_DATADIR@/morph-browser/morph-browser.svg' 'Icon=/run/current-system/sw/share/icons/hicolor/scalable/apps/morph-browser.svg' \ + --replace 'Icon=@CMAKE_INSTALL_FULL_DATADIR@/morph-browser/morph-browser.svg' 'Icon=morph-browser' \ --replace 'X-Lomiri-Splash-Image=@CMAKE_INSTALL_FULL_DATADIR@/morph-browser/morph-browser-splash.svg' 'X-Lomiri-Splash-Image=lomiri-app-launch/splash/morph-browser.svg' '' + lib.optionalString (!finalAttrs.finalPackage.doCheck) '' From 3d9f780734d652f7b5f1e1f39818edff407778aa Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 6 Jan 2025 21:17:29 +0100 Subject: [PATCH 11/34] ayatana-indicator-sound: Disable parallel testing Spins up & talks with D-Bus in multiple tests, parallelism gets tests talking to each others' D-Bus daemons and failing when the bus they're talking to gets shut down by another test. --- pkgs/by-name/ay/ayatana-indicator-sound/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ay/ayatana-indicator-sound/package.nix b/pkgs/by-name/ay/ayatana-indicator-sound/package.nix index 039d88bb2b356..75b51ff64a0c2 100644 --- a/pkgs/by-name/ay/ayatana-indicator-sound/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-sound/package.nix @@ -105,6 +105,9 @@ stdenv.mkDerivation (finalAttrs: { doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + # Starts & talks to D-Bus, breaks under parallelism + enableParallelChecking = false; + passthru = { ayatana-indicators = { ayatana-indicator-sound = [ From e089450af470234e83b54deb3f0c219d8709fb45 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Tue, 14 Jan 2025 23:41:42 +0100 Subject: [PATCH 12/34] lomiri.morph-browser: Modernise, help with test timeout, add doc output --- ...ace-wait-and-compare-with-tryCompare.patch | 196 ++++++++++++++++++ .../applications/morph-browser/default.nix | 30 ++- 2 files changed, 217 insertions(+), 9 deletions(-) create mode 100644 pkgs/desktops/lomiri/applications/morph-browser/1001-morph-browser-tst_AddressBar-Replace-wait-and-compare-with-tryCompare.patch diff --git a/pkgs/desktops/lomiri/applications/morph-browser/1001-morph-browser-tst_AddressBar-Replace-wait-and-compare-with-tryCompare.patch b/pkgs/desktops/lomiri/applications/morph-browser/1001-morph-browser-tst_AddressBar-Replace-wait-and-compare-with-tryCompare.patch new file mode 100644 index 0000000000000..72c27c3e0e295 --- /dev/null +++ b/pkgs/desktops/lomiri/applications/morph-browser/1001-morph-browser-tst_AddressBar-Replace-wait-and-compare-with-tryCompare.patch @@ -0,0 +1,196 @@ +From 9c4cd4fa938244cc2e319555d372e4e32029964a Mon Sep 17 00:00:00 2001 +From: OPNA2608 +Date: Tue, 14 Jan 2025 23:06:20 +0100 +Subject: [PATCH] tests/unittests/qml/tst_AddressBar.qml: Replace wait + + compare with tryCompare + +--- + tests/unittests/qml/tst_AddressBar.qml | 75 +++++++++++--------------- + 1 file changed, 30 insertions(+), 45 deletions(-) + +diff --git a/tests/unittests/qml/tst_AddressBar.qml b/tests/unittests/qml/tst_AddressBar.qml +index 5c27acff..dc0ec4c6 100644 +--- a/tests/unittests/qml/tst_AddressBar.qml ++++ b/tests/unittests/qml/tst_AddressBar.qml +@@ -73,6 +73,15 @@ Item { + name: "AddressBar" + when: windowShown + ++ function verifyAddressBarText(text) { ++ tryCompare(addressBar, "text", text) ++ } ++ ++ function typeStringAndVerify(text) { ++ typeString(text) ++ verifyAddressBarText(text) ++ } ++ + function init() { + addressBar.actualUrl = "" + validatedSpy.clear() +@@ -101,9 +110,7 @@ Item { + } + + function test_validUrlShouldNotBeRewritten(data) { +- typeString(data.url) +- wait(500) +- compare(addressBar.text, data.url) ++ typeStringAndVerify(data.url) + keyClick(Qt.Key_Return) + validatedSpy.wait() + compare(addressBar.requestedUrl, data.url) +@@ -120,9 +127,7 @@ Item { + } + + function test_urlWithoutSchemeShouldBeRewritten(data) { +- typeString(data.text) +- wait(500) +- compare(addressBar.text, data.text) ++ typeStringAndVerify(data.text) + keyClick(Qt.Key_Return) + validatedSpy.wait() + compare(addressBar.requestedUrl, data.requestedUrl) +@@ -137,9 +142,7 @@ Item { + } + + function test_leadingAndTrailingWhitespacesShouldBeTrimmed(data) { +- typeString(data.text) +- wait(500) +- compare(addressBar.text, data.text) ++ typeStringAndVerify(data.text) + keyClick(Qt.Key_Return) + validatedSpy.wait() + compare(addressBar.requestedUrl, data.requestedUrl) +@@ -153,9 +156,7 @@ Item { + } + + function test_searchQueryShouldBeRewritten(data) { +- typeString(data.text) +- wait(500) +- compare(addressBar.text, data.text) ++ typeStringAndVerify(data.text) + keyClick(Qt.Key_Return) + validatedSpy.wait() + compare(addressBar.requestedUrl.toString().indexOf(data.start), 0) +@@ -174,9 +175,7 @@ Item { + } + + function test_htmlEntitiesShouldBeEscapedInSearchQueries(data) { +- typeString(data.text) +- wait(500) +- compare(addressBar.text, data.text) ++ typeStringAndVerify(data.text) + keyClick(Qt.Key_Return) + validatedSpy.wait() + verify(addressBar.requestedUrl.toString().indexOf("q=" + data.escaped) > 0) +@@ -191,9 +190,7 @@ Item { + } + + function test_uppercaseDomainsShouldBeRewritten(data) { +- typeString(data.text) +- wait(500) +- compare(addressBar.text, data.text) ++ typeStringAndVerify(data.text) + keyClick(Qt.Key_Return) + validatedSpy.wait() + compare(addressBar.requestedUrl, data.requestedUrl) +@@ -213,9 +210,7 @@ Item { + } + + function test_uppercaseSchemeShouldBeRewritten(data) { +- typeString(data.text) +- wait(500) +- compare(addressBar.text, data.text) ++ typeStringAndVerify(data.text) + keyClick(Qt.Key_Return) + validatedSpy.wait() + compare(addressBar.requestedUrl, data.requestedUrl) +@@ -266,9 +261,7 @@ Item { + } + + function test_urlShouldBeSimplifiedWhenUnfocused(data) { +- typeString(data.input) +- wait(500) +- compare(addressBar.text, data.input) ++ typeStringAndVerify(data.input) + keyClick(Qt.Key_Return) + validatedSpy.wait() + addressBar.actualUrl = addressBar.requestedUrl +@@ -289,9 +282,7 @@ Item { + + function test_clickingWhenUnfocusedShouldSelectAll() { + var url = "http://example.org/" +- typeString(url) +- wait(500) +- compare(addressBar.text, url) ++ typeStringAndVerify(url) + addressBar.actualUrl = url + clickItem(textInput) + verify(!addressBar.activeFocus) +@@ -301,9 +292,7 @@ Item { + + function test_clickingWhenFocusedShouldDeselectText() { + var url = "http://example.org/" +- typeString(url) +- wait(500) +- compare(addressBar.text, url) ++ typeStringAndVerify(url) + addressBar.actualUrl = url + clickItem(textInput) + verify(!addressBar.activeFocus) +@@ -316,9 +305,7 @@ Item { + + function test_clickingActionButtonWhenUnfocusedShouldNotSelectAll() { + var url = "http://example.org/" +- typeString(url) +- wait(500) +- compare(addressBar.text, url) ++ typeStringAndVerify(url) + clickItem(textInput) + verify(!addressBar.activeFocus) + clickItem(addressBar.__actionButton) +@@ -355,31 +342,29 @@ Item { + } + + function test_unfocusingWhileEditingShouldResetUrl() { +- var url = "http://example.org/" +- typeString(url) +- wait(500) +- compare(addressBar.text, url) ++ var host = "example.org" ++ var url = "http://" + host + "/" ++ typeStringAndVerify(url) + addressBar.actualUrl = url + var clearButton = findChild(addressBar, "clear_button") + verify(clearButton != null) + clickItem(clearButton) +- compare(addressBar.text, "") ++ verifyAddressBarText("") + clickItem(textInput) +- compare(addressBar.text, "example.org") ++ verifyAddressBarText(host) + clickItem(addressBar) +- compare(addressBar.text, url) ++ verifyAddressBarText(url) + } + + function test_exitingFindInPageRestoresUrl() { +- addressBar.actualUrl = "http://example.org/" ++ var host = "example.org" ++ addressBar.actualUrl = "http://" + host + "/" + addressBar.findInPageMode = true + verify(addressBar.activeFocus) + compare(addressBar.text, "") +- typeString("hello") +- wait(500) ++ typeStringAndVerify("hello") + addressBar.findInPageMode = false +- wait(500) +- compare(addressBar.text, "example.org") ++ verifyAddressBarText(host) + } + } + } +-- +2.47.0 + diff --git a/pkgs/desktops/lomiri/applications/morph-browser/default.nix b/pkgs/desktops/lomiri/applications/morph-browser/default.nix index ce8a0c73ab6da..b1502dff2f84a 100644 --- a/pkgs/desktops/lomiri/applications/morph-browser/default.nix +++ b/pkgs/desktops/lomiri/applications/morph-browser/default.nix @@ -19,6 +19,7 @@ qtdeclarative, qtquickcontrols2, qtsystems, + qttools, qtwebengine, wrapQtAppsHook, xvfb-run, @@ -38,27 +39,38 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-VxSADFTlaxQUDc81TzGkx54mjAUgY2L+suQC9zYGKo0="; }; + outputs = [ + "out" + "doc" + ]; + patches = [ - # Remove when https://gitlab.com/ubports/development/core/morph-browser/-/merge_requests/576 merged & in release + # Remove when version > 1.1.1 (fetchpatch { name = "0002-morph-browser-Call-i18n-bindtextdomain-with-buildtime-determined-locale-path.patch"; - url = "https://gitlab.com/ubports/development/core/morph-browser/-/commit/0527a1e01fb27c62f5e0011274f73bad400e9691.patch"; + url = "https://gitlab.com/ubports/development/core/morph-browser/-/commit/3d9777fdc7d5b302a9f17679e4ea125e94468772.patch"; hash = "sha256-zx/pP72uNqAi8TZR4bKeONuqcJyK/vGtPglTA+5R5no="; }) + + # Remove when https://gitlab.com/ubports/development/core/morph-browser/-/merge_requests/589 merged & in release + ./1001-morph-browser-tst_AddressBar-Replace-wait-and-compare-with-tryCompare.patch ]; postPatch = '' substituteInPlace src/{Morph,Ubuntu}/CMakeLists.txt \ - --replace '/usr/lib/''${CMAKE_LIBRARY_ARCHITECTURE}/qt5/qml' "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" + --replace-fail '/usr/lib/''${CMAKE_LIBRARY_ARCHITECTURE}/qt5/qml' "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" substituteInPlace src/app/webbrowser/morph-browser.desktop.in.in \ - --replace 'Icon=@CMAKE_INSTALL_FULL_DATADIR@/morph-browser/morph-browser.svg' 'Icon=morph-browser' \ - --replace 'X-Lomiri-Splash-Image=@CMAKE_INSTALL_FULL_DATADIR@/morph-browser/morph-browser-splash.svg' 'X-Lomiri-Splash-Image=lomiri-app-launch/splash/morph-browser.svg' + --replace-fail 'Icon=@CMAKE_INSTALL_FULL_DATADIR@/morph-browser/morph-browser.svg' 'Icon=morph-browser' \ + --replace-fail 'X-Lomiri-Splash-Image=@CMAKE_INSTALL_FULL_DATADIR@/morph-browser/morph-browser-splash.svg' 'X-Lomiri-Splash-Image=lomiri-app-launch/splash/morph-browser.svg' + + substituteInPlace doc/CMakeLists.txt \ + --replace-fail 'COMMAND ''${QDOC_EXECUTABLE} -qt5' 'COMMAND ''${QDOC_EXECUTABLE}' '' + lib.optionalString (!finalAttrs.finalPackage.doCheck) '' substituteInPlace CMakeLists.txt \ - --replace 'add_subdirectory(tests)' "" + --replace-fail 'add_subdirectory(tests)' "" ''; strictDeps = true; @@ -67,6 +79,7 @@ stdenv.mkDerivation (finalAttrs: { cmake gettext pkg-config + qttools # qdoc wrapQtAppsHook ]; @@ -138,9 +151,8 @@ stdenv.mkDerivation (finalAttrs: { # Test of morph-browser itself standalone = nixosTests.morph-browser; - # Lomiri-specific issues with the desktop file may break the entire session, make sure it still works - lomiri-basics = nixosTests.lomiri.desktop-basics; - lomiri-appinteractions = nixosTests.lomiri.desktop-appinteractions; + # Interactions between the Lomiri ecosystem and this browser + inherit (nixosTests.lomiri) desktop-basics desktop-appinteractions; }; }; From a7e1062b05f8e53e0d79285a6c57aebf9cf7e334 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 15 Jan 2025 20:23:55 +0100 Subject: [PATCH 13/34] lomiri.lomiri-api: 0.2.1 -> 0.2.2 --- .../lomiri/development/lomiri-api/default.nix | 29 +++++++------------ 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/pkgs/desktops/lomiri/development/lomiri-api/default.nix b/pkgs/desktops/lomiri/development/lomiri-api/default.nix index 847569744a823..8786b0928d72a 100644 --- a/pkgs/desktops/lomiri/development/lomiri-api/default.nix +++ b/pkgs/desktops/lomiri/development/lomiri-api/default.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitLab, - fetchpatch, gitUpdater, makeFontsConf, testers, @@ -22,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lomiri-api"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-api"; - rev = finalAttrs.version; - hash = "sha256-UTl0vObSlEvHuLmDt7vS3yEqZWGklJ9tVwlUAtRSTlU="; + tag = finalAttrs.version; + hash = "sha256-+ttmtvt18NMKYfGntEXgBOSJ3lW9Bf55327XYIzxMh8="; }; outputs = [ @@ -37,19 +36,11 @@ stdenv.mkDerivation (finalAttrs: { "doc" ]; - patches = [ - (fetchpatch { - name = "0001-lomiri-api-Add-missing-headers-for-GCC13.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-api/-/commit/029b42a9b4d5467951595dff8bc536eb5a9e3ef7.patch"; - hash = "sha256-eWrDQGrwf22X49rtUAVbrd+QN+OwyGacVLCWYFsS02o="; - }) - ]; - postPatch = '' patchShebangs $(find test -name '*.py') - substituteInPlace data/*.pc.in \ - --replace "\''${prefix}/@CMAKE_INSTALL_LIBDIR@" "\''${prefix}/lib" + substituteInPlace data/liblomiri-api.pc.in \ + --replace "\''${prefix}/@CMAKE_INSTALL_LIBDIR@" '@CMAKE_INSTALL_FULL_LIBDIR@' # Variable is queried via pkg-config by reverse dependencies # TODO This is likely not supposed to be the regular Qt QML import prefix @@ -84,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { dontWrapQtApps = true; - FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; }; + env.FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; }; preBuild = '' # Makes fontconfig produce less noise in logs @@ -104,15 +95,15 @@ stdenv.mkDerivation (finalAttrs: { updateScript = gitUpdater { }; }; - meta = with lib; { + meta = { description = "Lomiri API Library for integrating with the Lomiri shell"; homepage = "https://gitlab.com/ubports/development/core/lomiri-api"; - license = with licenses; [ + license = with lib.licenses; [ lgpl3Only gpl3Only ]; - maintainers = teams.lomiri.members; - platforms = platforms.linux; + maintainers = lib.teams.lomiri.members; + platforms = lib.platforms.linux; pkgConfigModules = [ "liblomiri-api" "lomiri-shell-api" From 6a0afb0eb3c4de3d2e4aef73b229f44272455287 Mon Sep 17 00:00:00 2001 From: Sebastian Kowalak Date: Wed, 15 Jan 2025 19:28:41 +0100 Subject: [PATCH 14/34] maintainers: add skowalak --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 436c3c769c8fd..c68a2b1c7fcfd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -21306,6 +21306,12 @@ githubId = 49844593; name = "skovati"; }; + skowalak = { + github = "skowalak"; + githubId = 26260032; + name = "Sebastian Kowalak"; + matrix = "@scl:tchncs.de"; + }; skyesoss = { name = "Skye Soss"; matrix = "@skyesoss:matrix.org"; From ddc57775747e1f6bece9ee16563200c17b4b750f Mon Sep 17 00:00:00 2001 From: nartsisss Date: Thu, 9 Jan 2025 03:47:54 +0300 Subject: [PATCH 15/34] gping: 1.18.0 -> 1.19.0 --- pkgs/tools/networking/gping/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/gping/default.nix b/pkgs/tools/networking/gping/default.nix index 6611f99394a7b..f6a670d7c8256 100644 --- a/pkgs/tools/networking/gping/default.nix +++ b/pkgs/tools/networking/gping/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "gping"; - version = "1.18.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "orf"; repo = "gping"; - rev = "gping-v${version}"; - hash = "sha256-JZMgbCwEGfngCQVmuZX1tu3he/f/TBLitcP/Ea3S6yI="; + tag = "gping-v${version}"; + hash = "sha256-RTjYgsi3PmmPufdTcxZr+Laipa32Kkq1M1eHSAJVWZQ="; }; - cargoHash = "sha256-I9rcC2sotrdHMCCiDgfycKRnJxZLuA5OLZPZC0zFiLc="; + cargoHash = "sha256-c1GCF7Nztv7EpnPGPMRKdAQmeauy6OfI97e0nZWXe7E="; nativeBuildInputs = [ installShellFiles ]; @@ -29,6 +29,13 @@ rustPlatform.buildRustPackage rec { installManPage gping.1 ''; + # Requires internet access + checkFlags = [ + "--skip=test::tests::test_integration_any" + "--skip=test::tests::test_integration_ip6" + "--skip=test::tests::test_integration_ipv4" + ]; + doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; From 8966c27b2f44b1f3ffa74bf1200cc6585b59d23a Mon Sep 17 00:00:00 2001 From: nartsisss Date: Thu, 9 Jan 2025 03:48:29 +0300 Subject: [PATCH 16/34] gping: refactor meta --- pkgs/tools/networking/gping/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/gping/default.nix b/pkgs/tools/networking/gping/default.nix index f6a670d7c8256..bef6abcf64ab4 100644 --- a/pkgs/tools/networking/gping/default.nix +++ b/pkgs/tools/networking/gping/default.nix @@ -42,12 +42,12 @@ rustPlatform.buildRustPackage rec { versionCheckProgramArg = [ "--version" ]; - meta = with lib; { + meta = { description = "Ping, but with a graph"; homepage = "https://github.com/orf/gping"; changelog = "https://github.com/orf/gping/releases/tag/gping-v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ cafkafk ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ cafkafk ]; mainProgram = "gping"; }; } From ddaad969c764109414bc2e66b7801f3c6d7bc545 Mon Sep 17 00:00:00 2001 From: nartsisss Date: Thu, 9 Jan 2025 03:48:43 +0300 Subject: [PATCH 17/34] gping: add nix update script --- pkgs/tools/networking/gping/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/networking/gping/default.nix b/pkgs/tools/networking/gping/default.nix index bef6abcf64ab4..62c36d0b1db79 100644 --- a/pkgs/tools/networking/gping/default.nix +++ b/pkgs/tools/networking/gping/default.nix @@ -6,6 +6,7 @@ installShellFiles, iputils, versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage rec { @@ -42,6 +43,8 @@ rustPlatform.buildRustPackage rec { versionCheckProgramArg = [ "--version" ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Ping, but with a graph"; homepage = "https://github.com/orf/gping"; From 41cf2b03a58aa938d47e14c1d87d11bb2fc3558e Mon Sep 17 00:00:00 2001 From: nartsisss Date: Thu, 9 Jan 2025 03:50:37 +0300 Subject: [PATCH 18/34] gping: move to pkgs/by-name --- .../gping/default.nix => by-name/gp/gping/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/networking/gping/default.nix => by-name/gp/gping/package.nix} (100%) diff --git a/pkgs/tools/networking/gping/default.nix b/pkgs/by-name/gp/gping/package.nix similarity index 100% rename from pkgs/tools/networking/gping/default.nix rename to pkgs/by-name/gp/gping/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index feff714b2c7fb..aafa7c850c290 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2328,8 +2328,6 @@ with pkgs; inherit (darwin) libobjc libresolv; }; - gping = callPackage ../tools/networking/gping { }; - greg = callPackage ../applications/audio/greg { pythonPackages = python3Packages; }; From 9427db47f7c5ba8295660ac4999fae81a870d986 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Wed, 15 Jan 2025 16:22:36 -0500 Subject: [PATCH 19/34] zed-editor: 0.168.3 -> 0.169.2 --- pkgs/by-name/ze/zed-editor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index abd36c3558095..6644a1c78dd50 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -93,13 +93,13 @@ let in rustPlatform.buildRustPackage rec { pname = "zed-editor"; - version = "0.168.3"; + version = "0.169.2"; src = fetchFromGitHub { owner = "zed-industries"; repo = "zed"; tag = "v${version}"; - hash = "sha256-YGHbka8kCKOquY2I17N8oS7ckhX/uY6QXJ21+kQjQBg="; + hash = "sha256-IdJVWsHWMzE0AZxFy6jOmquc2jFeozNDdAhbB3fFMwk="; }; patches = [ @@ -119,7 +119,7 @@ rustPlatform.buildRustPackage rec { ''; useFetchCargoVendor = true; - cargoHash = "sha256-pZK2PzR39fMAiqhfA0WtZnIRzAVbqxnViQnWKmZoRV0="; + cargoHash = "sha256-0zH5J3nvBpqD22nFzX98MBoTtNDpWS4NSSMcT1DB2SM="; nativeBuildInputs = [ From 332af29d45d382aedb5b0d285284d224b939a858 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 15 Jan 2025 22:38:32 +0100 Subject: [PATCH 20/34] python3Packages.gpaw: 24.1.0 -> 25.1.0 update data sets 0.9.20000 -> 24.11.0 --- pkgs/development/python-modules/gpaw/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/gpaw/default.nix b/pkgs/development/python-modules/gpaw/default.nix index 9b647af6e2b18..6d7791434b8e7 100644 --- a/pkgs/development/python-modules/gpaw/default.nix +++ b/pkgs/development/python-modules/gpaw/default.nix @@ -68,22 +68,22 @@ let ''; }; - setupVersion = "0.9.20000"; + setupVersion = "24.11.0"; pawDataSets = fetchurl { url = "https://wiki.fysik.dtu.dk/gpaw-files/gpaw-setups-${setupVersion}.tar.gz"; - sha256 = "07yldxnn38gky39fxyv3rfzag9p4lb0xfpzn15wy2h9aw4mnhwbc"; + hash = "sha256-lkyBzCj3+RpGhtPTGCxOvaMO+wnT+Wt/lerjFGSZwRA="; }; in buildPythonPackage rec { pname = "gpaw"; - version = "24.1.0"; + version = "25.1.0"; format = "setuptools"; src = fetchFromGitLab { owner = "gpaw"; repo = pname; rev = version; - hash = "sha256-8eX50F124R46dGN2rJS/dDvPeDmEm7XpVyTiOAjMKyI="; + hash = "sha256-tdS383qT6hBr5hOqjoFS36nRSS2vdVkUR7sExwjWhng="; }; # `inetutils` is required because importing `gpaw`, as part of From 2256fa48115932ef1c1776a22975555659c6af29 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 15 Jan 2025 22:51:18 +0100 Subject: [PATCH 21/34] lomiri.lomiri-ui-toolkit: Reinstate problematic test marking Turns out that not every test is running well yet: https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/issues/43 --- .../2001-Mark-problematic-tests.patch | 88 +++++++++++++++++++ .../lomiri/qml/lomiri-ui-toolkit/default.nix | 2 + 2 files changed, 90 insertions(+) create mode 100644 pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/2001-Mark-problematic-tests.patch diff --git a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/2001-Mark-problematic-tests.patch b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/2001-Mark-problematic-tests.patch new file mode 100644 index 0000000000000..20b0d5c5a6361 --- /dev/null +++ b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/2001-Mark-problematic-tests.patch @@ -0,0 +1,88 @@ +From c1a69117793acec6841898f219935852cadc78d3 Mon Sep 17 00:00:00 2001 +From: OPNA2608 +Date: Wed, 15 Jan 2025 18:45:02 +0100 +Subject: [PATCH] Mark problematic tests + +- tst_textinput_touch.SEGFAULT.11.qml is flaky: + https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/issues/43 +--- + tests/checkresults.sh | 28 ++++++++++++++++++++++------ + 1 file changed, 22 insertions(+), 6 deletions(-) + +diff --git a/tests/checkresults.sh b/tests/checkresults.sh +index fc498985e..ade361236 100755 +--- a/tests/checkresults.sh ++++ b/tests/checkresults.sh +@@ -22,6 +22,7 @@ ERRORS_PATTERN=' Date: Thu, 16 Jan 2025 03:15:45 +0000 Subject: [PATCH 25/34] misconfig-mapper: 1.12.4 -> 1.12.6 --- pkgs/by-name/mi/misconfig-mapper/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/misconfig-mapper/package.nix b/pkgs/by-name/mi/misconfig-mapper/package.nix index b5502f53973d4..d87a6024284b1 100644 --- a/pkgs/by-name/mi/misconfig-mapper/package.nix +++ b/pkgs/by-name/mi/misconfig-mapper/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "misconfig-mapper"; - version = "1.12.4"; + version = "1.12.6"; src = fetchFromGitHub { owner = "intigriti"; repo = "misconfig-mapper"; tag = "v${version}"; - hash = "sha256-v+Ls3P+s/pBMLgFMIHcfs+z9GsYNCcpOxoKlO+OjpzE="; + hash = "sha256-OdwTY73w/N1NuEeK7GsQWFT9NyOwrKlK0q0llW9Ena0="; }; - vendorHash = "sha256-+DA/eicufx4odMmHJEFKkDH6XbLLXCg3CRHT2kJhy8M="; + vendorHash = "sha256-omnWQfriaPqz51xrUKZM5112ZEHJZgAm68hnqUyzR6A="; ldflags = [ "-s" From 029db9a62fb522a0f2ac2fb9a04e958956b67f6c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Jan 2025 03:26:40 +0000 Subject: [PATCH 26/34] trickest-cli: 1.8.3 -> 1.8.4 --- pkgs/by-name/tr/trickest-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tr/trickest-cli/package.nix b/pkgs/by-name/tr/trickest-cli/package.nix index 3a0f09739ef2c..730b9a4df1e24 100644 --- a/pkgs/by-name/tr/trickest-cli/package.nix +++ b/pkgs/by-name/tr/trickest-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "trickest-cli"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "trickest"; repo = "trickest-cli"; tag = "v${version}"; - hash = "sha256-9RZmLs95dHZw5hgob5+iogxb6DV0FqVaY+PavGFpXj4="; + hash = "sha256-8UrSY/ewy+0vo6QUV/cDBfv04TA3Toampf0hDnsWnXs="; }; vendorHash = "sha256-gk8YMMvTHBL7yoXU9n0jhtUS472fqLW5m+mSl4Lio6c="; From 79371f35ee1a29643d924ded6eeb33dfee025ec1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Jan 2025 03:39:27 +0000 Subject: [PATCH 27/34] bitcomet: 2.12.0 -> 2.12.1 --- pkgs/by-name/bi/bitcomet/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bi/bitcomet/package.nix b/pkgs/by-name/bi/bitcomet/package.nix index 6b09f16ba3b42..b7f0ebdc64d60 100644 --- a/pkgs/by-name/bi/bitcomet/package.nix +++ b/pkgs/by-name/bi/bitcomet/package.nix @@ -6,10 +6,10 @@ }: let pname = "bitcomet"; - version = "2.12.0"; + version = "2.12.1"; src = fetchurl { url = "https://download.bitcomet.com/linux/x86_64/BitComet-${version}-x86_64.AppImage"; - hash = "sha256-TbEdormqEZJymOQF8ftpZ6JBU1AeCdkQ/FAzRYrgaJ4="; + hash = "sha256-iaUPf9gSTd2m641Ja9/5v4wkO3H4+R08YXohLCeFuTQ="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in From 376a8b7230ffa804a09bdd7aafa50ee663014b95 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Jan 2025 04:31:38 +0000 Subject: [PATCH 28/34] murex: 6.4.1005 -> 6.4.2063 --- pkgs/by-name/mu/murex/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mu/murex/package.nix b/pkgs/by-name/mu/murex/package.nix index 71e576dad82fa..9dc5478f75048 100644 --- a/pkgs/by-name/mu/murex/package.nix +++ b/pkgs/by-name/mu/murex/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "murex"; - version = "6.4.1005"; + version = "6.4.2063"; src = fetchFromGitHub { owner = "lmorg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zuLVZnHZP/QbFZLUwWdQIy3LTaWF+8UnQ+DIhLjKbjw="; + sha256 = "sha256-czo2JCUwzENPuBBTaO4RYo7WRvepacaKElAj9DznFY0="; }; vendorHash = "sha256-NIhg8D8snCNxpb3i2JG5tLcZteYBCGN4QbOowG/vgJE="; From 4a71f60381ba80ef62d6a91ee4f2f4b9a1d9e256 Mon Sep 17 00:00:00 2001 From: misilelab Date: Thu, 16 Jan 2025 16:47:32 +0900 Subject: [PATCH 29/34] uv: 0.5.18 -> 0.5.20 Signed-off-by: misilelab --- pkgs/by-name/uv/uv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index b505598082667..2057dce1bac14 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -17,17 +17,17 @@ rustPlatform.buildRustPackage rec { pname = "uv"; - version = "0.5.18"; + version = "0.5.20"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = version; - hash = "sha256-n/Vh79CZ6mq5JB8Z+wZo+s6t87Bt9ISPj4svMOrMJf0="; + hash = "sha256-MuFeO7Ju/aPsDzujRS9hsHykUrImFWRUR+2oOaAlXLc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-+hv1LPbw1GAMcHIb7lxt8QNyQFtuuhPFJAa3iOJq3PQ="; + cargoHash = "sha256-e0U4yijsGyEm7PCrpn6WYn1cPEK4oGtK1fr7Wrxnmkg="; nativeBuildInputs = [ cmake From d0da78f987a9682cf961b906d1f34ec6cce4734d Mon Sep 17 00:00:00 2001 From: Benedikt Ritter Date: Thu, 16 Jan 2025 09:06:58 +0100 Subject: [PATCH 30/34] maintainers: add britter --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c2b5a52f042aa..bf9292753f9a6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3364,6 +3364,12 @@ github = "brianmcgillion"; githubId = 1044263; }; + britter = { + name = "Benedikt Ritter"; + email = "beneritter@gmail.com"; + github = "britter"; + githubId = 1327662; + }; brodes = { email = "me@brod.es"; github = "brhoades"; From 56a0ac2c97285d1bfdd9adfaa98867d85b106c49 Mon Sep 17 00:00:00 2001 From: Benedikt Ritter Date: Thu, 16 Jan 2025 09:07:35 +0100 Subject: [PATCH 31/34] gradle: Add britter as maintainer --- pkgs/development/tools/build-managers/gradle/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 5f34894e8dc37..cfdbaa262f0fc 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -174,7 +174,7 @@ rec { binaryNativeCode ]; license = licenses.asl20; - maintainers = with maintainers; [ lorenzleutgeb liff ] ++ lib.teams.java.members; + maintainers = with maintainers; [ britter liff lorenzleutgeb ] ++ lib.teams.java.members; mainProgram = "gradle"; } // meta; }); From b6a35ab9da9a0ea15b83f41a7421a83e0f5a6cd6 Mon Sep 17 00:00:00 2001 From: Mutsuha Asada Date: Thu, 16 Jan 2025 17:09:31 +0900 Subject: [PATCH 32/34] ocamlPackages.asn1-combinators: 0.3.1 -> 0.3.2 (#373485) Changelog: https://github.com/mirleft/ocaml-asn1-combinators/releases/tag/v0.3.2 Diff: https://github.com/mirleft/ocaml-asn1-combinators/compare/v0.3.1...v0.3.2 --- .../asn1-combinators/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/pkgs/development/ocaml-modules/asn1-combinators/default.nix index 2530312bfeac8..81e26af0a8e92 100644 --- a/pkgs/development/ocaml-modules/asn1-combinators/default.nix +++ b/pkgs/development/ocaml-modules/asn1-combinators/default.nix @@ -4,28 +4,33 @@ fetchurl, ptime, alcotest, + ohex, }: buildDunePackage rec { - minimalOCamlVersion = "4.08"; + minimalOCamlVersion = "4.13.0"; pname = "asn1-combinators"; - version = "0.3.1"; + version = "0.3.2"; src = fetchurl { url = "https://github.com/mirleft/ocaml-asn1-combinators/releases/download/v${version}/asn1-combinators-${version}.tbz"; - hash = "sha256-+imExupuHhxP4gM/AWWvYRljwkAM4roFEAS3ffxVfE4="; + hash = "sha256-KyaYX24nIgc9zZ+ENVvWdX4SZDtaSOMLPAf/fPsNin8="; }; propagatedBuildInputs = [ ptime ]; doCheck = true; - checkInputs = [ alcotest ]; + checkInputs = [ + alcotest + ohex + ]; - meta = with lib; { + meta = { homepage = "https://github.com/mirleft/ocaml-asn1-combinators"; + changelog = "https://github.com/mirleft/ocaml-asn1-combinators/blob/v${version}/CHANGES.md"; description = "Combinators for expressing ASN.1 grammars in OCaml"; - license = licenses.isc; - maintainers = with maintainers; [ vbgl ]; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ vbgl ]; }; } From 561fe54b21a3bac080dc4f0efbdfe568c8a4b9ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20S=C3=B8rensen?= Date: Thu, 16 Jan 2025 09:49:27 +0100 Subject: [PATCH 33/34] eza: 0.20.16 -> 0.20.17 changelog: https://github.com/eza-community/eza/releases/tag/v0.20.17 --- pkgs/by-name/ez/eza/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index db3a5abf82e58..c82e7671d3756 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.20.16"; + version = "0.20.17"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-0Fh12LuCPTK9vVmrR0pV0z8rs0XMJN9hJg026bSR6Z8="; + hash = "sha256-X3/qW8BFa6Muk4XzTO6z6SDP07NHh7MOkngHNgw/sUA="; }; - cargoHash = "sha256-dEXY33dv700M066LB46/wFeaB9wZvpPuq1M4XjneLks="; + cargoHash = "sha256-q48LhGwi6WnzV2JLYhwbr7GtHNH6kMglntZK+sFf5zo="; nativeBuildInputs = [ cmake From b07c183bf073428060ad6f6abe4f588afc6e3ea0 Mon Sep 17 00:00:00 2001 From: Sebastian Kowalak Date: Wed, 15 Jan 2025 19:31:28 +0100 Subject: [PATCH 34/34] gqlgen: init at 0.17.63 --- pkgs/by-name/gq/gqlgen/package.nix | 47 ++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 pkgs/by-name/gq/gqlgen/package.nix diff --git a/pkgs/by-name/gq/gqlgen/package.nix b/pkgs/by-name/gq/gqlgen/package.nix new file mode 100644 index 0000000000000..35606048bccdf --- /dev/null +++ b/pkgs/by-name/gq/gqlgen/package.nix @@ -0,0 +1,47 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, + versionCheckHook, +}: + +let + version = "0.17.63"; +in +buildGoModule { + pname = "gqlgen"; + inherit version; + + src = fetchFromGitHub { + owner = "99designs"; + repo = "gqlgen"; + tag = "v${version}"; + hash = "sha256-J9+pleHdbQMHP/Aq9Pl6ise6PDvRqxQ72Iq7SNxgMws="; + }; + + vendorHash = "sha256-hPUWYOfCx+kW2dJsjkCE/7bwofnGdQbDTvfZ877/pCk="; + + subPackages = [ "." ]; + + env.CGO_ENABLED = 0; + + checkFlags = [ + "-skip=^TestGenerate$" # skip tests that want to run `go mod tidy` + ]; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + + versionCheckProgramArg = "version"; + + meta = { + homepage = "https://github.com/99designs/gqlgen"; + changelog = "https://github.com/99designs/gqlgen/releases/tag/v${version}"; + description = "go generate based graphql server library"; + license = lib.licenses.mit; + mainProgram = "gqlgen"; + maintainers = with lib.maintainers; [ skowalak ]; + }; +}