diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6f9acf4ff373..968a0220d6c8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3370,6 +3370,12 @@ github = "brianmcgillion"; githubId = 1044263; }; + britter = { + name = "Benedikt Ritter"; + email = "beneritter@gmail.com"; + github = "britter"; + githubId = 1327662; + }; brodes = { email = "me@brod.es"; github = "brhoades"; @@ -21320,6 +21326,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"; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index f7fadbff867d..19c5fd9abbcf 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -13315,6 +13315,18 @@ final: prev: meta.homepage = "https://github.com/leafgarland/typescript-vim/"; }; + nvzone-typr = buildVimPlugin { + pname = "typr"; + version = "2025-01-15"; + src = fetchFromGitHub { + owner = "nvzone"; + repo = "typr"; + rev = "a60c7f237be94d4b39228a3bd2ced80fe9fe2781"; + sha256 = "0hbd85s2d28832qqy0lnm7f2iqa5n5s16h7n10hsm9iawi0z2ll9"; + }; + meta.homepage = "https://github.com/nvzone/typr/"; + }; + typst-conceal-vim = buildVimPlugin { pname = "typst-conceal.vim"; version = "2023-10-13"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index f7255044c86e..1e815d5343d8 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -3303,6 +3303,10 @@ in ]; }; + nvzone-typr = super.nvzone-typr.overrideAttrs { + dependencies = [ self.nvzone-volt ]; + }; + unicode-vim = let unicode-data = fetchurl { diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 7186d90b20f7..a06e5079331b 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -840,6 +840,7 @@ https://github.com/neovim/nvimdev.nvim/,, https://github.com/zbirenbaum/nvterm/,HEAD, https://github.com/nvzone/menu/,HEAD,nvzone-menu https://github.com/nvzone/minty/,HEAD,nvzone-minty +https://github.com/nvzone/typr/,HEAD,nvzone-typr https://github.com/nvzone/volt/,HEAD,nvzone-volt https://github.com/epwalsh/obsidian.nvim/,HEAD, https://github.com/nvimdev/oceanic-material/,, diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index f6dab13a787f..7749c9ef9a50 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="; }; } diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index bedcb6c1d8e3..fd61993b5543 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 = [ diff --git a/pkgs/by-name/ay/ayatana-indicator-sound/package.nix b/pkgs/by-name/ay/ayatana-indicator-sound/package.nix index 039d88bb2b35..75b51ff64a0c 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 = [ diff --git a/pkgs/by-name/bi/bitcomet/package.nix b/pkgs/by-name/bi/bitcomet/package.nix index 6b09f16ba3b4..b7f0ebdc64d6 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 diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index db3a5abf82e5..c82e7671d375 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 diff --git a/pkgs/tools/networking/gping/default.nix b/pkgs/by-name/gp/gping/package.nix similarity index 57% rename from pkgs/tools/networking/gping/default.nix rename to pkgs/by-name/gp/gping/package.nix index 6611f99394a7..62c36d0b1db7 100644 --- a/pkgs/tools/networking/gping/default.nix +++ b/pkgs/by-name/gp/gping/package.nix @@ -6,20 +6,21 @@ installShellFiles, iputils, versionCheckHook, + nix-update-script, }: 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,18 +30,27 @@ 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 ]; versionCheckProgramArg = [ "--version" ]; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + 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"; }; } diff --git a/pkgs/by-name/gq/gqlgen/package.nix b/pkgs/by-name/gq/gqlgen/package.nix new file mode 100644 index 000000000000..35606048bccd --- /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 ]; + }; +} diff --git a/pkgs/by-name/ma/maltego/package.nix b/pkgs/by-name/ma/maltego/package.nix index 4c143bd00bdd..ff31321a90aa 100644 --- a/pkgs/by-name/ma/maltego/package.nix +++ b/pkgs/by-name/ma/maltego/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "maltego"; - version = "4.8.1"; + version = "4.9.0"; src = fetchzip { url = "https://downloads.maltego.com/maltego-v4/linux/Maltego.v${finalAttrs.version}.linux.zip"; - hash = "sha256-FH2gyz3/4wDBRsOQl3l2pbavvSyK73HuAXvJ0YBC1dw="; + hash = "sha256-K5Nh9tfNsKViNyMkkLFZ3c1ebGnlj+glEUZ/Iio2bxE="; }; postPatch = '' diff --git a/pkgs/by-name/mi/misconfig-mapper/package.nix b/pkgs/by-name/mi/misconfig-mapper/package.nix index b5502f53973d..d87a6024284b 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" diff --git a/pkgs/by-name/mu/murex/package.nix b/pkgs/by-name/mu/murex/package.nix index 71e576dad82f..9dc5478f7504 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="; diff --git a/pkgs/by-name/po/pocketsphinx/package.nix b/pkgs/by-name/po/pocketsphinx/package.nix index 3904bee236b5..582230eb6a57 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 = [ diff --git a/pkgs/by-name/ra/radio-cli/package.nix b/pkgs/by-name/ra/radio-cli/package.nix index 655e416b554a..ccc444553ec8 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; }; } diff --git a/pkgs/by-name/tr/tracexec/package.nix b/pkgs/by-name/tr/tracexec/package.nix index fde7d0b8d5ab..5c800fa9d1c9 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" ]; diff --git a/pkgs/by-name/tr/trickest-cli/package.nix b/pkgs/by-name/tr/trickest-cli/package.nix index 3a0f09739ef2..730b9a4df1e2 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="; diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index b50559808266..2057dce1bac1 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 diff --git a/pkgs/by-name/wo/wownero/package.nix b/pkgs/by-name/wo/wownero/package.nix index 04efa59e6d43..9b658084b87b 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 = diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index abd36c355809..6644a1c78dd5 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 = [ 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 000000000000..72c27c3e0e29 --- /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 dd1390ce5475..b1502dff2f84 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,31 +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}" - # 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 '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; @@ -71,6 +79,7 @@ stdenv.mkDerivation (finalAttrs: { cmake gettext pkg-config + qttools # qdoc wrapQtAppsHook ]; @@ -142,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; }; }; diff --git a/pkgs/desktops/lomiri/data/lomiri-schemas/default.nix b/pkgs/desktops/lomiri/data/lomiri-schemas/default.nix index 31d963884877..11a16f224d83 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" ]; diff --git a/pkgs/desktops/lomiri/development/lomiri-api/default.nix b/pkgs/desktops/lomiri/development/lomiri-api/default.nix index 847569744a82..8786b0928d72 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" diff --git a/pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix b/pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix index a095aee3d092..71a233beb181 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 ]; 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 000000000000..20b0d5c5a636 --- /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='> $out/nix-support/manual-runtime-dependencies echo ${ncurses6} >> $out/nix-support/manual-runtime-dependencies + echo ${udev} >> $out/nix-support/manual-runtime-dependencies ''; passthru.tests = { @@ -174,7 +178,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; }); diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index 57d8823e9787..273618f71c3f 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -9,17 +9,17 @@ buildGoModule rec { pname = "alertmanager"; - version = "0.27.0"; + version = "0.28.0"; rev = "v${version}"; src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "alertmanager"; - hash = "sha256-soE2D/PLesV1+Kif9myB54a9zIFIa94i0BrmywJPTbI="; + hash = "sha256-m8UbC9aSzUmoyfCxBNNSCeUQvnQqMlXrcOU0ygH9byE="; }; - vendorHash = "sha256-zkHIdEdAy44iV2F929NB3ISuUbxdecaeZcsNQQGd06E="; + vendorHash = "sha256-oIQ7sXBoYC/KSYk8Er8XEg6nf0vJ3kF80hysmInmdIc="; subPackages = [ "cmd/alertmanager" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8b037f26378..f9cfdf04f898 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2330,8 +2330,6 @@ with pkgs; inherit (darwin) libobjc libresolv; }; - gping = callPackage ../tools/networking/gping { }; - greg = callPackage ../applications/audio/greg { pythonPackages = python3Packages; };