mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-19 15:11:30 +00:00
Merge master into staging-next
This commit is contained in:
@@ -19899,6 +19899,12 @@
|
||||
github = "Noodlesalat";
|
||||
githubId = 12748782;
|
||||
};
|
||||
nuexq = {
|
||||
email = "nuexqq@gmail.com";
|
||||
github = "nuexq";
|
||||
githubId = 145666753;
|
||||
name = "nuexq";
|
||||
};
|
||||
nukaduka = {
|
||||
email = "ksgokte@gmail.com";
|
||||
github = "NukaDuka";
|
||||
|
||||
@@ -14,7 +14,6 @@ in
|
||||
meta.maintainers = with lib.maintainers; [
|
||||
philandstuff
|
||||
rawkode
|
||||
kaynetik
|
||||
];
|
||||
|
||||
options = {
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "mgba";
|
||||
version = "0-unstable-2026-03-30";
|
||||
version = "0-unstable-2026-04-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "mgba";
|
||||
rev = "6ab29fed1b5139f19ac98c523fd4a6a7f0b30e38";
|
||||
hash = "sha256-6cCd2tuj2kXTL1w0DUPodaLU0ivNjPyKGytgxrjlwb0=";
|
||||
rev = "6dce57eef127dc4cc292644f38196e0e7c58590c";
|
||||
hash = "sha256-sLxQ7NG5ypSQACo1Q/9/FwQKCpZsIU0Y35dLa8uhOVs=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -87,7 +87,7 @@ let
|
||||
];
|
||||
in
|
||||
mkDerivation rec {
|
||||
version = "3.40.15";
|
||||
version = "3.44.8";
|
||||
pname = "qgis-ltr-unwrapped";
|
||||
outputs = [ "out" ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) "man";
|
||||
|
||||
@@ -95,7 +95,7 @@ mkDerivation rec {
|
||||
owner = "qgis";
|
||||
repo = "QGIS";
|
||||
rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
|
||||
hash = "sha256-N1ip6lMMpACDCr/Za26LGP455+iZiZe24s2MCkrYm8A=";
|
||||
hash = "sha256-FL/JqvcLqKhHsG96o/7Mel8wH8OaL+2LDtq6jngjW50=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
buildMozillaMach rec {
|
||||
pname = "firefox-beta";
|
||||
binaryName = "firefox-beta";
|
||||
version = "150.0b2";
|
||||
version = "150.0b5";
|
||||
applicationName = "Firefox Beta";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "eb9ad8fe2cc763e9b45b602156b86328ea6a679824318023759813ce42c4dc961bea92cac9e3d230fe1346114d7f4fd43bcffbfc6307d6a6d18b4cc9629b0651";
|
||||
sha512 = "6ae09ae8a73865a4d9cdfd389f0cfec667fc717e13127ae9927b6fc3bd5e7cf49a83dd5dbbed8bae9b72dddd24e6156bdc483fcb3ccb726b46070d25fd02f86f";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
buildMozillaMach rec {
|
||||
pname = "firefox-devedition";
|
||||
binaryName = "firefox-devedition";
|
||||
version = "150.0b3";
|
||||
version = "150.0b7";
|
||||
applicationName = "Firefox Developer Edition";
|
||||
requireSigning = false;
|
||||
branding = "browser/branding/aurora";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "1a1f9079b50bb632fe578be6452269db6195df0663165d3d3906897368d4d3752c51fb4ace9651881d5a4e9a5dd5dcb2bdf18efab193d80acac1c2f502ef11e1";
|
||||
sha512 = "e4240a9c13bbe188763eb03d65935576c03ba4ead80411ff2ca528a06788bbe4b61be3fa221c01f70e4601428bf8c7895506df28a782078e8171d34d017299a0";
|
||||
};
|
||||
|
||||
# buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but
|
||||
|
||||
@@ -438,16 +438,16 @@ in
|
||||
|
||||
docker_29 =
|
||||
let
|
||||
version = "29.3.1";
|
||||
version = "29.4.0";
|
||||
in
|
||||
callPackage dockerGen {
|
||||
inherit version;
|
||||
cliRev = "v${version}";
|
||||
cliHash = "sha256-K6aUHPprl5U99610UVHpLH8poWfTNF+FvQZbcPg6/E0=";
|
||||
cliHash = "sha256-ObuRuiC1+2E7PMMgoXC6SEi6zsdRqVvGCDvP7J/Ws28=";
|
||||
mobyRev = "docker-v${version}";
|
||||
mobyHash = "sha256-DPWb8kg5GUv2qDyEBfvBH4LBOVCUl0//oEYzLwv2l1I=";
|
||||
runcRev = "v1.3.4";
|
||||
runcHash = "sha256-1IfY08sBoDpbLrwz1AKBRSTuCZyOgQzYPHTDUI6fOZ8=";
|
||||
mobyHash = "sha256-Pot3N+AvxIYG5Vg3AQK3I0jegCW4bmC0OimsGnVCiuQ=";
|
||||
runcRev = "v1.3.5";
|
||||
runcHash = "sha256-Swphxbu/OLkUrfRjLMZIVGwYb7AN0xHdyxm0ysAVam0=";
|
||||
containerdRev = "v2.2.2";
|
||||
containerdHash = "sha256-1jYiyNHR1sXBwXdS33KWE+IB1tOZbiJyUxhsVeXwSrc=";
|
||||
tiniRev = "369448a167e8b3da4ca5bca0b3307500c3371828";
|
||||
|
||||
@@ -38,7 +38,13 @@ installFonts() {
|
||||
installFont 'ttf' "$out/share/fonts/truetype"
|
||||
installFont 'ttc' "$out/share/fonts/truetype"
|
||||
installFont 'otf' "$out/share/fonts/opentype"
|
||||
installFont 'otc' "$out/share/fonts/opentype"
|
||||
installFont 'pfa' "$out/share/fonts/type1"
|
||||
installFont 'pfb' "$out/share/fonts/type1"
|
||||
installFont 'pfm' "$out/share/fonts/type1"
|
||||
installFont 'afm' "$out/share/fonts/type1"
|
||||
installFont 'bdf' "$out/share/fonts/misc"
|
||||
installFont 'pcf' "$out/share/fonts/misc"
|
||||
installFont 'otb' "$out/share/fonts/misc"
|
||||
installFont 'psf' "$out/share/consolefonts"
|
||||
installFont 'psfu' "$out/share/consolefonts"
|
||||
|
||||
33
pkgs/by-name/ac/act3/package.nix
Normal file
33
pkgs/by-name/ac/act3/package.nix
Normal file
@@ -0,0 +1,33 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "act3";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dhth";
|
||||
repo = "act3";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-GE9f4hm+R4G4NCqdPN6h5MTZqMVLkrdMnc20bOZGcu4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+WSWlmxQTryLrpeloYdupyMibsgFYpjSuDvW+if3IHE=";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Glance at the last 3 runs of your GitHub Actions workflows";
|
||||
homepage = "https://github.com/dhth/act3";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "act3";
|
||||
maintainers = with lib.maintainers; [ phanirithvij ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -43,7 +43,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
kranzes
|
||||
vtuan10
|
||||
adamcstephens
|
||||
kaynetik
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -80,9 +80,6 @@ buildGoModule (finalAttrs: {
|
||||
description = "Modern encryption tool with small explicit keys";
|
||||
license = lib.licenses.bsd3;
|
||||
mainProgram = "age";
|
||||
maintainers = with lib.maintainers; [
|
||||
tazjin
|
||||
kaynetik
|
||||
];
|
||||
maintainers = with lib.maintainers; [ tazjin ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -33,14 +33,14 @@ let
|
||||
in
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
pname = "alpaca";
|
||||
version = "9.2.2";
|
||||
version = "9.2.3";
|
||||
pyproject = false; # Built with meson
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Jeffser";
|
||||
repo = "Alpaca";
|
||||
tag = version;
|
||||
hash = "sha256-5ZvvYsWfj51ie8LOP0fWeg3lDBHGjLwDjz4wQIvCj4A=";
|
||||
hash = "sha256-SwZcycyY2S4GcB6mMcP6JdzMsBlN5Xr6I9kaKKqnb/8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -72,7 +72,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
sciencentistguy
|
||||
_0x4A6F
|
||||
rvdp
|
||||
kaynetik
|
||||
];
|
||||
mainProgram = "atuin";
|
||||
};
|
||||
|
||||
@@ -41,7 +41,6 @@ buildGoModule (finalAttrs: {
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
elasticdog
|
||||
kaynetik
|
||||
];
|
||||
teams = [ lib.teams.bazel ];
|
||||
};
|
||||
|
||||
@@ -32,9 +32,6 @@ buildGoModule (finalAttrs: {
|
||||
homepage = "https://github.com/bazelbuild/bazelisk";
|
||||
changelog = "https://github.com/bazelbuild/bazelisk/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
elasticdog
|
||||
kaynetik
|
||||
];
|
||||
maintainers = with lib.maintainers; [ elasticdog ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -1,58 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
catch2,
|
||||
cmake,
|
||||
expected-lite,
|
||||
fmt,
|
||||
gsl-lite,
|
||||
ninja,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bencode";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fbdtemme";
|
||||
repo = "bencode";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-zpxvADZfYTUdlNLMZJSCanPL40EGl9BBCxR7oDhvOTw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
catch2
|
||||
expected-lite
|
||||
fmt
|
||||
gsl-lite
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Disable a test that requires an internet connection.
|
||||
substituteInPlace tests/CMakeLists.txt \
|
||||
--replace "add_subdirectory(cmake_fetch_content)" ""
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
postInstall = ''
|
||||
rm -rf $out/lib64
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Header-only C++20 bencode serialization/deserialization library";
|
||||
homepage = "https://github.com/fbdtemme/bencode";
|
||||
changelog = "https://github.com/fbdtemme/bencode/blob/${finalAttrs.src.rev}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
# Broken because the default stdenv on these targets doesn't support C++20.
|
||||
broken = with stdenv; isDarwin || (isLinux && isAarch64);
|
||||
};
|
||||
})
|
||||
47
pkgs/by-name/ca/cargo-sbom/package.nix
Normal file
47
pkgs/by-name/ca/cargo-sbom/package.nix
Normal file
@@ -0,0 +1,47 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
__structuredAttrs = true;
|
||||
|
||||
pname = "cargo-sbom";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "psastras";
|
||||
repo = "sbom-rs";
|
||||
tag = "cargo-sbom-v${finalAttrs.version}";
|
||||
hash = "sha256-U11tUXhUD0RjnTuTSmQwBD7OSsYXBfeofDfURDwbGrc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-a0tGBTCLvYUObFeZwSxEqRPpMkEZdsO4kHnExUMrNWk=";
|
||||
|
||||
versionCheckProgramArg = "--version";
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
checkFlags = [
|
||||
"--skip=test_cargo_binary_cyclonedx_1_5_example"
|
||||
"--skip=test_cargo_binary_cyclonedx_1_6_example"
|
||||
"--skip=test_cargo_binary_cyclonedx_example"
|
||||
"--skip=test_cargo_binary_spdx_example"
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Create software bill of materials (SBOM) for Rust";
|
||||
homepage = "https://github.com/psastras/sbom-rs";
|
||||
license = [ lib.licenses.mit ];
|
||||
maintainers = with lib.maintainers; [
|
||||
matthiasbeyer
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
mainProgram = "cargo-sbom";
|
||||
};
|
||||
})
|
||||
@@ -1,22 +1,22 @@
|
||||
{
|
||||
"version": "3.0.12",
|
||||
"version": "3.0.16",
|
||||
"vscodeVersion": "1.105.1",
|
||||
"sources": {
|
||||
"x86_64-linux": {
|
||||
"url": "https://downloads.cursor.com/production/a80ff7dfcaa45d7750f6e30be457261379c29b06/linux/x64/Cursor-3.0.12-x86_64.AppImage",
|
||||
"hash": "sha256-dUAF18h48nzLW+pjcAGeY0c7jZVbwD/3ceczZXxKJv0="
|
||||
"url": "https://downloads.cursor.com/production/475871d112608994deb2e3065dfb7c6b0baa0c54/linux/x64/Cursor-3.0.16-x86_64.AppImage",
|
||||
"hash": "sha256-/kBlLvaF3/7WSEI6ika6opgUVDQVo7vLVLsgG8htEpk="
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"url": "https://downloads.cursor.com/production/a80ff7dfcaa45d7750f6e30be457261379c29b06/linux/arm64/Cursor-3.0.12-aarch64.AppImage",
|
||||
"hash": "sha256-6RJaoJtx2YYr21174CfwxVYdjHoDXLAj19ekUA7E3Ck="
|
||||
"url": "https://downloads.cursor.com/production/475871d112608994deb2e3065dfb7c6b0baa0c54/linux/arm64/Cursor-3.0.16-aarch64.AppImage",
|
||||
"hash": "sha256-tG75z9SPVaH6cgN75XW1ZKRyj689Yd97cbQZSvQtPrA="
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"url": "https://downloads.cursor.com/production/a80ff7dfcaa45d7750f6e30be457261379c29b06/darwin/x64/Cursor-darwin-x64.dmg",
|
||||
"hash": "sha256-ct29cI2vrcy/E4nODVgdVf+pCm7faj3VlcaUws7cOps="
|
||||
"url": "https://downloads.cursor.com/production/475871d112608994deb2e3065dfb7c6b0baa0c54/darwin/x64/Cursor-darwin-x64.dmg",
|
||||
"hash": "sha256-8pGWntBuY6hwIuQ3x5yF93j0++3gB+wg/KsVfIVWUgI="
|
||||
},
|
||||
"aarch64-darwin": {
|
||||
"url": "https://downloads.cursor.com/production/a80ff7dfcaa45d7750f6e30be457261379c29b06/darwin/arm64/Cursor-darwin-arm64.dmg",
|
||||
"hash": "sha256-7igCfkYPRVdwKzakKxYpY0cgqfbpneHJIfcUv3KfRKk="
|
||||
"url": "https://downloads.cursor.com/production/475871d112608994deb2e3065dfb7c6b0baa0c54/darwin/arm64/Cursor-darwin-arm64.dmg",
|
||||
"hash": "sha256-HHd3CpSlGpuRUjakSCBRp3q3RYhiOapBKqblRNiQaZI="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
{
|
||||
"version" = "1.12.10";
|
||||
"hashes" = {
|
||||
"desktopSrcHash" = "sha256-2LQBT3+2JTR3XHO3DynOp8cw2m2SB/mGH01e3SFD/IM=";
|
||||
"desktopYarnHash" = "sha256-QIzuVKmUS4tqXAzhpfLZOp51kLbfC1M2nrff8e+sdg4=";
|
||||
};
|
||||
}
|
||||
@@ -5,16 +5,17 @@
|
||||
makeWrapper,
|
||||
makeDesktopItem,
|
||||
nodejs,
|
||||
electron_40,
|
||||
electron_41,
|
||||
element-web,
|
||||
sqlcipher,
|
||||
callPackage,
|
||||
typescript,
|
||||
tsx,
|
||||
sqlcipher,
|
||||
# command line arguments which are always set
|
||||
commandLineArgs ? "",
|
||||
yarnConfigHook,
|
||||
yarnBuildHook,
|
||||
fetchYarnDeps,
|
||||
fetchPnpmDeps,
|
||||
pnpmConfigHook,
|
||||
pnpm,
|
||||
asar,
|
||||
copyDesktopItems,
|
||||
darwin,
|
||||
@@ -22,166 +23,159 @@
|
||||
}:
|
||||
|
||||
let
|
||||
pinData = import ./element-desktop-pin.nix;
|
||||
inherit (pinData.hashes) desktopSrcHash desktopYarnHash;
|
||||
executableName = "element-desktop";
|
||||
electron = electron_40;
|
||||
electron = electron_41;
|
||||
seshat = callPackage ./seshat { };
|
||||
in
|
||||
stdenv.mkDerivation (
|
||||
finalAttrs:
|
||||
removeAttrs pinData [ "hashes" ]
|
||||
// {
|
||||
pname = "element-desktop";
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}";
|
||||
src = fetchFromGitHub {
|
||||
owner = "element-hq";
|
||||
repo = "element-desktop";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = desktopSrcHash;
|
||||
};
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "element-desktop";
|
||||
version = "1.12.14";
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = finalAttrs.src + "/yarn.lock";
|
||||
hash = desktopYarnHash;
|
||||
};
|
||||
src = fetchFromGitHub {
|
||||
owner = "element-hq";
|
||||
repo = "element-web";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-yy7CfMOMT1DBXHDHaDyAaOgp3s2KQIKA1A6zUhVOUhM=";
|
||||
};
|
||||
|
||||
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
pname = "element";
|
||||
inherit (finalAttrs)
|
||||
version
|
||||
src
|
||||
;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-0yqWObZtRntsH7gk+OB8pMuWsrvCQ4L9173Qv0o5abk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
asar
|
||||
copyDesktopItems
|
||||
nodejs
|
||||
makeWrapper
|
||||
typescript
|
||||
yarnConfigHook
|
||||
yarnBuildHook
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
darwin.autoSignDarwinBinariesHook
|
||||
actool
|
||||
];
|
||||
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
|
||||
inherit seshat;
|
||||
nativeBuildInputs = [
|
||||
asar
|
||||
copyDesktopItems
|
||||
nodejs
|
||||
makeWrapper
|
||||
typescript
|
||||
pnpm
|
||||
pnpmConfigHook
|
||||
tsx
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
darwin.autoSignDarwinBinariesHook
|
||||
actool
|
||||
];
|
||||
|
||||
# Only affects unused scripts in $out/share/element/electron/scripts. Also
|
||||
# breaks because there are some `node`-scripts with a `npx`-shebang and
|
||||
# this shouldn't be in the closure just for unused scripts.
|
||||
dontPatchShebangs = true;
|
||||
inherit seshat;
|
||||
|
||||
postPatch = ''
|
||||
cp -r ${electron.dist} electron-dist
|
||||
chmod -R u+w electron-dist
|
||||
postPatch = ''
|
||||
cd apps/desktop
|
||||
|
||||
substituteInPlace package.json \
|
||||
--replace-fail \
|
||||
' electron-builder",' \
|
||||
' electron-builder --dir -c.electronDist=electron-dist -c.electronVersion=${electron.version} -c.mac.identity=null",'
|
||||
cp -r ${electron.dist} electron-dist
|
||||
chmod -R u+w electron-dist
|
||||
|
||||
# `@electron/fuses` tries to run `codesign` and fails. Disable and use autoSignDarwinBinariesHook instead
|
||||
substituteInPlace ./electron-builder.ts \
|
||||
--replace-fail "resetAdHocDarwinSignature:" "// resetAdHocDarwinSignature:"
|
||||
# `@electron/fuses` tries to run `codesign` and fails. Disable and use autoSignDarwinBinariesHook instead
|
||||
substituteInPlace ./electron-builder.ts \
|
||||
--replace-fail "resetAdHocDarwinSignature:" "// resetAdHocDarwinSignature:"
|
||||
|
||||
# Need to disable asar integrity check to copy in native seshat files, see postBuild phase
|
||||
substituteInPlace ./electron-builder.ts \
|
||||
--replace-fail "enableEmbeddedAsarIntegrityValidation: true" "enableEmbeddedAsarIntegrityValidation: false"
|
||||
'';
|
||||
# Need to disable asar integrity check to copy in native seshat files, see postBuild phase
|
||||
substituteInPlace ./electron-builder.ts \
|
||||
--replace-fail "enableEmbeddedAsarIntegrityValidation: true" "enableEmbeddedAsarIntegrityValidation: false"
|
||||
|
||||
preBuild = ''
|
||||
# Apply upstream patch
|
||||
# Can be removed if upstream removes patches/@types+auto-launch+5.0.5.patch introduced in
|
||||
# https://github.com/element-hq/element-desktop/commit/5e882f8e08d58bf9663c8e3ab33885bf7b3709de
|
||||
node ./node_modules/patch-package/index.js
|
||||
'';
|
||||
cd ../../
|
||||
'';
|
||||
|
||||
postBuild = ''
|
||||
# relative path to app.asar differs on Linux and MacOS
|
||||
packed=$(find ./dist -name app.asar)
|
||||
asar extract "$packed" tmp-app
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
# linking here leads to Error: tmp-app/node_modules/matrix-seshat: file ... links out of the package
|
||||
cp -r $seshat tmp-app/node_modules/matrix-seshat
|
||||
export VERSION=${finalAttrs.version}
|
||||
|
||||
asar pack tmp-app "$packed"
|
||||
'';
|
||||
pnpm -C apps/desktop run build:ts
|
||||
pnpm -C apps/desktop run build:res
|
||||
pnpm -C apps/desktop exec electron-builder --dir -c.electronDist=electron-dist -c.electronVersion=${electron.version} -c.mac.identity=null
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
mkdir -p "$out/Applications" "$out/bin"
|
||||
mv dist/mac*/Element.app "$out/Applications"
|
||||
cd apps/desktop
|
||||
|
||||
ln -s '${element-web}' "$out/Applications/Element.app/Contents/Resources/webapp"
|
||||
# relative path to app.asar differs on Linux and MacOS
|
||||
packed=$(find ./dist -name app.asar)
|
||||
asar extract "$packed" tmp-app
|
||||
|
||||
wrapProgram "$out/Applications/Element.app/Contents/MacOS/Element" \
|
||||
--add-flags ${lib.escapeShellArg commandLineArgs}
|
||||
# linking here leads to Error: tmp-app/node_modules/matrix-seshat: file ... links out of the package
|
||||
cp -r $seshat tmp-app/node_modules/matrix-seshat
|
||||
|
||||
makeWrapper "$out/Applications/Element.app/Contents/MacOS/Element" "$out/bin/${executableName}"
|
||||
''
|
||||
+ lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
|
||||
mkdir -p "$out/bin" "$out/share"
|
||||
asar pack tmp-app "$packed"
|
||||
|
||||
cp -a dist/*-unpacked/resources $out/share/element
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
ln -s '${element-web}' "$out/share/element/webapp"
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
mkdir -p "$out/Applications" "$out/bin"
|
||||
mv dist/mac*/Element.app "$out/Applications"
|
||||
|
||||
# icon, used in makeDesktopItem
|
||||
mkdir -p "$out/share/icons/hicolor/512x512/apps"
|
||||
ln -s "$out/share/element/build/icon.png" "$out/share/icons/hicolor/512x512/apps/element.png"
|
||||
ln -s '${element-web}' "$out/Applications/Element.app/Contents/Resources/webapp"
|
||||
|
||||
# executable wrapper
|
||||
# LD_PRELOAD workaround for sqlcipher not found: https://github.com/matrix-org/seshat/issues/102
|
||||
makeWrapper '${lib.getExe electron}' "$out/bin/${executableName}" \
|
||||
--set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher.so \
|
||||
--add-flags "$out/share/element/app.asar" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--add-flags ${lib.escapeShellArg commandLineArgs}
|
||||
''
|
||||
+ ''
|
||||
runHook postInstall
|
||||
'';
|
||||
wrapProgram "$out/Applications/Element.app/Contents/MacOS/Element" \
|
||||
--add-flags ${lib.escapeShellArg commandLineArgs}
|
||||
|
||||
# The desktop item properties should be kept in sync with data from upstream:
|
||||
# https://github.com/element-hq/element-desktop/blob/develop/package.json
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "element-desktop";
|
||||
exec = "${executableName} %u";
|
||||
icon = "element";
|
||||
desktopName = "Element";
|
||||
genericName = "Matrix Client";
|
||||
comment = finalAttrs.meta.description;
|
||||
categories = [
|
||||
"Network"
|
||||
"InstantMessaging"
|
||||
"Chat"
|
||||
];
|
||||
startupWMClass = "Element";
|
||||
mimeTypes = [
|
||||
"x-scheme-handler/element"
|
||||
"x-scheme-handler/io.element.desktop"
|
||||
];
|
||||
})
|
||||
];
|
||||
makeWrapper "$out/Applications/Element.app/Contents/MacOS/Element" "$out/bin/element-desktop"
|
||||
''
|
||||
+ lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
|
||||
mkdir -p "$out/bin" "$out/share"
|
||||
|
||||
stripDebugList = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
"Applications/Element.app/Contents/MacOS"
|
||||
];
|
||||
cp -a dist/*-unpacked/resources $out/share/element
|
||||
|
||||
passthru = {
|
||||
# run with: nix-shell ./maintainers/scripts/update.nix --argstr package element-desktop
|
||||
updateScript = ./update.sh;
|
||||
};
|
||||
ln -s '${element-web}' "$out/share/element/webapp"
|
||||
|
||||
meta = {
|
||||
description = "Feature-rich client for Matrix.org";
|
||||
homepage = "https://element.io/";
|
||||
changelog = "https://github.com/element-hq/element-desktop/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
license = lib.licenses.agpl3Plus;
|
||||
teams = [ lib.teams.matrix ];
|
||||
inherit (electron.meta) platforms;
|
||||
mainProgram = "element-desktop";
|
||||
};
|
||||
}
|
||||
)
|
||||
# icon, used in makeDesktopItem
|
||||
mkdir -p "$out/share/icons/hicolor/512x512/apps"
|
||||
ln -s "$out/share/element/build/icon.png" "$out/share/icons/hicolor/512x512/apps/element.png"
|
||||
|
||||
# executable wrapper
|
||||
makeWrapper '${lib.getExe electron}' "$out/bin/element-desktop" \
|
||||
--add-flags "$out/share/element/app.asar" \
|
||||
--set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher.so \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--add-flags ${lib.escapeShellArg commandLineArgs}
|
||||
''
|
||||
+ ''
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# The desktop item properties should be kept in sync with data from upstream:
|
||||
# https://github.com/element-hq/element-desktop/blob/develop/package.json
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "element-desktop";
|
||||
exec = "element-desktop %u";
|
||||
icon = "element";
|
||||
desktopName = "Element";
|
||||
genericName = "Matrix Client";
|
||||
comment = finalAttrs.meta.description;
|
||||
categories = [
|
||||
"Network"
|
||||
"InstantMessaging"
|
||||
"Chat"
|
||||
];
|
||||
startupWMClass = "Element";
|
||||
mimeTypes = [
|
||||
"x-scheme-handler/element"
|
||||
"x-scheme-handler/io.element.desktop"
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
stripDebugList = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
"Applications/Element.app/Contents/MacOS"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Feature-rich client for Matrix.org";
|
||||
homepage = "https://element.io/";
|
||||
changelog = "https://github.com/element-hq/element-web/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
license = lib.licenses.agpl3Plus;
|
||||
teams = [ lib.teams.matrix ];
|
||||
inherit (electron.meta) platforms;
|
||||
mainProgram = "element-desktop";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -1,72 +1,50 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
sqlcipher,
|
||||
rustPlatform,
|
||||
nodejs,
|
||||
python3,
|
||||
yarn,
|
||||
fixup-yarn-lock,
|
||||
fetchYarnDeps,
|
||||
removeReferencesTo,
|
||||
yarnConfigHook,
|
||||
yarnBuildHook,
|
||||
sqlcipher,
|
||||
}:
|
||||
|
||||
let
|
||||
pinData = lib.importJSON ./pin.json;
|
||||
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "seshat-node";
|
||||
inherit (pinData) version cargoHash;
|
||||
version = "4.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matrix-org";
|
||||
repo = "seshat";
|
||||
rev = finalAttrs.version;
|
||||
hash = pinData.srcHash;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-2v/qXMCD+r+CSQHtP/YT62p4GoApbGz33kcZfJAKbOU=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/seshat-node/native";
|
||||
sourceRoot = "${finalAttrs.src.name}/seshat-node";
|
||||
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
python3
|
||||
yarn
|
||||
fixup-yarn-lock
|
||||
];
|
||||
buildInputs = [ sqlcipher ];
|
||||
|
||||
npm_config_nodedir = nodejs;
|
||||
cargoHash = "sha256-krSm1wy7HkCOLEHPPHCx6V9Mj+FiavyhO6bLOz2/3Qw=";
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = finalAttrs.src + "/seshat-node/yarn.lock";
|
||||
sha256 = pinData.yarnHash;
|
||||
hash = "sha256-hh9n8By/dNdKS55rcZkzCxmJWwQa6Ovt+4M3YP3/hDs=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
cd ..
|
||||
chmod u+w . ./yarn.lock
|
||||
export HOME=$PWD/tmp
|
||||
mkdir -p $HOME
|
||||
yarn config --offline set yarn-offline-mirror $yarnOfflineCache
|
||||
fixup-yarn-lock yarn.lock
|
||||
yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
|
||||
patchShebangs node_modules/
|
||||
node_modules/.bin/neon build --release -- --target ${stdenv.hostPlatform.rust.rustcTarget} -Z unstable-options --out-dir target/release
|
||||
runHook postBuild
|
||||
'';
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
yarn
|
||||
yarnConfigHook
|
||||
yarnBuildHook
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
buildInputs = [ sqlcipher ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
shopt -s extglob
|
||||
rm -rf native/!(index.node)
|
||||
rm -rf node_modules $HOME
|
||||
cp -r . $out
|
||||
${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc.cc} $out/native/index.node
|
||||
|
||||
mkdir -p "$out"
|
||||
mv "index."{node,js} "$out"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
{
|
||||
"version": "2.3.3",
|
||||
"srcHash": "sha256-HmKHWFoO8TQ9S/RcJnJ3h85/2uSkqGrgLnX82hkux4Q=",
|
||||
"yarnHash": "1cbkv8ap7f8vxl5brzqb86d2dyxg555sz67cldrp0vgnk8sq6ibp",
|
||||
"cargoHash": "sha256-klrFk0gpqQu/9MzLEYMNqEBETZMXtZJX67Sm5ZqyHfE=="
|
||||
}
|
||||
@@ -1,49 +0,0 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -I nixpkgs=../../../../../../ -i bash -p wget prefetch-yarn-deps yarn nix-prefetch nix-prefetch-github
|
||||
|
||||
if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then
|
||||
echo "Regenerates packaging data for the seshat package."
|
||||
echo "Usage: $0 [git release tag]"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
version="$1"
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
if [ -z "$version" ]; then
|
||||
version="$(wget -O- "https://api.github.com/repos/matrix-org/seshat/tags" | jq -r '.[] | .name' | sort --version-sort | tail -1)"
|
||||
fi
|
||||
|
||||
SRC="https://raw.githubusercontent.com/matrix-org/seshat/$version"
|
||||
|
||||
tmpdir=$(mktemp -d)
|
||||
trap 'rm -rf "$tmpdir"' EXIT
|
||||
|
||||
pushd $tmpdir
|
||||
wget "$SRC/seshat-node/yarn.lock"
|
||||
yarn_hash=$(prefetch-yarn-deps yarn.lock)
|
||||
popd
|
||||
|
||||
src_hash=$(nix-prefetch-github matrix-org seshat --rev ${version} | jq -r .hash)
|
||||
|
||||
cat > pin.json << EOF
|
||||
{
|
||||
"version": "$version",
|
||||
"srcHash": "$src_hash",
|
||||
"yarnHash": "$yarn_hash",
|
||||
"cargoHash": "0000000000000000000000000000000000000000000000000000"
|
||||
}
|
||||
EOF
|
||||
|
||||
cargo_hash=$(nix-prefetch "{ sha256 }: (import ../../../../../.. {}).element-desktop.seshat.cargoDeps")
|
||||
|
||||
cat > pin.json << EOF
|
||||
{
|
||||
"version": "$version",
|
||||
"srcHash": "$src_hash",
|
||||
"yarnHash": "$yarn_hash",
|
||||
"cargoHash": "$cargo_hash"
|
||||
}
|
||||
EOF
|
||||
|
||||
@@ -1,65 +0,0 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p nix coreutils prefetch-yarn-deps jq curl
|
||||
|
||||
if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then
|
||||
echo "Regenerates packaging data for the element packages."
|
||||
echo "Usage: $0 [git release tag]"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
version="$1"
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
if [ -z "$version" ]; then
|
||||
version="$(curl -fsSL "https://api.github.com/repos/element-hq/element-desktop/releases/latest" | jq -r '.tag_name')"
|
||||
fi
|
||||
|
||||
# strip leading "v"
|
||||
version="${version#v}"
|
||||
|
||||
cd "$(dirname "${BASH_SOURCE[0]}")" || exit 1
|
||||
|
||||
nixflags=(
|
||||
--extra-experimental-features
|
||||
"nix-command flakes"
|
||||
)
|
||||
|
||||
# HACK: prefetch-yarn-deps hashes may output extra clutter on stdout (!) so
|
||||
# we'll need to get the last line, last word
|
||||
fixupHash() {
|
||||
local sorta_yarn_hash="$(tail -n1 <<< "$1")"
|
||||
local almost_yarn_hash="${sorta_yarn_hash##* }"
|
||||
local yarn_hash="$(nix "${nixflags[@]}" hash convert --hash-algo sha256 "$almost_yarn_hash")"
|
||||
|
||||
printf "%s" "$yarn_hash"
|
||||
}
|
||||
|
||||
getHashes() {
|
||||
variant="$1"
|
||||
output="$2"
|
||||
|
||||
local url="github:element-hq/element-$variant/v$version"
|
||||
local src="$(nix "${nixflags[@]}" flake prefetch --json "$url")"
|
||||
local src_hash="$(jq -r ".hash" <<< "$src")"
|
||||
local src_path="$(jq -r ".storePath" <<< "$src")"
|
||||
local yarn_hash="$(fixupHash "$(prefetch-yarn-deps "$src_path/yarn.lock")")"
|
||||
|
||||
cat > "$output" << EOF
|
||||
{
|
||||
"version" = "$version";
|
||||
"hashes" = {
|
||||
"${variant}SrcHash" = "$src_hash";
|
||||
"${variant}YarnHash" = "$yarn_hash";
|
||||
};
|
||||
}
|
||||
EOF
|
||||
|
||||
if [ "$variant" = "web" ]; then
|
||||
local shared_components_yarn_hash="$(fixupHash "$(prefetch-yarn-deps "$src_path/packages/shared-components/yarn.lock")")"
|
||||
sed -i "/^ \"webYarnHash/a \ \"webSharedComponentsYarnHash\" = \"$shared_components_yarn_hash\";" "$output"
|
||||
fi
|
||||
}
|
||||
|
||||
getHashes web ../element-web-unwrapped/element-web-pin.nix
|
||||
getHashes desktop element-desktop-pin.nix
|
||||
@@ -1,8 +0,0 @@
|
||||
{
|
||||
"version" = "1.12.10";
|
||||
"hashes" = {
|
||||
"webSrcHash" = "sha256-qc17AK2HvTJi0r03VTH0D2QitdYcGNRObji9cm6XsFU=";
|
||||
"webYarnHash" = "sha256-qdmdwjVXA+ZnNG3S9Pnm3JOrJXYXVdH+w7mccNjRmVM=";
|
||||
"webSharedComponentsYarnHash" = "sha256-0sOF3w6BnY1WenDP+zqZAo1W4C91glMQSMQ22iYajTw=";
|
||||
};
|
||||
}
|
||||
@@ -2,16 +2,16 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchYarnDeps,
|
||||
jq,
|
||||
yarnConfigHook,
|
||||
nodejs,
|
||||
jitsi-meet,
|
||||
fetchPnpmDeps,
|
||||
pnpm,
|
||||
pnpmConfigHook,
|
||||
faketty,
|
||||
}:
|
||||
|
||||
let
|
||||
pinData = import ./element-web-pin.nix;
|
||||
inherit (pinData.hashes) webSrcHash webYarnHash webSharedComponentsYarnHash;
|
||||
noPhoningHome = {
|
||||
disable_guests = true; # disable automatic guest account registration at matrix.org
|
||||
};
|
||||
@@ -22,72 +22,62 @@ let
|
||||
meta = removeAttrs previousAttrs.meta [ "knownVulnerabilities" ];
|
||||
});
|
||||
in
|
||||
stdenv.mkDerivation (
|
||||
finalAttrs:
|
||||
removeAttrs pinData [ "hashes" ]
|
||||
// {
|
||||
pname = "element-web";
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "element-web";
|
||||
version = "1.12.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "element-hq";
|
||||
repo = "element-web";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = webSrcHash;
|
||||
};
|
||||
src = fetchFromGitHub {
|
||||
owner = "element-hq";
|
||||
repo = "element-web";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-yy7CfMOMT1DBXHDHaDyAaOgp3s2KQIKA1A6zUhVOUhM=";
|
||||
};
|
||||
|
||||
# https://github.com/element-hq/element-web/commit/e883b05206129857aa00ca726252e10a0eb05cf9
|
||||
# introduced a link: dependency that we need to fetch as well
|
||||
offlineCacheSharedComponents = fetchYarnDeps {
|
||||
yarnLock = finalAttrs.src + "/packages/shared-components/yarn.lock";
|
||||
sha256 = webSharedComponentsYarnHash;
|
||||
};
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
pname = "element";
|
||||
inherit (finalAttrs) version src;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-0yqWObZtRntsH7gk+OB8pMuWsrvCQ4L9173Qv0o5abk=";
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = finalAttrs.src + "/yarn.lock";
|
||||
sha256 = webYarnHash;
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
nodejs
|
||||
pnpm
|
||||
pnpmConfigHook
|
||||
faketty
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
yarnConfigHook
|
||||
jq
|
||||
nodejs
|
||||
];
|
||||
# faketty is required to work around a bug in nx.
|
||||
# See: https://github.com/nrwl/nx/issues/22445
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
cd apps/web
|
||||
|
||||
export VERSION=${finalAttrs.version}
|
||||
export VERSION=${finalAttrs.version}
|
||||
faketty pnpm run build
|
||||
|
||||
pushd packages/shared-components
|
||||
yarnOfflineCache=${finalAttrs.offlineCacheSharedComponents} yarnConfigHook
|
||||
popd
|
||||
yarn --offline --cwd packages/shared-components prepare
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
yarn --offline build:res
|
||||
yarn --offline build:module_system
|
||||
yarn --offline build:bundle
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
cp -R webapp $out
|
||||
cp ${jitsi-meet-override}/libs/external_api.min.js $out/jitsi_external_api.min.js
|
||||
echo "${finalAttrs.version}" > "$out/version"
|
||||
jq -s '.[0] * $conf' "config.sample.json" --argjson "conf" '${builtins.toJSON noPhoningHome}' > "$out/config.json"
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
cp -R webapp $out
|
||||
cp ${jitsi-meet-override}/libs/external_api.min.js $out/jitsi_external_api.min.js
|
||||
echo "${finalAttrs.version}" > "$out/version"
|
||||
jq -s '.[0] * $conf' "config.sample.json" --argjson "conf" '${builtins.toJSON noPhoningHome}' > "$out/config.json"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Glossy Matrix collaboration client for the web";
|
||||
homepage = "https://element.io/";
|
||||
changelog = "https://github.com/element-hq/element-web/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
teams = [ lib.teams.matrix ];
|
||||
license = lib.licenses.agpl3Plus;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
)
|
||||
meta = {
|
||||
description = "Glossy Matrix collaboration client for the web";
|
||||
homepage = "https://element.io/";
|
||||
changelog = "https://github.com/element-hq/element-web/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
teams = [ lib.teams.matrix ];
|
||||
license = lib.licenses.agpl3Plus;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -34,16 +34,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "emulsion";
|
||||
version = "11.0";
|
||||
version = "12.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ArturKovacs";
|
||||
repo = "emulsion";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-0t+MUZu1cvkJSL9Ly9kblH8fMr05KuRpOo+JDn/VUc8=";
|
||||
sha256 = "sha256-+C4YB5usNKfNydyEyIvaScnjK0h/PKN1x8gnt7Lz2kQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-1s5kCUxn4t1A40QHuygGKaqphLmcl+EYfx++RZQmL00=";
|
||||
cargoHash = "sha256-i+lSUSgq98iT9OzsdkZgRidLszc6mJJA1b1Jfq+yk5s=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -117,7 +117,9 @@ python.pkgs.buildPythonApplication rec {
|
||||
git
|
||||
]
|
||||
}"
|
||||
"--prefix PYTHONPATH : ${python.pkgs.makePythonPath dependencies}" # will show better error messages
|
||||
# The dashboard requires esphome to be importable
|
||||
# dependencies are added to show better error messages
|
||||
"--prefix PYTHONPATH : $out/${python.sitePackages}:${python.pkgs.makePythonPath dependencies}"
|
||||
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ stdenv.cc.cc ]}"
|
||||
"--set ESPHOME_USE_SUBPROCESS ''"
|
||||
# https://github.com/NixOS/nixpkgs/issues/362193
|
||||
|
||||
@@ -75,7 +75,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
cafkafk
|
||||
_9glenda
|
||||
sigmasquadron
|
||||
kaynetik
|
||||
];
|
||||
platforms = with lib.platforms; unix ++ windows;
|
||||
};
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "feh";
|
||||
version = "3.11.4";
|
||||
version = "3.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "derf";
|
||||
repo = "feh";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-CURXaEkYwN0RWxjkoe5cZptIUcgTOOH3q0QAAw3P+cs=";
|
||||
hash = "sha256-cjfP/jnVWIGXTihtjVANE1T31R9ZFj8g5H8W3F+JrQk=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
@@ -48,6 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=${placeholder "out"}"
|
||||
"VERSION=${finalAttrs.version}"
|
||||
"exif=1"
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin "verscmp=0"
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "gemini-cli-bin";
|
||||
version = "0.36.0";
|
||||
version = "0.37.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/google-gemini/gemini-cli/releases/download/v${finalAttrs.version}/gemini-cli-bundle.zip";
|
||||
hash = "sha256-wu+QZ5roBNY1mwtte+7opKFBRdOCXONW95UEJ7M3gJI=";
|
||||
hash = "sha256-JbR37CZGjZN0px+bGLQ67dbo/yyAb7BSx1v6IVuBCJc=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -30,20 +30,15 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "gitbutler";
|
||||
version = "0.18.8";
|
||||
version = "0.19.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gitbutlerapp";
|
||||
repo = "gitbutler";
|
||||
tag = "release/${finalAttrs.version}";
|
||||
hash = "sha256-OSM2yjiz3I5+SVpcJSWCDyS4y4w9JJ/8CAP2BK0sL7o=";
|
||||
hash = "sha256-ppl1noikPwTvG/XT7iYG41+9ZZO8i0x2L+odeEzRP1s=";
|
||||
};
|
||||
|
||||
# Workaround for https://github.com/NixOS/nixpkgs/issues/359340
|
||||
cargoPatches = [
|
||||
./gix-from-crates-io.patch
|
||||
];
|
||||
|
||||
# Let Tauri know what version we're building and deactivate the built-in updater
|
||||
# Note: .bundle.externalBin doesn't include `"but"` at the moment
|
||||
# as that'd require more build adjustments
|
||||
@@ -59,12 +54,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
--replace-fail 'checkUpdate = tauriCheck;' 'checkUpdate = () => null;'
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-L53iIVxv3KtmXiqITad1enIMX3Iu/mWSJJPZk7KAWuM=";
|
||||
cargoHash = "sha256-xW/eO+AQQUBN2MrixNx3LKhwMookkKuX5LF4DSWQKKY=";
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-IAsEzM9kmZWnh390CV7mOyOshVlESsyoNT0ZvdY03KY=";
|
||||
hash = "sha256-0WLgtidG8hqTkXY3heu+m3VoqQD/kGMlTmLb0qAS8sQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -136,10 +131,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
"git_editor_takes_precedence"
|
||||
# FLAKY (try again): child exited unsuccessfully: ExitStatus(unix_wait_status(10752))
|
||||
"migrations_in_parallel_with_processes"
|
||||
# FLAKY: Broken pipe (os error 32) - hook script doesn't consume stdin, races with writer
|
||||
"pre_push_ignores_husky_core_hooks_path_when_disabled"
|
||||
# Archive at 'tests/fixtures/generated-archives/[...].tar' not found [..] Error: No such file or directory (os error 2)
|
||||
"merge_first_branch_into_gb_local_and_verify_rebase"
|
||||
"json_output_with_dangling_commits"
|
||||
"two_dangling_commits_different_branches"
|
||||
"new_from_project_handle_uses_repo_gitdir"
|
||||
"new_from_project_handle_keeps_repo_cached"
|
||||
# darwin: Error: timeout waiting for matching event
|
||||
"track_directory_changes_after_rename"
|
||||
];
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "glances";
|
||||
version = "4.5.2";
|
||||
version = "4.5.3.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = python3Packages.isPyPy;
|
||||
@@ -20,7 +20,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
owner = "nicolargo";
|
||||
repo = "glances";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-o/q/zW7lRKQg+u4XblwNIswCVIroMdeUaPTNkN8QKwo=";
|
||||
hash = "sha256-QMKi37+uuRkZxK1qcRIUDAElLU7njjGYUoSecBdbCO0=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [ setuptools ];
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "grpc-client-cli";
|
||||
version = "1.24.2";
|
||||
version = "1.24.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vadimi";
|
||||
repo = "grpc-client-cli";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-y+EY0dhz5+rxegWEgBwcFHcz1MFlbygt0jAWh8yFQmw=";
|
||||
sha256 = "sha256-M3YhVNu7yx/JAMoNrG/JDEMR7JLLLx02+XchCniYVCU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-dkntncYuu5KtIpr73qSxb45NeiuKv8a1bJi645xsIx4=";
|
||||
vendorHash = "sha256-MNl+4PA0hJwWQZwegwVBcUTKWUSfaSdNo4b4lvKRMxM=";
|
||||
|
||||
meta = {
|
||||
description = "Generic gRPC command line client";
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "hugo";
|
||||
version = "0.159.2";
|
||||
version = "0.160.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gohugoio";
|
||||
repo = "hugo";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-86qlh4did365g75j3fk5gkBp3T3YH3zEnNhaOrPFVcI=";
|
||||
hash = "sha256-6vBVGqT/Ia7XSbBhRaQVsr/pT1bRXvMz3rZZLYydSfc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-w6wjKB4jQejxW7IqpZaujxlZSUxWYqHiPI6aqOOD2+0=";
|
||||
vendorHash = "sha256-x1Gk4fZfzTKr6QcnraJ6fuwPMa3cTLlY6OaSQkWrdC0=";
|
||||
|
||||
checkFlags =
|
||||
let
|
||||
|
||||
@@ -78,7 +78,6 @@ buildGoModule (finalAttrs: {
|
||||
qjoly
|
||||
devusb
|
||||
ryan4yin
|
||||
kaynetik
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "kyverno";
|
||||
version = "1.16.2";
|
||||
version = "1.17.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kyverno";
|
||||
repo = "kyverno";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-wXoqE3AZ5PQ8nxkJhfGrNdyJBKW8BF0loqqCs6A2Etg=";
|
||||
hash = "sha256-/5ax23jkD+DlR9566ok09kXX0E0fZTH4x5/AyopKnr4=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
@@ -27,7 +27,7 @@ buildGoModule (finalAttrs: {
|
||||
"-X github.com/kyverno/kyverno/pkg/version.BuildTime=1970-01-01_00:00:00"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-7zonEXXrd5+QaQQcgHwGwj665YB9gBxtE8Yi09SGsPU=";
|
||||
vendorHash = "sha256-GTleFbdf7LYmtPaCYYpQ5NUdsP1nstzXIFJe75HajBY=";
|
||||
|
||||
subPackages = [ "cmd/cli/kubectl-kyverno" ];
|
||||
|
||||
|
||||
@@ -46,7 +46,6 @@ buildGoModule (finalAttrs: {
|
||||
khaneliman
|
||||
starsep
|
||||
sigmasquadron
|
||||
kaynetik
|
||||
];
|
||||
mainProgram = "lazygit";
|
||||
};
|
||||
|
||||
7
pkgs/by-name/lx/lxi-tools-gui/package.nix
Normal file
7
pkgs/by-name/lx/lxi-tools-gui/package.nix
Normal file
@@ -0,0 +1,7 @@
|
||||
{
|
||||
lxi-tools,
|
||||
}:
|
||||
|
||||
lxi-tools.override {
|
||||
withGui = true;
|
||||
}
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mediawriter";
|
||||
version = "5.3.0";
|
||||
version = "5.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FedoraQt";
|
||||
repo = "MediaWriter";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-oicnUxyo+5nuDh7A3oL9Pgrm69Lv7CWeNaJdMfuESu8=";
|
||||
hash = "sha256-INq07MdWLq5qwBNWrrBRmtIpxsmnHcqPEUyRkIl3Qa4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -22,13 +22,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mixing-station";
|
||||
version = "2.8.0";
|
||||
version = "2.8.2";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://mixingstation.app/backend/api/web/download/archive/mixing-station-pc/update/${finalAttrs.version}";
|
||||
name = "mixing-station-${finalAttrs.version}.zip";
|
||||
extension = "zip";
|
||||
hash = "sha256-AGmBCkaYt3kZv/XuR9fkeEVryFw6t/p1CHVirNp+81s=";
|
||||
hash = "sha256-hGxwr+Juf8ES4Mifs/B6wq5h2Vs+ymcMl8k8Y6HxcJk=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
@@ -23,13 +23,13 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "noto-fonts${suffix}";
|
||||
version = "2026.03.01";
|
||||
version = "2026.04.01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "notofonts";
|
||||
repo = "notofonts.github.io";
|
||||
tag = "noto-monthly-release-${finalAttrs.version}";
|
||||
hash = "sha256-WWLNBT+Su8cKxmkJIUBZykhFQIAyhG3DV2r8ksqikL0=";
|
||||
hash = "sha256-f5A9vFTO+TgZTarN0cDmRZfBQxeqedzJp3KdCnua4Yw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "opencode";
|
||||
version = "1.4.0";
|
||||
version = "1.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anomalyco";
|
||||
repo = "opencode";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-u3OeU+3Y/O6KEeDiOl+pswBZ7++kMqwoK+ams03qWE4=";
|
||||
hash = "sha256-m+Ue7FWiTjKMAn1QefAwOMfOb2Vybk0mJPV9zcbkOmE=";
|
||||
};
|
||||
|
||||
node_modules = stdenvNoCC.mkDerivation {
|
||||
@@ -72,7 +72,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
# NOTE: Required else we get errors that our fixed-output derivation references store paths
|
||||
dontFixup = true;
|
||||
|
||||
outputHash = "sha256-atufNVv1pxdcz9TGhlZsQSwZ8E8dxJ7syPA/FD/cZWI=";
|
||||
outputHash = "sha256-hVXlQcUuvUudIB35Td6ucBYopM/QOSx59tQbCTqoB/0=";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
};
|
||||
|
||||
@@ -43,10 +43,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
homepage = "https://github.com/containers/podman-compose";
|
||||
license = lib.licenses.gpl2Only;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [
|
||||
sikmir
|
||||
kaynetik
|
||||
];
|
||||
maintainers = [ lib.maintainers.sikmir ];
|
||||
teams = [ lib.teams.podman ];
|
||||
mainProgram = "podman-compose";
|
||||
};
|
||||
|
||||
@@ -170,7 +170,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
booxter
|
||||
kaynetik
|
||||
];
|
||||
inherit (electron.meta) platforms;
|
||||
mainProgram = "podman-desktop";
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "pv-migrate";
|
||||
version = "3.2.0";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "utkuozdemir";
|
||||
repo = "pv-migrate";
|
||||
tag = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-zWE0jpBYauI8Xm4HcArV3I0m3LMLEz8CoThjNrjxddE=";
|
||||
sha256 = "sha256-ieE7kO/PA/2ZgvGbDhu1MzJTk5yvg2plKTyQe0Y/nb8=";
|
||||
};
|
||||
|
||||
subPackages = [ "cmd/pv-migrate" ];
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "rectangle-pro";
|
||||
version = "3.63";
|
||||
version = "3.75";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://rectangleapp.com/pro/downloads/Rectangle%20Pro%20${finalAttrs.version}.dmg";
|
||||
hash = "sha256-ysRIf19Woo6odCEgkNfoRDelF7gflDhaiNH+hjygz/Q=";
|
||||
hash = "sha256-1NIR3iql9+e2nX/mzThkJ2LnLi0onrgF8gLwFBf2iKc=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "retroarch-assets";
|
||||
version = "1.22.0-unstable-2025-12-01";
|
||||
version = "1.22.0-unstable-2026-04-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "retroarch-assets";
|
||||
rev = "a7b711dfd74871e9985ba3b2fe2c15048a928aaf";
|
||||
hash = "sha256-M0abYzsWxGHgwQEobhLKIIKj3XeDxmZBN+5+UER4c9k=";
|
||||
rev = "9ba4071d04cbd00404a52b5c6c41cf9d3cf218fb";
|
||||
hash = "sha256-K3EtqRStUSJwRxX0OeFPtnjuX0aV5DHcr/d4YvZgb1c=";
|
||||
};
|
||||
|
||||
makeFlags = [
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ripdrag";
|
||||
version = "0.4.11";
|
||||
version = "0.4.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nik012003";
|
||||
repo = "ripdrag";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-1IUS0PNzIoSrlBXQrUmw/lXUD8auVVKhu/irSoYoK6w=";
|
||||
hash = "sha256-syirR3t3AxThwIPMviGaSeXpDz2ApDGZOozPJ5bGEt4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-LtkSGu261rPFgofaD/t2rSilxUPL6eHBpd/Tz9gR8ZM=";
|
||||
cargoHash = "sha256-/OczChiDDK6Y2CxpjfgWkTwweKe4FVpOMlsB+qMp/r8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -70,7 +70,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
globin
|
||||
ma27
|
||||
zowoq
|
||||
kaynetik
|
||||
];
|
||||
mainProgram = "rg";
|
||||
platforms = lib.platforms.all;
|
||||
|
||||
30
pkgs/by-name/rs/rsyslog-light/package.nix
Normal file
30
pkgs/by-name/rs/rsyslog-light/package.nix
Normal file
@@ -0,0 +1,30 @@
|
||||
{
|
||||
rsyslog,
|
||||
}:
|
||||
|
||||
rsyslog.override {
|
||||
withKrb5 = false;
|
||||
withSystemd = false;
|
||||
withJemalloc = false;
|
||||
withMysql = false;
|
||||
withPostgres = false;
|
||||
withDbi = false;
|
||||
withNetSnmp = false;
|
||||
withUuid = false;
|
||||
withCurl = false;
|
||||
withGnutls = false;
|
||||
withGcrypt = false;
|
||||
withLognorm = false;
|
||||
withMaxminddb = false;
|
||||
withOpenssl = false;
|
||||
withRelp = false;
|
||||
withKsi = false;
|
||||
withLogging = false;
|
||||
withNet = false;
|
||||
withHadoop = false;
|
||||
withRdkafka = false;
|
||||
withMongo = false;
|
||||
withCzmq = false;
|
||||
withRabbitmq = false;
|
||||
withHiredis = false;
|
||||
}
|
||||
@@ -39,13 +39,13 @@
|
||||
openssl,
|
||||
withRelp ? true,
|
||||
librelp,
|
||||
withKsi ? true,
|
||||
withKsi ? false, # Currently Broken
|
||||
libksi,
|
||||
withLogging ? true,
|
||||
liblogging,
|
||||
withNet ? true,
|
||||
libnet,
|
||||
withHadoop ? true,
|
||||
withHadoop ? false, # Currently Broken
|
||||
hadoop,
|
||||
withRdkafka ? true,
|
||||
rdkafka,
|
||||
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
version = "8.2512.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.rsyslog.com/files/download/rsyslog/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
|
||||
url = "https://www.rsyslog.com/files/download/rsyslog/rsyslog-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-k8UAJdkLbHlfo1DVaj2DK/zkUEPqm9aCQNnCqTlLxik=";
|
||||
};
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
diff --git a/ts/scripts/get-expire-time.node.ts b/ts/scripts/get-expire-time.node.ts
|
||||
index 7938f74d3..9d427977d 100644
|
||||
index deebfcee6..50f6df652 100644
|
||||
--- a/ts/scripts/get-expire-time.node.ts
|
||||
+++ b/ts/scripts/get-expire-time.node.ts
|
||||
@@ -18,7 +18,7 @@ const buildCreation = unixTimestamp * 1000;
|
||||
|
||||
// NB: Build expirations are also determined via users' auto-update settings; see
|
||||
// getExpirationTimestamp
|
||||
-const validDuration = isNotUpdatable(version) ? DAY * 30 : DAY * 90;
|
||||
-const validDuration = isNotUpdatable(packageJson.version) ? DAY * 30 : DAY * 90;
|
||||
+const validDuration = DAY * 90;
|
||||
const buildExpiration = buildCreation + validDuration;
|
||||
|
||||
const localProductionPath = join(
|
||||
diff --git a/ts/util/buildExpiration.std.ts b/ts/util/buildExpiration.std.ts
|
||||
index 530443ec7..26cb03d7c 100644
|
||||
index c2ac24c6d..65260f8bd 100644
|
||||
--- a/ts/util/buildExpiration.std.ts
|
||||
+++ b/ts/util/buildExpiration.std.ts
|
||||
@@ -70,9 +70,7 @@ export function hasBuildExpired({
|
||||
@@ -25,4 +25,4 @@ index 530443ec7..26cb03d7c 100644
|
||||
+ const safeExpirationMs = NINETY_ONE_DAYS;
|
||||
|
||||
const buildExpirationDuration = buildExpirationTimestamp - now;
|
||||
const tooFarIntoFuture = buildExpirationDuration > safeExpirationMs;
|
||||
const tooFarIntoFuture = buildExpirationDuration > safeExpirationMs;
|
||||
@@ -14,23 +14,23 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "libsignal-node";
|
||||
version = "0.89.1";
|
||||
version = "0.91.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "signalapp";
|
||||
repo = "libsignal";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-eYeRlyKtTxPT1tpmuEsFrXNnp1F+l/PJcxpUDblCL60=";
|
||||
hash = "sha256-icmmQWWVCWg8dpNkQtLi3YWSxBrUwaGP4ezTDqC/0kc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-7kLqrU/yD0aeeULpuh8EgZvmKo1c3Wuwe+9vEm8sFT8=";
|
||||
cargoHash = "sha256-NaFl9r4e08I3+/asek7VMA0yikxPR0MtBX9TnHaebSU=";
|
||||
|
||||
npmRoot = "node";
|
||||
npmDeps = fetchNpmDeps {
|
||||
name = "${finalAttrs.pname}-npm-deps";
|
||||
inherit (finalAttrs) version src;
|
||||
sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}";
|
||||
hash = "sha256-SZJIj5uBB6EZEACC44IpGvDTQuQIDgqmLGkgRbtUwOc=";
|
||||
hash = "sha256-TTU7cfoS0h2fqHanSOCsF+dtkhBfaWApfOC3O4DGClo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -58,13 +58,13 @@ let
|
||||
'';
|
||||
});
|
||||
|
||||
version = "8.4.1";
|
||||
version = "8.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "signalapp";
|
||||
repo = "Signal-Desktop";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-HjIU7L3iSr51w3KxzmaVzOI6qtAyyyWTlK1HygNyEzw=";
|
||||
hash = "sha256-K6mufC7LFGWeCkIkrsYPO2n/0L1b6yBqiLcv7w7e57g=";
|
||||
};
|
||||
|
||||
sticker-creator = stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -159,11 +159,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# language-pack postprocessing), and they expect a different macOS
|
||||
# app layout than nixpkgs' Electron provides.
|
||||
substituteInPlace package.json \
|
||||
--replace-fail '"artifactBuildCompleted": "ts/scripts/artifact-build-completed.node.js",' "" \
|
||||
--replace-fail '"afterSign": "ts/scripts/after-sign.node.js",' "" \
|
||||
--replace-fail '"afterPack": "ts/scripts/after-pack.node.js",' "" \
|
||||
--replace-fail '"sign": "./ts/scripts/sign-macos.node.js",' "" \
|
||||
--replace-fail '"afterAllArtifactBuild": "ts/scripts/after-all-artifact-build.node.js",' ""
|
||||
--replace-fail '"artifactBuildCompleted": "ts/scripts/artifact-build-completed.node.ts",' "" \
|
||||
--replace-fail '"afterSign": "ts/scripts/after-sign.node.ts",' "" \
|
||||
--replace-fail '"afterPack": "ts/scripts/after-pack.node.ts",' "" \
|
||||
--replace-fail '"sign": "./ts/scripts/sign-macos.node.ts",' "" \
|
||||
--replace-fail '"afterAllArtifactBuild": "ts/scripts/after-all-artifact-build.node.ts",' ""
|
||||
'';
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
@@ -177,15 +177,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
fetcherVersion = 3;
|
||||
hash =
|
||||
if withAppleEmojis then
|
||||
"sha256-QaYUL5/JcXqd564CFAR+4EMMG38h8a1dpls054iWDzU="
|
||||
"sha256-d6ul6MTJhnM4PyxMlMaVovnvSPfYh3DmMjHjmOideB4="
|
||||
else
|
||||
"sha256-NEUKdRT0aVznkXTZOJJ8TCUhidhTAiDdBxoukKvt4qs=";
|
||||
"sha256-JymcPdFMi0wfceOJnPrwEBG4PnosIFnrxiIrTlcGf/g=";
|
||||
};
|
||||
|
||||
env = {
|
||||
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
SIGNAL_ENV = "production";
|
||||
SOURCE_DATE_EPOCH = 1774560637;
|
||||
SOURCE_DATE_EPOCH = 1775687068;
|
||||
}
|
||||
// lib.optionalAttrs stdenv.hostPlatform.isDarwin {
|
||||
# Disable code signing during local macOS builds.
|
||||
|
||||
@@ -46,32 +46,32 @@ index 483d1c4e4..66609d9e9 100644
|
||||
getBadgesPath(userDataPath),
|
||||
getDraftPath(userDataPath),
|
||||
diff --git a/package.json b/package.json
|
||||
index 31399e645..05fc46b8b 100644
|
||||
index 8585e6bdc..4d900ebfe 100644
|
||||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -156,7 +156,6 @@
|
||||
"dashdash": "2.0.0",
|
||||
"direction": "1.0.4",
|
||||
@@ -122,7 +122,6 @@
|
||||
"@signalapp/sqlcipher": "3.2.1",
|
||||
"@signalapp/windows-ucv": "1.0.1",
|
||||
"emoji-datasource": "16.0.0",
|
||||
- "emoji-datasource-apple": "16.0.0",
|
||||
"emoji-regex": "10.4.0",
|
||||
"encoding": "0.1.13",
|
||||
"fabric": "4.6.0",
|
||||
"google-libphonenumber": "3.2.39"
|
||||
},
|
||||
"devDependencies": {
|
||||
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
|
||||
index 223557f67..2250b619d 100644
|
||||
index 756130661..4872be4cf 100644
|
||||
--- a/pnpm-lock.yaml
|
||||
+++ b/pnpm-lock.yaml
|
||||
@@ -200,9 +200,6 @@ importers:
|
||||
@@ -97,9 +97,6 @@ importers:
|
||||
emoji-datasource:
|
||||
specifier: 16.0.0
|
||||
version: 16.0.0
|
||||
- emoji-datasource-apple:
|
||||
- specifier: 16.0.0
|
||||
- version: 16.0.0
|
||||
emoji-regex:
|
||||
specifier: 10.4.0
|
||||
version: 10.4.0
|
||||
@@ -5835,9 +5832,6 @@ packages:
|
||||
google-libphonenumber:
|
||||
specifier: 3.2.39
|
||||
version: 3.2.39
|
||||
@@ -6068,9 +6065,6 @@ packages:
|
||||
resolution: {integrity: sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==}
|
||||
engines: {node: '>=12'}
|
||||
|
||||
@@ -81,7 +81,7 @@ index 223557f67..2250b619d 100644
|
||||
emoji-datasource@16.0.0:
|
||||
resolution: {integrity: sha512-/qHKqK5Nr3+8zhgO6kHmF43Fm5C8HNn0AaFRIpgw8HF3+uF0Vfc8jgLI1ZQS5ba1vBzksS8NBCjHejwLb2D/Sg==}
|
||||
|
||||
@@ -17062,8 +17056,6 @@ snapshots:
|
||||
@@ -16954,8 +16948,6 @@ snapshots:
|
||||
|
||||
emittery@0.13.1: {}
|
||||
|
||||
|
||||
@@ -66,7 +66,6 @@ buildGoModule (finalAttrs: {
|
||||
maintainers = with lib.maintainers; [
|
||||
Scrumplex
|
||||
mic92
|
||||
kaynetik
|
||||
];
|
||||
license = lib.licenses.mpl20;
|
||||
};
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "temporal_capi";
|
||||
version = "0.2.2";
|
||||
version = "0.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "boa-dev";
|
||||
repo = "temporal";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-aAe8gaMAkUrVcEbe8PJfo1Mn8wEwriH4PPjbgNdcUkY=";
|
||||
hash = "sha256-wD4pTVgQZrGONgSTDm9Eq3fo3Ez7aIC0/n4Rqgksad4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-25NBtoWc/YrBjvRT/AqMYwFVBuGuEyn3Nrq+ZlzTIXQ=";
|
||||
cargoHash = "sha256-8m4fWMEZxQ4g3h+81K9KnQvHHewmExOq0nouJ7wec8M=";
|
||||
|
||||
postPatch = ''
|
||||
# Force crate-type to include staticlib
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "terraform-mcp-server";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = "terraform-mcp-server";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-V+TcIuw9SrSbqtjZMM5CSUjPof9xpdwN0NKGrU7M6kQ=";
|
||||
hash = "sha256-pYco93oARCqgUk99X3oxBcuNKStw0JeyVQOoEt6PYn8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-8bKDnnByc6tId7mWCaSxY9zgoBW7Ajlmd33xuMrJp1E=";
|
||||
vendorHash = "sha256-fJ3G/kqJlnoBdBVgnl1MzYLrNhucNocWT3rHgrTpfQU=";
|
||||
|
||||
ldflags = [
|
||||
"-X main.version=${finalAttrs.version}"
|
||||
|
||||
@@ -61,9 +61,6 @@ buildGo125Module (finalAttrs: {
|
||||
homepage = "https://github.com/terraform-linters/tflint";
|
||||
changelog = "https://github.com/terraform-linters/tflint/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
license = lib.licenses.mpl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
momeemt
|
||||
kaynetik
|
||||
];
|
||||
maintainers = with lib.maintainers; [ momeemt ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -38,7 +38,6 @@ buildGoModule (finalAttrs: {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
fab
|
||||
kaynetik
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -113,7 +113,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
maintainers = with lib.maintainers; [
|
||||
ethancedwards8
|
||||
fpletz
|
||||
kaynetik
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -18,16 +18,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "uv";
|
||||
version = "0.11.4";
|
||||
version = "0.11.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astral-sh";
|
||||
repo = "uv";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-bOvArcuBrF/4ENhQx1cH79Q2+zygBO+GMOe2oNZwCTc=";
|
||||
hash = "sha256-S3D8KjIyUw9cy+y8FCNX4o2CezWWBS1c00f6bLytTrE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-1Q58GFLhBVFqhSxI1korv3iwSwxEKNHLN9rzqIhWBHU=";
|
||||
cargoHash = "sha256-1zKhePStJQx8OiRJo7omJn1w0UdQ9at0c1glsjFPuTo=";
|
||||
|
||||
buildInputs = [
|
||||
rust-jemalloc-sys
|
||||
|
||||
@@ -90,7 +90,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
maintainers = with lib.maintainers; [
|
||||
zx2c4
|
||||
ma27
|
||||
kaynetik
|
||||
];
|
||||
mainProgram = "wg";
|
||||
platforms = lib.platforms.unix;
|
||||
|
||||
@@ -75,10 +75,7 @@ buildGoModule (finalAttrs: {
|
||||
homepage = "https://github.com/ngoduykhanh/wireguard-ui";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [
|
||||
bot-wxt1221
|
||||
kaynetik
|
||||
];
|
||||
maintainers = with lib.maintainers; [ bot-wxt1221 ];
|
||||
mainProgram = "wireguard-ui";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "xan";
|
||||
version = "0.56.0";
|
||||
version = "0.57.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "medialab";
|
||||
repo = "xan";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-eXzWquBFuX4DB9uOJFgWwp1cNxi02KcU4yZQ3PsPRRs=";
|
||||
hash = "sha256-54kLrWOSHnS26nogw/u3Prq6nfxsrT/VaDKEQr8kK48=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Mck41QDRCyQvbKDIIjaoniHOk2U5FPbr4Oun2WuL800=";
|
||||
cargoHash = "sha256-3L6WMkCecyhYVWchcFcs5lesxax468pIZc+ZllLwbro=";
|
||||
|
||||
# FIXME: tests fail and I do not have the time to investigate. Temporarily disable
|
||||
# tests so that we can manually run and test the package for packaging purposes.
|
||||
|
||||
@@ -2,15 +2,13 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
wrapQtAppsHook,
|
||||
cmake,
|
||||
bzip2,
|
||||
qtbase,
|
||||
qttools,
|
||||
libnova,
|
||||
proj,
|
||||
libpng,
|
||||
openjpeg,
|
||||
qt5,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@@ -21,17 +19,17 @@ stdenv.mkDerivation {
|
||||
owner = "opengribs";
|
||||
repo = "XyGrib";
|
||||
rev = "88c425ca2d7f4ba5d7ab75bfa25e177bee02d310";
|
||||
sha256 = "sha256-qMMeRYIQqJpVRE3YjbXIiXHwS/CHs9l2QihszwQIr/A=";
|
||||
hash = "sha256-qMMeRYIQqJpVRE3YjbXIiXHwS/CHs9l2QihszwQIr/A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
qttools
|
||||
wrapQtAppsHook
|
||||
qt5.qttools
|
||||
qt5.wrapQtAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
bzip2
|
||||
qtbase
|
||||
qt5.qtbase
|
||||
libnova
|
||||
proj
|
||||
openjpeg
|
||||
@@ -76,7 +76,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
SuperSandro2000
|
||||
matthiasbeyer
|
||||
ryan4yin
|
||||
kaynetik
|
||||
];
|
||||
mainProgram = "zoxide";
|
||||
};
|
||||
|
||||
95
pkgs/data/fonts/ioskeley-mono/default.nix
Normal file
95
pkgs/data/fonts/ioskeley-mono/default.nix
Normal file
@@ -0,0 +1,95 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchzip,
|
||||
installFonts,
|
||||
}:
|
||||
|
||||
let
|
||||
version = "v2.0.0-beta.1";
|
||||
|
||||
mkFont =
|
||||
{
|
||||
width,
|
||||
hash,
|
||||
isNF ? false,
|
||||
variant ? "Hinted",
|
||||
}:
|
||||
let
|
||||
variantName = lib.toLower width;
|
||||
pkgSuffix = if isNF then "${variantName}-NF" else variantName;
|
||||
fileName = "IoskeleyMono-${if isNF then "NerdFont-" else ""}${width}.zip";
|
||||
in
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "ioskeley-mono-${pkgSuffix}";
|
||||
inherit version;
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/ahatem/IoskeleyMono/releases/download/${version}/${fileName}";
|
||||
stripRoot = false;
|
||||
inherit hash;
|
||||
};
|
||||
sourceRoot = if isNF then "." else "source/${variant}";
|
||||
|
||||
nativeBuildInputs = [ installFonts ];
|
||||
|
||||
fontDirectories = [
|
||||
"."
|
||||
"Hinted"
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/ahatem/IoskeleyMono";
|
||||
description = "Iosevka configuration mimicking Berkeley Mono (${width}${
|
||||
if isNF then ", Nerd Font" else ""
|
||||
})";
|
||||
license = lib.licenses.ofl;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [ nuexq ];
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
normal = mkFont {
|
||||
width = "Normal";
|
||||
hash = "sha256-ZuV4yg6H0SayGo3LB2Naqn4axR0Lnmw95u/jiRk5B/U=";
|
||||
};
|
||||
normal-unhinted = mkFont {
|
||||
width = "Normal";
|
||||
hash = "sha256-ZuV4yg6H0SayGo3LB2Naqn4axR0Lnmw95u/jiRk5B/U=";
|
||||
variant = "Unhinted";
|
||||
};
|
||||
semiCondensed = mkFont {
|
||||
width = "SemiCondensed";
|
||||
hash = "sha256-fOuQmf+ANuKy3kaLRbAu9RIsL3rORGJUlR/BerDg60U=";
|
||||
};
|
||||
semiCondensed-unhinted = mkFont {
|
||||
width = "SemiCondensed";
|
||||
hash = "sha256-fOuQmf+ANuKy3kaLRbAu9RIsL3rORGJUlR/BerDg60U=";
|
||||
variant = "Unhinted";
|
||||
};
|
||||
condensed = mkFont {
|
||||
width = "Condensed";
|
||||
hash = "sha256-bzEh9YvbERZrIvXZPopHwhkSe87y3MdHhLaRGWLvTQU=";
|
||||
};
|
||||
condensed-unhinted = mkFont {
|
||||
width = "Condensed";
|
||||
hash = "sha256-bzEh9YvbERZrIvXZPopHwhkSe87y3MdHhLaRGWLvTQU=";
|
||||
variant = "Unhinted";
|
||||
};
|
||||
normal-NF = mkFont {
|
||||
width = "Normal";
|
||||
hash = "sha256-rhSU4Md6D7hLT6EeH3TMetPgQGuiYowpYVaZqewGgh8=";
|
||||
isNF = true;
|
||||
};
|
||||
semiCondensed-NF = mkFont {
|
||||
width = "SemiCondensed";
|
||||
hash = "sha256-W1ykPzdsoXfRBJ5YuxrjOc/J7uzwLQRjZTc9G2cj06Y=";
|
||||
isNF = true;
|
||||
};
|
||||
condensed-NF = mkFont {
|
||||
width = "Condensed";
|
||||
hash = "sha256-TAneNRImlRNsvTr6xDCG+VKFycttbTxkP6hfh9Kr+X4=";
|
||||
isNF = true;
|
||||
};
|
||||
}
|
||||
76
pkgs/development/python-modules/async-geotiff/default.nix
Normal file
76
pkgs/development/python-modules/async-geotiff/default.nix
Normal file
@@ -0,0 +1,76 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
pytestCheckHook,
|
||||
uv-build,
|
||||
|
||||
affine,
|
||||
async-tiff,
|
||||
defusedxml,
|
||||
numpy,
|
||||
pyproj,
|
||||
|
||||
# tests
|
||||
pydantic,
|
||||
rasterio,
|
||||
morecantile,
|
||||
jsonschema,
|
||||
pytest-asyncio,
|
||||
}:
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "async-geotiff";
|
||||
version = "0.4.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "developmentseed";
|
||||
repo = "async-geotiff";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-J72/VRDAgqGOm7rYmlkURKgWSIa11L260LX447MQWbc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# see https://github.com/developmentseed/async-geotiff/pull/136
|
||||
./uv-build-relax-deps.patch
|
||||
# see https://github.com/developmentseed/async-tiff/pull/292
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/developmentseed/async-geotiff/commit/f8325c0decb2a7e61faf3db5e51ec5a104d3cbdb.patch?full_index=1";
|
||||
hash = "sha256-RLqMWKtjDSmxQkUXz9dXKIIqRXM7BWkuJIbbeHxCPyQ=";
|
||||
})
|
||||
];
|
||||
|
||||
build-system = [ uv-build ];
|
||||
|
||||
# see https://github.com/developmentseed/async-geotiff/pull/133
|
||||
pythonRemoveDeps = [ "types-defusedxml" ];
|
||||
|
||||
dependencies = [
|
||||
affine
|
||||
async-tiff
|
||||
defusedxml
|
||||
numpy
|
||||
pyproj
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "async_geotiff" ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
checkInputs = [
|
||||
jsonschema
|
||||
morecantile
|
||||
rasterio
|
||||
pydantic
|
||||
pytest-asyncio
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Fast, async GeoTIFF and COG reader for Python";
|
||||
homepage = "https://developmentseed.org/async-geotiff/latest/";
|
||||
license = lib.licenses.mit;
|
||||
teams = [ lib.teams.geospatial ];
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,49 @@
|
||||
diff --git i/pyproject.toml w/pyproject.toml
|
||||
index 601e2e5..cd26339 100644
|
||||
--- i/pyproject.toml
|
||||
+++ w/pyproject.toml
|
||||
@@ -69,7 +69,7 @@ docs = [
|
||||
|
||||
|
||||
[build-system]
|
||||
-requires = ["uv_build>=0.8.8,<0.9.0"]
|
||||
+requires = ["uv_build>=0.8.8,<0.12.0"]
|
||||
build-backend = "uv_build"
|
||||
|
||||
[tool.ruff]
|
||||
diff --git i/uv.lock w/uv.lock
|
||||
index e7cd10f..2a74412 100644
|
||||
--- i/uv.lock
|
||||
+++ w/uv.lock
|
||||
@@ -55,7 +55,6 @@ dependencies = [
|
||||
{ name = "defusedxml" },
|
||||
{ name = "numpy" },
|
||||
{ name = "pyproj" },
|
||||
- { name = "types-defusedxml" },
|
||||
]
|
||||
|
||||
[package.optional-dependencies]
|
||||
@@ -77,6 +76,7 @@ dev = [
|
||||
{ name = "pytest-asyncio" },
|
||||
{ name = "rasterio", version = "1.4.4", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.12'" },
|
||||
{ name = "rasterio", version = "1.5.0", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.12'" },
|
||||
+ { name = "types-defusedxml" },
|
||||
{ name = "types-jsonschema" },
|
||||
]
|
||||
docs = [
|
||||
@@ -97,7 +97,6 @@ requires-dist = [
|
||||
{ name = "morecantile", marker = "extra == 'morecantile'", specifier = ">=7.0,<8.0" },
|
||||
{ name = "numpy", specifier = ">=2.0" },
|
||||
{ name = "pyproj", specifier = ">=3.3.0" },
|
||||
- { name = "types-defusedxml", specifier = ">=0.7.0.20250822" },
|
||||
]
|
||||
provides-extras = ["morecantile"]
|
||||
|
||||
@@ -114,6 +113,7 @@ dev = [
|
||||
{ name = "pytest", specifier = ">=9.0.2" },
|
||||
{ name = "pytest-asyncio", specifier = ">=1.3.0" },
|
||||
{ name = "rasterio", specifier = ">=1.4.4" },
|
||||
+ { name = "types-defusedxml", specifier = ">=0.7.0.20250822" },
|
||||
{ name = "types-jsonschema", specifier = ">=4.26.0.20260109" },
|
||||
]
|
||||
docs = [
|
||||
93
pkgs/development/python-modules/async-tiff/default.nix
Normal file
93
pkgs/development/python-modules/async-tiff/default.nix
Normal file
@@ -0,0 +1,93 @@
|
||||
{
|
||||
# utils
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
lib,
|
||||
rustPlatform,
|
||||
|
||||
# build and dependencies
|
||||
llvmPackages,
|
||||
maturin,
|
||||
obspec,
|
||||
|
||||
# tests dependencies
|
||||
pytestCheckHook,
|
||||
numpy,
|
||||
obstore,
|
||||
pytest-asyncio,
|
||||
rasterio,
|
||||
}:
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "async-tiff";
|
||||
version = "0.7.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "developmentseed";
|
||||
repo = "async-tiff";
|
||||
tag = "py-v${finalAttrs.version}";
|
||||
hash = "sha256-o77iYqzBCloE5xgn0Sa6SWbrCMgnNuZwQ2MZ0wgtNew=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/developmentseed/async-tiff/commit/c7db2fc693089f3326328cc59863f8a9a6dd1cb9.patch?full_index=1";
|
||||
hash = "sha256-FsOZk8KZ3guqIoECYRsBQMEq8TrAQn9Z01NqUJAQOu8=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
cd python
|
||||
'';
|
||||
|
||||
buildSystem = [ maturin ];
|
||||
|
||||
buildInputs = [ llvmPackages.libclang ];
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
pname = finalAttrs.pname;
|
||||
version = finalAttrs.version;
|
||||
src = finalAttrs.src;
|
||||
hash = "sha256-AKa4SsBYBCabMlYJqTcbHv9Z7ouqtiIEK0el/i/fo6I=";
|
||||
|
||||
preBuild = ''
|
||||
cd python
|
||||
'';
|
||||
};
|
||||
|
||||
nativeBuildInputs = with rustPlatform; [
|
||||
cargoSetupHook
|
||||
maturinBuildHook
|
||||
rustPlatform.bindgenHook
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
obspec
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "async_tiff" ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
checkInputs = [
|
||||
numpy
|
||||
obstore
|
||||
pytest-asyncio
|
||||
rasterio
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# network access
|
||||
"test_cog_s3"
|
||||
"test_raise_typeerror_fetch_tile_striped_tiff"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Async TIFF reader for Python";
|
||||
homepage = "http://developmentseed.org/async-tiff/";
|
||||
license = lib.licenses.mit;
|
||||
teams = [ lib.teams.geospatial ];
|
||||
};
|
||||
})
|
||||
@@ -358,13 +358,13 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "boto3-stubs";
|
||||
version = "1.42.86";
|
||||
version = "1.42.87";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "boto3_stubs";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-hfwSM39wUj4l8wiFuA/u7PhiOXerpT92cr03pWdHGKM=";
|
||||
hash = "sha256-TDhzzDzBsJVgdhaQnezE+aqbujejwh1HNIKA7t+YVmM=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "dtschema";
|
||||
version = "2025.12";
|
||||
version = "2026.04";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "devicetree-org";
|
||||
repo = "dt-schema";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-DCkZDI0/W/4IkMzaa769vKJxlSMWoEsLIdlyChYd+Mk=";
|
||||
hash = "sha256-U86h0FVmsYfoKMOaS3DRwKOUjpsm4uNTbUm2YJehaFs=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools-scm ];
|
||||
|
||||
@@ -17,14 +17,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "i-pi";
|
||||
version = "3.1.11";
|
||||
version = "3.1.12";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "i-pi";
|
||||
repo = "i-pi";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-9APlG1P+4G5GRZ7LG2Vvfr0l9ZcIxWkHW1M7wT7W1sk=";
|
||||
hash = "sha256-FXDinbsM5sznXNn6lR85dLqy3p0YJESGCgvjkYoPCDc=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "iamdata";
|
||||
version = "0.1.202604091";
|
||||
version = "0.1.202604101";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloud-copilot";
|
||||
repo = "iam-data-python";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-KcXJmV+5aeOhIxN3xvjZPFQSDTMxeFPYq/1IErnV1t0=";
|
||||
hash = "sha256-YA6q5BMQ+71Jn54KEqAqt7LMg+t36f56paDtMYQcHGc=";
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
@@ -854,8 +854,8 @@ in
|
||||
"sha256-1cIpxNx/Q1C89D27DO0PTsFRhZvSok7L1e+B6WjPXvs=";
|
||||
|
||||
mypy-boto3-mediaconnect =
|
||||
buildMypyBoto3Package "mediaconnect" "1.42.37"
|
||||
"sha256-NYn/N65sVAUxA4kTCi/IJNP/QQeutFjH8S7N2AeK3g8=";
|
||||
buildMypyBoto3Package "mediaconnect" "1.42.87"
|
||||
"sha256-JxR2l3AZarl6nr9l6UiBxTC7638DvVwNQmm6a0dxpsI=";
|
||||
|
||||
mypy-boto3-mediaconvert =
|
||||
buildMypyBoto3Package "mediaconvert" "1.42.71"
|
||||
@@ -1094,8 +1094,8 @@ in
|
||||
"sha256-hQyZdqznZ8uJVoiwuiVRQRG8fDVWykuyWGJ6BOEc0bE=";
|
||||
|
||||
mypy-boto3-redshift-data =
|
||||
buildMypyBoto3Package "redshift-data" "1.42.3"
|
||||
"sha256-Mby+hQJcBXqmDY5wC1Uut4EQex1PmjT8bgB81rT5NKU=";
|
||||
buildMypyBoto3Package "redshift-data" "1.42.87"
|
||||
"sha256-KjFXEK3rcYOgaN1unw0mFxqW8VKPzsYT95KQO4DTZp8=";
|
||||
|
||||
mypy-boto3-redshift-serverless =
|
||||
buildMypyBoto3Package "redshift-serverless" "1.42.28"
|
||||
@@ -1170,8 +1170,8 @@ in
|
||||
"sha256-juVfwdjPDNPaT5tvyXpzDtomugqxeu++AERLkVtFIxw=";
|
||||
|
||||
mypy-boto3-sagemaker =
|
||||
buildMypyBoto3Package "sagemaker" "1.42.79"
|
||||
"sha256-HSSrvBgXk0HwS8ys2e8+euzupPc075axwh7WAduvvR8=";
|
||||
buildMypyBoto3Package "sagemaker" "1.42.87"
|
||||
"sha256-w1mjZjHC65uJ+pkfhBcn7wwhhmaZ4AQPKATS2mXYfkU=";
|
||||
|
||||
mypy-boto3-sagemaker-a2i-runtime =
|
||||
buildMypyBoto3Package "sagemaker-a2i-runtime" "1.42.3"
|
||||
|
||||
53
pkgs/development/python-modules/obspec/default.nix
Normal file
53
pkgs/development/python-modules/obspec/default.nix
Normal file
@@ -0,0 +1,53 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pytestCheckHook,
|
||||
|
||||
# build system
|
||||
hatchling,
|
||||
|
||||
# dependencies
|
||||
typing-extensions,
|
||||
|
||||
# test dependencies
|
||||
pytest,
|
||||
pytest-mypy-plugins,
|
||||
mypy,
|
||||
}:
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "obspec";
|
||||
version = "0.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "developmentseed";
|
||||
repo = "obspec";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-zO2T189WUl1HJkBLrGpArS5NoFNpEchWfjJQJEME5W8=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
dependencies = [
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "obspec" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
mypy
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest-mypy-plugins
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Object storage interface definitions for Python";
|
||||
homepage = "http://developmentseed.org/obspec/";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ autra ];
|
||||
};
|
||||
})
|
||||
@@ -11,12 +11,12 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "publicsuffixlist";
|
||||
version = "1.0.2.20260408";
|
||||
version = "1.0.2.20260410";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-nADjVKqlb776Rw8CC7dDqryD2BRJqXr8MNMWTKH2puk=";
|
||||
hash = "sha256-XhH04df3ikVy3yxVzipIdybghKAwi1/9kVH8bsNAp5E=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -20,14 +20,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pydantic-ai-slim";
|
||||
version = "1.77.0";
|
||||
version = "1.79.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pydantic";
|
||||
repo = "pydantic-ai";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-g1behrlnpYio1w12jzMS13DQSs6ajgN8bezinIPr928=";
|
||||
hash = "sha256-humCEXsoBNoLG33GjHdvagg3QNxjf/1gSQZUrk6ZnHg=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/pydantic_ai_slim";
|
||||
|
||||
@@ -16,14 +16,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pydantic-graph";
|
||||
version = "1.77.0";
|
||||
version = "1.79.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pydantic";
|
||||
repo = "pydantic-ai";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-g1behrlnpYio1w12jzMS13DQSs6ajgN8bezinIPr928=";
|
||||
hash = "sha256-humCEXsoBNoLG33GjHdvagg3QNxjf/1gSQZUrk6ZnHg=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/pydantic_graph";
|
||||
|
||||
@@ -12,19 +12,19 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "resvg-py";
|
||||
version = "0.2.6";
|
||||
version = "0.3.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "baseplate-admin";
|
||||
repo = "resvg-py";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-lNNAIEEzwPEs/Qup6PXkMWezGHEAVs4VxuwBv5DgjWE=";
|
||||
hash = "sha256-XXzNrOR2/bMXR5GWEk8XKlCNHNG4+Sz0+0EgESc8FbQ=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-OrXWiMIgqZ2opl3XfC2zVwN9w0xz2u08mRA883tN6pM=";
|
||||
hash = "sha256-pIz92GeQctxAbCZ8QPbFhSTmdSVNopw0vL2fwMJXoYc=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
pytestCheckHook,
|
||||
|
||||
async-geotiff,
|
||||
attrs,
|
||||
boto3,
|
||||
cachetools,
|
||||
@@ -17,21 +18,23 @@
|
||||
obstore,
|
||||
pydantic,
|
||||
pystac,
|
||||
pytest-asyncio,
|
||||
rasterio,
|
||||
rioxarray,
|
||||
typing-extensions,
|
||||
zarr,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "rio-tiler";
|
||||
version = "8.0.5";
|
||||
version = "9.0.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cogeotiff";
|
||||
repo = "rio-tiler";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-FOTwP4iTLfWl81KKarLOQQyp4gpi6Q+pjUXfZrXXsfo=";
|
||||
hash = "sha256-R8vmb33ZfKGqRLkJ55npL031Gnc7HTUDeWiCvtaLsiM=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
@@ -47,6 +50,7 @@ buildPythonPackage (finalAttrs: {
|
||||
pydantic
|
||||
pystac
|
||||
rasterio
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
@@ -64,11 +68,18 @@ buildPythonPackage (finalAttrs: {
|
||||
]
|
||||
++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies);
|
||||
|
||||
checkInputs = [
|
||||
async-geotiff
|
||||
pytest-asyncio
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "rio_tiler" ];
|
||||
|
||||
disabledTests = [
|
||||
# Requires network access
|
||||
"test_dataset_reader"
|
||||
# for some reason, str date representation are not the same
|
||||
"test_xarray_reader"
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -1,32 +1,41 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
python3Packages,
|
||||
}:
|
||||
buildPythonPackage,
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
# build systems
|
||||
setuptools,
|
||||
# runtime deps
|
||||
click,
|
||||
jsonschema,
|
||||
pyyaml,
|
||||
requests,
|
||||
tqdm,
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "stac-validator";
|
||||
version = "3.11.0";
|
||||
version = "4.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stac-utils";
|
||||
repo = "stac-validator";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-5wcnEdk8+/stdJVQ97Me/+H3GrS7DA+Nd0OQtPEXDl4=";
|
||||
hash = "sha256-qO1DRYpPn+zarHTj2mZQ2LJ2uhmS1bax6Yxy035ZEUA=";
|
||||
};
|
||||
|
||||
build-system = [ python3Packages.setuptools ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"click"
|
||||
];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
dependencies = [
|
||||
click
|
||||
jsonschema
|
||||
pyyaml
|
||||
requests
|
||||
tqdm
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "stac_validator" ];
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "tencentcloud-sdk-python";
|
||||
version = "3.1.73";
|
||||
version = "3.1.75";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TencentCloud";
|
||||
repo = "tencentcloud-sdk-python";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-VYjJLaFVGgIV35naRZaFhTSf8Z3AjCmPTkcxJdshSyY=";
|
||||
hash = "sha256-O/heoxVZybJYZF3qFcuKXgbncClfKK21WpXGqtwxw58=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -11,12 +11,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "xyzservices";
|
||||
version = "2025.11.0";
|
||||
version = "2026.3.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-L8crSVArJQI/1x6PUy+0vt278KoSTZDqJdukT1ReF84=";
|
||||
hash = "sha256-0iaGal2On+8zcDTY2jeoKY8KHZ0UibQBjmlXnrMh/qQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
11
pkgs/development/tools/electron/40-angle-patchdir.patch
Normal file
11
pkgs/development/tools/electron/40-angle-patchdir.patch
Normal file
@@ -0,0 +1,11 @@
|
||||
diff --git a/electron/patches/config.json b/electron/patches/config.json
|
||||
index f5dbe8600f..9e1e5e0704 100644
|
||||
--- a/electron/patches/config.json
|
||||
+++ b/electron/patches/config.json
|
||||
@@ -15,5 +15,5 @@
|
||||
{ "patch_dir": "src/electron/patches/reclient-configs", "repo": "src/third_party/engflow-reclient-configs" },
|
||||
{ "patch_dir": "src/electron/patches/sqlite", "repo": "src/third_party/sqlite/src" },
|
||||
{ "patch_dir": "src/electron/patches/skia", "repo": "src/third_party/skia" },
|
||||
- { "patch_dir": "src/electron/patches/angle", "repo": "src/third_party/angle/src" }
|
||||
+ { "patch_dir": "src/electron/patches/angle", "repo": "src/third_party/angle" }
|
||||
]
|
||||
@@ -1,12 +0,0 @@
|
||||
diff --git a/electron/patches/config.json b/electron/patches/config.json
|
||||
index ed42ff8123..7af1c839cc 100644
|
||||
--- a/electron/patches/config.json
|
||||
+++ b/electron/patches/config.json
|
||||
@@ -12,6 +12,6 @@
|
||||
{ "patch_dir": "src/electron/patches/ReactiveObjC", "repo": "src/third_party/squirrel.mac/vendor/ReactiveObjC" },
|
||||
{ "patch_dir": "src/electron/patches/webrtc", "repo": "src/third_party/webrtc" },
|
||||
{ "patch_dir": "src/electron/patches/reclient-configs", "repo": "src/third_party/engflow-reclient-configs" },
|
||||
- { "patch_dir": "src/electron/patches/skia", "repo": "src/third_party/skia/src" },
|
||||
+ { "patch_dir": "src/electron/patches/skia", "repo": "src/third_party/skia" },
|
||||
{ "patch_dir": "src/electron/patches/sqlite", "repo": "src/third_party/sqlite/src" }
|
||||
]
|
||||
@@ -12,35 +12,35 @@
|
||||
},
|
||||
"39": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "1910b2b857e0ee6d2ebd57ead75c3ace7d367a6bb9ccd6a48f8d2b23d93ffe67",
|
||||
"aarch64-linux": "856848216c549a783b39f8d84dd93668d71da0d804e3bba709265804e5b4ba94",
|
||||
"armv7l-linux": "56602fe1579eec07d810389ccf3d10c3d50e994f0319048f4f3057f8b24aa97b",
|
||||
"headers": "0pi0nf8dk7sxj2a8k57zmwy39slph8j18icgpkgqyq5pfl5skmci",
|
||||
"x86_64-darwin": "9d80221dd2621a9526047be09379e32bbfc9dd57331e41bc0826aadbb69f632a",
|
||||
"x86_64-linux": "3977017548b5dfdf78e1342cbe251c7ee7a127e52514903e181fa92143b0fa3a"
|
||||
"aarch64-darwin": "86fa117ba10e36149ca33d7c22de2cfc3fb7490ca88b07ce953d2efe1f2a41cd",
|
||||
"aarch64-linux": "fd721650a0e25829b76d307e944383be828533cdddd53e44a0b772e96e3e019b",
|
||||
"armv7l-linux": "5d0a75a53cdba1ecfc678910084802fe500f13f470310ae1d2c66840d3c7390b",
|
||||
"headers": "0sb9biq3z92f32dklisiax9pk5kj8yhwvihchcsp6v4vag7jx45v",
|
||||
"x86_64-darwin": "5dfe5559fd283c3962221c674b30a5b986895b644b1b4bc179e0c7673a14f1cf",
|
||||
"x86_64-linux": "233b2775f1c46e5ebd5afeb4fb95ce9fda61229bad20aef1031468eb54b3656e"
|
||||
},
|
||||
"version": "39.8.2"
|
||||
"version": "39.8.7"
|
||||
},
|
||||
"40": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "fdcd3e3500a09c7191b3e5375f7bf884bde1068b013e9f7786d4572364fadd22",
|
||||
"aarch64-linux": "13b4d4b73d1ed96b647e26f5117cd79180db1d8cf3bf344e6c13c506693bf988",
|
||||
"armv7l-linux": "af746bd31ef1801eba08cae6935fd6f576262c311d3f641a8accc4c2f0f4b986",
|
||||
"aarch64-darwin": "7a400c28aeba7bdf691ff03d2a620b76c7f8c75fdfac1f4543a8dc13b039fa24",
|
||||
"aarch64-linux": "5af0073c52a8dc729e118340b5f50c4b2932bd94ba992e1c5380fe1545330373",
|
||||
"armv7l-linux": "8f65d16758cdec2d4474732fb60e1f28e1829b4ee7ba67fcb9b5b6510652e667",
|
||||
"headers": "1jrcg0yqbi7xxlk7hanqbxvj2p4d7r2dqikbbawqvb7iakw4m5iv",
|
||||
"x86_64-darwin": "96f9f69e6a91dff7defcfe6c6a9ff3d366478dbbb0ae6ff4f74fe779ea1bb893",
|
||||
"x86_64-linux": "3eba5cc2ebe1d33395188c22c4b2310658db18699ee55b6a7a003a388321b761"
|
||||
"x86_64-darwin": "2600d89b2ffa452bb5dc2fe11f0f7719ae001273f6f6c68988140986e5f95508",
|
||||
"x86_64-linux": "3bce6ee4e4e481f7ce6d0be384f6c539ce16e0b9b7f46115aec6516770f6c26d"
|
||||
},
|
||||
"version": "40.8.2"
|
||||
"version": "40.8.5"
|
||||
},
|
||||
"41": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "8e18ef53da62bca6132508721c1f94e06b5773b48d366b95e593479892f0a2fe",
|
||||
"aarch64-linux": "5eff34c3c28f7a35d8f90ba23b58e5d5125b7f8fb39be12416dc61fe28b24c21",
|
||||
"armv7l-linux": "963b9ddbad8f6003807544c485fc548554ced3cfedcf0b8c130ba724b5560952",
|
||||
"headers": "0ndgpbszlnimvrmxjwlx15xds9csjsxpi6ix36cfq9dbvr6dn85m",
|
||||
"x86_64-darwin": "446bd464236cec71fdfb5562bae5d092cbf27ed5213feac39b7667081578b9c6",
|
||||
"x86_64-linux": "9f1f347dc81e94b1207fc6ae4c1f1d189d26d3356da6f99e7e46087c84d28f10"
|
||||
"aarch64-darwin": "e018684f96c873415fbea4713fc7db96b6d1e2bd3db4513e2b8c1887ec83a719",
|
||||
"aarch64-linux": "f8983c877df8f2b93c76d35e45af9df82c9eb5f294b183f8fe5930e5155fdc4e",
|
||||
"armv7l-linux": "71e8db75ab19d3c403c5476fdec120bbd19750b0c4cbe9086ff729e0e0c712c4",
|
||||
"headers": "0620qjyndlq9kg9ypr9l7l97bd6z5fxx5sa2am0nh7z4cxvx5rz7",
|
||||
"x86_64-darwin": "fb3750bcfccc0146065708bf065288252da02489d51414a6d5b77d04f94a3f2a",
|
||||
"x86_64-linux": "fb0b31f5bb2b248d571c08ab57437c08a69b57f63ccdf9e55d6692b6132848d4"
|
||||
},
|
||||
"version": "41.0.2"
|
||||
"version": "41.2.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,35 +12,35 @@
|
||||
},
|
||||
"39": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "0f8398b79fb1d6a0036be18c24caef2d48dab9e8980ff6a7f0f658e11df86ca0",
|
||||
"aarch64-linux": "45083a530bd03781dd759720519c805c046f392d88e2404268392446f896e265",
|
||||
"armv7l-linux": "09a6548e5abc4e1589870031bf35edb00b506da10102bb5d1b52fc069b7c1b34",
|
||||
"headers": "0pi0nf8dk7sxj2a8k57zmwy39slph8j18icgpkgqyq5pfl5skmci",
|
||||
"x86_64-darwin": "f9995e244e0c703b0c1e06bcad2b1b9feca79d4437901e3b9dfa1f635b03884b",
|
||||
"x86_64-linux": "713570bbe7877fa950cbb533197cfb12aa7ff85d4db7e1fc9ad6ac57ca5733c9"
|
||||
"aarch64-darwin": "2e2a3533f9969ded3b11eb0baa5357abeb652975d9bcaea0b0725c9bd0866061",
|
||||
"aarch64-linux": "a8caf72372eb47deb336dc440eb183c30d228b3fef5349dac7571d86103f117c",
|
||||
"armv7l-linux": "5d5f02b2e28e8328435d2fd83207098e69dc3e5fecbbbdc2612792370ab2c4ec",
|
||||
"headers": "0sb9biq3z92f32dklisiax9pk5kj8yhwvihchcsp6v4vag7jx45v",
|
||||
"x86_64-darwin": "c74882bcbdd53f6e8cd65906809ac446bb032dce3ce8f109e2376d49b9b394ee",
|
||||
"x86_64-linux": "e336dc2dce9d11d44f6eb5b5cc655d3311a9a109ea184625da3ac51181c3ad27"
|
||||
},
|
||||
"version": "39.8.2"
|
||||
"version": "39.8.7"
|
||||
},
|
||||
"40": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "9e6e4b4ed6a76dae4528c2d89d7df2dcf6f9c998f87e84fae346006403612448",
|
||||
"aarch64-linux": "bff62b17117e6f574067efe776bfb64760a5ec1167e7cd69995cc549778d5c53",
|
||||
"armv7l-linux": "87ec532bb5dbec921e8772099b928c2ababb3f07b163c1bcd0c620eab7d4a4b4",
|
||||
"aarch64-darwin": "60a199b111b7cb032f6400371064cfa75457c13fd1699aa25dae2ca780e10b63",
|
||||
"aarch64-linux": "6dec383c6f0779daffdd7b8e106d7a4261bc798acf7c250195a98de79f0e92d5",
|
||||
"armv7l-linux": "57304ae9d455ba9be1fc079138ccaa1c4f168dece10aec970477beea7b92270f",
|
||||
"headers": "1jrcg0yqbi7xxlk7hanqbxvj2p4d7r2dqikbbawqvb7iakw4m5iv",
|
||||
"x86_64-darwin": "f3e196a27eee46e58965747041f1e6ec55ac089a433ed18aa3cebcc0072ae896",
|
||||
"x86_64-linux": "7cbc40681c71bbdd56f7f3dd9cbb8912fbffb9044e9e6a2e363583103b26c60f"
|
||||
"x86_64-darwin": "6e774f3ae2d69accc3745e09f39fce6dc18d7cbe63e2698dfb7f36a2881b2f05",
|
||||
"x86_64-linux": "804d1cd1c20c44691e071a2f9a25e42cfd28f4ccfd4368552072e37ad18ad807"
|
||||
},
|
||||
"version": "40.8.2"
|
||||
"version": "40.8.5"
|
||||
},
|
||||
"41": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "b24542ea11f192425a8416524bd710cad3e0bf61f4ef6f8e0bb772034f445798",
|
||||
"aarch64-linux": "04c82fd4c384197e088921a1fc80d0ecf2e26437c1e61d9d1a448e177fc901bd",
|
||||
"armv7l-linux": "d991063e2c9006fe2561b13e267860400958d78a75bb9e1abec7732d215a6996",
|
||||
"headers": "0ndgpbszlnimvrmxjwlx15xds9csjsxpi6ix36cfq9dbvr6dn85m",
|
||||
"x86_64-darwin": "1b42ad2c246480b994f939ebcda435a48e048bdcda278316c02ed657489ba29e",
|
||||
"x86_64-linux": "43c41b02eddc944300c516e218c46a12db924cfa5d9559023085adc3aa18c564"
|
||||
"aarch64-darwin": "9f8e18fec80a8a93d123549e379f1524c61bdd7c005d90a4df02a5aa5c9b779b",
|
||||
"aarch64-linux": "83c9570411fb2ed83548b08b1a95928a3828ecb5f8a5f7c862f4188611420614",
|
||||
"armv7l-linux": "217ffd04268cd8f459e1f6be0cd81431f45a04af3175073e0e56a4f15068e372",
|
||||
"headers": "0620qjyndlq9kg9ypr9l7l97bd6z5fxx5sa2am0nh7z4cxvx5rz7",
|
||||
"x86_64-darwin": "9e7fc8ded16d5f4c82373a4b048d48beec8529b6126bad188f08fc7923f8b40d",
|
||||
"x86_64-linux": "84009c924c7e5feabee8066f7dbf54abf1997d033d9156a6a36e3b8cf9f0b148"
|
||||
},
|
||||
"version": "41.0.2"
|
||||
"version": "41.2.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -132,8 +132,8 @@ in
|
||||
++ lib.optionals (lib.versions.major info.version == "39") [
|
||||
./39-angle-patchdir.patch
|
||||
]
|
||||
++ lib.optionals (lib.versions.major info.version == "41") [
|
||||
./41-skia-patchdir.patch
|
||||
++ lib.optionals (lib.versions.major info.version == "40") [
|
||||
./40-angle-patchdir.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -56,10 +56,10 @@
|
||||
},
|
||||
"src/electron": {
|
||||
"args": {
|
||||
"hash": "sha256-RveQxDKnvEMdijWO1w3qVME64bc/EPosyv5qS1BUQTc=",
|
||||
"hash": "sha256-RrqxAum+OEmuh/f2PfPFDulmU3LhTqUtwww8Nb+F7NI=",
|
||||
"owner": "electron",
|
||||
"repo": "electron",
|
||||
"tag": "v39.8.2"
|
||||
"tag": "v39.8.7"
|
||||
},
|
||||
"fetcher": "fetchFromGitHub"
|
||||
},
|
||||
@@ -1342,10 +1342,10 @@
|
||||
"fetcher": "fetchFromGitiles"
|
||||
}
|
||||
},
|
||||
"electron_yarn_hash": "sha256-l24z99s6gwdwkAnFex/tFxLpOlN72SS0j1rWP0V3LmA=",
|
||||
"electron_yarn_hash": "sha256-HCnJJqfgcilB+Cl2OaezL9Uu1xk0ZBdVEXg2VDR1dwU=",
|
||||
"modules": "140",
|
||||
"node": "22.22.1",
|
||||
"version": "39.8.2"
|
||||
"version": "39.8.7"
|
||||
},
|
||||
"40": {
|
||||
"chrome": "144.0.7559.236",
|
||||
@@ -1404,10 +1404,10 @@
|
||||
},
|
||||
"src/electron": {
|
||||
"args": {
|
||||
"hash": "sha256-ft8q4spa4DiNH+rinT83KZHENA1gFHA0L8fLq+uO2MY=",
|
||||
"hash": "sha256-Uvgjmq/xfD1IjYMC2CSmNHGWtsV9V2RJmtKhhRKITyM=",
|
||||
"owner": "electron",
|
||||
"repo": "electron",
|
||||
"tag": "v40.8.2"
|
||||
"tag": "v40.8.5"
|
||||
},
|
||||
"fetcher": "fetchFromGitHub"
|
||||
},
|
||||
@@ -2693,10 +2693,10 @@
|
||||
"electron_yarn_hash": "sha256-+7UFFBC4awv3Eg7aB5fKgIysAA2QIpds7s7xN2DuoP8=",
|
||||
"modules": "143",
|
||||
"node": "24.14.0",
|
||||
"version": "40.8.2"
|
||||
"version": "40.8.5"
|
||||
},
|
||||
"41": {
|
||||
"chrome": "146.0.7680.72",
|
||||
"chrome": "146.0.7680.179",
|
||||
"chromium": {
|
||||
"deps": {
|
||||
"gn": {
|
||||
@@ -2705,15 +2705,15 @@
|
||||
"version": "0-unstable-2026-02-05"
|
||||
}
|
||||
},
|
||||
"version": "146.0.7680.72"
|
||||
"version": "146.0.7680.179"
|
||||
},
|
||||
"chromium_npm_hash": "sha256-ByB1Ea5tduIJZXyydeBWsoS8OPABOgwHe+dNXRssdvc=",
|
||||
"deps": {
|
||||
"src": {
|
||||
"args": {
|
||||
"hash": "sha256-+McF03H5tyxItoSfqFpaRO/nSx6T4rjOmoHaGgkaS4s=",
|
||||
"hash": "sha256-HTeAvITnXbFdNiKmXWlOPfWFRjJ1ES2QkY5LjwX4OII=",
|
||||
"postFetch": "rm -rf $(find $out/third_party/blink/web_tests ! -name BUILD.gn -mindepth 1 -maxdepth 1); rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",
|
||||
"tag": "146.0.7680.72",
|
||||
"tag": "146.0.7680.179",
|
||||
"url": "https://chromium.googlesource.com/chromium/src.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
@@ -2752,10 +2752,10 @@
|
||||
},
|
||||
"src/electron": {
|
||||
"args": {
|
||||
"hash": "sha256-Bto47eWPdteTsKKrVtH6e0dI303cRbaaev3Hd2+m2nA=",
|
||||
"hash": "sha256-Pt/BZVy3kSREabV0LvLAQN5D2v2GHBvnRKUuZ9DIQ+Y=",
|
||||
"owner": "electron",
|
||||
"repo": "electron",
|
||||
"tag": "v41.0.2"
|
||||
"tag": "v41.2.0"
|
||||
},
|
||||
"fetcher": "fetchFromGitHub"
|
||||
},
|
||||
@@ -2785,8 +2785,8 @@
|
||||
},
|
||||
"src/third_party/angle": {
|
||||
"args": {
|
||||
"hash": "sha256-QVtTxBBox8fiqTj0gjqvYx6HoBSlvuWIe5ki4iCQl08=",
|
||||
"rev": "1d3190bf5633327395d694d621258978d989dffd",
|
||||
"hash": "sha256-9Me/9kdDgcDLGP/0lLWpj294IoUp0hDD5hfFjSZbTOc=",
|
||||
"rev": "1c0f91aaa60a1f87725840495cbfd9717e7c77c8",
|
||||
"url": "https://chromium.googlesource.com/angle/angle.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
@@ -2977,8 +2977,8 @@
|
||||
},
|
||||
"src/third_party/dawn": {
|
||||
"args": {
|
||||
"hash": "sha256-Duv3kNulPtVxCLPa3bFIev64O9Y4ObJP/IZz31oPJ0E=",
|
||||
"rev": "c46c81b25577c40de6e7e510743ae0454e0c8351",
|
||||
"hash": "sha256-ATTNb61RG7hS1mapDw0o4ZyBeny4ONI8ZjJLpmbQaKU=",
|
||||
"rev": "10fb89e3179bb7443e66911eb3c795c7aaf022e5",
|
||||
"url": "https://dawn.googlesource.com/dawn.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
@@ -3243,8 +3243,8 @@
|
||||
},
|
||||
"src/third_party/harfbuzz-ng/src": {
|
||||
"args": {
|
||||
"hash": "sha256-pXAQYEotsqZmfaJSQFaJmZAQVzUiNrHw52z0vmbxQRQ=",
|
||||
"rev": "fa2908bf16d2ccd6623f4d575455fea72a1a722b",
|
||||
"hash": "sha256-2utl+HNeomIpdqS3hsYZveFfZ+ksMGRvgCaH3WVvsFw=",
|
||||
"rev": "c24f6a29e5912332e269891fbdb1ac771d543a08",
|
||||
"url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
@@ -3347,8 +3347,8 @@
|
||||
},
|
||||
"src/third_party/libaom/source/libaom": {
|
||||
"args": {
|
||||
"hash": "sha256-RuCmzPIR6hW8znjQH4kQqSJmIIJWtMkUQjYEVn3B9AE=",
|
||||
"rev": "4018d3b63456eb657475e66c352bfa86f321e0f5",
|
||||
"hash": "sha256-hLddZzWBQZ/MEF5fcCiju5ibNPSb+zhahlxdLaczdsE=",
|
||||
"rev": "446588f90da2e3372a9352d3b2ba8ab3f342c8ce",
|
||||
"url": "https://aomedia.googlesource.com/aom.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
@@ -3628,8 +3628,8 @@
|
||||
},
|
||||
"src/third_party/pdfium": {
|
||||
"args": {
|
||||
"hash": "sha256-jMoYwf63C0IHx/QcOT+LKCCYN3dJVUhC5COukkhwqx0=",
|
||||
"rev": "67cf48602b0c8aaa9807cd185212ee078eb30b21",
|
||||
"hash": "sha256-yfjXNWczeGwPlnAVB161OsFXiHms2IRstqKmoZ/AWFU=",
|
||||
"rev": "bccc616f83aaed08f65d4a707dfe00e24133772b",
|
||||
"url": "https://pdfium.googlesource.com/pdfium.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
@@ -3724,8 +3724,8 @@
|
||||
},
|
||||
"src/third_party/skia": {
|
||||
"args": {
|
||||
"hash": "sha256-RoLgaE5mj9UqePhnfH+BOTit04TyiAvgF7/2PLuBG4Y=",
|
||||
"rev": "50841da4a7b7064b3cea8a851e60ef921c87a103",
|
||||
"hash": "sha256-2/Deen9OwDgDRrm5j7Rw27Z2JUX1thX7mnKWRLJbEvM=",
|
||||
"rev": "30d129c8800b5626c46fb83fa62db10b9b22b319",
|
||||
"url": "https://skia.googlesource.com/skia.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
@@ -3999,8 +3999,8 @@
|
||||
},
|
||||
"src/third_party/webrtc": {
|
||||
"args": {
|
||||
"hash": "sha256-evtOzxwWgKUaJl9zwpQDqPp1wM7w3DzjRcLg29z9ELQ=",
|
||||
"rev": "d1972add2a63b2a528a6471d447f82e0010b5215",
|
||||
"hash": "sha256-g2GYFVTK8f296v7lUcYPqkI4qDoladsTpnKWb6SGRmw=",
|
||||
"rev": "6733aa5ba16e1e1087f339d1151c80c924a6fbf8",
|
||||
"url": "https://webrtc.googlesource.com/src.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
@@ -4047,16 +4047,16 @@
|
||||
},
|
||||
"src/v8": {
|
||||
"args": {
|
||||
"hash": "sha256-dsjddO/LCNAYLJ1XyDkJLJ9TToiy7pENlBryF1VcmtY=",
|
||||
"rev": "bc343986bd4cb17e49ef15b70c4bdac710e27167",
|
||||
"hash": "sha256-nG4goqqVAAWPMkq8296wCYhnwL93oAL+pF1oaMXyqZI=",
|
||||
"rev": "0ad812d268a7820dba9bf848b416aeda4dd1b2e5",
|
||||
"url": "https://chromium.googlesource.com/v8/v8.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
}
|
||||
},
|
||||
"electron_yarn_hash": "sha256-yZJjsVx1dvxj0X08n5kO8F2FWYIndbJ+ZiNIXTxsgEw=",
|
||||
"electron_yarn_hash": "sha256-tPI7O7xlvDjU5+krILVB6JhLpftMq4Bn8+KIKMjBVgA=",
|
||||
"modules": "145",
|
||||
"node": "24.14.0",
|
||||
"version": "41.0.2"
|
||||
"version": "41.2.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,12 +2,12 @@
|
||||
|
||||
grafanaPlugin rec {
|
||||
pname = "grafana-clickhouse-datasource";
|
||||
version = "4.8.2";
|
||||
version = "4.14.0";
|
||||
zipHash = {
|
||||
x86_64-linux = "sha256-gegkpks7KIHKUG3nmNzEulbhH18eOsx8Afr0tprHFkk=";
|
||||
aarch64-linux = "sha256-wvde2c+goezC1xFPZZ9MnHEk287E2ScyExKNXDTbcT8=";
|
||||
x86_64-darwin = "sha256-zS9LfvSOWCKQIv5GsRS48taM31ZN4i2REY+IIQbqisk=";
|
||||
aarch64-darwin = "sha256-0QfTdgOkfs27EW1VB+AgHPwF1GRcFBxMPBZ9nRyovrs=";
|
||||
x86_64-linux = "sha256-+4RoyDRGLgD46FelK9zWfjokiXtgBhEU5RdsGheCEns=";
|
||||
aarch64-linux = "sha256-9CJy8Wf/B17T64NyL4SBrmLYecdVYSXA5qnpKhcdAHs=";
|
||||
x86_64-darwin = "sha256-ixrSa02vC/MBg29FNmBRd6YvhkL3QZnzOysLLFgjHEA=";
|
||||
aarch64-darwin = "sha256-g7ovNQ5jJWcG82EJr6mnc2ijD/Wk6dY3cYhSchZOs5M=";
|
||||
};
|
||||
meta = {
|
||||
description = "Connects Grafana to ClickHouse";
|
||||
|
||||
@@ -35,8 +35,8 @@ update() {
|
||||
update-source-version $system "grafanaPlugins.${plugin_name}" "$latest_version" "$hash"
|
||||
}
|
||||
|
||||
if echo "$api_response" | jq -e .packages.any > /dev/null; then
|
||||
# the package contains an "any" package, so there should be only one zipHash.
|
||||
if echo "$api_response" | jq -e '.packages | select(length == 1) | .any' > /dev/null; then
|
||||
# the package only contains an "any" package, so there should be only one zipHash.
|
||||
update "any"
|
||||
else
|
||||
update "linux-amd64" "x86_64-linux"
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
buildPgrxExtension (finalAttrs: {
|
||||
pname = "pg_search";
|
||||
version = "0.22.5";
|
||||
version = "0.22.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paradedb";
|
||||
repo = "paradedb";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-b5sdKEWy4/uXLIE6HtcRMihtRK9iO9jM8pvktO3rOUU=";
|
||||
hash = "sha256-TJLrsdsCZJX1opwvr92G2zQjRoGbuD5a/jKar/rlb9E=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Umbx1ZrQEYifp09+unfaN/MBcbSq16NcqhP6h703Sb8=";
|
||||
cargoHash = "sha256-VgoN4joyobRyKbiDDwjyMFt+mWaIJFQtCdIpTSNf134=";
|
||||
|
||||
inherit postgresql;
|
||||
|
||||
|
||||
@@ -373,6 +373,7 @@ mapAliases {
|
||||
belcard = throw "'belcard' has been moved to 'linphonePackages.belcard'"; # Added 2025-09-20
|
||||
belle-sip = throw "'belle-sip' has been moved to 'linphonePackages.belle-sip'"; # Added 2025-09-20
|
||||
belr = throw "'belr' has been moved to 'linphonePackages.belr'"; # Added 2025-09-20
|
||||
bencode = throw "'bencode' has been removed because it is unmaintained upstream"; # Added 2026-04-09
|
||||
bfc = throw "bfc has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
|
||||
bfr = throw "bfr has been removed, did not update since 2004, fails to build on gcc-15, no homepage"; # Added 2026-01-28
|
||||
bindle = throw "bindle has been removed since it is vulnerable to CVE-2025-62518 and upstream has been archived"; # Added 2025-10-24
|
||||
|
||||
@@ -1630,6 +1630,8 @@ with pkgs;
|
||||
haskellPackages.generateOptparseApplicativeCompletions [ "cabal2nix" ] haskellPackages.cabal2nix
|
||||
);
|
||||
|
||||
stac-validator = with python3Packages; toPythonApplication stac-validator;
|
||||
|
||||
stack2nix =
|
||||
with haskell.lib;
|
||||
overrideCabal (justStaticExecutables haskellPackages.stack2nix) (_: {
|
||||
@@ -1929,38 +1931,6 @@ with pkgs;
|
||||
|
||||
roundcubePlugins = recurseIntoAttrs (callPackage ../servers/roundcube/plugins { });
|
||||
|
||||
rsyslog = callPackage ../tools/system/rsyslog {
|
||||
withHadoop = false; # Currently Broken
|
||||
withKsi = false; # Currently Broken
|
||||
};
|
||||
|
||||
rsyslog-light = rsyslog.override {
|
||||
withKrb5 = false;
|
||||
withSystemd = false;
|
||||
withJemalloc = false;
|
||||
withMysql = false;
|
||||
withPostgres = false;
|
||||
withDbi = false;
|
||||
withNetSnmp = false;
|
||||
withUuid = false;
|
||||
withCurl = false;
|
||||
withGnutls = false;
|
||||
withGcrypt = false;
|
||||
withLognorm = false;
|
||||
withMaxminddb = false;
|
||||
withOpenssl = false;
|
||||
withRelp = false;
|
||||
withKsi = false;
|
||||
withLogging = false;
|
||||
withNet = false;
|
||||
withHadoop = false;
|
||||
withRdkafka = false;
|
||||
withMongo = false;
|
||||
withCzmq = false;
|
||||
withRabbitmq = false;
|
||||
withHiredis = false;
|
||||
};
|
||||
|
||||
xmlsort = perlPackages.XMLFilterSort;
|
||||
|
||||
mcelog = callPackage ../os-specific/linux/mcelog {
|
||||
@@ -3014,6 +2984,8 @@ with pkgs;
|
||||
hdf5 = hdf5-mpi.override { usev110Api = true; };
|
||||
};
|
||||
|
||||
ioskeley-mono = recurseIntoAttrs (callPackage ../data/fonts/ioskeley-mono { });
|
||||
|
||||
# Not in aliases because it wouldn't get picked up by callPackage
|
||||
netbox = netbox_4_5;
|
||||
|
||||
@@ -9994,9 +9966,6 @@ with pkgs;
|
||||
|
||||
luddite = with python3Packages; toPythonApplication luddite;
|
||||
|
||||
lxi-tools = callPackage ../tools/networking/lxi-tools { };
|
||||
lxi-tools-gui = callPackage ../tools/networking/lxi-tools { withGui = true; };
|
||||
|
||||
lyx = libsForQt5.callPackage ../applications/misc/lyx { };
|
||||
|
||||
magic-wormhole = with python3Packages; toPythonApplication magic-wormhole;
|
||||
@@ -10966,8 +10935,6 @@ with pkgs;
|
||||
xppen_4
|
||||
;
|
||||
|
||||
xygrib = libsForQt5.callPackage ../applications/misc/xygrib { };
|
||||
|
||||
ydiff = with python3.pkgs; toPythonApplication ydiff;
|
||||
|
||||
yokadi = python3Packages.callPackage ../applications/misc/yokadi { };
|
||||
|
||||
@@ -1116,6 +1116,8 @@ self: super: with self; {
|
||||
|
||||
async-generator = callPackage ../development/python-modules/async-generator { };
|
||||
|
||||
async-geotiff = callPackage ../development/python-modules/async-geotiff { };
|
||||
|
||||
async-interrupt = callPackage ../development/python-modules/async-interrupt { };
|
||||
|
||||
async-lru = callPackage ../development/python-modules/async-lru { };
|
||||
@@ -1124,6 +1126,8 @@ self: super: with self; {
|
||||
|
||||
async-stagger = callPackage ../development/python-modules/async-stagger { };
|
||||
|
||||
async-tiff = callPackage ../development/python-modules/async-tiff { };
|
||||
|
||||
async-timeout = callPackage ../development/python-modules/async-timeout { };
|
||||
|
||||
async-tkinter-loop = callPackage ../development/python-modules/async-tkinter-loop { };
|
||||
@@ -11321,6 +11325,8 @@ self: super: with self; {
|
||||
|
||||
obsidian-media = callPackage ../development/python-modules/obsidian-media { };
|
||||
|
||||
obspec = callPackage ../development/python-modules/obspec { };
|
||||
|
||||
obspy = callPackage ../development/python-modules/obspy { };
|
||||
|
||||
obstore = callPackage ../development/python-modules/obstore { };
|
||||
@@ -18490,6 +18496,8 @@ self: super: with self; {
|
||||
|
||||
stable-baselines3 = callPackage ../development/python-modules/stable-baselines3 { };
|
||||
|
||||
stac-validator = callPackage ../development/python-modules/stac-validator { };
|
||||
|
||||
stack-data = callPackage ../development/python-modules/stack-data { };
|
||||
|
||||
stackprinter = callPackage ../development/python-modules/stackprinter { };
|
||||
|
||||
Reference in New Issue
Block a user