diff --git a/pkgs/by-name/be/bento/package.nix b/pkgs/by-name/be/bento/package.nix index badc035b76cc..7acea78088f9 100644 --- a/pkgs/by-name/be/bento/package.nix +++ b/pkgs/by-name/be/bento/package.nix @@ -8,17 +8,17 @@ buildGoModule rec { pname = "bento"; - version = "1.7.1"; + version = "1.8.1"; src = fetchFromGitHub { owner = "warpstreamlabs"; repo = "bento"; tag = "v${version}"; - hash = "sha256-pV7Fd+Ir+ZqteM0In/NiZrAyvPFS+oOnONhGVeBzA2g="; + hash = "sha256-5AXXtjQU8GGepAlXWPAA32WfnkFtNmyJDaSqfbvoips="; }; proxyVendor = true; - vendorHash = "sha256-ow/XOO8Xc72v6Ue9VHjnPuq+HlqE4YZHw+gJB4x7sKk="; + vendorHash = "sha256-N3YkY1wfxdPnwbEXDxHi/J3Oi3qiNtDMOwvSThX6cf0="; subPackages = [ "cmd/bento" diff --git a/pkgs/by-name/go/go-mockery/package.nix b/pkgs/by-name/go/go-mockery/package.nix index 8910fe5c35f6..99cd99afeaaa 100644 --- a/pkgs/by-name/go/go-mockery/package.nix +++ b/pkgs/by-name/go/go-mockery/package.nix @@ -2,39 +2,80 @@ lib, buildGoModule, # sync with go below, update to latest release fetchFromGitHub, - versionCheckHook, + + # passthru test + go-mockery, + runCommand, + go, }: buildGoModule rec { pname = "go-mockery"; - version = "3.2.5"; + version = "2.53.3"; src = fetchFromGitHub { owner = "vektra"; repo = "mockery"; - tag = "v${version}"; - hash = "sha256-QtfiW9yZvqCjKb3wH+QqfD98d7FLDVBQxj2Y/GC6Yhk="; + rev = "v${version}"; + sha256 = "sha256-X0cHpv4o6pzgjg7+ULCuFkspeff95WFtJbVHqy4LxAg="; }; ldflags = [ "-s" "-w" - "-X github.com/vektra/mockery/v${lib.versions.major version}/internal/logging.SemVer=v${version}" + "-X" + "github.com/vektra/mockery/v${lib.versions.major version}/pkg/logging.SemVer=v${version}" ]; env.CGO_ENABLED = false; proxyVendor = true; - vendorHash = "sha256-ac9wqHmkmpb1tIkQQ7x8+X+wQ217vsNm4IIidzNlne0="; - doInstallCheck = true; - nativeInstallCheckInputs = [ - versionCheckHook - ]; - versionCheckProgram = "${placeholder "out"}/bin/mockery"; - versionCheckProgramArg = "version"; + vendorHash = "sha256-AQY4x2bLqMwHIjoKHzEm1hebR29gRs3LJN8i00Uup5o="; subPackages = [ "." ]; + preCheck = '' + # check all paths + unset subPackages + + substituteInPlace ./pkg/generator_test.go --replace-fail 0.0.0-dev ${version} + substituteInPlace ./pkg/logging/logging_test.go --replace-fail v0.0 v${lib.versions.majorMinor version} + ''; + + passthru.tests = { + generateMock = + runCommand "${pname}-test" + { + nativeBuildInputs = [ go-mockery ]; + buildInputs = [ go ]; + } + '' + if [[ $(${meta.mainProgram} --version) != *"${version}"* ]]; then + echo "Error: program version does not match package version" + exit 1 + fi + + export HOME=$TMPDIR + + cat < foo.go + package main + + type Foo interface { + Bark() string + } + EOF + + ${meta.mainProgram} --name Foo --dir . + + if [[ ! -f "mocks/Foo.go" ]]; then + echo "Error: mocks/Foo.go was not generated by ${pname}" + exit 1 + fi + + touch $out + ''; + }; + meta = { homepage = "https://github.com/vektra/mockery"; description = "Mock code autogenerator for Golang"; diff --git a/pkgs/by-name/la/laravel/composer.lock b/pkgs/by-name/la/laravel/composer.lock index 16f2543fbb63..5efe1eecfe30 100644 --- a/pkgs/by-name/la/laravel/composer.lock +++ b/pkgs/by-name/la/laravel/composer.lock @@ -168,16 +168,16 @@ }, { "name": "illuminate/collections", - "version": "v12.16.0", + "version": "v12.19.2", "source": { "type": "git", "url": "https://github.com/illuminate/collections.git", - "reference": "d5ea498fd4de52341eced75eced74b7f076bb35f" + "reference": "21a206b2b2297e838c181b482b5f8bbe7ac48f61" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/collections/zipball/d5ea498fd4de52341eced75eced74b7f076bb35f", - "reference": "d5ea498fd4de52341eced75eced74b7f076bb35f", + "url": "https://api.github.com/repos/illuminate/collections/zipball/21a206b2b2297e838c181b482b5f8bbe7ac48f61", + "reference": "21a206b2b2297e838c181b482b5f8bbe7ac48f61", "shasum": "" }, "require": { @@ -221,11 +221,11 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2025-05-26T17:22:35+00:00" + "time": "2025-06-12T14:21:37+00:00" }, { "name": "illuminate/conditionable", - "version": "v12.16.0", + "version": "v12.19.2", "source": { "type": "git", "url": "https://github.com/illuminate/conditionable.git", @@ -271,16 +271,16 @@ }, { "name": "illuminate/contracts", - "version": "v12.16.0", + "version": "v12.19.2", "source": { "type": "git", "url": "https://github.com/illuminate/contracts.git", - "reference": "b559b9840344cc02cb142a5d72132a2c928f2e5c" + "reference": "ad1d16d827927455d3b7e39fabac66b1afb82582" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/contracts/zipball/b559b9840344cc02cb142a5d72132a2c928f2e5c", - "reference": "b559b9840344cc02cb142a5d72132a2c928f2e5c", + "url": "https://api.github.com/repos/illuminate/contracts/zipball/ad1d16d827927455d3b7e39fabac66b1afb82582", + "reference": "ad1d16d827927455d3b7e39fabac66b1afb82582", "shasum": "" }, "require": { @@ -315,20 +315,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2025-05-13T15:08:45+00:00" + "time": "2025-06-12T15:07:31+00:00" }, { "name": "illuminate/filesystem", - "version": "v12.16.0", + "version": "v12.19.2", "source": { "type": "git", "url": "https://github.com/illuminate/filesystem.git", - "reference": "80fe8605cfa360fdbc85f67c19801a9657615aab" + "reference": "a5ec0cc347d46ff4aa3615c7739f321df3183fb7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/filesystem/zipball/80fe8605cfa360fdbc85f67c19801a9657615aab", - "reference": "80fe8605cfa360fdbc85f67c19801a9657615aab", + "url": "https://api.github.com/repos/illuminate/filesystem/zipball/a5ec0cc347d46ff4aa3615c7739f321df3183fb7", + "reference": "a5ec0cc347d46ff4aa3615c7739f321df3183fb7", "shasum": "" }, "require": { @@ -382,11 +382,11 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2025-05-13T15:08:45+00:00" + "time": "2025-06-17T23:40:32+00:00" }, { "name": "illuminate/macroable", - "version": "v12.16.0", + "version": "v12.19.2", "source": { "type": "git", "url": "https://github.com/illuminate/macroable.git", @@ -432,16 +432,16 @@ }, { "name": "illuminate/support", - "version": "v12.16.0", + "version": "v12.19.2", "source": { "type": "git", "url": "https://github.com/illuminate/support.git", - "reference": "ca7535d97755d36dd0afcb3627e5f0623dae5000" + "reference": "4e5d098d1cdbf5cabff09c1903a141bd9747ae75" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/support/zipball/ca7535d97755d36dd0afcb3627e5f0623dae5000", - "reference": "ca7535d97755d36dd0afcb3627e5f0623dae5000", + "url": "https://api.github.com/repos/illuminate/support/zipball/4e5d098d1cdbf5cabff09c1903a141bd9747ae75", + "reference": "4e5d098d1cdbf5cabff09c1903a141bd9747ae75", "shasum": "" }, "require": { @@ -505,7 +505,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2025-05-26T17:21:08+00:00" + "time": "2025-06-12T15:07:56+00:00" }, { "name": "laravel/prompts", @@ -568,16 +568,16 @@ }, { "name": "nesbot/carbon", - "version": "3.9.1", + "version": "3.10.0", "source": { "type": "git", "url": "https://github.com/CarbonPHP/carbon.git", - "reference": "ced71f79398ece168e24f7f7710462f462310d4d" + "reference": "c1397390dd0a7e0f11660f0ae20f753d88c1f3d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/ced71f79398ece168e24f7f7710462f462310d4d", - "reference": "ced71f79398ece168e24f7f7710462f462310d4d", + "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/c1397390dd0a7e0f11660f0ae20f753d88c1f3d9", + "reference": "c1397390dd0a7e0f11660f0ae20f753d88c1f3d9", "shasum": "" }, "require": { @@ -585,9 +585,9 @@ "ext-json": "*", "php": "^8.1", "psr/clock": "^1.0", - "symfony/clock": "^6.3 || ^7.0", + "symfony/clock": "^6.3.12 || ^7.0", "symfony/polyfill-mbstring": "^1.0", - "symfony/translation": "^4.4.18 || ^5.2.1|| ^6.0 || ^7.0" + "symfony/translation": "^4.4.18 || ^5.2.1 || ^6.0 || ^7.0" }, "provide": { "psr/clock-implementation": "1.0" @@ -595,14 +595,13 @@ "require-dev": { "doctrine/dbal": "^3.6.3 || ^4.0", "doctrine/orm": "^2.15.2 || ^3.0", - "friendsofphp/php-cs-fixer": "^3.57.2", + "friendsofphp/php-cs-fixer": "^3.75.0", "kylekatarnls/multi-tester": "^2.5.3", - "ondrejmirtes/better-reflection": "^6.25.0.4", "phpmd/phpmd": "^2.15.0", - "phpstan/extension-installer": "^1.3.1", - "phpstan/phpstan": "^1.11.2", - "phpunit/phpunit": "^10.5.20", - "squizlabs/php_codesniffer": "^3.9.0" + "phpstan/extension-installer": "^1.4.3", + "phpstan/phpstan": "^2.1.17", + "phpunit/phpunit": "^10.5.46", + "squizlabs/php_codesniffer": "^3.13.0" }, "bin": [ "bin/carbon" @@ -670,7 +669,7 @@ "type": "tidelift" } ], - "time": "2025-05-01T19:51:51+00:00" + "time": "2025-06-12T10:24:28+00:00" }, { "name": "psr/clock", @@ -826,7 +825,7 @@ }, { "name": "symfony/clock", - "version": "v7.2.0", + "version": "v7.3.0", "source": { "type": "git", "url": "https://github.com/symfony/clock.git", @@ -880,7 +879,7 @@ "time" ], "support": { - "source": "https://github.com/symfony/clock/tree/v7.2.0" + "source": "https://github.com/symfony/clock/tree/v7.3.0" }, "funding": [ { @@ -900,23 +899,24 @@ }, { "name": "symfony/console", - "version": "v7.2.6", + "version": "v7.3.0", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "0e2e3f38c192e93e622e41ec37f4ca70cfedf218" + "reference": "66c1440edf6f339fd82ed6c7caa76cb006211b44" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/0e2e3f38c192e93e622e41ec37f4ca70cfedf218", - "reference": "0e2e3f38c192e93e622e41ec37f4ca70cfedf218", + "url": "https://api.github.com/repos/symfony/console/zipball/66c1440edf6f339fd82ed6c7caa76cb006211b44", + "reference": "66c1440edf6f339fd82ed6c7caa76cb006211b44", "shasum": "" }, "require": { "php": ">=8.2", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-mbstring": "~1.0", "symfony/service-contracts": "^2.5|^3", - "symfony/string": "^6.4|^7.0" + "symfony/string": "^7.2" }, "conflict": { "symfony/dependency-injection": "<6.4", @@ -973,7 +973,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v7.2.6" + "source": "https://github.com/symfony/console/tree/v7.3.0" }, "funding": [ { @@ -989,7 +989,7 @@ "type": "tidelift" } ], - "time": "2025-04-07T19:09:28+00:00" + "time": "2025-05-24T10:34:04+00:00" }, { "name": "symfony/deprecation-contracts", @@ -1060,16 +1060,16 @@ }, { "name": "symfony/finder", - "version": "v7.2.2", + "version": "v7.3.0", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "87a71856f2f56e4100373e92529eed3171695cfb" + "reference": "ec2344cf77a48253bbca6939aa3d2477773ea63d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/87a71856f2f56e4100373e92529eed3171695cfb", - "reference": "87a71856f2f56e4100373e92529eed3171695cfb", + "url": "https://api.github.com/repos/symfony/finder/zipball/ec2344cf77a48253bbca6939aa3d2477773ea63d", + "reference": "ec2344cf77a48253bbca6939aa3d2477773ea63d", "shasum": "" }, "require": { @@ -1104,7 +1104,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v7.2.2" + "source": "https://github.com/symfony/finder/tree/v7.3.0" }, "funding": [ { @@ -1120,7 +1120,7 @@ "type": "tidelift" } ], - "time": "2024-12-30T19:00:17+00:00" + "time": "2024-12-30T19:00:26+00:00" }, { "name": "symfony/polyfill-ctype", @@ -1519,16 +1519,16 @@ }, { "name": "symfony/process", - "version": "v7.2.5", + "version": "v7.3.0", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "87b7c93e57df9d8e39a093d32587702380ff045d" + "reference": "40c295f2deb408d5e9d2d32b8ba1dd61e36f05af" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/87b7c93e57df9d8e39a093d32587702380ff045d", - "reference": "87b7c93e57df9d8e39a093d32587702380ff045d", + "url": "https://api.github.com/repos/symfony/process/zipball/40c295f2deb408d5e9d2d32b8ba1dd61e36f05af", + "reference": "40c295f2deb408d5e9d2d32b8ba1dd61e36f05af", "shasum": "" }, "require": { @@ -1560,7 +1560,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v7.2.5" + "source": "https://github.com/symfony/process/tree/v7.3.0" }, "funding": [ { @@ -1576,7 +1576,7 @@ "type": "tidelift" } ], - "time": "2025-03-13T12:21:46+00:00" + "time": "2025-04-17T09:11:12+00:00" }, { "name": "symfony/service-contracts", @@ -1663,16 +1663,16 @@ }, { "name": "symfony/string", - "version": "v7.2.6", + "version": "v7.3.0", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "a214fe7d62bd4df2a76447c67c6b26e1d5e74931" + "reference": "f3570b8c61ca887a9e2938e85cb6458515d2b125" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/a214fe7d62bd4df2a76447c67c6b26e1d5e74931", - "reference": "a214fe7d62bd4df2a76447c67c6b26e1d5e74931", + "url": "https://api.github.com/repos/symfony/string/zipball/f3570b8c61ca887a9e2938e85cb6458515d2b125", + "reference": "f3570b8c61ca887a9e2938e85cb6458515d2b125", "shasum": "" }, "require": { @@ -1730,7 +1730,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v7.2.6" + "source": "https://github.com/symfony/string/tree/v7.3.0" }, "funding": [ { @@ -1746,20 +1746,20 @@ "type": "tidelift" } ], - "time": "2025-04-20T20:18:16+00:00" + "time": "2025-04-20T20:19:01+00:00" }, { "name": "symfony/translation", - "version": "v7.2.6", + "version": "v7.3.0", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "e7fd8e2a4239b79a0fd9fb1fef3e0e7f969c6dc6" + "reference": "4aba29076a29a3aa667e09b791e5f868973a8667" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/e7fd8e2a4239b79a0fd9fb1fef3e0e7f969c6dc6", - "reference": "e7fd8e2a4239b79a0fd9fb1fef3e0e7f969c6dc6", + "url": "https://api.github.com/repos/symfony/translation/zipball/4aba29076a29a3aa667e09b791e5f868973a8667", + "reference": "4aba29076a29a3aa667e09b791e5f868973a8667", "shasum": "" }, "require": { @@ -1769,6 +1769,7 @@ "symfony/translation-contracts": "^2.5|^3.0" }, "conflict": { + "nikic/php-parser": "<5.0", "symfony/config": "<6.4", "symfony/console": "<6.4", "symfony/dependency-injection": "<6.4", @@ -1782,7 +1783,7 @@ "symfony/translation-implementation": "2.3|3.0" }, "require-dev": { - "nikic/php-parser": "^4.18|^5.0", + "nikic/php-parser": "^5.0", "psr/log": "^1|^2|^3", "symfony/config": "^6.4|^7.0", "symfony/console": "^6.4|^7.0", @@ -1825,7 +1826,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v7.2.6" + "source": "https://github.com/symfony/translation/tree/v7.3.0" }, "funding": [ { @@ -1841,7 +1842,7 @@ "type": "tidelift" } ], - "time": "2025-04-07T19:09:28+00:00" + "time": "2025-05-29T07:19:49+00:00" }, { "name": "symfony/translation-contracts", @@ -2059,16 +2060,16 @@ }, { "name": "nikic/php-parser", - "version": "v5.4.0", + "version": "v5.5.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "447a020a1f875a434d62f2a401f53b82a396e494" + "reference": "ae59794362fe85e051a58ad36b289443f57be7a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/447a020a1f875a434d62f2a401f53b82a396e494", - "reference": "447a020a1f875a434d62f2a401f53b82a396e494", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/ae59794362fe85e051a58ad36b289443f57be7a9", + "reference": "ae59794362fe85e051a58ad36b289443f57be7a9", "shasum": "" }, "require": { @@ -2111,9 +2112,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.4.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.5.0" }, - "time": "2024-12-30T11:07:19+00:00" + "time": "2025-05-31T08:24:38+00:00" }, { "name": "phar-io/manifest", diff --git a/pkgs/by-name/la/laravel/package.nix b/pkgs/by-name/la/laravel/package.nix index a8064b0ef2a9..c13b51eedc13 100644 --- a/pkgs/by-name/la/laravel/package.nix +++ b/pkgs/by-name/la/laravel/package.nix @@ -7,19 +7,19 @@ }: php.buildComposerProject2 (finalAttrs: { pname = "laravel"; - version = "5.15.0"; + version = "5.16.0"; src = fetchFromGitHub { owner = "laravel"; repo = "installer"; tag = "v${finalAttrs.version}"; - hash = "sha256-hnbcJ2RF/fTUBm2KhV1tECc3iMSmFia0zI95QmcRkNM="; + hash = "sha256-A2DUa1TD9xeZ8zyIVOGgPEnY/UrDSzVpC32JNg5OpyU="; }; nativeBuildInputs = [ makeWrapper ]; composerLock = ./composer.lock; - vendorHash = "sha256-l+mzm4sIURKkXu6WPVQrGbj9YhunPfmYmDDmtUuKuXY="; + vendorHash = "sha256-2mUC6uu9DS0FJaKiiNVCUSZoEW5+bpkUlrWHZV+pzL0="; # Adding npm (nodejs) and php composer to path postInstall = '' diff --git a/pkgs/by-name/lo/lon/package.nix b/pkgs/by-name/lo/lon/package.nix index 718b48d3586a..450dd563e27e 100644 --- a/pkgs/by-name/lo/lon/package.nix +++ b/pkgs/by-name/lo/lon/package.nix @@ -10,19 +10,19 @@ rustPlatform.buildRustPackage rec { pname = "lon"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "nikstur"; repo = "lon"; tag = version; - hash = "sha256-+hCqAtu9uo9BndZogXUIMMoL1pXmwyec5edj6gg82GM="; + hash = "sha256-bxu83mbdfAeDZYOnjZQYyjTs5WgZS8o6Q2irlzgbYs0="; }; sourceRoot = "source/rust/lon"; useFetchCargoVendor = true; - cargoHash = "sha256-i+DAVtXAYQ254Y7jechjOcwe3nT/0O4AzxBH5QkK9aM="; + cargoHash = "sha256-x+qxn0s64fPJpTG/d0PgzAdzMXegYdnsC1FFFuBpsaI="; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/by-name/op/openvr/package.nix b/pkgs/by-name/op/openvr/package.nix index fa65d10af9e3..9966f945141e 100644 --- a/pkgs/by-name/op/openvr/package.nix +++ b/pkgs/by-name/op/openvr/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "openvr"; - version = "2.5.1"; + version = "2.12.1"; src = fetchFromGitHub { owner = "ValveSoftware"; repo = "openvr"; rev = "v${finalAttrs.version}"; - hash = "sha256-bIKjZ7DvJVmDK386WgXaAFQrS0E1TNEUMhfQp7FNnvk="; + hash = "sha256-SdCN1BmYa2XyBi+aIKrk7RQBRG9+NeEpO7RsEmEBRjc="; }; patches = [ diff --git a/pkgs/by-name/tr/trilium-next-desktop/package.nix b/pkgs/by-name/tr/trilium-next-desktop/package.nix index dae3d5de6729..d51666362caf 100644 --- a/pkgs/by-name/tr/trilium-next-desktop/package.nix +++ b/pkgs/by-name/tr/trilium-next-desktop/package.nix @@ -5,7 +5,7 @@ fetchurl, makeBinaryWrapper, # use specific electron since it has to load a compiled module - electron_35, + electron_36, autoPatchelfHook, makeDesktopItem, copyDesktopItems, @@ -15,7 +15,7 @@ let pname = "trilium-next-desktop"; - version = "0.93.0"; + version = "0.95.0"; triliumSource = os: arch: sha256: { url = "https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-v${version}-${os}-${arch}.zip"; @@ -26,10 +26,10 @@ let darwinSource = triliumSource "macos"; # exposed like this for update.sh - x86_64-linux.sha256 = "02cz98bgv8l5c96irmxla93h9vpxpfh2l25q5h4r1wcyg00k0gqc"; - aarch64-linux.sha256 = "0ahkskdaggff34zn6ml8s3v3ig8fq3isrcrckpvy9acyhk2nm924"; - x86_64-darwin.sha256 = "0p1db3bij5pipwjjh0vyscvd6anq1qriny7y7yxx2sviksgyl0i8"; - aarch64-darwin.sha256 = "0fkqlxssrdz2g63yhs1l74h037xac04y3dng7kqnrzhn740p2wjc"; + x86_64-linux.sha256 = "1lykzd1spvl6x6xm2qhw5bzcs9pbcars686gwbirscr53fb7q841"; + aarch64-linux.sha256 = "0bxrsj1g8dgg9rd6s0aj9jm2w6nk9yn6b1xgiab8kn298p3iqz64"; + x86_64-darwin.sha256 = "16cv52c6jn5ah5ccdfxffwrmf6vz8d4q4rj0v5ny4m0g0al78isg"; + aarch64-darwin.sha256 = "0v388frd4skpilxn8i5isd9xgn0qs9zszfs3h75q3qpx4xz355ps"; sources = { x86_64-linux = linuxSource "x64" x86_64-linux.sha256; @@ -100,22 +100,18 @@ let cp -r ./* "$out/share/trilium/" rm $out/share/trilium/{*.so*,trilium,chrome_crashpad_handler,chrome-sandbox} - # Rebuild the ASAR archive, hardcoding the resourcesPath + # Rebuild the ASAR archive to patchelf native module. tmp=$(mktemp -d) asar extract $out/share/trilium/resources/app.asar $tmp rm $out/share/trilium/resources/app.asar - for f in "src/services/utils.js"; do - substituteInPlace $tmp/$f \ - --replace-fail "process.resourcesPath" "'$out/share/trilium/resources'" - done autoPatchelf $tmp - cp $tmp/src/public/icon.png $out/share/icons/hicolor/512x512/apps/trilium.png + cp $tmp/public/assets/icon.png $out/share/icons/hicolor/512x512/apps/trilium.png asar pack $tmp/ $out/share/trilium/resources/app.asar rm -rf $tmp - makeWrapper ${lib.getExe electron_35} $out/bin/trilium \ + makeWrapper ${lib.getExe electron_36} $out/bin/trilium \ "''${gappsWrapperArgs[@]}" \ --set-default ELECTRON_IS_DEV 0 \ --add-flags $out/share/trilium/resources/app.asar diff --git a/pkgs/by-name/tr/trilium-next-server/0001-Use-console-logger-instead-of-rolling-files.patch b/pkgs/by-name/tr/trilium-next-server/0001-Use-console-logger-instead-of-rolling-files.patch deleted file mode 100644 index e6f33b51bf24..000000000000 --- a/pkgs/by-name/tr/trilium-next-server/0001-Use-console-logger-instead-of-rolling-files.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/src/services/log.js b/src/services/log.js -index 2840c185a..7fb16dd08 100644 ---- a/src/services/log.js -+++ b/src/services/log.js -@@ -3,9 +3,6 @@ import fs from "fs"; - import dataDir from "./data_dir.js"; - import cls from "./cls.js"; - import { isWindows } from "./utils.js"; --if (!fs.existsSync(dataDir.LOG_DIR)) { -- fs.mkdirSync(dataDir.LOG_DIR, 0o700); --} - let logFile; - const SECOND = 1000; - const MINUTE = 60 * SECOND; -@@ -24,7 +21,6 @@ function initLogFile() { - if (logFile) { - logFile.end(); - } -- logFile = fs.createWriteStream(path, { flags: "a" }); - } - function checkDate(millisSinceMidnight) { - if (millisSinceMidnight >= DAY) { -@@ -40,7 +36,6 @@ function log(str) { - } - let millisSinceMidnight = Date.now() - todaysMidnight.getTime(); - millisSinceMidnight = checkDate(millisSinceMidnight); -- logFile.write(`${formatTime(millisSinceMidnight)} ${str}${NEW_LINE}`); - console.log(str); - } - function info(message) { diff --git a/pkgs/by-name/tr/trilium-next-server/package.nix b/pkgs/by-name/tr/trilium-next-server/package.nix index 1c7fb0d25739..327f462c9287 100644 --- a/pkgs/by-name/tr/trilium-next-server/package.nix +++ b/pkgs/by-name/tr/trilium-next-server/package.nix @@ -7,12 +7,12 @@ }: let - version = "0.93.0"; + version = "0.95.0"; serverSource_x64.url = "https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-Server-v${version}-linux-x64.tar.xz"; - serverSource_x64.sha256 = "0gm0j8w16ynwb1rsgxd7g4pa4vm47728d8393bazppxgf91gnh3d"; + serverSource_x64.sha256 = "1rjl38i6l894kwpmc925amf9zbwyjlc4sqh3skm1f13vhv9pj9dx"; serverSource_arm64.url = "https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-Server-v${version}-linux-arm64.tar.xz"; - serverSource_arm64.sha256 = "0in1y3zsx4mni02lq17q0camn07p7fngl1qjmjnhkps7pr799d2q"; + serverSource_arm64.sha256 = "1rpzc13vdp5b3iwwc1l6h78nb5iairlxbflwvjwhy1149lpqnn8m"; serverSource = if stdenv.hostPlatform.isx86_64 then @@ -28,11 +28,6 @@ stdenv.mkDerivation { src = fetchurl serverSource; - patches = [ - # patch logger to use console instead of rolling files - ./0001-Use-console-logger-instead-of-rolling-files.patch - ]; - nativeBuildInputs = [ autoPatchelfHook makeBinaryWrapper @@ -53,10 +48,7 @@ stdenv.mkDerivation { makeWrapper "$out/share/trilium-server/node/bin/node" "$out/bin/trilium-server" \ --chdir "$out/share/trilium-server" \ - --add-flags "src/main" - - # Clean up broken symlinks and build tools. - rm -r "$out"/share/trilium-server/node_modules/{@npmcli,@rollup,@babel} + --add-flags "main.cjs" runHook postInstall ''; diff --git a/pkgs/by-name/wa/warehouse/package.nix b/pkgs/by-name/wa/warehouse/package.nix index 7fd50af13e08..b07aff78550a 100644 --- a/pkgs/by-name/wa/warehouse/package.nix +++ b/pkgs/by-name/wa/warehouse/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "warehouse"; - version = "2.0.2"; + version = "2.1.0"; src = fetchFromGitHub { owner = "flattool"; repo = "warehouse"; tag = finalAttrs.version; - hash = "sha256-EcpHFS0EczUDFs0A/7IuNs1082hsuuS0J6wxSq47vaQ="; + hash = "sha256-3xtC6pcZo6MTypeILy+cNMBaPK+PlshIXaeJW6KGyV0="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/games/minecraft/mcaselector/default.nix b/pkgs/tools/games/minecraft/mcaselector/default.nix index d214dfd52baf..ffe52140b83d 100644 --- a/pkgs/tools/games/minecraft/mcaselector/default.nix +++ b/pkgs/tools/games/minecraft/mcaselector/default.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "mcaselector"; - version = "2.5.2"; + version = "2.5.3"; src = fetchurl { url = "https://github.com/Querz/mcaselector/releases/download/${finalAttrs.version}/mcaselector-${finalAttrs.version}.jar"; - hash = "sha256-bbhbTsMtBIBTGd6IRTKPzY5T8NLfLqBu2bYc8GK8y/U="; + hash = "sha256-PQCXwtEK+Tq1cRJDkzlQ43dhdQ3J+bd8x/ymvsfIfdA="; }; dontUnpack = true;