Merge staging-next into staging
This commit is contained in:
@@ -220,6 +220,17 @@
|
||||
|
||||
- `services.mattermost` now defaults to version 11, which has dropped support for MySQL in favor of Postgres. As a result, all support for MySQL has been removed from the module.
|
||||
See the [migration steps](https://docs.mattermost.com/deployment-guide/manual-postgres-migration.html) if you were not running Postgres.
|
||||
Note that version 11 also restricts the user limit to 250 [by default](https://forum.mattermost.com/t/clarification-request-on-user-limits-max-250-user-server-v-11/25309);
|
||||
see the `pkgs.mattermost` removeUserLimit and removeFreeBadge options combined with `services.mattermost.package` to change this behavior. For example:
|
||||
|
||||
```nix
|
||||
{
|
||||
services.mattermost.package = pkgs.mattermost.override {
|
||||
removeUserLimit = true;
|
||||
removeFreeBadge = true;
|
||||
};
|
||||
}
|
||||
```
|
||||
|
||||
- `post-resume.target` has been removed. See {manpage}`systemd.special(7)` about `sleep.target` for instructions on ordering a process after resume with `ExecStop=`.
|
||||
|
||||
|
||||
@@ -217,7 +217,7 @@ in
|
||||
# When imperative, seed /etc/vconsole.conf on first boot from declared
|
||||
# defaults so the keymap isn't lost before localectl is ever used
|
||||
systemd.tmpfiles.rules = lib.mkIf i18nCfg.imperativeLocale [
|
||||
"C /etc/vconsole.conf - - - - ${vconsoleConf}"
|
||||
"C /etc/vconsole.conf - - - - ${vconsoleConf true}"
|
||||
];
|
||||
|
||||
systemd.services.reload-systemd-vconsole-setup = {
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
};
|
||||
|
||||
enableOCR = true;
|
||||
interactive.sshBackdoor.enable = true; # ssh -o User=root vsock/3
|
||||
interactive.sshBackdoor.enable = true;
|
||||
|
||||
testScript =
|
||||
{ nodes, ... }:
|
||||
|
||||
@@ -58,11 +58,20 @@ import ../make-test-python.nix (
|
||||
UserNoticesEnabled = false;
|
||||
};
|
||||
};
|
||||
package = pkgs.mattermost.override {
|
||||
removeFreeBadge = true;
|
||||
removeUserLimit = true;
|
||||
};
|
||||
} mattermostConfig;
|
||||
|
||||
# Upgrade to the latest Mattermost.
|
||||
specialisation.latest.configuration = {
|
||||
services.mattermost.package = lib.mkForce pkgs.mattermostLatest;
|
||||
services.mattermost.package = lib.mkForce (
|
||||
pkgs.mattermostLatest.override {
|
||||
removeFreeBadge = true;
|
||||
removeUserLimit = true;
|
||||
}
|
||||
);
|
||||
system.stateVersion = lib.mkVMOverride (lib.versions.majorMinor lib.version);
|
||||
};
|
||||
}
|
||||
|
||||
@@ -83,8 +83,6 @@
|
||||
# Debug interactively with:
|
||||
# - nix run .#nixosTests.reaction.driverInteractive -L
|
||||
# - run_tests()
|
||||
# ssh -o User=root vsock%3 (can also do vsock/3, but % works with scp etc.)
|
||||
# ssh -o User=root vsock%4
|
||||
interactive.sshBackdoor.enable = true;
|
||||
|
||||
interactive.nodes.server =
|
||||
|
||||
@@ -73,7 +73,7 @@
|
||||
# Debug interactively with:
|
||||
# - nix run .#nixosTests.reaction-firewall.driverInteractive -L
|
||||
# - run_tests()
|
||||
interactive.sshBackdoor.enable = true; # ssh -o User=root vsock%3
|
||||
interactive.sshBackdoor.enable = true;
|
||||
interactive.nodes.machine = _: {
|
||||
virtualisation.graphics = false;
|
||||
};
|
||||
|
||||
@@ -98,8 +98,6 @@
|
||||
# Debug interactively with:
|
||||
# - nix run .#nixosTests.reaction.driverInteractive -L
|
||||
# - run_tests()
|
||||
# ssh -o User=root vsock%3 (can also do vsock/3, but % works with scp etc.)
|
||||
# ssh -o User=root vsock%4
|
||||
interactive.sshBackdoor.enable = true;
|
||||
|
||||
interactive.nodes.server =
|
||||
|
||||
@@ -40,7 +40,6 @@
|
||||
# Debug interactively with:
|
||||
# - nix run .#nixosTests.repath-studio.driverInteractive -L
|
||||
# - start_all()/run_tests()
|
||||
# ssh -o User=root vsock%3 (can also do vsock/3, but % works with scp etc.)
|
||||
interactive.sshBackdoor.enable = true;
|
||||
|
||||
testScript = /* python */ ''
|
||||
|
||||
@@ -107,7 +107,6 @@ in
|
||||
# - nix-build -A nixosTests.stirling-pdf-desktop.driverInteractive
|
||||
# - ./result/bin/nixos-test-driver
|
||||
# - run_tests()
|
||||
# ssh -o User=root vsock%3 (can also do vsock/3, but % works with scp etc.)
|
||||
interactive.sshBackdoor.enable = true;
|
||||
interactive.nodes.client =
|
||||
{ pkgs, ... }:
|
||||
|
||||
@@ -121,7 +121,6 @@ in
|
||||
# - nix-build -A nixosTests.goupile.driverInteractive
|
||||
# - ./result/bin/nixos-test-driver
|
||||
# - run_tests()
|
||||
# ssh -o User=root vsock%3 (can also do vsock/3, but % works with scp etc.)
|
||||
interactive.sshBackdoor.enable = true;
|
||||
|
||||
interactive.nodes.machine =
|
||||
|
||||
@@ -140,7 +140,7 @@
|
||||
# Debug interactively with:
|
||||
# - nix run .#nixosTests.pdfding.basic.driverInteractive -L
|
||||
# - start_all() / run_tests()
|
||||
interactive.sshBackdoor.enable = true; # ssh -o User=root vsock%3
|
||||
interactive.sshBackdoor.enable = true;
|
||||
interactive.nodes.machine =
|
||||
{ config, ... }:
|
||||
let
|
||||
|
||||
@@ -59,7 +59,7 @@
|
||||
# Debug interactively with:
|
||||
# - nix run .#nixosTests.pdfding.e2e.driverInteractive -L
|
||||
# - start_all() / run_tests()
|
||||
interactive.sshBackdoor.enable = true; # ssh -o User=root vsock%3
|
||||
interactive.sshBackdoor.enable = true;
|
||||
interactive.nodes.machine =
|
||||
{ config, ... }:
|
||||
{
|
||||
|
||||
@@ -72,7 +72,7 @@
|
||||
# Debug interactively with:
|
||||
# - nix run .#nixosTests.pdfding.postgres.driverInteractive -L
|
||||
# - start_all() / run_tests()
|
||||
interactive.sshBackdoor.enable = true; # ssh -o User=root vsock%3
|
||||
interactive.sshBackdoor.enable = true;
|
||||
interactive.nodes.machine =
|
||||
{ config, ... }:
|
||||
let
|
||||
|
||||
@@ -172,7 +172,7 @@ in
|
||||
# Debug interactively with:
|
||||
# - nix run .#nixosTests.pdfding.s3.driverInteractive -L
|
||||
# - start_all() / run_tests()
|
||||
interactive.sshBackdoor.enable = true; # ssh -o User=root vsock%3
|
||||
interactive.sshBackdoor.enable = true;
|
||||
interactive.nodes.machine =
|
||||
{ config, ... }:
|
||||
let
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -9,10 +9,10 @@
|
||||
|
||||
buildMozillaMach rec {
|
||||
pname = "firefox";
|
||||
version = "151.0.1";
|
||||
version = "151.0.2";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "8492a1bb956b38373153938bd18b0e18e3a4ad0d2abc2017b45e02bc2768c8f468d5c06329a32485a03a67bb9c22102e6abff1e73080c77764735d430dc77277";
|
||||
sha512 = "87308953ed354a2799a9a45be40033bf9ff8d80fa220f034aacfbd6e754716901d4164c37fa56032c659b259116603e0ba2b566c1f3651ab9cc0835d502cd739";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -73,13 +73,13 @@
|
||||
"vendorHash": "sha256-FHBpTYSmVivoqz+Eaa/r5y1f/saIx4l6mjOtZhxZVRw="
|
||||
},
|
||||
"auth0_auth0": {
|
||||
"hash": "sha256-9Kar2oz09oqucIz6x1ZEEbXFAuE/8OH6DTDz4Jk1lpo=",
|
||||
"hash": "sha256-XCptfoE1VI+Vn8Mls86KOYo1XwLEemi4NXzm5MhsNF4=",
|
||||
"homepage": "https://registry.terraform.io/providers/auth0/auth0",
|
||||
"owner": "auth0",
|
||||
"repo": "terraform-provider-auth0",
|
||||
"rev": "v1.46.0",
|
||||
"rev": "v1.47.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-9Imtc2/rxcJBMch/i7iRyjYFlNeHaCL+KyJr3WzINHs="
|
||||
"vendorHash": "sha256-U9pfdnh7jAJvdUcKzV5qD3ex5vprhN2k+f+jqLyKJqM="
|
||||
},
|
||||
"aviatrixsystems_aviatrix": {
|
||||
"hash": "sha256-46djOfAj/5kfeoKLQHbeKefzdGbmlBATR+uN/IaAn8I=",
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
enableRST ? true,
|
||||
docutils,
|
||||
enableSpelling ? true,
|
||||
gspell,
|
||||
libspelling,
|
||||
enableUPnP ? true,
|
||||
gupnp-igd,
|
||||
enableAppIndicator ? true,
|
||||
@@ -70,7 +70,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
libnice
|
||||
]
|
||||
++ lib.optional enableSecrets libsecret
|
||||
++ lib.optional enableSpelling gspell
|
||||
++ lib.optional enableSpelling libspelling
|
||||
++ lib.optional enableUPnP gupnp-igd
|
||||
++ lib.optional enableAppIndicator libappindicator-gtk3
|
||||
++ lib.optional enableSoundNotifications gsound;
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cargo-public-api";
|
||||
version = "0.51.0";
|
||||
version = "0.52.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-fnkoIXv6QYJPYtsLZldOEjOxke6YVDEds3jF5SGZGKE=";
|
||||
hash = "sha256-Z0r3lcuteU3DcXarBInYzkMaJSwfStdGi6ng2uRMXn8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-F4s3h+WF/S6sQ9ux28sqNe9+C1I5H9735b+cVuRFjk8=";
|
||||
cargoHash = "sha256-k846yNUwytLTDjrEwQU5eMj2jIuAI6B1RtttZluijDY=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cvc5";
|
||||
version = "1.3.3";
|
||||
version = "1.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cvc5";
|
||||
repo = "cvc5";
|
||||
tag = "cvc5-${finalAttrs.version}";
|
||||
hash = "sha256-tXhOMrf/sZwEZFWB2Amp9lApWEsfuPqaj9H7RmI733o=";
|
||||
hash = "sha256-PZcOArSTyJzyd2DKT8K0aFC4RlVXgTCnkoU0f08KPfY=";
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
eprover-ho,
|
||||
cvc5,
|
||||
libpoly,
|
||||
symfpu,
|
||||
csdp,
|
||||
rlwrap,
|
||||
perl,
|
||||
@@ -109,6 +110,10 @@ let
|
||||
version = "0.2.0";
|
||||
__intentionallyOverridingVersion = true;
|
||||
};
|
||||
symfpu = symfpu.overrideAttrs {
|
||||
version = "0-unstable-2019-05-17";
|
||||
__intentionallyOverridingVersion = true;
|
||||
};
|
||||
}).overrideAttrs
|
||||
{
|
||||
version = "1.2.0";
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "kubexporter";
|
||||
version = "0.8.4";
|
||||
version = "0.8.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bakito";
|
||||
repo = "kubexporter";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-kEQN0qrtXVPSl0v3uhOWO0OS70bCqZmojKcPrHQLLTw=";
|
||||
hash = "sha256-sAY7nm+BaNOoPNmMDWVqJrzMSFnah8z6bKiGQrX1/+k=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+2Ab/bA+IgCYvNvdnVOdDCtpbzNEcHvKxEviHgLZNvU=";
|
||||
vendorHash = "sha256-I6FBS8VnH4p9aZgJd1/dDf1xVJ3+PBhqkePZKTMuEJo=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -0,0 +1,102 @@
|
||||
diff --git i/src/common/types.ts w/src/common/types.ts
|
||||
index 1e6f8172..7e8e8b22 100644
|
||||
--- i/src/common/types.ts
|
||||
+++ w/src/common/types.ts
|
||||
@@ -84,7 +84,6 @@ export interface Config {
|
||||
captureFrameQuality: number,
|
||||
captureFrameFileNameFormat: 'timestamp' | 'index',
|
||||
enableNativeHevc: boolean,
|
||||
- enableUpdateCheck: boolean,
|
||||
cleanupChoices: {
|
||||
trashTmpFiles: boolean, askForCleanup: boolean, closeFile: boolean, cleanupAfterExport?: boolean | undefined,
|
||||
},
|
||||
diff --git i/src/main/configStore.ts w/src/main/configStore.ts
|
||||
index 3a80d2aa..b95546a9 100644
|
||||
--- i/src/main/configStore.ts
|
||||
+++ w/src/main/configStore.ts
|
||||
@@ -154,7 +154,6 @@ const defaults: Config = {
|
||||
captureFrameQuality: 0.95,
|
||||
captureFrameFileNameFormat: 'timestamp',
|
||||
enableNativeHevc: true,
|
||||
- enableUpdateCheck: true,
|
||||
cleanupChoices: {
|
||||
trashTmpFiles: true, askForCleanup: true, closeFile: true, cleanupAfterExport: false,
|
||||
},
|
||||
diff --git i/src/main/index.ts w/src/main/index.ts
|
||||
index 9144ddae..9b23f6ea 100644
|
||||
--- i/src/main/index.ts
|
||||
+++ w/src/main/index.ts
|
||||
@@ -30,7 +30,6 @@ import HttpServer from './httpServer.js';
|
||||
import isDev from './isDev.js';
|
||||
import isStoreBuild from './isStoreBuild.js';
|
||||
import { getAboutPanelOptions } from './aboutPanel.js';
|
||||
-import { checkNewVersion } from './updateChecker.js';
|
||||
import * as i18nCommon from './i18nCommon.js';
|
||||
import './i18n.js';
|
||||
import type { ApiActionRequest } from '../common/types.js';
|
||||
@@ -371,14 +370,6 @@ async function init() {
|
||||
createWindow();
|
||||
// will also updateMenu and set about panel options
|
||||
await changeLanguage(language);
|
||||
-
|
||||
- const enableUpdateCheck = configStore.get('enableUpdateCheck');
|
||||
-
|
||||
- if (!disableNetworking && enableUpdateCheck && !isStoreBuild) {
|
||||
- newVersion = await checkNewVersion();
|
||||
- // newVersion = '1.2.3';
|
||||
- if (newVersion) updateMenu();
|
||||
- }
|
||||
} catch (err) {
|
||||
logger.error('Failed to initialize', err);
|
||||
}
|
||||
diff --git i/src/renderer/src/components/Settings.tsx w/src/renderer/src/components/Settings.tsx
|
||||
index b91b562e..36f779db 100644
|
||||
--- i/src/renderer/src/components/Settings.tsx
|
||||
+++ w/src/renderer/src/components/Settings.tsx
|
||||
@@ -76,7 +76,7 @@ function Settings({
|
||||
}) {
|
||||
const { t } = useTranslation();
|
||||
|
||||
- const { customOutDir, changeOutDir, keyframeCut, toggleKeyframeCut, timecodeFormat, setTimecodeFormat, invertCutSegments, setInvertCutSegments, askBeforeClose, setAskBeforeClose, enableImportChapters, setEnableImportChapters, enableAskForFileOpenAction, setEnableAskForFileOpenAction, autoSaveProjectFile, setAutoSaveProjectFile, invertTimelineScroll, setInvertTimelineScroll, language, setLanguage, hideNotifications, setHideNotifications, hideOsNotifications, setHideOsNotifications, autoLoadTimecode, setAutoLoadTimecode, enableAutoHtml5ify, setEnableAutoHtml5ify, customFfPath, setCustomFfPath, storeProjectInWorkingDir, mouseWheelZoomModifierKey, setMouseWheelZoomModifierKey, mouseWheelFrameSeekModifierKey, setMouseWheelFrameSeekModifierKey, mouseWheelKeyframeSeekModifierKey, setMouseWheelKeyframeSeekModifierKey, segmentMouseModifierKey, setSegmentMouseModifierKey, captureFrameMethod, setCaptureFrameMethod, captureFrameQuality, setCaptureFrameQuality, captureFrameFileNameFormat, setCaptureFrameFileNameFormat, enableNativeHevc, setEnableNativeHevc, enableUpdateCheck, setEnableUpdateCheck, allowMultipleInstances, setAllowMultipleInstances, preferStrongColors, setPreferStrongColors, treatInputFileModifiedTimeAsStart, setTreatInputFileModifiedTimeAsStart, treatOutputFileModifiedTimeAsStart, setTreatOutputFileModifiedTimeAsStart, exportConfirmEnabled, toggleExportConfirmEnabled, storeWindowBounds, setStoreWindowBounds, reducedMotion, setReducedMotion } = useUserSettings();
|
||||
+ const { customOutDir, changeOutDir, keyframeCut, toggleKeyframeCut, timecodeFormat, setTimecodeFormat, invertCutSegments, setInvertCutSegments, askBeforeClose, setAskBeforeClose, enableImportChapters, setEnableImportChapters, enableAskForFileOpenAction, setEnableAskForFileOpenAction, autoSaveProjectFile, setAutoSaveProjectFile, invertTimelineScroll, setInvertTimelineScroll, language, setLanguage, hideNotifications, setHideNotifications, hideOsNotifications, setHideOsNotifications, autoLoadTimecode, setAutoLoadTimecode, enableAutoHtml5ify, setEnableAutoHtml5ify, customFfPath, setCustomFfPath, storeProjectInWorkingDir, mouseWheelZoomModifierKey, setMouseWheelZoomModifierKey, mouseWheelFrameSeekModifierKey, setMouseWheelFrameSeekModifierKey, mouseWheelKeyframeSeekModifierKey, setMouseWheelKeyframeSeekModifierKey, segmentMouseModifierKey, setSegmentMouseModifierKey, captureFrameMethod, setCaptureFrameMethod, captureFrameQuality, setCaptureFrameQuality, captureFrameFileNameFormat, setCaptureFrameFileNameFormat, enableNativeHevc, setEnableNativeHevc, allowMultipleInstances, setAllowMultipleInstances, preferStrongColors, setPreferStrongColors, treatInputFileModifiedTimeAsStart, setTreatInputFileModifiedTimeAsStart, treatOutputFileModifiedTimeAsStart, setTreatOutputFileModifiedTimeAsStart, exportConfirmEnabled, toggleExportConfirmEnabled, storeWindowBounds, setStoreWindowBounds, reducedMotion, setReducedMotion } = useUserSettings();
|
||||
|
||||
const onLangChange = useCallback<ChangeEventHandler<HTMLSelectElement>>((e) => {
|
||||
const { value } = e.target;
|
||||
@@ -204,7 +204,7 @@ function Settings({
|
||||
<Row>
|
||||
<KeyCell>{t('Check for updates on startup?')}</KeyCell>
|
||||
<td>
|
||||
- <Switch checked={enableUpdateCheck} onCheckedChange={setEnableUpdateCheck} />
|
||||
+ (always disabled in nixpkgs build)
|
||||
</td>
|
||||
</Row>
|
||||
)}
|
||||
diff --git i/src/renderer/src/hooks/useUserSettingsRoot.ts w/src/renderer/src/hooks/useUserSettingsRoot.ts
|
||||
index 4f8b8e0a..e67b1cd0 100644
|
||||
--- i/src/renderer/src/hooks/useUserSettingsRoot.ts
|
||||
+++ w/src/renderer/src/hooks/useUserSettingsRoot.ts
|
||||
@@ -166,8 +166,6 @@ export default function useUserSettingsRoot() {
|
||||
useEffect(() => safeSetConfig({ captureFrameFileNameFormat }), [captureFrameFileNameFormat]);
|
||||
const [enableNativeHevc, setEnableNativeHevc] = useState(safeGetConfigInitial('enableNativeHevc'));
|
||||
useEffect(() => safeSetConfig({ enableNativeHevc }), [enableNativeHevc]);
|
||||
- const [enableUpdateCheck, setEnableUpdateCheck] = useState(safeGetConfigInitial('enableUpdateCheck'));
|
||||
- useEffect(() => safeSetConfig({ enableUpdateCheck }), [enableUpdateCheck]);
|
||||
const [cleanupChoices, setCleanupChoices] = useState(safeGetConfigInitial('cleanupChoices'));
|
||||
useEffect(() => safeSetConfig({ cleanupChoices }), [cleanupChoices]);
|
||||
const [allowMultipleInstances, setAllowMultipleInstances] = useState(safeGetConfigInitial('allowMultipleInstances'));
|
||||
@@ -280,7 +278,6 @@ export default function useUserSettingsRoot() {
|
||||
captureFrameQuality,
|
||||
captureFrameFileNameFormat,
|
||||
enableNativeHevc,
|
||||
- enableUpdateCheck,
|
||||
cleanupChoices,
|
||||
allowMultipleInstances,
|
||||
darkMode,
|
||||
@@ -356,7 +353,6 @@ export default function useUserSettingsRoot() {
|
||||
setCaptureFrameQuality,
|
||||
setCaptureFrameFileNameFormat,
|
||||
setEnableNativeHevc,
|
||||
- setEnableUpdateCheck,
|
||||
setCleanupChoices,
|
||||
setAllowMultipleInstances,
|
||||
toggleDarkMode,
|
||||
@@ -0,0 +1,154 @@
|
||||
{
|
||||
"@esbuild/aix-ppc64@npm:0.25.12": "b2cc7e0cd348bc315907f6ce090ee545d4157a19fc44327ff0262ba9296f0fad19c57dd679b1b526a0a18f34f1971b128e15b41bca794c74a9b2c32238fdd537",
|
||||
"@esbuild/aix-ppc64@npm:0.27.2": "9c18cc2e4a03339a55013aac05b4a3fc4b77e75715dc252d034aa3d43b754abc053a7601b95e31249f4b6e69b68db2f5e6cb04b0ed619f825f2f70daff1a78d7",
|
||||
"@esbuild/android-arm64@npm:0.25.12": "f770937988ec42e289277abc03800ccf88902684dbda3013a8ab274bb9eca36d35619a75f0f0510e225bdb4c7cf9a426218c7d2641a98fed74287a52d60d8865",
|
||||
"@esbuild/android-arm64@npm:0.27.2": "a318fc9ffcdad7fda8bb521af8b17f73d93d9a94b4cca9301fbf72cf3f5a6e945edd589a47388de70f3e9582655dcf5b5bb928a11e306368fae4a9106d5143d2",
|
||||
"@esbuild/android-arm@npm:0.25.12": "7a5d507aa717d85470c595e11f3c03fbf4f0bffdd10d30f49e1a3f14c2553191f156b214eacd6911fa36719faef23c28be7d88ac876ec300995987964ea16e99",
|
||||
"@esbuild/android-arm@npm:0.27.2": "01114275e096b9177ad2496730087ee081d6e65a75bc087457b527c5baac5a8ccb362435f45232532bf6f97de95e1790dbce127d55abd5e4152c7214682bf4d3",
|
||||
"@esbuild/android-x64@npm:0.25.12": "cd459b0433b0541bae9ffafd274c57529125719a5b78f4ee92aa9f8a1f54b002a18d889bee19084a503c114412269ef4e740d21b4a2de811ec2a076e96b35f48",
|
||||
"@esbuild/android-x64@npm:0.27.2": "e92c5b6919081a14c8882f1167cf90b4e4bba745ad6e9a23428f85a1cd5e79dfa3f1d2fc943686b237e4cd09fac52ad3b3791deab6a0419ee10859284d3834aa",
|
||||
"@esbuild/darwin-arm64@npm:0.25.12": "067f4588b9b64c93742c4a8cec35282dd076583006ce8089aae3095fcae5b606a2f60d86caf0527be6009be234178fb83d360af82698e2017a6f9fb9345e084d",
|
||||
"@esbuild/darwin-arm64@npm:0.27.2": "5e99db5037167bad4a095fc445b94a2ce02357870ed58b79e13ae6bc09b5cb33d7e03f925492df940f9e0ad685a889f02beec1431d8fbf4c7ced55b2f48f5659",
|
||||
"@esbuild/darwin-x64@npm:0.25.12": "c29947d07adacadcb29092860b69d1b668d9c5abfaf525e2a7f3ece61c3f4e72a95c1c66ad0e80fbf31d01210ae4e8330d4ae6d9c6c9ad2b8aa159eb115f9a8d",
|
||||
"@esbuild/darwin-x64@npm:0.27.2": "87f2fbc4cf11724ef805b17cbdc7b0a9498332bc4b61d55e110ecc3b09bc488b88c0bd140ea48924e9c97a2063cf7e440fef13dd56e415c46799619d61086910",
|
||||
"@esbuild/freebsd-arm64@npm:0.25.12": "c51691aeb04e41c554a59cbb5ab8d917446f352aeec70e3d5a7f25409e9115ff2db930589052df3e7d60f03eff4c298bda89db62f2408d1a49b6a70e69c5d4a0",
|
||||
"@esbuild/freebsd-arm64@npm:0.27.2": "1ffa23243b913e377a5b09fd97ad9f089be3695aafdd893b60bb7f9be479256d8b7546f0bc96c4e61133fe7aeeaf95a8e941e82a65d99008ff82c99bdec85eee",
|
||||
"@esbuild/freebsd-x64@npm:0.25.12": "9b84c48176350811690751c34d1513005290641923a161f96cb433cbcbb8c072ecb92cef39ba641f48032071f74c6119e5f081b5788242109426c54f3ef1a01e",
|
||||
"@esbuild/freebsd-x64@npm:0.27.2": "44f744b289cf9e115b0adfac1905818d756dfced14213bf144d9016d96f67575ef2a55526f76e29ee775fcfec7274ba3a5e6833f35ed79a4592d3f5eac278267",
|
||||
"@esbuild/linux-arm64@npm:0.25.12": "1e9cc29569890f5944e7dbe2e597eb19d76e85fe07aef6253129b16800ccb5b33a79cea17873d7debdf681d34adf77e06ae99742fe06cab095f3db441b741b1e",
|
||||
"@esbuild/linux-arm64@npm:0.27.2": "2b037d74eaff4e9b5a6076760ede873320707636a3495939687cdd0c2c7150883111273bc0a8663fa305c42f439f4748b5ad7f15a1a1ea9fa7db575d9faf2d1b",
|
||||
"@esbuild/linux-arm@npm:0.25.12": "fcf091d6a51834c9a942ee33b568342990c7fa29d2ff338ce628a41bc415696d09bca7ef502c2b04518973010f73ab3d13e37096030db9c8d393ab29408f104b",
|
||||
"@esbuild/linux-arm@npm:0.27.2": "28cfc3a9ca11fc899649e7a706fb4b2ee57999bd92e86c23726b3ed0f832732411dd0aa3e2bcdb4105759f83bc4e5adc98dc195aaafce736c910db4e43694702",
|
||||
"@esbuild/linux-ia32@npm:0.25.12": "ccd563c3189e5f651b479dd80d3bebd9d5c4747ce7448bb80266c804c3141eb3514b8c70445d77301899c54c1ff8c74614f8423704fde475a5c67efe86713235",
|
||||
"@esbuild/linux-ia32@npm:0.27.2": "ac6cc92b9be2ec6d9d483c53fc973e6381765b784a2e1b71fa93ea0cf976344c2e3e0bfda0140b0829b3ec4304d9b886692b2891e68c17d2121066d06e67f0ac",
|
||||
"@esbuild/linux-loong64@npm:0.25.12": "6df2710d99d84006ad8151a9ca26861dbb97524a15e61f56eb1a5a76786865ad03be838fe3d414a72b239262364964528f3136c2965b3c442c7ed85090b145c4",
|
||||
"@esbuild/linux-loong64@npm:0.27.2": "625f5b6c2218a3acb2cff8f7f02a53ca89d13925f8932260ddad01595c6907beda4a79e4b767b1101f5971049f88d3ec6ab29cf565b4d61d9b0d7277e2cb578d",
|
||||
"@esbuild/linux-mips64el@npm:0.25.12": "883bd8c4afd70b8e372db8a6bdb429d419ae30253a63987ff824994958d8431b6e51ead05e6372b2a233e025ea57f6f65b04ebaff8308e39acf54bfa73a5cae2",
|
||||
"@esbuild/linux-mips64el@npm:0.27.2": "0c62692cb3a297b37212dfde52a861861843a716f6b3bdb73da49ba249a4c001b989ea61dc4540c430fac59ce2f8fc45035cdfac80172c5ddaf1b9df8471aecf",
|
||||
"@esbuild/linux-ppc64@npm:0.25.12": "71f8544a3b99b4c95d49604b66d144e9617ae9925914c1bd5bc6731d15d4e48e7f8e9bffd85835e1c93a88c3537b53f3e99b500e4dd2533af9483055b02f9d38",
|
||||
"@esbuild/linux-ppc64@npm:0.27.2": "b804d2dd0a6a85fe1c731828c725731a55ab120d2cc16941d560b2e9af5c2ec51586914ce26a84a326a9d46fa61eb8bb1f843953fe29ddd43b3f3099c491b5ff",
|
||||
"@esbuild/linux-riscv64@npm:0.25.12": "fe8048262c5c6a040c047a9b7ab8547b0e7a32ce50f622ea8dadc3ec22065676efbc9b36896ca96959f77839757319633a2d05af5f2de7b32389a03b80f027f1",
|
||||
"@esbuild/linux-riscv64@npm:0.27.2": "03e67e7207a83801363e3637f9a35fb6224ed4dc23bbf6eca41904fc42f5a6806e1e591666bf48dbf62eba97d41ff4355413b14dcb2339007b22c693374c49f6",
|
||||
"@esbuild/linux-s390x@npm:0.25.12": "e5c023be1dfd75c915453763f944db8ab3da4f60a00c2b0e6f3b9349bc6c51e5ac5ce928db56e8f316e910213adf2172efd1b37abe070f6cda0c28583d770bab",
|
||||
"@esbuild/linux-s390x@npm:0.27.2": "eb24b9c0a4a1492e4ff34a87933f6a3b348739c12f864b408144efdf949871c1fbb02a1cca741bfa11fd08aebe585d046fd3311b462ce4c795e3064ba3912469",
|
||||
"@esbuild/linux-x64@npm:0.25.12": "8b2c7f5e00c40058f5c150df267cd303eae5907822f196902cd8e64af70475e800a7f132ac6388aa2b77b877d6314147e67f3fb67d97c867adccd54a2a6caaf6",
|
||||
"@esbuild/linux-x64@npm:0.27.2": "ed1542f203329521fb1f308696c76ba59ed4a4616a24e21bf4820685362bba209d5c44c2f4e66c88dc7b7399df9ace625454d4829ee529d076ccaf61566e11cf",
|
||||
"@esbuild/netbsd-arm64@npm:0.25.12": "19bc5a1295697aa8787929472323494302d117ea1e592f17cfae443525c1e5917a5f77e6582fc1ec9de3a11a9e296bc12749c6b12cde0aab10695b5c25f29f73",
|
||||
"@esbuild/netbsd-arm64@npm:0.27.2": "576dd082047077b9cc41fbeffd728821a4f3b80969c1d2d6c274301122c6de2050f484fd4e946777527b8a15bd2a5ac54f85ca7ab95ea72b5345177e6a888687",
|
||||
"@esbuild/netbsd-x64@npm:0.25.12": "8eb2ff51aa39b43a021e4b51411789b6299fd0dc38b3896719684333e32fd42ed4508ab67dcc88435631e5333573a4848dbfeec12569de46c2318dcdb39ad3ab",
|
||||
"@esbuild/netbsd-x64@npm:0.27.2": "f8994af3e2ff3c9a91e874e58698b66e6f8d4e72dbc0aaf749b74a79420954146ed053359b0a4c213918582cee187d8a371737a33cfb93e624b4d091e5a6c240",
|
||||
"@esbuild/openbsd-arm64@npm:0.25.12": "5ff26a012d0d35673bc3800d28f284a62c310801a68c55b2d1ed8a7e09ef7568117fb8ab2d7ec7a6e7d73ce6a9e05150ee07335fc6447ba98658469b9da1cb2e",
|
||||
"@esbuild/openbsd-arm64@npm:0.27.2": "f710da24beeb747ef3a11b9d99085a14f5c929f942fd9d9a05b7806d5ff1b85631bfa506eb7a6aed9fd01ec99bf91f24736f9f0e0eb6b7c0019fe0dddd2e615c",
|
||||
"@esbuild/openbsd-x64@npm:0.25.12": "41dce65493548bc0dc411a6175e9fb109a93bbbf370ef444d1459698226ad2a3096ab7edd420c27eb3d15e6bbd0bc79357bd7c0a59c5527ace0fefac181638f8",
|
||||
"@esbuild/openbsd-x64@npm:0.27.2": "62670fbe1f609c5362df7b45968ded512a0860e2ad8a4715a89993abfa2f9f08a28f1294c7857d80e6d3f713639a71d291c06a961b331de67ad350032d1b8e96",
|
||||
"@esbuild/openharmony-arm64@npm:0.25.12": "b3e0502067e760e5b92d3180e20372cbb2dba8267fbb56206d50bdeccd8895feb408020b98c3f17054eea0f1fba365385850cb91d1f79a25dfa3751032278825",
|
||||
"@esbuild/openharmony-arm64@npm:0.27.2": "e279efdc18301add96ea791ba9ef117cae05346688cd521fd225a60ad166add4bc995af985058e3b6ab9e65a7c49a79108a294d6aa26a1d1685ad0db194e2c56",
|
||||
"@esbuild/sunos-x64@npm:0.25.12": "50ed9767e00ff74a1d98d94c5fe6027bc5e9e095a64735d1d0676ec72adc4b15b0095e97f5ac71602f2c5fcdcf3e9f6cfe005315e998d9d3e12ca93a2076b639",
|
||||
"@esbuild/sunos-x64@npm:0.27.2": "7234302321d36576b5a9f027915417cddc195a67b19cdfb50e69c337ee0dd63a88be6b72d7ef299cd569d1af62e54774303d52d3d6b5e5858db975241ae467d6",
|
||||
"@esbuild/win32-arm64@npm:0.25.12": "4969d20da28a0c783ada6116724f51a542fad81dab043c4f6f9b7c8f4a68be558f03beb29d75bd550ab6e63f720535ebacb9ce1760099be7a63d4e1ec8351e2b",
|
||||
"@esbuild/win32-arm64@npm:0.27.2": "36620fddf79da3e8e527ef8331436929fa7a0b23c9b591af8f8573d80ed9c4ef45b24c6fa0abbb01d187dec497efa6c9d9d397d575afc1f28477e9ca16a48d73",
|
||||
"@esbuild/win32-ia32@npm:0.25.12": "60ce7d21c5e01c8b0c8c2c4660ff6d890a32b1acf09f5499f950a86bc5c6da17eee760c6bb7a720a0429f7633bbb38b2db517e444408d8a6ff6fc76157310980",
|
||||
"@esbuild/win32-ia32@npm:0.27.2": "96e8c1fa0ec2b5529ead2ba703e5da7644c138b2f9b6e285c05513f0455e99b2b0dcf399f01779fb384e22810e82f892491e44402772c62d3fe094b025bbdc0f",
|
||||
"@esbuild/win32-x64@npm:0.25.12": "bbdc69d57d85a6b8af85731c0979186aba54eb34c8d1de5eab4aa1d8fd45e3b38b5426c287cedf43228bb0794a741d9b2c55284c7db7d79335bc33dc389e7bb3",
|
||||
"@esbuild/win32-x64@npm:0.27.2": "1ed08bebd916c16003f3784276ae683ab41d34951a0c272f6e072b8067a2b4bacd6f6f75a8dcea375b8545e15891d305425cf7c8dd31f7deab56ef22cde4a1e2",
|
||||
"@img/sharp-darwin-arm64@npm:0.33.5": "021e77a84b2239142d82c462babf4c0b39c9ae6b6fcd10cd3e86264c48ed8d0f2e5c22e3c8427440045a9b09e21e9ddce26218a5b7148be8fa996ac5328faf06",
|
||||
"@img/sharp-darwin-arm64@npm:0.34.5": "0f872f02a49c87c1c844c9715a1c1e4449fab30c85711d948767d41ea1eba1cc7be8268b582d95513e66cff090ab520e4104dcf30cc6f598ee429b40e890eeec",
|
||||
"@img/sharp-darwin-x64@npm:0.33.5": "3742294f45d94742402b8d5c268f336ed0fe2c280552711e727a258e076ad2a6ee0cfb8af235654c45c288f26a8d6b94a77c00fb36c2b5079f749ddc4896f1a2",
|
||||
"@img/sharp-darwin-x64@npm:0.34.5": "a9c0b03ad1d1c3ce549770e0655a6ad87a6e80633d65f9a009a2e19d1f5fe7b79c3ec946412f16ce302db3dfe759a35007e60e1f7042cb3e2291b49ba8d58a6a",
|
||||
"@img/sharp-libvips-darwin-arm64@npm:1.0.4": "370561095765f56fc9b7114de22fda777bfa484c8d8643220ad39c46796ae8b389587bcaaabbc956f2ba7cc27a62ce0aeaeeba75980b6809f79205e77706ebc5",
|
||||
"@img/sharp-libvips-darwin-arm64@npm:1.2.4": "5076747c32a07caaf86e026f84a07378bd34eec6a6bc8843e5c09fc99e22f89e383d88824c0f527070efc33fb04569fa3f867038138faf8d76af1e4ecc0fc962",
|
||||
"@img/sharp-libvips-darwin-x64@npm:1.0.4": "cf664e6eaef5eb1355a227b629ce977ed710125652197c20d18b30db70b62fb750fc40ef08e6e4890ba22ea2ac7aa6406b05c79333d34ff0d1dc892601876680",
|
||||
"@img/sharp-libvips-darwin-x64@npm:1.2.4": "607213511370a700fda3ece08eb0a061a09483b595b75ce5e115c9d95efb6793d1e8e90d79873a9f526378f06f5fe5f3a8f0006cf76f7c7907985c8d4539f376",
|
||||
"@img/sharp-libvips-linux-arm64@npm:1.0.4": "b1279af75dff01d94a573a4a2d79c5d54d9daaa9b581dc1af6e416647b66bd74c8ad35fd87862085c0e02fdde7951da3dbe7da2d80f1b43c0f217386e4816789",
|
||||
"@img/sharp-libvips-linux-arm64@npm:1.2.4": "e078ef44f936609cb2b5fc01433e6c8f3babd5ab69fcc5f006504eb4664efa791438ea61e44c8f236eef55ba6ddb7bc41dc9b8b264fe689ff35fac428ce356a0",
|
||||
"@img/sharp-libvips-linux-arm@npm:1.0.5": "a9b4ad7285240b6717ad50975a1f95d58dc4a8575e56b9a3c53e6d92f45c4d9a550a01ba08de8c8465805cb7db0ffe4019ebff0e7d6160ed72f60f46680fc987",
|
||||
"@img/sharp-libvips-linux-arm@npm:1.2.4": "493a3d34f9ec5a2aa71cada3c2b0cc2428659cc2aaaf4d7b7f6065648da560cb62e1febd4d49fc48f814787dc431a2c7e94992a2e2334dc409b73ec658cd0c43",
|
||||
"@img/sharp-libvips-linux-ppc64@npm:1.2.4": "d746268a804ff66f363823840ea84a91c2c24e0f28438812c66f659b29305efee2219f1bfd7569944e02b0783044c275000c13b4180c4b07af3786bd1991567c",
|
||||
"@img/sharp-libvips-linux-riscv64@npm:1.2.4": "3bfb408d0e333593247aff9cbbcafa8bace4714a54a742d3b18a73dc506a1176c56fed63cc682c34ac27704e207e6a53a1c9c955395abcc4ef8af8ca12b4e09b",
|
||||
"@img/sharp-libvips-linux-s390x@npm:1.0.4": "eb8d337e1d3fe45d3fd9d1df168f04692a1175f288d7fe81312c3d96fe09c5d16b25b757714296d392a35e22297874cad24d831529bc7ac8a1f75e8b98ded0f5",
|
||||
"@img/sharp-libvips-linux-s390x@npm:1.2.4": "79cd9764df0e845779cbc80ebf8eb0571080bce69d935fa8cd9a28a3aa5c4601c0e762ac83b6b8df0050ab54048098f692087265f64b16efc61de0818c2eea1b",
|
||||
"@img/sharp-libvips-linux-x64@npm:1.0.4": "0fc5c2a5b5651e2f72b909edf0cbb9f85ac398878b9f197c534b3d954c016e074adf20e6bb9e0b6636864569d4d8b04baad7c30790ee5764967707a192535d20",
|
||||
"@img/sharp-libvips-linux-x64@npm:1.2.4": "da642063f7a8f7e2c26e0b5734c1a39e7f4ca0d4521d9c6c65d81112146c4ecb846e73602fa145cf2106cd8f426d84010bb3f0baf4a9cf41db1b7deb3b47f353",
|
||||
"@img/sharp-libvips-linuxmusl-arm64@npm:1.0.4": "56f07b51656a293547973cd99f56d2bebb8034e2a8b129fba105ebbb33ccdaf4eea94f342edc20841d355ce2aac4c5f13ae349afdcb53c8a9ae09bf2e3312884",
|
||||
"@img/sharp-libvips-linuxmusl-arm64@npm:1.2.4": "e0ca7280827d433d10655ea1491543be98994e75a7b33b158faa7b4f6c866462d2abed253378b2534b9fab351a0961f23baaf16b4e7441131df0e3d47068507c",
|
||||
"@img/sharp-libvips-linuxmusl-x64@npm:1.0.4": "d6447348de2653aa14ebe21bec21cc7f97e00062d07aae02a5a6b6137e90198b5a951837c97f73318694bf7325825ba4ca20f226bca378332955ea19e63262d5",
|
||||
"@img/sharp-libvips-linuxmusl-x64@npm:1.2.4": "876e3bde360cc6966bc3a703dd316f570b031085722c9c8bf27bb31050e30c8a10ef4a8fe2e66fefa0f4482db62044c47a1df25874c6330467e12a6983bb32d2",
|
||||
"@img/sharp-linux-arm64@npm:0.33.5": "03d77e1f4e85fe34a0e4262fb0a0d9db6fc34f889f2e20ca69b809c94db487f8d6c02aea410b12ee4b79da5dcc717f94ce4fabfbb7838e6d99597dc206ccd0a2",
|
||||
"@img/sharp-linux-arm64@npm:0.34.5": "933c217e432ae7280bee1ef2bc0b5f3225b5ff3cfed19c25607ed7ed909b16cfa4a59c14089dd020e9b789ffd544df09e9b471281a049c926cd337509fa35241",
|
||||
"@img/sharp-linux-arm@npm:0.33.5": "8b33046a907d89026514515c69aa58e40b42defceddba4b1fd452bf62f34e9d2acd7c53661c014b966120ba94d25bac9d694642373f79de187cad9f90c71398b",
|
||||
"@img/sharp-linux-arm@npm:0.34.5": "c20e85339d0e4e2116094293d9c1171407faa7a7b60d579cdc4af06d7b2ad4ff4976374593a2e525a08df4fc9df0dd9e80822a38764f07bc8d63e8d988ffa165",
|
||||
"@img/sharp-linux-ppc64@npm:0.34.5": "8ded427067577bdd686534a0db30833d43b0c232c17d232d6608f0635f364241a6078ccdbbf54f5a48b773c95a05906a5ba20cc589c86959eb0e6329902c7cb4",
|
||||
"@img/sharp-linux-riscv64@npm:0.34.5": "764ff0baa4275a4fd9376012893ca64b6cde601a208be216d38e2c6db3977d6f3e91e12342c7cb1cd3038b7108f8778bcfba85afaf097689907a4b932e79dc7a",
|
||||
"@img/sharp-linux-s390x@npm:0.33.5": "d8597a3e1690959e51de0bfdfc3b21148dec6428e213eeaeb5515246ca0ee5b798ba1bf84168a0586549ac4732ffc8bbaa8ffdfad2565f8fdbb7cce97f0c51ca",
|
||||
"@img/sharp-linux-s390x@npm:0.34.5": "a4e7cae17ebf95dd53e9dd845ae3e73c783f6c7da4a5aeddf7922dda09822c55327e892d2c8888dba097e666b97254b04df3cca99aeb9eb9fc57d73b20cc6b86",
|
||||
"@img/sharp-linux-x64@npm:0.33.5": "822b4c2f84755ba4bc9ddf309c09bab73e7d14efda964b13ff765027e745448770f35333c9912492e724ae050e9d39d5436856a2d651aec435927b213bf2c14c",
|
||||
"@img/sharp-linux-x64@npm:0.34.5": "2f4fc06e1d3544bf41296f2776b531d5aa0ab618e129cd928514a803e4a01202b8453c0321f7999619033c687571a7f50da454ff5ca04d41f31a7796a38e9a8b",
|
||||
"@img/sharp-linuxmusl-arm64@npm:0.33.5": "cac8f10f634d9b0432389b35e47b30770a7b3f18c001bd47ca6b46e3ee80d1107a1525f8869b3d0657d4469fa1fc93b3464c0a7cbc70a48ab1317216e7ec8d20",
|
||||
"@img/sharp-linuxmusl-arm64@npm:0.34.5": "2bd993173f42ab72df423f968b28cbd037e82f78cd469c3b6a7f4317e164f41f04cb9b106e35337e392a1fc4848aece67f0a765b346691133d7ad71146ef97ea",
|
||||
"@img/sharp-linuxmusl-x64@npm:0.33.5": "17060fe2130b2a1f66ad57c31cc55b5321dc6fe2616980631f6f69a7cc841d408caa991aeb4f3aebf436a1824f6a675449dceb50b5441fe15b4aadb7e2b91b8b",
|
||||
"@img/sharp-linuxmusl-x64@npm:0.34.5": "00a5c641a144ad177d3ece569da6c05d891ab6a5c6e0f0f7ef4f74ab132c72f20b07927e5ae9c9afe090d44cf36be2170b4dc1831d0976533c693091995bb486",
|
||||
"@img/sharp-wasm32@npm:0.33.5": "90cf7629aaec6a32f33523a48c784cff3c8981c14607f3b750db82059571962a68b862efac59c87758ed3d35c8a82790cef731c6cc2ac7fae4bd92df17e67cd2",
|
||||
"@img/sharp-wasm32@npm:0.34.5": "7c1ed71bd821c1ddb2aac32f128d4b173af97a33274f9e386c49ccedc31bd273ae0bf564626f068a61c8bb0de1f84a4b9211c7fd79a62d8170479a1887bc935c",
|
||||
"@img/sharp-win32-arm64@npm:0.34.5": "07146b037ae4cdc7592b983bcee7b1c0199fa0fe14f9e3430a8ec6c46c056ba9bca0ee89d18e1aac4f43331dcaf464fe82bebf34e08d5bd1541ebd2d6345e518",
|
||||
"@img/sharp-win32-ia32@npm:0.33.5": "fed0090aa909b8f20bf8bffba3f23c3c64b11ce9d765661b9a1e7f073c39662e26d85c65355fc41dc7c645c4f12f126d597c5f897a934d248c75e058f2db9a4d",
|
||||
"@img/sharp-win32-ia32@npm:0.34.5": "d5887234959a32c9072043e8f14589ceec867f9fb0b440a5849750c2f0e79614962f566c44763ce560c52cd1e0d086ffac6299f91711477f1316d83f8b2151c1",
|
||||
"@img/sharp-win32-x64@npm:0.33.5": "6355e896790b1a97628884e7aca731edab9cb17faa58084d6dccdabfd1d7030eaed9dce337fa7dc0db1a6f72cda23405da666ebb623fe646be501c46dc4a6237",
|
||||
"@img/sharp-win32-x64@npm:0.34.5": "e10ab4421a46eecab0af903761679f27f91dde01ed4d533af4d77101d17e4f16b28628e91bbbcae63ec051606103f3cde21fd5055330130217277cb13242e7af",
|
||||
"@parcel/watcher-android-arm64@npm:2.5.1": "e9c94ede3bd5c5d999d117d22ac8032a17f8ebc72db3eff04ccb2b4e6718db19f24bf29a66a610e03f4ee95e2cd7b2d30c15b1845eb897b971fec75dbdd76141",
|
||||
"@parcel/watcher-darwin-arm64@npm:2.5.1": "0cab55a55c128ac5742388fc8dbfeb9877018509943801ce8a52b57bb6dca24189d025d38684b1e482cb7816368a52c6434dfe45d3997e2fd2509276f48774ea",
|
||||
"@parcel/watcher-darwin-x64@npm:2.5.1": "bf07b8ca9a435fb885fb0ca6565204d2f2098d7f632faf26a6478bb39f538c73b50afca17c193dc189a80a864d85e40f924ec7f21a0e7ad7d0de6f97f7154134",
|
||||
"@parcel/watcher-freebsd-x64@npm:2.5.1": "9f62b9da08e98bffb7cf91b557af209586e1d7dd654c56c5a58fc4b0bb61a9bb318116ed0048416d3341d3434b1fb3089bf6cfbfcd08e61333917bc59e691c1d",
|
||||
"@parcel/watcher-linux-arm-glibc@npm:2.5.1": "07a55a0050e913c9781d009a05b3a0a49c77c2679ae9f98b2374a7e17c5401e2076a776c7bec88de58c71fef040c89aa97176dfa28a03abf8754e18e8d1109b4",
|
||||
"@parcel/watcher-linux-arm-musl@npm:2.5.1": "f9cab0efa652276fb4bcb58845c9606f7aead1ec81f7c4ce2d237eec754bbd3101682c735b6a371dccf93f16fcfe0ea1beef5d43eb39e4505df7f29b73ea0004",
|
||||
"@parcel/watcher-linux-arm64-glibc@npm:2.5.1": "ce22f303187aa03fa9d1f9609d2cd56cce6b62f0a60f14a65449adc25b7072d06118d956eb7ebb548210cf2d120cf5e987abe34e6515a5bfbd35b15643f40142",
|
||||
"@parcel/watcher-linux-arm64-musl@npm:2.5.1": "7a0b32b7b784fe3e594452b6642adc3bb4ad78eae526f5e4c7cf061f428eef2e05e827334806cd230bc873903abb1f70886716a0353e653b3b784f09d2237956",
|
||||
"@parcel/watcher-linux-x64-glibc@npm:2.5.1": "a6241bb57c409ab56ef944e8d64e057817f41a9335047d1e252aab4e4b10f64d8bc2620ae5c761b71551f3c4b494edd687a08c274a46ca2eb84ad34f6f4de9c0",
|
||||
"@parcel/watcher-linux-x64-musl@npm:2.5.1": "a68cfcd10a50906ab228d7b906eced68faf6a42a29da5506d24d0dd91b9593a61605b91749d9b1e3ed9f257b845f48ba3df62572e40b4ff1f724d879865b225a",
|
||||
"@parcel/watcher-win32-arm64@npm:2.5.1": "0f467a731cf9403b8bc7d35418d991596cf5e7898029796b4c769bcbb38cd07ae6ec05ef0f19298e5f11e73ec5198bc474d79b056bdfbaea513525725103d7dd",
|
||||
"@parcel/watcher-win32-ia32@npm:2.5.1": "9ab5f3e9849a6077c8c2aba7bdf9030dea38f0ab9180792ecd30094520cddf16f3b68006f666845b86c5ef0e05c648364475c9ba151e0269561891ca3e276667",
|
||||
"@parcel/watcher-win32-x64@npm:2.5.1": "e588d87d5b892484d252ac8e1ec3f4bf7a664d91f0d03dd93764be8db2c35f81879275908dcbec42b0e43bc99c7afdfd29fe687ec022bb2c8c4bc7edd29eaa15",
|
||||
"@rollup/rollup-android-arm-eabi@npm:4.54.0": "decffa63d62dd35bdb26d8d0b1a74335b4202bc987203d5479a1a5b9db6920ddf4509a6fc1b13acaf9ecb72bb6ae9dd4546c52eef15b6306782ee639e553a345",
|
||||
"@rollup/rollup-android-arm64@npm:4.54.0": "7031d838022e6b7a29d7e7f9dd1246f02630860bb2befd12e82710f93563c394b6c975630124659e1468231bccea4bb64f10f113391ef6e48eed9ac639e03d42",
|
||||
"@rollup/rollup-darwin-arm64@npm:4.54.0": "9084277827c93f26e24fb9e47102364c9c0b42ec995124d4b7247c0369e45e55fc59af9721cd1c43eece57e0be4d2477cc108ae815e7711f8c5b8c516b0fbfd1",
|
||||
"@rollup/rollup-darwin-x64@npm:4.54.0": "fb5a1f2f2e1a741cf15704c30a8a6eea8a8fe6c1b660f727046f2144e8976451f228761a53a5da64e65c20f5d20a70e3c0ceb40375383ec39bdc8ad2e38afc9d",
|
||||
"@rollup/rollup-freebsd-arm64@npm:4.54.0": "972694e21dc228bada7966e6b5725f432cd6110067fe8267e0b5c927c4c2b465d071fac5b470084d76140b79a6d6727ec75eda66a3741869d585c4d8dd9e4a96",
|
||||
"@rollup/rollup-freebsd-x64@npm:4.54.0": "93ee0dabcab1a48b0be3ced6ad06bc3005a351ab9630a46610d3127d36ca1a62896b8a507e565e54c9eee0ac4c462e74fe723b180b81bd7e8f5097c7eb00a69a",
|
||||
"@rollup/rollup-linux-arm-gnueabihf@npm:4.54.0": "ac6795d6964fb63520608133b23e316041f30d96b2ab942761da6b403c113776b624bbe3b505ecc9a1d4c5867939fb1a73b63ff2790fd5b30ae4cc9784f5741d",
|
||||
"@rollup/rollup-linux-arm-musleabihf@npm:4.54.0": "92192958aa6eb42e0bec35de1951909be38551cddb205ac3f374d679e5881e621a68cc2f918b66d2c3aec911f2515a7fb990dc29c1b4fadfe7bdb5b471d43f0b",
|
||||
"@rollup/rollup-linux-arm64-gnu@npm:4.54.0": "71f11e6784898d6dbb838d4627361294557d176365bdfa203e614ddbb426a82c1b5fc421a963c32bd0e21466cfc029a853da1300934af64c7603d9ebf8225b51",
|
||||
"@rollup/rollup-linux-arm64-musl@npm:4.54.0": "731ee5b23b73a45f81e73fd282961ad729f0967d2ff8c7b91f215e7cda89c77572419a63cf4bb200b161e0a4943eab66f29d9da13fa447dbf884cc7803839ee1",
|
||||
"@rollup/rollup-linux-loong64-gnu@npm:4.54.0": "f94d4ac7df23b13e8a06e1ef35397c270ccf51e8b076ef0b83642c035f3ce4f07a9e2bbc27d21f7317f95426f08f89a95ca2c68d54cc34f5ae4fbac574def324",
|
||||
"@rollup/rollup-linux-ppc64-gnu@npm:4.54.0": "5fe4f115fa1b2c8c6f5003edbc2daef0d5088d61f8035920729989aae38ad2dc9b13f544eb6d0c584428d277dbabe0cc4a870c0f5e9e5ed4dc4ceeae5c5cc947",
|
||||
"@rollup/rollup-linux-riscv64-gnu@npm:4.54.0": "3a42d799a0996b9b38c0ae806f516fa27fc30ff620794bf460e5879e7a1b4b2f1545a6dda7e5c6dc773998763382cdeb1ac2123742f280abf16ff031c01b84cd",
|
||||
"@rollup/rollup-linux-riscv64-musl@npm:4.54.0": "9e1ff8459d09f7aab892aa3a45b88098336ef9cfb9d80f1f564f648400dace91a345378237e7c0139f87a425ffc367fcc7c8f1c7120c85e44664c1ab43fca5e5",
|
||||
"@rollup/rollup-linux-s390x-gnu@npm:4.54.0": "cf69118bb9551d614494089a58600299abb9cac927d7e4d510c216f6df962f792a8abec1526cbd7cb1ae2e054030f049f123270cf16a68668833fa99a623a1a0",
|
||||
"@rollup/rollup-linux-x64-gnu@npm:4.54.0": "ff40bd306fd3f8589468c31ea9a391c50832971567fbd3c2f932754500dee7380276a98e5c370143aad5e9a8e491d070e523449931b0bd882d574fbd0faf22fc",
|
||||
"@rollup/rollup-linux-x64-musl@npm:4.54.0": "c9e24edc69d66afa58e852ad0e0890b15153ecda9a2ee230e8d2b16688fe8050541aba85474d1522f064765784efea4c56d4094673a7797d1495eca651452815",
|
||||
"@rollup/rollup-openharmony-arm64@npm:4.54.0": "5aa3df94a66f1887311c3a8b7710ae51c54b4191954870a931b5e4eed246ca4d2513378770c9e120b726df6a4e165526aa45cce57a35f1208f42e31abafff38a",
|
||||
"@rollup/rollup-win32-arm64-msvc@npm:4.54.0": "4f161b3f02835ac5aa5d23312403552aa335f69f3a9f2ff8cf476a702d330aa815fe23c1745c2cd7a8516fb31bd0058df650f1eb6246b0bc4a1315afc1d45c02",
|
||||
"@rollup/rollup-win32-ia32-msvc@npm:4.54.0": "ebfdb21a07447bddd64a4e06947b5a747a796f888ae9ac13019f58cc943f72ab10c6d87e7bbe6bb5135b71392c757a4c0daeb034af8f0a4be33659d4a7cee92c",
|
||||
"@rollup/rollup-win32-x64-gnu@npm:4.54.0": "bac45fe931be6474e52eaa7cb0ad249fb16deac4bb84eed0f1da40e4071cd176f689235b79f343a50e8fe6312bffe0d4328900f1a5fb0b20b4601da4779f05df",
|
||||
"@rollup/rollup-win32-x64-msvc@npm:4.54.0": "fb67bac7c9a08fc9802b6bea292ac352a32ed66c30459b838599d704ba49b506a1f20c65acd81629867c922eaca33211730a79dd7627bee903e3f142cffce9bc",
|
||||
"@swc/core-darwin-arm64@npm:1.15.4": "55f4601bf5c1ab2b6aadbd6cbb41e42a68f2bf5d2416f31134060f19f921883678b1dd10612a01e49ff748f79da6791d2fbb41f3c8ed16c516556ad363310844",
|
||||
"@swc/core-darwin-arm64@npm:1.15.8": "4458d26f6682bdbf88565d548a04f6e8ed81ea05691204703a511adf4d4ef1889883da727349b5e492b2e53a4f2969fd06ea34f84e32cc5a963ac25194d6caa1",
|
||||
"@swc/core-darwin-x64@npm:1.15.4": "2c57b7bb5c250458ee2d6e7ff43b5c4ea541347a1ad900044a22c9a328a6cb771e1e41715d1d07c683cd3f7dc007622d05725793fce2b53b70fbbc87727c89e9",
|
||||
"@swc/core-darwin-x64@npm:1.15.8": "4075f73359b4cda8d7bcc68a636fbff60db3dea0ef4813b7e1a5ebdaa2c1197b4f888f7565a411f77ee5e8fe2398e3f1c27dfe06b2b087e7004009aeefac2019",
|
||||
"@swc/core-linux-arm-gnueabihf@npm:1.15.4": "cde521b23e53ab61d9dff41f4d36d210affaeda2b362726fb09f4f5b52c8d62c28f16b64d8d7a0b67dd9a7fc5858b0ae43c0b2ad3e92f8f3d53fcfbea826d1ea",
|
||||
"@swc/core-linux-arm-gnueabihf@npm:1.15.8": "6b82976fd35007ac7be41a7d8529dbb0c93bfa858e532c6a8d3fd899c41ecc9976fa40746f6005cd48d82340fcdf0a426296bef248ac7b77334c3744141fa823",
|
||||
"@swc/core-linux-arm64-gnu@npm:1.15.4": "cf582a0c8b20688afc37801b08b1e062f394feb89561d5f0400cbdc01184828c06581d9e996685601fdffe149f57a55d43f55d034893a7fac3842d654d431463",
|
||||
"@swc/core-linux-arm64-gnu@npm:1.15.8": "ed3a8f363bc589886d44db58dabe6d53ce23d2cb8fe93a80fd05dd1ff46ebf438d2f1d38cf4144f4d5b89504dc73d15bd84540ac23b20d4aeb4f463de99c416a",
|
||||
"@swc/core-linux-arm64-musl@npm:1.15.4": "bcbf617fdcd8cb9d3bd74f459a3bac3ec81ab8f0ece3f3a539bf660b953e55faf3e291d7bd7a2b1f8950b630856e1fef41a3c8210f2950865f999ecbb2fd16a9",
|
||||
"@swc/core-linux-arm64-musl@npm:1.15.8": "b063f086e3e92f622fd8fb1585bf0cf0b49eb910361844a4bdb0d0165fdb906fe53051cfbcd92ccfcbfb13ae6c0d85f2c12e373a01df5a4136b513ae94d7f626",
|
||||
"@swc/core-linux-x64-gnu@npm:1.15.4": "0bd748a2e119e34f4934d2c3423f6471b85ced20383f0ba567f53cceda0f3681423c2cbf7dbcf7148e57b181224174856a5fe677e294ec2ac1188387152ffc58",
|
||||
"@swc/core-linux-x64-gnu@npm:1.15.8": "7028720f8aa475896f0468dcd77cc2512362082357e4e89d6e31ec559c87d25f0f9d7fc1702d59766217ea4ee7cfc0d1de817fde56958537f8f3ed9259673b55",
|
||||
"@swc/core-linux-x64-musl@npm:1.15.4": "8a9a3f1f4109a4747335f24853ee54c55e029819aa23ea8a0297073ee363e5cc8f63c4a5938bee4753f4fd4290b8903e3b37026465c3fc473bc13449893c28ba",
|
||||
"@swc/core-linux-x64-musl@npm:1.15.8": "be913db41e70ae8b9553a759f7a9cc80e50c4f521f058672471a182938c3789605c2122c77c32579d2b739ba4f91fa7e8beb8be31f87858e9b52e199c6644e0c",
|
||||
"@swc/core-win32-arm64-msvc@npm:1.15.4": "ecf64654b4c9f0cce6644976c70dc8ef35ac60b8386eb63b50d36bb64c09d6d003b26c6bef8b4cc2a262eb76877ff2b378f630746d731a8f0f3473c9b38e8059",
|
||||
"@swc/core-win32-arm64-msvc@npm:1.15.8": "7047d7250e10577921b9250985c8e4408767fca73963b594f1e747f64e77eb5e2a4d2067a58debca9d33b2fd69385fd56410d5dca0e15bb6957aec9475909809",
|
||||
"@swc/core-win32-ia32-msvc@npm:1.15.4": "872338382531493403bc1ef57c8b9c390b5017ec875525e0d29aecf6cad342c7113571529ffc7f37fa3b23e691bba421444f472221e91b716353fcd5e8e8b000",
|
||||
"@swc/core-win32-ia32-msvc@npm:1.15.8": "4992c3c2fe8fc0dd870319080b806e965278a07d23d0463b16b2c95d0299c0b2e03a1b7bb84c7da41002556b8a71f86b721037e743648321c2186d68bd2b4e32",
|
||||
"@swc/core-win32-x64-msvc@npm:1.15.4": "4cb21d5da230c820fe759fac1bb3cfa33bb9ab29eafe5951fc3f31c65e26d895f6085b660c2649747ca81e37c3abeff4de016e23479723a5d1e57c5dfca743fc",
|
||||
"@swc/core-win32-x64-msvc@npm:1.15.8": "4faf5a9cbbe7e7afc038aa26ec658e41614c06116265be1a938e91839b027e1a847a0a767d9821165693f84fb98700032ad92830fee875164b672ac2024a035f",
|
||||
"dmg-license@npm:1.0.11": "36c0a7b030801b91216affa9b2bb00caa345b2327f298accb2263a80a0320ca305f90b99da68007d187c830c543410d58a0a2bbc229e8d169b0e1d1652ff42aa",
|
||||
"iconv-corefoundation@npm:1.1.7": "0189733ef51a9f481379202cb1919f2677efc44aa014ba662a6fd99e47993e350eab0ff724ed18cda8011c9b78c4702b2d374f732955f1def3fd2a14a29d25c0"
|
||||
}
|
||||
@@ -0,0 +1,186 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
stdenv,
|
||||
yarn-berry_4,
|
||||
nodejs_24,
|
||||
electron_39,
|
||||
makeWrapper,
|
||||
ffmpeg-headless,
|
||||
copyDesktopItems,
|
||||
makeDesktopItem,
|
||||
imagemagick,
|
||||
nix-update-script,
|
||||
}:
|
||||
let
|
||||
yarn-berry = yarn-berry_4;
|
||||
nodejs = nodejs_24;
|
||||
electron = electron_39;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "losslesscut";
|
||||
version = "3.68.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mifi";
|
||||
repo = "lossless-cut";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-LNh9F2aKxVegZTAPuEAqo2f78ynGMgnpwnDXEP1u2+M=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fixes a few things that try to guess whether it's a dev build
|
||||
./undev.patch
|
||||
./yarn-4.14-support.patch
|
||||
./disable-update-check.patch
|
||||
# LosslessCut will retrieve a URL from mifi.no (the author's domain) and directly embed the HTML in the app.
|
||||
# This was previously used to show a Ukraine flag, which I don't have strong opinions on.
|
||||
# However, this effectively allows arbitrary code execution, which could be IP-gated. I can't allow that.
|
||||
# This is also a form of telemetry; a ping every time the application is launched.
|
||||
# See https://github.com/mifi/lossless-cut/issues/1055
|
||||
./stub-load-mifi.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
for f in src/main/ffmpeg.ts src/main/i18nCommon.ts; do
|
||||
substituteInPlace "$f" \
|
||||
--subst-var-by losslesscut_resources_path $out/share/losslesscut
|
||||
done
|
||||
'';
|
||||
|
||||
env = {
|
||||
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
ELECTRON_OVERRIDE_DIST_PATH = electron.dist;
|
||||
NODE_ENV = "production";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
yarn-berry.yarnBerryConfigHook
|
||||
yarn-berry
|
||||
makeWrapper
|
||||
copyDesktopItems
|
||||
imagemagick
|
||||
];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "losslesscut";
|
||||
desktopName = "LosslessCut";
|
||||
comment = "simple video editor to trim or cut videos";
|
||||
exec = "losslesscut";
|
||||
icon = "losslesscut";
|
||||
mimeTypes = [
|
||||
"video/mpeg"
|
||||
"video/x-mpeg"
|
||||
"video/msvideo"
|
||||
"video/quicktime"
|
||||
"video/x-anim"
|
||||
"video/x-avi"
|
||||
"video/x-ms-asf"
|
||||
"video/x-ms-wmv"
|
||||
"video/x-msvideo"
|
||||
"video/x-nsv"
|
||||
"video/x-flc"
|
||||
"video/x-fli"
|
||||
"video/x-flv"
|
||||
"video/vnd.rn-realvideo"
|
||||
"video/mp4"
|
||||
"video/mp4v-es"
|
||||
"video/mp2t"
|
||||
"application/ogg"
|
||||
"application/x-ogg"
|
||||
"video/x-ogm+ogg"
|
||||
"audio/x-vorbis+ogg"
|
||||
"application/x-matroska"
|
||||
"audio/x-matroska"
|
||||
"video/x-matroska"
|
||||
"video/webm"
|
||||
];
|
||||
terminal = false;
|
||||
categories = [
|
||||
"AudioVideo"
|
||||
"AudioVideoEditing"
|
||||
];
|
||||
keywords = [
|
||||
"trim"
|
||||
"codec"
|
||||
"cut"
|
||||
"movie"
|
||||
"mpeg"
|
||||
"avi"
|
||||
"h264"
|
||||
"mkv"
|
||||
"mp4"
|
||||
];
|
||||
startupWMClass = "losslesscut";
|
||||
})
|
||||
];
|
||||
|
||||
missingHashes = ./missing-hashes.json;
|
||||
offlineCache = yarn-berry.fetchYarnBerryDeps {
|
||||
inherit (finalAttrs) src missingHashes patches;
|
||||
hash = "sha256-o0u9dAoo0sTEV+kjQg8TjRNAIcx8fqfk79HsDwAXriA=";
|
||||
};
|
||||
|
||||
postConfigure = ''
|
||||
cp -r ${electron.dist} electron-dist
|
||||
chmod u+w -R electron-dist
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
yarn build
|
||||
|
||||
yarn electron-builder \
|
||||
--dir \
|
||||
-c.electronDist=electron-dist \
|
||||
-c.electronVersion=${electron.version}
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin $out/share/applications
|
||||
|
||||
cp -a dist/*-unpacked/resources $out/share/losslesscut
|
||||
|
||||
ln -s -t $out/share/losslesscut/ ${lib.getExe' ffmpeg-headless "ffmpeg"} ${lib.getExe' ffmpeg-headless "ffprobe"}
|
||||
|
||||
makeWrapper ${lib.getExe electron} $out/bin/losslesscut \
|
||||
--set-default ELECTRON_IS_DEV 0 \
|
||||
--add-flags $out/share/losslesscut/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
|
||||
|
||||
for size in 16 24 32 48 64 128 256 512; do
|
||||
mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
|
||||
magick src/renderer/src/icon.svg -resize "$size"x"$size" $out/share/icons/hicolor/"$size"x"$size"/apps/losslesscut.png
|
||||
done
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Swiss army knife of lossless video/audio editing";
|
||||
homepage = "https://losslesscut.app/";
|
||||
license = lib.licenses.gpl2Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
shelvacu
|
||||
ShamrockLee
|
||||
];
|
||||
mainProgram = "losslesscut";
|
||||
sourceProvenance = with lib.sourceTypes; [
|
||||
fromSource
|
||||
binaryNativeCode # due to npm/yarn deps
|
||||
];
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,12 @@
|
||||
diff --git i/src/renderer/src/mifi.ts w/src/renderer/src/mifi.ts
|
||||
index c5e29bef..760da7b5 100644
|
||||
--- i/src/renderer/src/mifi.ts
|
||||
+++ w/src/renderer/src/mifi.ts
|
||||
@@ -8,6 +8,7 @@ import { isMasBuild } from './util';
|
||||
|
||||
|
||||
export async function loadMifiLink() {
|
||||
+ return undefined;
|
||||
try {
|
||||
// In old versions: https://mifi.no/losslesscut/config.json
|
||||
return await ky('https://losslesscut.mifi.no/config.json').json();
|
||||
@@ -0,0 +1,51 @@
|
||||
diff --git i/src/main/ffmpeg.ts w/src/main/ffmpeg.ts
|
||||
index 3e2e71c9..11da9721 100644
|
||||
--- i/src/main/ffmpeg.ts
|
||||
+++ w/src/main/ffmpeg.ts
|
||||
@@ -50,8 +50,8 @@ function getFfPath(cmd: string) {
|
||||
|
||||
if (customFfPath) return join(customFfPath, exeName);
|
||||
|
||||
- if (app.isPackaged) {
|
||||
- return join(process.resourcesPath, exeName);
|
||||
+ if (app.isPackaged || true) {
|
||||
+ return join('@losslesscut_resources_path@', exeName);
|
||||
}
|
||||
|
||||
// local dev
|
||||
@@ -110,8 +110,6 @@ function getExecaOptions<T extends ExecaOptions>({ env, cancelSignal, ...rest }:
|
||||
...rest,
|
||||
env: {
|
||||
...env,
|
||||
- // https://github.com/mifi/lossless-cut/issues/1143#issuecomment-1500883489
|
||||
- ...(isLinux && !isDev && !customFfPath && { LD_LIBRARY_PATH: process.resourcesPath }),
|
||||
},
|
||||
};
|
||||
return execaOptions as T;
|
||||
diff --git i/src/main/i18nCommon.ts w/src/main/i18nCommon.ts
|
||||
index 431eb396..2c96a93f 100644
|
||||
--- i/src/main/i18nCommon.ts
|
||||
+++ w/src/main/i18nCommon.ts
|
||||
@@ -16,8 +16,7 @@ export function setCustomLocalesPath(p: string) {
|
||||
|
||||
function getLangPath(subPath: string) {
|
||||
if (customLocalesPath != null) return join(customLocalesPath, subPath);
|
||||
- if (app.isPackaged) return join(process.resourcesPath, 'locales', subPath);
|
||||
- return join('locales', subPath);
|
||||
+ return join('@losslesscut_resources_path@', 'locales', subPath);
|
||||
}
|
||||
|
||||
export const fallbackLng = 'en';
|
||||
diff --git i/src/main/logger.ts w/src/main/logger.ts
|
||||
index 80355d78..2536d83d 100644
|
||||
--- i/src/main/logger.ts
|
||||
+++ w/src/main/logger.ts
|
||||
@@ -28,7 +28,7 @@ const createLogger = () => winston.createLogger({
|
||||
),
|
||||
});
|
||||
|
||||
-const logDirPath = app.isPackaged ? app.getPath('userData') : '.';
|
||||
+const logDirPath = app.getPath('userData');
|
||||
export const logFilePath = join(logDirPath, 'app.log');
|
||||
|
||||
const logger = createLogger();
|
||||
@@ -0,0 +1,13 @@
|
||||
diff --git i/yarn.lock w/yarn.lock
|
||||
index 1e4550e7..6a2e770c 100644
|
||||
--- i/yarn.lock
|
||||
+++ w/yarn.lock
|
||||
@@ -2,7 +2,7 @@
|
||||
# Manual changes might be lost - proceed with caution!
|
||||
|
||||
__metadata:
|
||||
- version: 8
|
||||
+ version: 9
|
||||
cacheKey: 10
|
||||
|
||||
"7zip-bin@npm:~5.2.0":
|
||||
@@ -0,0 +1,85 @@
|
||||
diff --git a/webapp/channels/src/components/global_header/left_controls/product_menu/product_branding_team_edition/product_branding_free_edition.tsx b/webapp/channels/src/components/global_header/left_controls/product_menu/product_branding_team_edition/product_branding_free_edition.tsx
|
||||
index 93cb8ab263..3d12cd5e54 100644
|
||||
--- a/webapp/channels/src/components/global_header/left_controls/product_menu/product_branding_team_edition/product_branding_free_edition.tsx
|
||||
+++ b/webapp/channels/src/components/global_header/left_controls/product_menu/product_branding_team_edition/product_branding_free_edition.tsx
|
||||
@@ -57,7 +57,6 @@ const ProductBrandingFreeEdition = (): JSX.Element => {
|
||||
width={116}
|
||||
height={20}
|
||||
/>
|
||||
- <Badge>{badgeText}</Badge>
|
||||
</ProductBrandingFreeEditionContainer>
|
||||
);
|
||||
};
|
||||
diff --git a/webapp/channels/src/components/header_footer_route/header.scss b/webapp/channels/src/components/header_footer_route/header.scss
|
||||
index c2e6fbd187..bc1cedcff1 100644
|
||||
--- a/webapp/channels/src/components/header_footer_route/header.scss
|
||||
+++ b/webapp/channels/src/components/header_footer_route/header.scss
|
||||
@@ -47,20 +47,7 @@
|
||||
}
|
||||
|
||||
.freeBadge {
|
||||
- position: relative;
|
||||
- top: 1px;
|
||||
- display: flex;
|
||||
- align-self: center;
|
||||
- padding: 2px 6px;
|
||||
- border-radius: var(--radius-s);
|
||||
- margin-left: 12px;
|
||||
- background: rgba(var(--center-channel-color-rgb), 0.08);
|
||||
- color: rgba(var(--center-channel-color-rgb), 0.75);
|
||||
- font-family: 'Open Sans', sans-serif;
|
||||
- font-size: 10px;
|
||||
- font-weight: 600;
|
||||
- letter-spacing: 0.025em;
|
||||
- line-height: 16px;
|
||||
+ display: none !important;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -83,12 +70,6 @@
|
||||
margin-top: 12px;
|
||||
}
|
||||
}
|
||||
-
|
||||
- &.has-free-banner.has-custom-site-name {
|
||||
- .header-back-button {
|
||||
- bottom: -20px;
|
||||
- }
|
||||
- }
|
||||
}
|
||||
|
||||
@media screen and (max-width: 699px) {
|
||||
diff --git a/webapp/channels/src/components/widgets/menu/menu_items/menu_item.scss b/webapp/channels/src/components/widgets/menu/menu_items/menu_item.scss
|
||||
index dee9b57f8c..8ef4aa073a 100644
|
||||
--- a/webapp/channels/src/components/widgets/menu/menu_items/menu_item.scss
|
||||
+++ b/webapp/channels/src/components/widgets/menu/menu_items/menu_item.scss
|
||||
@@ -316,14 +316,7 @@
|
||||
}
|
||||
|
||||
.MenuStartTrial {
|
||||
- display: flex;
|
||||
- flex-direction: column;
|
||||
- align-items: flex-start;
|
||||
- padding: 8px 20px;
|
||||
- border-radius: 4px;
|
||||
- margin-top: 0;
|
||||
- font-size: 12px;
|
||||
- line-height: 16px;
|
||||
+ display: none !important;
|
||||
|
||||
button {
|
||||
padding: 3px 0;
|
||||
diff --git a/webapp/channels/webpack.config.js b/webapp/channels/webpack.config.js
|
||||
index f29f19f9ab..ab85fc3b86 100644
|
||||
--- a/webapp/channels/webpack.config.js
|
||||
+++ b/webapp/channels/webpack.config.js
|
||||
@@ -469,6 +469,9 @@ if (targetIsDevServer) {
|
||||
historyApiFallback: {
|
||||
index: '/static/root.html',
|
||||
},
|
||||
+ client: {
|
||||
+ overlay: false,
|
||||
+ },
|
||||
},
|
||||
performance: false,
|
||||
optimization: {
|
||||
@@ -0,0 +1,16 @@
|
||||
diff --git a/server/channels/app/limits.go b/server/channels/app/limits.go
|
||||
index 4c88c1f049..3c1af8d02f 100644
|
||||
--- a/server/channels/app/limits.go
|
||||
+++ b/server/channels/app/limits.go
|
||||
@@ -10,8 +10,8 @@ import (
|
||||
)
|
||||
|
||||
const (
|
||||
- maxUsersLimit = 200
|
||||
- maxUsersHardLimit = 250
|
||||
+ maxUsersLimit = 10000000
|
||||
+ maxUsersHardLimit = 10000000
|
||||
)
|
||||
|
||||
func (a *App) GetServerLimits() (*model.ServerLimits, *model.AppError) {
|
||||
|
||||
@@ -13,6 +13,8 @@
|
||||
nixosTests,
|
||||
|
||||
latestVersionInfo ? null,
|
||||
removeUserLimit ? false,
|
||||
removeFreeBadge ? false,
|
||||
versionInfo ? {
|
||||
# ESR releases only. Note: if NixOS would release with an ESR that goes out
|
||||
# of support during the lifetime of the NixOS release, it is acceptable
|
||||
@@ -136,6 +138,14 @@ buildMattermost rec {
|
||||
'';
|
||||
};
|
||||
|
||||
patches =
|
||||
lib.optionals removeFreeBadge [
|
||||
./mattermost-remove-free-banner.patch
|
||||
]
|
||||
++ lib.optionals removeUserLimit [
|
||||
./mattermost-remove-user-limit.patch
|
||||
];
|
||||
|
||||
# Needed because buildGoModule does not support go workspaces yet.
|
||||
# We use go 1.22's workspace vendor command, which is not yet available
|
||||
# in the default version of go used in nixpkgs, nor is it used by upstream:
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "nitrotpm-tools";
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "NitroTPM-Tools";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Jnv1ZKRs59eXnW/O6UCZLIhQolQ9LZjJI6+SqXVws5Q=";
|
||||
hash = "sha256-SL0I1bMh9QmBo4aBv1ZL3M5ZaVeJ0K3kZCMStma6bG0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ckygzrbDzzjL2eBktAHdbA40E7HDeR8S5rZCbbuVIW0=";
|
||||
cargoHash = "sha256-/2Lo5/CCv12PJocUYjZiRD4uBxrcKWA5RelLnU4TpcQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
abseil-cpp_202508,
|
||||
buildPackages,
|
||||
cmake,
|
||||
cpuinfo,
|
||||
eigen,
|
||||
@@ -61,16 +62,16 @@ let
|
||||
name = "onnx-src";
|
||||
owner = "onnx";
|
||||
repo = "onnx";
|
||||
tag = "v1.20.1";
|
||||
hash = "sha256-XZJXD6sBvVJ6cLPyDkKOW8oSkjqcw9whUqDWd7dxY3c=";
|
||||
tag = "v1.21.0";
|
||||
hash = "sha256-eF6BdTwTuHh6ckuLGN1d6z2GLU47lPqtzu4zIv8+cTs=";
|
||||
};
|
||||
|
||||
cutlass-src = fetchFromGitHub {
|
||||
name = "cutlass-src";
|
||||
owner = "NVIDIA";
|
||||
repo = "cutlass";
|
||||
tag = "v4.2.1";
|
||||
hash = "sha256-iP560D5Vwuj6wX1otJhwbvqe/X4mYVeKTpK533Wr5gY=";
|
||||
tag = "v4.4.2";
|
||||
hash = "sha256-0q9Ad0Z6E/rO2PdM4uQc8H0E0qs9uKc3reHepiHhjEc=";
|
||||
};
|
||||
|
||||
dlpack-src = fetchFromGitHub {
|
||||
@@ -109,14 +110,14 @@ let
|
||||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "onnxruntime";
|
||||
version = "1.24.4";
|
||||
version = "1.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "onnxruntime";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-CjPgRkPyp7dUPAOo3cePWQvucOlQAwtT4NO5w3NkV+E=";
|
||||
hash = "sha256-+9M4mEPLLJ5N+JomoXIKcUBV85lr6lFJjJQ3qsMRrQY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -163,7 +164,6 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
cmake
|
||||
pkg-config
|
||||
python3Packages.python
|
||||
protobuf
|
||||
]
|
||||
++ lib.optionals pythonSupport (
|
||||
with python3Packages;
|
||||
@@ -240,10 +240,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
(darwinMinVersionHook "13.3")
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
gtest
|
||||
]
|
||||
++ lib.optionals pythonSupport (
|
||||
nativeCheckInputs = lib.optionals pythonSupport (
|
||||
with python3Packages;
|
||||
[
|
||||
onnx
|
||||
@@ -252,6 +249,10 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
]
|
||||
);
|
||||
|
||||
checkInputs = [
|
||||
gtest
|
||||
];
|
||||
|
||||
# TODO: build server, and move .so's to lib output
|
||||
# Python's wheel is stored in a separate dist output
|
||||
outputs = [
|
||||
@@ -269,7 +270,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "ABSL_ENABLE_INSTALL" true)
|
||||
# leads to failing builds, which isn't particularly useful for Nixpkgs
|
||||
(lib.cmakeFeature "CMAKE_CXX_FLAGS" "-Wno-error=unused-variable")
|
||||
(lib.cmakeFeature "CMAKE_CXX_FLAGS" "-Wno-error=unused-variable -Wno-error=deprecated")
|
||||
(lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true)
|
||||
(lib.cmakeBool "FETCHCONTENT_QUIET" false)
|
||||
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_ABSEIL_CPP" "${abseil-cpp_202508.src}")
|
||||
@@ -281,7 +282,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_SAFEINT" "${safeint-src}")
|
||||
(lib.cmakeFeature "FETCHCONTENT_TRY_FIND_PACKAGE_MODE" "ALWAYS")
|
||||
# fails to find protoc on darwin, so specify it
|
||||
(lib.cmakeFeature "ONNX_CUSTOM_PROTOC_EXECUTABLE" (lib.getExe protobuf))
|
||||
(lib.cmakeFeature "ONNX_CUSTOM_PROTOC_EXECUTABLE" (lib.getExe buildPackages.protobuf))
|
||||
(lib.cmakeBool "onnxruntime_BUILD_SHARED_LIB" true)
|
||||
(lib.cmakeBool "onnxruntime_BUILD_UNIT_TESTS" finalAttrs.doCheck)
|
||||
(lib.cmakeBool "onnxruntime_USE_FULL_PROTOBUF" withFullProtobuf)
|
||||
@@ -374,6 +375,8 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
../include/onnxruntime/core/providers/coreml/coreml_provider_factory.h
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
# See comments in `cudaPackages.nccl`
|
||||
postFixup = lib.optionalString cudaSupport ''
|
||||
remove-references-to -t "${lib.getBin cuda_nvcc}" ''${!outputLib}/lib/libonnxruntime_providers_cuda.so
|
||||
|
||||
@@ -73,28 +73,6 @@ index 055b255132..3925db8ac7 100644
|
||||
ofs.flush();
|
||||
|
||||
ASSERT_TRUE(std::filesystem::exists(serialized_model_path));
|
||||
diff --git a/onnxruntime/test/framework/inference_session_test.cc b/onnxruntime/test/framework/inference_session_test.cc
|
||||
index 1c4e7800b7..8ceb05f0f6 100644
|
||||
--- a/onnxruntime/test/framework/inference_session_test.cc
|
||||
+++ b/onnxruntime/test/framework/inference_session_test.cc
|
||||
@@ -1045,7 +1045,7 @@ static void TestBindHelper(const std::string& log_str,
|
||||
CreateMatMulModel(p_model, run_provider_type);
|
||||
|
||||
std::string s1;
|
||||
- p_model->ToProto().SerializeToString(&s1);
|
||||
+ ASSERT_TRUE(p_model->ToProto().SerializeToString(&s1));
|
||||
std::stringstream sstr(s1);
|
||||
ASSERT_STATUS_OK(session_object.Load(sstr));
|
||||
ASSERT_STATUS_OK(session_object.Initialize());
|
||||
@@ -1078,7 +1078,7 @@ TEST(InferenceSessionTests, TestIOBindingReuse) {
|
||||
CreateMatMulModel(p_model, kCpuExecutionProvider);
|
||||
|
||||
std::string s1;
|
||||
- p_model->ToProto().SerializeToString(&s1);
|
||||
+ ASSERT_TRUE(p_model->ToProto().SerializeToString(&s1));
|
||||
std::stringstream sstr(s1);
|
||||
ASSERT_TRUE(session_object.Load(sstr).IsOK());
|
||||
ASSERT_STATUS_OK(session_object.Initialize());
|
||||
diff --git a/onnxruntime/test/ir/graph_test.cc b/onnxruntime/test/ir/graph_test.cc
|
||||
index 4d80cb7047..c69ac46c05 100644
|
||||
--- a/onnxruntime/test/ir/graph_test.cc
|
||||
@@ -201,3 +179,16 @@ index 5caafa0f37..327463c615 100644
|
||||
std::shared_ptr<IExecutionProvider> ep_shared = ep ? std::move(ep) : nullptr;
|
||||
|
||||
auto run_model = [&](TransformerLevel level, std::vector<OrtValue>& fetches,
|
||||
diff --git a/onnxruntime/test/optimizer/transpose_optimizer_test.cc b/onnxruntime/test/optimizer/transpose_optimizer_test.cc
|
||||
index 9e9e9e9e9e..8e8e8e8e8e 100644
|
||||
--- a/onnxruntime/test/optimizer/transpose_optimizer_test.cc
|
||||
+++ b/onnxruntime/test/optimizer/transpose_optimizer_test.cc
|
||||
@@ -4532,7 +4532,7 @@ TEST(TransposeOptimizerTests, RegressionTest_Permute1DConstantEmptyPerm) {
|
||||
|
||||
// Serialize the model to a string.
|
||||
std::string model_data;
|
||||
- model.ToProto().SerializeToString(&model_data);
|
||||
+ ASSERT_TRUE(model.ToProto().SerializeToString(&model_data));
|
||||
|
||||
SessionOptions session_options;
|
||||
session_options.graph_optimization_level = TransformerLevel::Level1;
|
||||
|
||||
@@ -13,16 +13,16 @@ let
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "pinact";
|
||||
version = "3.9.2";
|
||||
version = "4.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "suzuki-shunsuke";
|
||||
repo = "pinact";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-wbonAugeAgN4drlndazoypQKH5vQNqmZj0Pbkmiygr0=";
|
||||
hash = "sha256-aY/M9sv3XxYQf/MrDnMGq5RCUA8XK9XgxzHD1l3UkAQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-FEZ0F/6gmWMKE5iNfBONbeEIGVwTrBgDFa7q7knrfK8=";
|
||||
vendorHash = "sha256-+AdS/+oDsOYG9F39IFd7bShRuCFYR9e4Vi6dRxeY82Q=";
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
|
||||
@@ -22,16 +22,16 @@ let
|
||||
in
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "shogihome";
|
||||
version = "1.27.2";
|
||||
version = "1.27.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sunfish-shogi";
|
||||
repo = "shogihome";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-VaHIDhTYcGT4J7ken/Cz0QwSlL42RMcP4lqFR4P7/SM=";
|
||||
hash = "sha256-25Iu/bKUCotJdQESxPPOiYehwn+D3RYnZiJfMWJ4cn0=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-2NeiCpcX1j7z+PtIF3euQamVTa+6G4SEHPGk8IVC1Dw=";
|
||||
npmDepsHash = "sha256-gWI21dPha7yX367r50U3C9wpX5/6oBzHGJNtFmG/GQ8=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace package.json \
|
||||
|
||||
@@ -8,13 +8,23 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "symfpu";
|
||||
version = "0-unstable-2019-05-17";
|
||||
version = "1.2.0-unstable-2026-05-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "martin-cs";
|
||||
repo = "symfpu";
|
||||
rev = "8fbe139bf0071cbe0758d2f6690a546c69ff0053";
|
||||
sha256 = "1jf5lkn67q136ppfacw3lsry369v7mdr1rhidzjpbz18jfy9zl9q";
|
||||
rev =
|
||||
{
|
||||
"1.2.0-unstable-2026-05-13" = "40bdec00e99f8ea1b96c3dac0a05eed11c541639";
|
||||
"0-unstable-2019-05-17" = "8fbe139bf0071cbe0758d2f6690a546c69ff0053";
|
||||
}
|
||||
."${finalAttrs.version}";
|
||||
hash =
|
||||
{
|
||||
"1.2.0-unstable-2026-05-13" = "sha256-ho0tLWFlPozq5hD+qX6AQiCPxUuRPwnXe9dEfzXwSY0=";
|
||||
"0-unstable-2019-05-17" = "sha256-ONGfvJMo/HXlbxHmkFs9O5nhs6aDM+XuNSPgY+ykxck=";
|
||||
}
|
||||
."${finalAttrs.version}";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ copyPkgconfigItems ];
|
||||
@@ -36,6 +46,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
includedir = "${placeholder "out"}/include";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
|
||||
@@ -69,11 +69,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "uclibc-ng";
|
||||
version = "1.0.57";
|
||||
version = "1.0.58";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.uclibc-ng.org/releases/${finalAttrs.version}/uClibc-ng-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-i8c0tYTiP/auPQ67TA+x0dgUxYyCgiuTEw1Davp6zos=";
|
||||
hash = "sha256-noEApEL3B5uXKMoobjA19n3wV4YGFm6i0e+GWkoS3bk=";
|
||||
};
|
||||
|
||||
configurePhase = ''
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "vacuum-go";
|
||||
version = "0.26.5";
|
||||
version = "0.26.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "daveshanley";
|
||||
repo = "vacuum";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Em+wmDt2kI4mfqS9u/Jq499tQiLh3w/CiZlrkixZjg4=";
|
||||
hash = "sha256-KKunxNMTYm3FCxierFHU8xc0+SA+iXBB4Xs8H3/rm/o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-AWn/J/BAPIFKXpTdUej1uMBkwh3r5v8DpZHh4D7GRKg=";
|
||||
vendorHash = "sha256-Vf9WsP3DEjb1xFWql5SHHmBC/81+VxhrK/2a0uEkPJg=";
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
ldflags = [
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xmake";
|
||||
version = "3.0.8";
|
||||
version = "3.0.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xmake-io";
|
||||
repo = "xmake";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-8Rm1OtjpyzM/G8YN8nsK8TypF/C/8tQvW+7TxEX5st0=";
|
||||
hash = "sha256-JoIXsEvcB65NQ7G06HgNIDqMSVzxlX7jOVxe1bWaEAQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -7,18 +7,18 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "zlint";
|
||||
version = "3.7.0";
|
||||
version = "3.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zmap";
|
||||
repo = "zlint";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-e12GMbUsZFm0yPD4yh+kuK47YKvDC+VcSfth2radyUk=";
|
||||
hash = "sha256-HgpNa1XCAaSGfzc6rMFE4NukL+WxRYxA7il2P/5DI8Q=";
|
||||
};
|
||||
|
||||
modRoot = "v3";
|
||||
|
||||
vendorHash = "sha256-7g/97DjtXOsWFguWeYi7jLe7xeW1sfY0BrQxYbtIZyM=";
|
||||
vendorHash = "sha256-NqqW5IHo15Dv1jmYSfbPtkApYIhNoDaJTxwBGwDPDjc=";
|
||||
|
||||
excludedPackages = [
|
||||
"cmd/genTestCerts"
|
||||
|
||||
@@ -7,8 +7,7 @@
|
||||
mirage-crypto-rng,
|
||||
mirage-crypto-pk,
|
||||
x509,
|
||||
cstruct,
|
||||
cstruct-unix,
|
||||
ohex,
|
||||
eqaf,
|
||||
mtime,
|
||||
logs,
|
||||
@@ -21,11 +20,11 @@
|
||||
|
||||
buildDunePackage (finalAttrs: {
|
||||
pname = "awa";
|
||||
version = "0.5.2";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/awa-ssh/releases/download/v${finalAttrs.version}/awa-${finalAttrs.version}.tbz";
|
||||
hash = "sha256-64gloekVN0YsBwUodrJc6QaNU3PGKMIZMPJWvBfzaj0=";
|
||||
hash = "sha256-TO4O2n+L1avIGGKBnZ0wo6jSQBml5Yn6C46VWEPvcvE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@@ -34,7 +33,7 @@ buildDunePackage (finalAttrs: {
|
||||
mirage-crypto-rng
|
||||
mirage-crypto-pk
|
||||
x509
|
||||
cstruct
|
||||
ohex
|
||||
mtime
|
||||
logs
|
||||
base64
|
||||
@@ -44,7 +43,6 @@ buildDunePackage (finalAttrs: {
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [
|
||||
cstruct-unix
|
||||
cmdliner
|
||||
fmt
|
||||
mirage-mtime
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{
|
||||
buildDunePackage,
|
||||
awa,
|
||||
cstruct,
|
||||
mtime,
|
||||
lwt,
|
||||
mirage-flow,
|
||||
@@ -18,7 +17,6 @@ buildDunePackage {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
awa
|
||||
cstruct
|
||||
mtime
|
||||
lwt
|
||||
mirage-flow
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
|
||||
buildDunePackage (finalAttrs: {
|
||||
pname = "caqti";
|
||||
version = "2.2.4";
|
||||
version = "2.3.1";
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/paurkedal/ocaml-caqti/releases/download/v${finalAttrs.version}/caqti-v${finalAttrs.version}.tbz";
|
||||
hash = "sha256-uOpDKCAVTsCVEyxPeyRLBs2FU+CyA1GFuETZxPMK+Ls=";
|
||||
hash = "sha256-A2OAoPGmfgnQAsxH8sscUuv098ybiepbcM7Ds4nOKY0=";
|
||||
};
|
||||
|
||||
buildInputs = [ dune-site ];
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildDunePackage (finalAttrs: {
|
||||
pname = "iri";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
|
||||
minimalOCamlVersion = "4.12";
|
||||
|
||||
@@ -18,7 +18,7 @@ buildDunePackage (finalAttrs: {
|
||||
owner = "zoggy";
|
||||
repo = "ocaml-iri";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-fh5+0CWplDdGXCotZL2UzjOGil2LR4NppttaquO/ndE=";
|
||||
hash = "sha256-+wBQBzRkN36T3zAQWmqq/VdhgLrCnbvOouEmVg37s/w=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -9,8 +9,6 @@
|
||||
let
|
||||
inherit (lib)
|
||||
licenses
|
||||
maintainers
|
||||
platforms
|
||||
sourceTypes
|
||||
;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user