mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-06-05 21:03:40 +00:00
Merge staging-next-25.11 into staging-25.11
This commit is contained in:
nixpkgs-ci[bot]
@@ -1,10 +1,10 @@
|
||||
{
|
||||
"chromium": {
|
||||
"version": "148.0.7778.167",
|
||||
"version": "148.0.7778.178",
|
||||
"chromedriver": {
|
||||
"version": "148.0.7778.168",
|
||||
"hash_darwin": "sha256-F24gaQI0JZkStM71KJDEn8EKBTw1UifMxYXDdUIVup4=",
|
||||
"hash_darwin_aarch64": "sha256-WpAiIz3nXxJLkxAP5JSn6rSxDW0vvl7EHeJA5MD+nss="
|
||||
"version": "148.0.7778.179",
|
||||
"hash_darwin": "sha256-jDw+ON0X8rePW1HLBZ5FVKMibImBuW/Tp0EDZ/UjJlw=",
|
||||
"hash_darwin_aarch64": "sha256-hNaaKMVy8sKNU444Uf78YI3ayUATrTBAr6/7Z3jewv0="
|
||||
},
|
||||
"deps": {
|
||||
"depot_tools": {
|
||||
@@ -21,8 +21,8 @@
|
||||
"DEPS": {
|
||||
"src": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src.git",
|
||||
"rev": "65db666ac2cf205fcc36db8bb5b9cd87f94808ac",
|
||||
"hash": "sha256-Vda6y35lHYP3xK9FT5FdsnfTtL0MiY2m/auSq6NyL0U=",
|
||||
"rev": "d096af1c9e98c45c3596e59620622b1a049bfecb",
|
||||
"hash": "sha256-XRalekzeALnDh9KiGqhYdhXvkGkjO3TOIZeqwpPLO+U=",
|
||||
"recompress": true
|
||||
},
|
||||
"src/third_party/clang-format/script": {
|
||||
@@ -92,8 +92,8 @@
|
||||
},
|
||||
"src/third_party/angle": {
|
||||
"url": "https://chromium.googlesource.com/angle/angle.git",
|
||||
"rev": "6c71c70ec7e838c5f1712974086c8bc33d07de14",
|
||||
"hash": "sha256-35Zu8jSopO47pH1rNLtSq5I8QRsOkMMvTgtmD13Yw/Y="
|
||||
"rev": "50fd896fb21cca91f325812d01d1e971593efc73",
|
||||
"hash": "sha256-HcfKm7UQmg3wMDOytmaYzm7Z7gRdOrRoqAKaE0ZdI4E="
|
||||
},
|
||||
"src/third_party/angle/third_party/glmark2/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
|
||||
@@ -392,8 +392,8 @@
|
||||
},
|
||||
"src/third_party/icu": {
|
||||
"url": "https://chromium.googlesource.com/chromium/deps/icu.git",
|
||||
"rev": "ff7995a708a10ab44db101358083c7f74752da9f",
|
||||
"hash": "sha256-yQ55MGzqkVkp/arTlmKqySBvQFtaPaBk9UUAFE0imhE="
|
||||
"rev": "3859e64eed5d34544b27fbcab0ac1685ce83df3c",
|
||||
"hash": "sha256-rNErsn11FZUh8GXAl7jK+NyLHIKrQR3LuoM1qFFGtmM="
|
||||
},
|
||||
"src/third_party/nlohmann_json/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/nlohmann/json.git",
|
||||
@@ -822,13 +822,13 @@
|
||||
},
|
||||
"src/v8": {
|
||||
"url": "https://chromium.googlesource.com/v8/v8.git",
|
||||
"rev": "e38030f4228c8d1405fe105fc5feaa5173559e25",
|
||||
"hash": "sha256-VsJpsCfDGF6rlfYQXccgF+F/pBhY/ybUa9N5HnHJ2lU="
|
||||
"rev": "ad6e4525c418a92147c8247ef9d144ce4c242a38",
|
||||
"hash": "sha256-+cQdsWTgIohd3yOCsNCprSr4Ctes77fWGdmPxN2tQlM="
|
||||
}
|
||||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "148.0.7778.167",
|
||||
"version": "148.0.7778.178",
|
||||
"deps": {
|
||||
"depot_tools": {
|
||||
"rev": "41c40cfaec7ee3bf0423c59925d8b23982a601f1",
|
||||
@@ -840,16 +840,16 @@
|
||||
"hash": "sha256-BTPD8WM1pVAMkFDlHekMdWFGyf63KdhKkKwsqikqoBQ="
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "148.0.7778.167-1",
|
||||
"hash": "sha256-07mzJHDgWiEQm/8pPDDzT8r+6/bh95yBrZMm2jDqCus="
|
||||
"rev": "148.0.7778.178-1",
|
||||
"hash": "sha256-s4zTU4rQUcrfpg7CWFdvEn3JYNqhHGsAFcYmQGS64fc="
|
||||
},
|
||||
"npmHash": "sha256-JuVcY8iFRDWcPcP4Pg+qm5rnTXkiVfNsqSkXbDWqsE8="
|
||||
},
|
||||
"DEPS": {
|
||||
"src": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src.git",
|
||||
"rev": "65db666ac2cf205fcc36db8bb5b9cd87f94808ac",
|
||||
"hash": "sha256-Vda6y35lHYP3xK9FT5FdsnfTtL0MiY2m/auSq6NyL0U=",
|
||||
"rev": "d096af1c9e98c45c3596e59620622b1a049bfecb",
|
||||
"hash": "sha256-XRalekzeALnDh9KiGqhYdhXvkGkjO3TOIZeqwpPLO+U=",
|
||||
"recompress": true
|
||||
},
|
||||
"src/third_party/clang-format/script": {
|
||||
@@ -919,8 +919,8 @@
|
||||
},
|
||||
"src/third_party/angle": {
|
||||
"url": "https://chromium.googlesource.com/angle/angle.git",
|
||||
"rev": "6c71c70ec7e838c5f1712974086c8bc33d07de14",
|
||||
"hash": "sha256-35Zu8jSopO47pH1rNLtSq5I8QRsOkMMvTgtmD13Yw/Y="
|
||||
"rev": "50fd896fb21cca91f325812d01d1e971593efc73",
|
||||
"hash": "sha256-HcfKm7UQmg3wMDOytmaYzm7Z7gRdOrRoqAKaE0ZdI4E="
|
||||
},
|
||||
"src/third_party/angle/third_party/glmark2/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
|
||||
@@ -1219,8 +1219,8 @@
|
||||
},
|
||||
"src/third_party/icu": {
|
||||
"url": "https://chromium.googlesource.com/chromium/deps/icu.git",
|
||||
"rev": "ff7995a708a10ab44db101358083c7f74752da9f",
|
||||
"hash": "sha256-yQ55MGzqkVkp/arTlmKqySBvQFtaPaBk9UUAFE0imhE="
|
||||
"rev": "3859e64eed5d34544b27fbcab0ac1685ce83df3c",
|
||||
"hash": "sha256-rNErsn11FZUh8GXAl7jK+NyLHIKrQR3LuoM1qFFGtmM="
|
||||
},
|
||||
"src/third_party/nlohmann_json/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/nlohmann/json.git",
|
||||
@@ -1649,8 +1649,8 @@
|
||||
},
|
||||
"src/v8": {
|
||||
"url": "https://chromium.googlesource.com/v8/v8.git",
|
||||
"rev": "e38030f4228c8d1405fe105fc5feaa5173559e25",
|
||||
"hash": "sha256-VsJpsCfDGF6rlfYQXccgF+F/pBhY/ybUa9N5HnHJ2lU="
|
||||
"rev": "ad6e4525c418a92147c8247ef9d144ce4c242a38",
|
||||
"hash": "sha256-+cQdsWTgIohd3yOCsNCprSr4Ctes77fWGdmPxN2tQlM="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,3 +15,5 @@ safe_browsing_mode=0
|
||||
treat_warnings_as_errors=false
|
||||
use_official_google_api_keys=false
|
||||
use_unofficial_version_number=false
|
||||
v8_drumbrake_bounds_checks=true
|
||||
v8_enable_drumbrake=true
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "lightway";
|
||||
version = "0-unstable-2026-04-10";
|
||||
version = "0-unstable-2026-04-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "expressvpn";
|
||||
repo = "lightway";
|
||||
rev = "72a924935df9db641e7f4fe28cbeafaead59014f";
|
||||
hash = "sha256-tygK2CQmbbynJiwGkMvYzt2dHoE17DCJeqD+jlai/m8=";
|
||||
rev = "8e0940f047ee72db5daa1fb7c3bb82bc89e0f1d9";
|
||||
hash = "sha256-OFMAEw613aIGG7N5LBAGbVrpkqMUBi7lUy7jm5tZowc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-NdVOphyBW5sflv5jZPV/ShfAJXb3ZOyDRctmn/2JY38=";
|
||||
cargoHash = "sha256-gY8KokOtdBT7Vq+lGn2sk4/o3A0TypEqv09TVJqaZjc=";
|
||||
|
||||
cargoBuildFlags = lib.cli.toCommandLineGNU { } {
|
||||
package = [
|
||||
|
||||
@@ -170,11 +170,11 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "microsoft-edge";
|
||||
version = "146.0.3856.84";
|
||||
version = "148.0.3967.54";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";
|
||||
hash = "sha256-fiUkxQagvoKHbGy1preQecYnlGyH0fvbz7AbFLuqbrI=";
|
||||
hash = "sha256-ccMYxwaQ70p+za3LoM0vT+lXiRIlYmoldVDqsHT7I9o=";
|
||||
};
|
||||
|
||||
# With strictDeps on, some shebangs were not being patched correctly
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "mprisence";
|
||||
version = "1.5.2";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lazykern";
|
||||
repo = "mprisence";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-uZBJMK+naX4ilos3xO1ZMcU/MflshOYIruAljzWiD3Q=";
|
||||
hash = "sha256-8w4k+l0uqIFgIVBuK0H/Mhvwp2HHEzvKmExkTiRUmEM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-bsKDo3gndqm7Z0j+6K2H9kWUAYOGna6Bk++yfr59HU4=";
|
||||
cargoHash = "sha256-PcQc7LpQqnTiAfTL+E67Ibbsw5UI7j0YICiHpxWrrj8=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -11,33 +11,12 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "msedgedriver";
|
||||
# finding a version that has all 4 builds is a pain
|
||||
# https://msedgewebdriverstorage.z22.web.core.windows.net/?form=MA13LH
|
||||
version = "130.0.2849.1";
|
||||
|
||||
src =
|
||||
let
|
||||
inherit (stdenvNoCC.hostPlatform) system;
|
||||
selectSystem = attrs: attrs.${system} or (throw "Unsupported system: ${system}");
|
||||
suffix = selectSystem {
|
||||
x86_64-linux = "linux64";
|
||||
aarch64-linux = "arm64";
|
||||
x86_64-darwin = "mac64";
|
||||
aarch64-darwin = "mac64_m1";
|
||||
};
|
||||
|
||||
hash = selectSystem {
|
||||
x86_64-linux = "sha256-U6YGD2PAhVUa7f+R5pmKLazGLOBbf3bRqzlwIJewA+w=";
|
||||
aarch64-linux = "sha256-QJ1jRw8kkWbT8US5qI8DMZI/7Q8yJWpFXrfzGdxDWKE=";
|
||||
x86_64-darwin = "sha256-Ejcv1DtuEiLJvTsv48AwoCQlFO3xM9PkM3HvZG65AC4=";
|
||||
aarch64-darwin = "sha256-ykn4bYREE6xmJY02WiCRGsGnyWjnmnZM8FemK4XZqhc=";
|
||||
};
|
||||
in
|
||||
fetchzip {
|
||||
url = "https://msedgedriver.azureedge.net/${finalAttrs.version}/edgedriver_${suffix}.zip";
|
||||
inherit hash;
|
||||
stripRoot = false;
|
||||
};
|
||||
version = "148.0.3967.54";
|
||||
src = fetchzip {
|
||||
url = "https://msedgedriver.microsoft.com/${finalAttrs.version}/edgedriver_linux64.zip";
|
||||
hash = "sha256-woGkky1i9so+1D61irtJYjDQ0xoHUeGQsJi/eQ4VGhU=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
|
||||
@@ -97,7 +97,7 @@ let
|
||||
++ lib.optionals mediaSupport [ ffmpeg_7 ]
|
||||
);
|
||||
|
||||
version = "15.0.12";
|
||||
version = "15.0.14";
|
||||
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
@@ -109,7 +109,7 @@ let
|
||||
"https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
|
||||
];
|
||||
hash = "sha256-Tqfa9f2q4bv2KpotoDKvklEmHa5AF4ARp/qKxlVBomE=";
|
||||
hash = "sha256-E/q2wXeTGcEhiAvUCrFKv34gc4vP4o3ZPjqkcS6Dxgk=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
# https://github.com/abathur/resholve/issues/107
|
||||
resholve.mkDerivation rec {
|
||||
pname = "nix-direnv";
|
||||
version = "3.1.0";
|
||||
version = "3.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = "nix-direnv";
|
||||
rev = version;
|
||||
hash = "sha256-HdnQRcysoKNPbVa/D3KDcLgqf5+u9JDPmcl29cGj4AI=";
|
||||
hash = "sha256-AsWnRH7LAb78iFfE+ZdYyCR5AVuPloT8ZnghDXW6arY=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
fetchurl,
|
||||
lib,
|
||||
makeWrapper,
|
||||
electron_39, # as in upstream bundle, see https://github.com/NixOS/nixpkgs/pull/510075
|
||||
electron_40, # see https://github.com/NixOS/nixpkgs/pull/521495
|
||||
makeDesktopItem,
|
||||
imagemagick,
|
||||
writeScript,
|
||||
@@ -78,7 +78,7 @@ let
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${electron_39}/bin/electron $out/bin/obsidian \
|
||||
makeWrapper ${electron_40}/bin/electron $out/bin/obsidian \
|
||||
--add-flags $out/share/obsidian/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-wayland-ime=true --wayland-text-input-version=3}}" \
|
||||
--add-flags ${lib.escapeShellArg commandLineArgs}
|
||||
|
||||
@@ -14,16 +14,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "openbao";
|
||||
version = "2.5.3";
|
||||
version = "2.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openbao";
|
||||
repo = "openbao";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-VpW27vWKtqabJiNxuyx3PGDThHF6MOlxxfzD1UksX6I=";
|
||||
hash = "sha256-Gf/2/3XLzCnmU8hJfctUra6mamBsH/4QEiC89FolKQ4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-imP8GJjm8udJ1RXfGhVJX7YZ9J47p/vdKjKjMfMgTXA=";
|
||||
vendorHash = "sha256-TPBKqIa9ZkxqXbMXSY4tuVne4ed19tzZp7+LvH0to9M=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
||||
@@ -10,23 +10,23 @@
|
||||
|
||||
let
|
||||
pname = "osu-lazer-bin";
|
||||
version = "2026.429.0";
|
||||
version = "2026.518.0";
|
||||
|
||||
src =
|
||||
{
|
||||
aarch64-darwin = fetchzip {
|
||||
url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.app.Apple.Silicon.zip";
|
||||
hash = "sha256-So87dCg3exApEEnzj0tMi30+OFHhcPHlb3M2uwEyZgU=";
|
||||
hash = "sha256-T/uoriXCXfK+HnLqMZ3xQ79qmlT5rVaoeEi5Wgu1Oc4=";
|
||||
stripRoot = false;
|
||||
};
|
||||
x86_64-darwin = fetchzip {
|
||||
url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.app.Intel.zip";
|
||||
hash = "sha256-n2XkyzBsgiY65yrd5Jd0zvByaJ0EZ3C4URTb2Z6n5Fc=";
|
||||
hash = "sha256-G/l2WSgl7GcIMHmb86K4qzryMirebe5dmnMrsSlYNfY=";
|
||||
stripRoot = false;
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.AppImage";
|
||||
hash = "sha256-3yBDCMffgWQKmBHETYl7IrvT5BOE6vN+sH8dGg+w//s=";
|
||||
hash = "sha256-4LLNjrKEBS77LIbq+O6Xpxj6CvufGDApNqs61HN2JmA=";
|
||||
};
|
||||
}
|
||||
.${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported.");
|
||||
|
||||
20
pkgs/by-name/os/osu-lazer/deps.json
generated
20
pkgs/by-name/os/osu-lazer/deps.json
generated
@@ -16,8 +16,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "DiscordRichPresence",
|
||||
"version": "1.6.1.70",
|
||||
"hash": "sha256-uXTNIWfZU7Gf/JpXQ5ufKA3SQdXYSkg3yLm5yCrBDd8="
|
||||
"version": "1.5.0.51",
|
||||
"hash": "sha256-ZfyXXsJ7c8u0EAfKjquv/pAL3ZajKLnVIJWADQYJ6wI="
|
||||
},
|
||||
{
|
||||
"pname": "FFmpeg.AutoGen",
|
||||
@@ -616,8 +616,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "ppy.osu.Framework",
|
||||
"version": "2026.428.0",
|
||||
"hash": "sha256-mlf9kFMjtBLx+9VV7Z08VaQicnH4Z8EV3CHzH60+JAQ="
|
||||
"version": "2026.513.0",
|
||||
"hash": "sha256-9mrCn7mBxDYUAhD4cJSDRanPD1fghDlmJEu3rqExJbY="
|
||||
},
|
||||
{
|
||||
"pname": "ppy.osu.Framework.NativeLibs",
|
||||
@@ -631,8 +631,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "ppy.osu.Game.Resources",
|
||||
"version": "2026.427.0",
|
||||
"hash": "sha256-vrPesDiu08qqdcm06Lzs0iKY2rH/pOfkVXvvr7rMsQY="
|
||||
"version": "2026.516.0",
|
||||
"hash": "sha256-jMm4uJBhaqfi8QKayMWlN4IDn8mR+gtHDGRZgzbYFtI="
|
||||
},
|
||||
{
|
||||
"pname": "ppy.osuTK.NS20",
|
||||
@@ -646,8 +646,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "ppy.SDL3-CS",
|
||||
"version": "2026.302.0",
|
||||
"hash": "sha256-7e+HN9StGkK4je1QITNT2Fsk/wrPVDEXb97xjlZx6yY="
|
||||
"version": "2026.512.0",
|
||||
"hash": "sha256-JWa1njiqY0Cz1bME5uQ4jSxfY9VCThNcmMttMXKGH5Y="
|
||||
},
|
||||
{
|
||||
"pname": "ppy.Veldrid",
|
||||
@@ -956,8 +956,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "SharpCompress",
|
||||
"version": "0.47.0",
|
||||
"hash": "sha256-eeTuwUXeH9gw54bczkwrYCze2bHX22Rclx8QZm4zoxY="
|
||||
"version": "0.48.0",
|
||||
"hash": "sha256-2MXainbTJeuBwRA6eJU+AlUT8ireNrWxHYNCMkFG8Lc="
|
||||
},
|
||||
{
|
||||
"pname": "SharpFNT",
|
||||
|
||||
@@ -22,13 +22,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "osu-lazer";
|
||||
version = "2026.429.0";
|
||||
version = "2026.518.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ppy";
|
||||
repo = "osu";
|
||||
tag = "${version}-lazer";
|
||||
hash = "sha256-QmdgcK65TD+VM6wx5Py1Kyp0MhRe1lr0V4nwTMkvtuA=";
|
||||
hash = "sha256-ELtK5itKM7QIdVWzy3bHurp76AJvXA1a15OkYJgFcvU=";
|
||||
};
|
||||
|
||||
projectFile = "osu.Desktop/osu.Desktop.csproj";
|
||||
|
||||
@@ -7,12 +7,12 @@
|
||||
|
||||
let
|
||||
pname = "plexamp";
|
||||
version = "4.13.0";
|
||||
version = "4.13.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
hash = "sha512-3Blgl3t21hH6lgDe5u3vy3I/3k9b4VM1CvoZg2oashkGXSDwV8q7MATN9YjsBgWysNXwdm7nQ/yrFQ7DiRfdYg==";
|
||||
hash = "sha512-HgF0+ojb0wOWO1DuiifiYMb0kSiRLvvMcteC89zZ4IYOflzOw+vNKoU+eyRo1Yl6irIL/Pg32eK4xRn5wyB46g==";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
@@ -38,7 +38,7 @@ appimageTools.wrapType2 {
|
||||
meta = {
|
||||
description = "Beautiful Plex music player for audiophiles, curators, and hipsters";
|
||||
homepage = "https://plexamp.com/";
|
||||
changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/82";
|
||||
changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/83";
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with lib.maintainers; [
|
||||
killercup
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "radicle-ci-broker";
|
||||
version = "0.27.0";
|
||||
version = "0.28.0";
|
||||
|
||||
src = fetchFromRadicle {
|
||||
seed = "seed.radicle.xyz";
|
||||
repo = "zwTxygwuz5LDGBq255RA2CbNGrz8";
|
||||
node = "z6MkgEMYod7Hxfy9qCvDv5hYHkZ4ciWmLFgfvm3Wn1b2w2FV";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-1MXoAj2pa+fRKbu2WtxZb6ki6l86n2k+uqYYMcas6fA=";
|
||||
hash = "sha256-p+fOCS9Z5x8pwwgtz08wj6noY1CIGkeqQ4TKgPeBPWA=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C $out rev-parse --short HEAD > $out/.git_head
|
||||
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
'';
|
||||
};
|
||||
|
||||
cargoHash = "sha256-EO3KK9u17YWIwJukIDTQdQ25b0lGMuiC/gImGSYBkgs=";
|
||||
cargoHash = "sha256-J0tUgtK1mj/su/IxKDdWXoWpWZBOUHLr4n9gbLWc8bU=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace build.rs \
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
wrapGAppsHook4,
|
||||
rustfmt,
|
||||
clippy,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
@@ -96,12 +97,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
radicle-node
|
||||
rustfmt
|
||||
clippy
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
export RAD_HOME="$PWD/_rad-home"
|
||||
export RAD_PASSPHRASE=""
|
||||
rad auth --alias test
|
||||
bins="tests/tmp/bin/heartwood/$HW_RELEASE"
|
||||
|
||||
@@ -1,11 +1,9 @@
|
||||
{
|
||||
radicle-httpd,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
buildNpmPackage,
|
||||
writeText,
|
||||
jq,
|
||||
runCommand,
|
||||
fetchFromGitHub,
|
||||
radicle-httpd,
|
||||
writers,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -14,106 +12,80 @@ let
|
||||
twemojiAssets = fetchFromGitHub {
|
||||
owner = "twitter";
|
||||
repo = "twemoji";
|
||||
rev = "v14.0.2";
|
||||
tag = "v14.0.2";
|
||||
hash = "sha256-YoOnZ5uVukzi/6bLi22Y8U5TpplPzB7ji42l+/ys5xI=";
|
||||
meta.license = [ lib.licenses.cc-by-40 ];
|
||||
};
|
||||
|
||||
mkPassthru = self: args: {
|
||||
# radicle-explorer is configured through static build time configuration.
|
||||
#
|
||||
# Using this function you can override the this configuration, for example,
|
||||
# to configure alternative preferred peers (which are shown in the UI by
|
||||
# default).
|
||||
#
|
||||
# Example usage:
|
||||
#
|
||||
# ```nix
|
||||
# radicle-explorer.withConfig {
|
||||
# preferredSeeds = [{
|
||||
# hostname = "seed.example.com";
|
||||
# port = 443;
|
||||
# scheme = "https";
|
||||
# }];
|
||||
# }
|
||||
# ```
|
||||
withConfig =
|
||||
config:
|
||||
let
|
||||
overrides = writeText "config-overrides.json" (builtins.toJSON config);
|
||||
newConfig = runCommand "config.json" { } ''
|
||||
${jq}/bin/jq -s '.[0] * .[1]' ${(self args).src}/config/default.json ${overrides} > $out
|
||||
'';
|
||||
in
|
||||
lib.fix (
|
||||
final:
|
||||
(self args).overrideAttrs (prev: {
|
||||
preBuild = ''
|
||||
${prev.preBuild or ""}
|
||||
cp ${newConfig} config/local.json
|
||||
'';
|
||||
|
||||
passthru = prev.passthru // mkPassthru final args;
|
||||
})
|
||||
);
|
||||
};
|
||||
in
|
||||
lib.fix (
|
||||
self:
|
||||
lib.makeOverridable (
|
||||
{
|
||||
npmDepsHash ? "sha256-8vmAs788PjdUTaQ5E8YLX0KiIPymJbH51oNaGZACe6I=",
|
||||
patches ? [ ],
|
||||
}@args:
|
||||
buildNpmPackage {
|
||||
pname = "radicle-explorer";
|
||||
version = radicle-httpd.version;
|
||||
inherit patches npmDepsHash;
|
||||
|
||||
# radicle-explorer uses the radicle-httpd API, and they are developed in the
|
||||
# same repo. For this reason we pin the sources to each other, but due to
|
||||
# radicle-httpd using a more limited sparse checkout we need to carry a
|
||||
# separate hash.
|
||||
src = radicle-httpd.src.override {
|
||||
hash = "sha256-cnQsPWkRChC8yPrICRoUpGW2GGLB2TK9+3v8ZRGe3x0=";
|
||||
sparseCheckout = [ ];
|
||||
};
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "radicle-explorer";
|
||||
inherit (radicle-httpd) version;
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs --build ./scripts
|
||||
mkdir -p "public/twemoji"
|
||||
cp -t public/twemoji -r -- ${twemojiAssets}/assets/svg/*
|
||||
: >scripts/install-twemoji-assets
|
||||
'';
|
||||
# radicle-explorer uses the radicle-httpd API, and they are developed in the
|
||||
# same repo. For this reason we pin the sources to each other, but due to
|
||||
# radicle-httpd using a more limited sparse checkout we need to carry a
|
||||
# separate hash.
|
||||
src = radicle-httpd.src.override {
|
||||
hash = "sha256-cnQsPWkRChC8yPrICRoUpGW2GGLB2TK9+3v8ZRGe3x0=";
|
||||
sparseCheckout = [ ];
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
doCheck = false;
|
||||
npmDepsHash = "sha256-8vmAs788PjdUTaQ5E8YLX0KiIPymJbH51oNaGZACe6I=";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p "$out"
|
||||
cp -r -t "$out" build/*
|
||||
runHook postInstall
|
||||
'';
|
||||
postPatch = ''
|
||||
patchShebangs --build ./scripts
|
||||
: >scripts/install-twemoji-assets
|
||||
|
||||
passthru = mkPassthru self args;
|
||||
cp -r "${twemojiAssets}/assets/svg" public/twemoji
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Web frontend for Radicle";
|
||||
longDescription = ''
|
||||
Radicle Explorer is a web-frontend for Radicle which supports browsing
|
||||
repositories, issues and patches on publicly available Radicle seeds.
|
||||
preBuild = ''
|
||||
if [[ $configFile ]]; then
|
||||
cp "$configFile" config/local.json
|
||||
fi
|
||||
'';
|
||||
|
||||
This package builds the web interface, ready to be served by any web
|
||||
server.
|
||||
'';
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
homepage = "https://radicle.xyz";
|
||||
license = lib.licenses.gpl3;
|
||||
mv build $out
|
||||
|
||||
teams = [ lib.teams.radicle ];
|
||||
maintainers = with lib.maintainers; [ tazjin ];
|
||||
};
|
||||
}
|
||||
)
|
||||
) { }
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# radicle-explorer is configured through static build time configuration.
|
||||
#
|
||||
# Using this function you can override this configuration, for example to
|
||||
# configure alternative preferred peers (which are shown in the UI by default).
|
||||
#
|
||||
# Example usage:
|
||||
#
|
||||
# ```nix
|
||||
# radicle-explorer.withConfig {
|
||||
# preferredSeeds = [{
|
||||
# hostname = "seed.example.com";
|
||||
# port = 443;
|
||||
# scheme = "https";
|
||||
# }];
|
||||
# }
|
||||
# ```
|
||||
passthru.withConfig =
|
||||
config:
|
||||
finalAttrs.finalPackage.overrideAttrs { configFile = writers.writeJSON "config.json" config; };
|
||||
|
||||
meta = {
|
||||
description = "Web frontend for Radicle";
|
||||
longDescription = ''
|
||||
Radicle Explorer is a web-frontend for Radicle which supports browsing
|
||||
repositories, issues and patches on publicly available Radicle seeds.
|
||||
|
||||
This package builds the web interface, ready to be served by any web
|
||||
server.
|
||||
'';
|
||||
homepage = "https://radicle.dev";
|
||||
license = lib.licenses.gpl3;
|
||||
teams = [ lib.teams.radicle ];
|
||||
maintainers = with lib.maintainers; [ tazjin ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -15,9 +15,9 @@
|
||||
xdg-utils,
|
||||
versionCheckHook,
|
||||
|
||||
version ? "1.8.0",
|
||||
srcHash ? "sha256-QjAdZO5PwJ6FuThzQYnkF+hAeArltXxhEnzIcAePwzA=",
|
||||
cargoHash ? "sha256-m8CqRTJD/1bOqTB2SoUjglZsOWGfv/nBNTOQftNvIqE=",
|
||||
version ? "1.9.0",
|
||||
srcHash ? "sha256-ECged52tJaBSW2ua3MPDEBdGKPJ50Q347evd5wdbbU0=",
|
||||
cargoHash ? "sha256-Vb86Zx851Mrn9yaNuIQHEuVr7PrD7plPZhPGFJOLKRg=",
|
||||
updateScript ? ./update.sh,
|
||||
}:
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{ radicle-node }:
|
||||
|
||||
radicle-node.override {
|
||||
version = "1.8.0";
|
||||
srcHash = "sha256-QjAdZO5PwJ6FuThzQYnkF+hAeArltXxhEnzIcAePwzA=";
|
||||
cargoHash = "sha256-m8CqRTJD/1bOqTB2SoUjglZsOWGfv/nBNTOQftNvIqE=";
|
||||
version = "1.9.0";
|
||||
srcHash = "sha256-ECged52tJaBSW2ua3MPDEBdGKPJ50Q347evd5wdbbU0=";
|
||||
cargoHash = "sha256-Vb86Zx851Mrn9yaNuIQHEuVr7PrD7plPZhPGFJOLKRg=";
|
||||
updateScript = ./update-unstable.sh;
|
||||
}
|
||||
|
||||
@@ -102,7 +102,7 @@ let
|
||||
++ lib.optionals mediaSupport [ ffmpeg_7 ]
|
||||
);
|
||||
|
||||
version = "15.0.13";
|
||||
version = "15.0.14";
|
||||
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
@@ -112,7 +112,7 @@ let
|
||||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
|
||||
];
|
||||
hash = "sha256-v21pvipaEPj3WzDybQkDxHLefl14ZMCOJDQAvJatSSU=";
|
||||
hash = "sha256-kxRtNraru8w/lAwwhAD2h6Q+CqFdS2DzV2FZHnNj9Q4=";
|
||||
};
|
||||
|
||||
i686-linux = fetchurl {
|
||||
@@ -122,7 +122,7 @@ let
|
||||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
|
||||
];
|
||||
hash = "sha256-RPJUoRZlY1upYivnnDxSLJI2hoVII56PY7BeCN87lOc=";
|
||||
hash = "sha256-GHLeAyMrnwD5lC4NnwM72nZQeRN7AjrlS/zlOqfmjtw=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -180,6 +180,9 @@ let
|
||||
'';
|
||||
|
||||
passthru.dist = finalAttrs.finalPackage + "/libexec/electron";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
};
|
||||
|
||||
darwin = finalAttrs: {
|
||||
|
||||
@@ -23,35 +23,46 @@
|
||||
},
|
||||
"39": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "2c921ce845b4f5fa0abeb160f38f472ed486f7b1c8fb8a19f549a48f388bdbfa",
|
||||
"aarch64-linux": "c0cb946a480b0f4a6dfdbed3287fd38b099b749696d7b9107e24287aa9eded97",
|
||||
"armv7l-linux": "e16173659ba8d982ad5718309d0eb22f793c6a58e9c0fd2e518ef5f045d96b40",
|
||||
"headers": "15alm4mx7ad4czrysnk7wds625y7rsz7ncr1djq8an8fdar3fnw0",
|
||||
"x86_64-darwin": "5a42fa7665fa67570990b5b2608d2414692a8176033401ffc07b3f26fca3901d",
|
||||
"x86_64-linux": "9473c2773377344fd8822fe0255a1d2bff00b4f4b3e1fe8acadea00164e56c33"
|
||||
"aarch64-darwin": "f7e3ed2cc34dd2eba3f2a95234b576fe8082d35fb133e482102c08105f298572",
|
||||
"aarch64-linux": "8d01f0063ce2cc83a68b5c723db813c2bb8621ff63ba2ddec786a589baef7247",
|
||||
"armv7l-linux": "6e4d0d96b5ed98b9973868b8ea6234a5511cae866f15e586be7003a753b7afcc",
|
||||
"headers": "0sb9biq3z92f32dklisiax9pk5kj8yhwvihchcsp6v4vag7jx45v",
|
||||
"x86_64-darwin": "de5389b3a1a8803fa50e2a2c2a9a8816f1fd5d996ac66a217c04396109d42e6b",
|
||||
"x86_64-linux": "92e8b031fa5327c78a972279fd75fc8503fcd1773401809f4557e4de583eabd1"
|
||||
},
|
||||
"version": "39.8.9"
|
||||
"version": "39.8.10"
|
||||
},
|
||||
"40": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "70cc74c3c16f1d8536ed7095bac4eefadfa0ef27d2632507c0f7e3c137ed9ed7",
|
||||
"aarch64-linux": "b732c89edcc45bd5d32135e0309f42dc76c0753501e002550e9459323f473634",
|
||||
"armv7l-linux": "fc1f7800d1318578a0dabaa14485e8af915c34d94144c248f9d91e0f5b76dca5",
|
||||
"headers": "0j9mqglwcp1rgcwm33qhlb4bydfjmy1si5f9z42kh7y6diz3361p",
|
||||
"x86_64-darwin": "e5fcf17b02e1ce362ef60984ecc65f029766322d4adff6ee8c51d7331b6eedf0",
|
||||
"x86_64-linux": "cfe272fedfd4f164be45f7c8c12736220a98b60bb888fa51fb830031118ee6e8"
|
||||
"aarch64-darwin": "c3dd4d70aeb214a5b755af59e4e5d7b5b743f3f662a8a452b0afc2741953b7a5",
|
||||
"aarch64-linux": "cb4454ae64f00f43cef86f57d38eff9a6cef7b1e0690debc1dc81323f98e6e63",
|
||||
"armv7l-linux": "d3a99f2f734b407ab7de45dbb992825089a2f9e351c470a5fea0273ec027a681",
|
||||
"headers": "0x534f94ds3qavwh90a4l63wpsagscwnbzi8399z067d2ghyzh18",
|
||||
"x86_64-darwin": "a73b879e5cfa880e0b82e0a75d7a2ba1c892715d2db95dc6578277e74c7b8a04",
|
||||
"x86_64-linux": "35efe7401822e8d2e474e13788a6191362c7494dd1f7ae327b70087e0768a667"
|
||||
},
|
||||
"version": "40.9.2"
|
||||
"version": "40.10.0"
|
||||
},
|
||||
"41": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "7a98f47f4c4f49399d3a838e9150b8828d2f5bf8aa7db769657ae82fab21f9d0",
|
||||
"aarch64-linux": "c2bc73bf42630cf233fc9701d1cabb1edc0c367f47c8c967d9263cf90585e37a",
|
||||
"armv7l-linux": "f116698dae5a68d9e9d650d97bcae6ef0ac6457d03e86b422f47ed4d79275d7c",
|
||||
"headers": "1w8rdbjanqkl1237ppcgrkwdng93gniv3mqfxqikv0rpsg2d7gi7",
|
||||
"x86_64-darwin": "9d0accc2157df3eb3a15c79f27a9dd763099d96aa286041cc1ba9a3ce6aed737",
|
||||
"x86_64-linux": "b20e03cf174f8e56e235127d784dff8161ef4bb9c6bbc3d9383130225eb1e2a2"
|
||||
"aarch64-darwin": "b41988e6aa105e550931d9d2eff15c0bb99c39871c2ff5af87f105c44edc5a7a",
|
||||
"aarch64-linux": "b69fb25275d744e272afe3775aed0cce20c8ad2309744558089c33da92c0432a",
|
||||
"armv7l-linux": "f318e60b182fc791ba90bd7c586ee7e1f603daf90925b64d7c295e8b7a610875",
|
||||
"headers": "1n1w2ngk44w9khbh4bnw6kfakawdxh3wii3hkynbjzj21swvqzrb",
|
||||
"x86_64-darwin": "fc802de570925bf75ca5911ffd8a8736232de2c742430938b2b621c79af93db4",
|
||||
"x86_64-linux": "8f1bbd1ea46c5e4fc5f3ae9a04554de9da2fe0c65fbd8751b8493d2b39bf7a97"
|
||||
},
|
||||
"version": "41.3.0"
|
||||
"version": "41.6.1"
|
||||
},
|
||||
"42": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "98d097299eb08094d0df3312b2d6e8677069d8defdab891143628d4f82f46117",
|
||||
"aarch64-linux": "1e700f7f3daef794cc45235e51c1172664aed49a4e7737b8896ddc398bff4d7d",
|
||||
"armv7l-linux": "576a317dda0dc8ea150d5b6f792c3eb0631a5065ec9c100af954d1cabddde93a",
|
||||
"headers": "0r0g3iaji6a7gx51bv2ijq23zpcz8ip8kmfy0x9fxqpm9angvins",
|
||||
"x86_64-darwin": "63b938cbe6696f67f172d8f7cb6c31a58c38853d03d33f047fcba8c628cc700f",
|
||||
"x86_64-linux": "882047343a9e203c6cfc5d39b166ea9e025dd256943e0d3711f86725ad0e3bd9"
|
||||
},
|
||||
"version": "42.1.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -86,6 +86,9 @@ let
|
||||
install -m777 -D chromedriver $out/bin/chromedriver
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
};
|
||||
|
||||
darwin = {
|
||||
|
||||
@@ -23,35 +23,46 @@
|
||||
},
|
||||
"39": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "3d42fdf5593888c429b00ec93f6a82419a9d5c61a5d61570e579383f4c08f8cf",
|
||||
"aarch64-linux": "276aedebc81eb62b7ae8f84066c8973fb7e9b273dbbea8362960d68ca87440d3",
|
||||
"armv7l-linux": "fcc4530933f100a2aef219478bb15ead89da64da1b80e393152195b34468cec6",
|
||||
"headers": "15alm4mx7ad4czrysnk7wds625y7rsz7ncr1djq8an8fdar3fnw0",
|
||||
"x86_64-darwin": "f6a4774573be8922cd6b993e0d65af9d660b2648656ec26703ba8ee9b49f5b69",
|
||||
"x86_64-linux": "dbff1ba3f73432215eb2968a00374a6f8e1028eae155c228fec034037e2deb14"
|
||||
"aarch64-darwin": "c21e261f8047a51c5a2e8d5ad19fc66d9f389c215bd2ada680c3ea39618f3f90",
|
||||
"aarch64-linux": "c6fa8afa312dd4fa13ab4c34ea1a97481f8225cf78f3cc8bbe2dedf27fa0f2b0",
|
||||
"armv7l-linux": "68963e6ab1d9eae92776782f194a31c9c48db2371d6a4c70058b4495cc244d2b",
|
||||
"headers": "0sb9biq3z92f32dklisiax9pk5kj8yhwvihchcsp6v4vag7jx45v",
|
||||
"x86_64-darwin": "8e8c9feeec3416a79223fcdbd855c5df121567b341366d516ae6f7f15769498c",
|
||||
"x86_64-linux": "90dc451e7faad8e2efb4aa6a01e74195b607896a29f168f2f60a8eaf92af0e33"
|
||||
},
|
||||
"version": "39.8.9"
|
||||
"version": "39.8.10"
|
||||
},
|
||||
"40": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "ceb0feda64be263d6bfa0173c25959315e127d8f5bcd6d6189b1bcef5b356528",
|
||||
"aarch64-linux": "8c488eb7691bbaa8c5c9868db92339f768a739ac2de127561df2f45bcdc09107",
|
||||
"armv7l-linux": "a3115eb15d6bc34b9fca833b8e573ed967aa5fe11e2b37ceec6ba6a2d3eb28e4",
|
||||
"headers": "0j9mqglwcp1rgcwm33qhlb4bydfjmy1si5f9z42kh7y6diz3361p",
|
||||
"x86_64-darwin": "525a0bb96790542274f6cbd13d5fba81e4f5a6e7f6f488e351eb64ae7fcd391a",
|
||||
"x86_64-linux": "3704387a4f3073d2dfa03c6cfce7dca6d78f3ee0b7f600f9eb3eeacf54c18432"
|
||||
"aarch64-darwin": "ed4e021fe841be3b04c6c4cf3968a1628b9d84ca07b5362aa54c377b3fde18f0",
|
||||
"aarch64-linux": "bfb57aa77b06e2179c5076274f9d61615414c295e16eabd99206a7553c9eacdc",
|
||||
"armv7l-linux": "8f35c8b25f98d18d5d5852d2b244e64183dfb61b10b9a64b0be579f450f2cb73",
|
||||
"headers": "0x534f94ds3qavwh90a4l63wpsagscwnbzi8399z067d2ghyzh18",
|
||||
"x86_64-darwin": "f2caf8c9fe1c5c38259881824adce6b11a5a482576d47d7dc113a950e9315bf8",
|
||||
"x86_64-linux": "303345908d998a83b953c9f60a8b0f07e8fa82ed839260784a7b5c2fc517a86f"
|
||||
},
|
||||
"version": "40.9.2"
|
||||
"version": "40.10.0"
|
||||
},
|
||||
"41": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "f654e5cd471ff09f861fd7bc68a18866882881dab86b71e53aaac939ac286f16",
|
||||
"aarch64-linux": "1781267ed7ecfe92457242edd5e8110470a24d3eff4d5fa6f4afc433f85292c5",
|
||||
"armv7l-linux": "5e54790862956c39eae0ece135bd779d5c10a30b8749ff66e8896a58018af6ee",
|
||||
"headers": "1w8rdbjanqkl1237ppcgrkwdng93gniv3mqfxqikv0rpsg2d7gi7",
|
||||
"x86_64-darwin": "4b656ad287e5afe3efbcb371584fc8a602c8afa3322d4b19ba6550b42f15d3e9",
|
||||
"x86_64-linux": "250c2f8382902f97754fa1ff4691f6608a2ac99489af58459017906aee66878f"
|
||||
"aarch64-darwin": "33852f5e551e18c43e1031492fe62153759fc7968bd14f9cc179673517e10bd0",
|
||||
"aarch64-linux": "2f99b486290989bc4d756ffc0448c93c728e03d519872e492b1cadd5d5905885",
|
||||
"armv7l-linux": "27d03e18b3e3e484ceb7f7f05ace5eda075a5a468223797d4ae988a75424b6d0",
|
||||
"headers": "1n1w2ngk44w9khbh4bnw6kfakawdxh3wii3hkynbjzj21swvqzrb",
|
||||
"x86_64-darwin": "5e47e5ae1d0401b32838a9074fc13d291b09bad0cb61a265ad5388ef9eb8ade7",
|
||||
"x86_64-linux": "9921145c87cb6f279e5baa2c5af8763a4695c84bc5206273dbbb0385b493513c"
|
||||
},
|
||||
"version": "41.3.0"
|
||||
"version": "41.6.1"
|
||||
},
|
||||
"42": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "15f47f905b59c37a2c1845595001589a1867e03c627a1880a8d6599e8ff65b21",
|
||||
"aarch64-linux": "81a094306b68190e27fd253958e2047d4786d6a19035d118089100257b1c64f1",
|
||||
"armv7l-linux": "6dad4f6c6ed82445cb10a86f6878dd7cb86ec49e5e48a2837ee1526f209e510b",
|
||||
"headers": "0r0g3iaji6a7gx51bv2ijq23zpcz8ip8kmfy0x9fxqpm9angvins",
|
||||
"x86_64-darwin": "1328a03d7f4f08946984b51dee62e761375bc9c912887965fb2dd900e65b2dfb",
|
||||
"x86_64-linux": "05ffcaa8ae2f71a153217b5ffcd4aad7aed5428a70beb84b02888eb9a4097f6e"
|
||||
},
|
||||
"version": "42.1.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
npmHooks,
|
||||
yarn-berry_4,
|
||||
unzip,
|
||||
writers,
|
||||
|
||||
libnotify,
|
||||
libpulseaudio,
|
||||
@@ -64,9 +65,19 @@ in
|
||||
|
||||
npmRoot = "third_party/node";
|
||||
|
||||
missingHashes =
|
||||
if (info.electron_yarn_data ? "missing_hashes") then
|
||||
writers.writeJSON "missing-hashes.json" info.electron_yarn_data.missing_hashes
|
||||
else
|
||||
null;
|
||||
yarnOfflineCache = yarn-berry.fetchYarnBerryDeps {
|
||||
src = gclientDeps."src/electron".path;
|
||||
hash = info.electron_yarn_hash;
|
||||
hash = info.electron_yarn_data.hash;
|
||||
missingHashes =
|
||||
if (info.electron_yarn_data ? "missing_hashes") then
|
||||
writers.writeJSON "missing-hashes.json" info.electron_yarn_data.missing_hashes
|
||||
else
|
||||
null;
|
||||
};
|
||||
|
||||
dontYarnBerryInstallDeps = true; # we'll run the hook manually
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -113,17 +113,35 @@ def get_chromium_gn_source(chromium_tag: str) -> dict:
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@memory.cache
|
||||
def get_electron_yarn_hash(electron_tag: str) -> str:
|
||||
def get_electron_yarn_data(electron_tag: str) -> dict:
|
||||
print(f"yarn-berry-fetcher prefetch", file=sys.stderr)
|
||||
with tempfile.TemporaryDirectory() as tmp_dir:
|
||||
with open(tmp_dir + "/yarn.lock", "w") as f:
|
||||
f.write(get_electron_file(electron_tag, "yarn.lock"))
|
||||
return (
|
||||
subprocess.check_output(["yarn-berry-fetcher", "prefetch", tmp_dir + "/yarn.lock"])
|
||||
missing_hashes_str = (
|
||||
subprocess.check_output(
|
||||
["yarn-berry-fetcher", "missing-hashes", tmp_dir + "/yarn.lock"]
|
||||
)
|
||||
.decode("utf-8")
|
||||
.strip()
|
||||
)
|
||||
missing_hashes = json.loads(missing_hashes_str)
|
||||
cmd = ["yarn-berry-fetcher", "prefetch", tmp_dir + "/yarn.lock"]
|
||||
if missing_hashes:
|
||||
with open(tmp_dir + "/missing-hashes.json", "w") as f:
|
||||
f.write(missing_hashes_str)
|
||||
cmd.append(tmp_dir + "/missing-hashes.json")
|
||||
hash = subprocess.check_output(cmd).decode("utf-8").strip()
|
||||
|
||||
data = {
|
||||
"hash": hash,
|
||||
}
|
||||
if missing_hashes:
|
||||
data["missing_hashes"] = missing_hashes
|
||||
|
||||
return data
|
||||
|
||||
|
||||
@memory.cache
|
||||
def get_chromium_npm_hash(chromium_tag: str) -> str:
|
||||
@@ -143,7 +161,12 @@ def get_chromium_npm_hash(chromium_tag: str) -> str:
|
||||
def get_update(major_version: str, m: str, gclient_data: any) -> Tuple[str, dict]:
|
||||
|
||||
tasks = []
|
||||
a = lambda: (("electron_yarn_hash", get_electron_yarn_hash(gclient_data["src/electron"]["args"]["tag"])))
|
||||
a = lambda: (
|
||||
(
|
||||
"electron_yarn_data",
|
||||
get_electron_yarn_data(gclient_data["src/electron"]["args"]["tag"]),
|
||||
)
|
||||
)
|
||||
tasks.append(delayed(a)())
|
||||
a = lambda: (
|
||||
(
|
||||
|
||||
@@ -40,5 +40,9 @@ stdenv.mkDerivation {
|
||||
unwrapped = electron-unwrapped;
|
||||
inherit (electron-unwrapped) headers dist;
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
inherit (electron-unwrapped) meta;
|
||||
}
|
||||
|
||||
@@ -63,13 +63,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sssd";
|
||||
version = "2.12.0";
|
||||
version = "2.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SSSD";
|
||||
repo = "sssd";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-9F+D7qZKwnP1U0zJbvzy0f7dQSKkfgJrewDJ4p+Svgk=";
|
||||
hash = "sha256-/zMF7+rpQpWNq7srK2/gP99tgq8s6uFAYb/ORoPO/9w=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
diff --git a/src/external/pac_responder.m4 b/src/external/pac_responder.m4
|
||||
index 9072718..3501b6b 100644
|
||||
--- a/src/external/pac_responder.m4
|
||||
+++ b/src/external/pac_responder.m4
|
||||
@@ -23,7 +23,8 @@ then
|
||||
Kerberos\ 5\ release\ 1.18* | \
|
||||
Kerberos\ 5\ release\ 1.19* | \
|
||||
Kerberos\ 5\ release\ 1.20* | \
|
||||
- Kerberos\ 5\ release\ 1.21*)
|
||||
+ Kerberos\ 5\ release\ 1.21* | \
|
||||
+ Kerberos\ 5\ release\ 1.22*)
|
||||
krb5_version_ok=yes
|
||||
AC_MSG_RESULT([yes])
|
||||
;;
|
||||
@@ -21,8 +21,8 @@ let
|
||||
in
|
||||
buildMongoDB {
|
||||
inherit avxSupport;
|
||||
version = "7.0.31";
|
||||
hash = "sha256-Vk/XsnYut0Hfad/X6LZw6gJX1NHc4/6XT8y1KehpLMk=";
|
||||
version = "7.0.32";
|
||||
hash = "sha256-1jK7MhYF+61sa5jAqPpJwmYcXebIZgk/8gFn0037I+E=";
|
||||
patches = [
|
||||
# ModuleNotFoundError: No module named 'mongo_tooling_metrics':
|
||||
# NameError: name 'SConsToolingMetrics' is not defined:
|
||||
|
||||
@@ -6081,6 +6081,7 @@ with pkgs;
|
||||
electron_39-bin
|
||||
electron_40-bin
|
||||
electron_41-bin
|
||||
electron_42-bin
|
||||
;
|
||||
|
||||
inherit (callPackages ../development/tools/electron/chromedriver { })
|
||||
@@ -6089,6 +6090,7 @@ with pkgs;
|
||||
electron-chromedriver_39
|
||||
electron-chromedriver_40
|
||||
electron-chromedriver_41
|
||||
electron-chromedriver_42
|
||||
;
|
||||
|
||||
inherit
|
||||
@@ -6122,6 +6124,10 @@ with pkgs;
|
||||
src = electron-source.electron_41;
|
||||
bin = electron_41-bin;
|
||||
};
|
||||
electron_42 = getElectronPkg {
|
||||
src = electron-source.electron_42;
|
||||
bin = electron_42-bin;
|
||||
};
|
||||
}
|
||||
)
|
||||
electron_37
|
||||
@@ -6129,6 +6135,7 @@ with pkgs;
|
||||
electron_39
|
||||
electron_40
|
||||
electron_41
|
||||
electron_42
|
||||
;
|
||||
electron = electron_41;
|
||||
electron-bin = electron_41-bin;
|
||||
|
||||
Reference in New Issue
Block a user