Merge master into staging-nixos
This commit is contained in:
nixpkgs-ci[bot]
@@ -8,11 +8,12 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "claude-code";
|
||||
publisher = "anthropic";
|
||||
version = "2.1.11";
|
||||
hash = "sha256-zqCILYNwBudsEv7+7ZV1YQoPJi30kj5w8suXqAPKORo=";
|
||||
version = "2.1.15";
|
||||
hash = "sha256-BtVxSVp80qlZhMrh872+0DQ7sTskEdP/5p5T7n9jeGU=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p "$out/$installPrefix/resources/native-binary"
|
||||
rm -f "$out/$installPrefix/resources/native-binary/claude"*
|
||||
ln -s "${claude-code}/bin/claude" "$out/$installPrefix/resources/native-binary/claude"
|
||||
'';
|
||||
|
||||
@@ -1355,13 +1355,13 @@
|
||||
"vendorHash": "sha256-CcbNooB1AjLbyMkTNmAklqNm6o6FVCBEBiEnD/U5yGU="
|
||||
},
|
||||
"terraform-routeros_routeros": {
|
||||
"hash": "sha256-KhxNuzVaZFCO6XTCaj9wBddgw7TXULh/6LnMjiqPRLg=",
|
||||
"hash": "sha256-19QR6kugDQoWlW3U1u2PX/7+S+Rb+o58HWsKHHd7pqo=",
|
||||
"homepage": "https://registry.terraform.io/providers/terraform-routeros/routeros",
|
||||
"owner": "terraform-routeros",
|
||||
"repo": "terraform-provider-routeros",
|
||||
"rev": "v1.98.0",
|
||||
"rev": "v1.99.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-+u00PWotHxCQ/BveXY23ulrQszoyG59GCkUIYKwlulc="
|
||||
"vendorHash": "sha256-0VVL8wF8bAB77erJ4YgHN5Q4gkuRPL30OucJe7Jvj1w="
|
||||
},
|
||||
"timohirt_hetznerdns": {
|
||||
"hash": "sha256-wmXZ6+5Ex3G2JUdw2is2VIo/X1X0V1Auw5KmYpGllug=",
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "adrs";
|
||||
version = "0.3.0";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "joshrotenberg";
|
||||
repo = "adrs";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-C9Kg7xY3Q0xsd2DlUcc3OM+/hyzmwz55oi6Ul3K7zkM=";
|
||||
hash = "sha256-LjuEYOZJzptryjtqmfH5L/BI+9daLPAGSkAkXeE7Z/E=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Ep1Y2PDNesaDzEc2JNoKZjFSay1utZiNR5eQYhdqiUU=";
|
||||
cargoHash = "sha256-mevUqsqFDfF2dMYSdc0eGxh55W7shLSo8e5NpbDI/Zo=";
|
||||
|
||||
meta = {
|
||||
description = "Command-line tool for managing Architectural Decision Records";
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cdk";
|
||||
version = "5.0-20251014";
|
||||
version = "5.0-20260119";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://invisible-mirror.net/archives/cdk/cdk-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-DtRpScaApfQuNCzEiizmC8/CzIue67F2h3takfgpQ1w=";
|
||||
hash = "sha256-RrtoRB5pinsfZC4lZJaKdwCv7wOGRCr9XPLnspbTDuU=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "chipsec";
|
||||
version = "1.13.17";
|
||||
version = "1.13.19";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chipsec";
|
||||
repo = "chipsec";
|
||||
tag = version;
|
||||
hash = "sha256-8QiFIk9bq/yX26jw9aOd6wtt+WDUwfLBUVD5hL30RKE=";
|
||||
hash = "sha256-QJDoUnmZhKimgVnKCarc70b1OZAF3uIKqefuXjD7dOg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
rebar,
|
||||
rebar3,
|
||||
erlang,
|
||||
opencl-headers,
|
||||
ocl-icd,
|
||||
@@ -22,18 +22,18 @@ stdenv.mkDerivation rec {
|
||||
# https://github.com/tonyrog/cl/issues/39
|
||||
postPatch = ''
|
||||
substituteInPlace c_src/Makefile \
|
||||
--replace "-m64" ""
|
||||
--replace-fail "-m64" ""
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
erlang
|
||||
rebar
|
||||
rebar3
|
||||
opencl-headers
|
||||
ocl-icd
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
rebar compile
|
||||
rebar3 compile
|
||||
'';
|
||||
|
||||
# 'cp' line taken from Arch recipe
|
||||
|
||||
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "@anthropic-ai/claude-code",
|
||||
"version": "2.1.14",
|
||||
"version": "2.1.15",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "@anthropic-ai/claude-code",
|
||||
"version": "2.1.14",
|
||||
"version": "2.1.15",
|
||||
"license": "SEE LICENSE IN README.md",
|
||||
"bin": {
|
||||
"claude": "cli.js"
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
}:
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "claude-code";
|
||||
version = "2.1.14";
|
||||
version = "2.1.15";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-QiBvRm1iMtO3mmlu5a/aKaJzcAQxeBW7yLK4R4k6SU0=";
|
||||
hash = "sha256-3zhjeAwKj1fMLuriX1qpVA8zaCk1oekJ1UmeEdDx4Xg=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-PIhayi4wNoP4XxWpEIH7/Ycq1mBAMcE4vDuLCTW7/bE=";
|
||||
npmDepsHash = "sha256-K5re0co3Tkz5peXHe/UUlsqAWq4YzSULdY9+xncfL5A=";
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
|
||||
@@ -29,11 +29,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clightning";
|
||||
version = "25.09.2";
|
||||
version = "25.12.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip";
|
||||
hash = "sha256-iLzVDWTdKkpAjmuyCnSnqyWiv6CgdzQwNTmWZH/x7gM=";
|
||||
hash = "sha256-50rcNH9dXeRezJ3nEW/cRK5uE+IpGoHAzkU3C7p44KY=";
|
||||
};
|
||||
|
||||
# when building on darwin we need cctools to provide the correct libtool
|
||||
|
||||
@@ -14,18 +14,18 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "codex";
|
||||
version = "0.87.0";
|
||||
version = "0.88.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openai";
|
||||
repo = "codex";
|
||||
tag = "rust-v${finalAttrs.version}";
|
||||
hash = "sha256-XdfB0izL2w5IYLr8RUiP9Dytg6cOONNk9EtVnvzv83k=";
|
||||
hash = "sha256-Ff6Ut1GwRPd2oB4/YojKgS/CYMG0TVizXOHKfpKClqY=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/codex-rs";
|
||||
|
||||
cargoHash = "sha256-Ryr5mFc+StT1d+jBtRsrOzMtyEJf7W1HbMbnC84ps4s=";
|
||||
cargoHash = "sha256-eLao+Jaq7+Bu9QNHDJYD3zX2BQvlX/BSTYr4gpCD++Q=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -15,11 +15,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ddcutil";
|
||||
version = "2.2.3";
|
||||
version = "2.2.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.ddcutil.com/tarballs/ddcutil-${version}.tar.gz";
|
||||
hash = "sha256-4XvAUqYvnqhS2eOLpPHtfnNmVnoOGdvhpDnuca2+BqA=";
|
||||
hash = "sha256-CK48ga6qozz068MqgElCjnbOVXh0VG44H9ZaglYN0ZU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -48,13 +48,13 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "gitea";
|
||||
version = "1.25.3";
|
||||
version = "1.25.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "go-gitea";
|
||||
repo = "gitea";
|
||||
tag = "v${gitea.version}";
|
||||
hash = "sha256-jCh4CuVS/WHpd1+NLfB3Sc2sonVcfedDZAgYTqcXZaU=";
|
||||
hash = "sha256-sVpCdDJWzHtRKiqTeRuvrHf/cmeLbLs4THAqkH8hqMY=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
}:
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "jellyfin-web";
|
||||
version = "10.11.5";
|
||||
version = "10.11.6";
|
||||
|
||||
src =
|
||||
assert finalAttrs.version == jellyfin.version;
|
||||
@@ -21,7 +21,7 @@ buildNpmPackage (finalAttrs: {
|
||||
owner = "jellyfin";
|
||||
repo = "jellyfin-web";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-9gDGREPORJILjVqw+Kk56+5qS/TQUd8OFmsEXL7KPAE=";
|
||||
hash = "sha256-qmpVuxwsMM9Fhjkrrkxh+pMDh6+c3rZde7in5vIpaDg=";
|
||||
};
|
||||
|
||||
nodejs = nodejs_20; # does not build with 22
|
||||
@@ -31,7 +31,7 @@ buildNpmPackage (finalAttrs: {
|
||||
--replace-fail "git describe --always --dirty" "echo ${finalAttrs.src.rev}" \
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-AYGWZ5QvmQl8+ayjzkWuBra+QUvde36ReIJ7Fxk89VM=";
|
||||
npmDepsHash = "sha256-bXZn2FOWeIN8VTNLbKe7jM7yDtE2QRmyoWNZXgE5W4Q=";
|
||||
|
||||
preBuild = ''
|
||||
# using sass-embedded fails at executing node_modules/sass-embedded-linux-x64/dart-sass/src/dart
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
buildDotnetModule (finalAttrs: {
|
||||
pname = "jellyfin";
|
||||
version = "10.11.5"; # ensure that jellyfin-web has matching version
|
||||
version = "10.11.6"; # ensure that jellyfin-web has matching version
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jellyfin";
|
||||
repo = "jellyfin";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-MOzMSubYkxz2kwpvamaOwz3h8drEgeSoiE9Gwassmbk=";
|
||||
hash = "sha256-bF/N6FC1/qfBar2KNut8KY3Rz+pqArCt4HV3NAH8eaU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ sqlite ];
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
name = "libclipboard";
|
||||
pname = "libclipboard";
|
||||
version = "1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -31,6 +31,13 @@ stdenv.mkDerivation rec {
|
||||
"ac_cv_openssl_xts_duplicate_keys=yes"
|
||||
];
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"lib"
|
||||
"dev"
|
||||
"man"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Library for support of the Expert Witness Compression Format";
|
||||
homepage = "https://sourceforge.net/projects/libewf/";
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
name = "libgnunetchat";
|
||||
pname = "libgnunetchat";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchgit {
|
||||
|
||||
@@ -162,11 +162,11 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "microsoft-edge";
|
||||
version = "143.0.3650.139";
|
||||
version = "144.0.3719.82";
|
||||
|
||||
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-sLn8llw8wdLLAl0wGbBUT4nyjYiZcgXS7LNCwpTb/qQ=";
|
||||
hash = "sha256-W7wT+1aNF7ZuhYPQ2VAvVgJ+5GWsopEnDM9FhdpxBIg=";
|
||||
};
|
||||
|
||||
# With strictDeps on, some shebangs were not being patched correctly
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "naja";
|
||||
version = "0.3.3";
|
||||
version = "0.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "najaeda";
|
||||
repo = "naja";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-emtn/RsLQljcQ/rLV7lzhBEX+8ilBBvBS3J+nG9DNGo=";
|
||||
hash = "sha256-Oh1rAS20bQRp8P/8qMPjoCTC9wghBRhmRRh7J/+NG0A=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "nest-cli";
|
||||
version = "11.0.15";
|
||||
version = "11.0.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nestjs";
|
||||
repo = "nest-cli";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-yUDlF5UyRE9UdGhw9HDLDpg1voUMQsIenUZZ4UPhBT4=";
|
||||
hash = "sha256-naVDl3fjjPdrZhUynoy98ggVIDlmIVgvrEYxdNvwD1Y=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-qsY1pGKg+qt7meKwH9wKuPF57KtZC7Y8hYgkm5ObOwE=";
|
||||
npmDepsHash = "sha256-eLytaWABoJTFBnkdqt/rIrgeI4Z2gPpUBL/bt6UIduQ=";
|
||||
npmFlags = [ "--legacy-peer-deps" ];
|
||||
|
||||
env = {
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
zlib,
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
name = "ropebwt2";
|
||||
pname = "ropebwt2";
|
||||
version = "0-unstable-2021-02-01";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lh3";
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "squid";
|
||||
version = "7.3";
|
||||
version = "7.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/squid-cache/squid/releases/download/SQUID_${
|
||||
builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version
|
||||
}/squid-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-2twqmjkmzhs7q+qnp9eyHLsIkCWHbao/XBnn62OR3c0=";
|
||||
hash = "sha256-4xl27ddVwpW9WEKjScnH2tFqaD0GYzfMCQM8EwK0/tQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
name = "sxcs";
|
||||
pname = "sxcs";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
|
||||
@@ -157,6 +157,7 @@ in
|
||||
coreSetup ? false, # Use only core packages to build Setup.hs.
|
||||
useCpphs ? false,
|
||||
hardeningDisable ? null,
|
||||
enableObjectDeterminism ? lib.versionAtLeast ghc.version "9.12",
|
||||
enableSeparateBinOutput ? false,
|
||||
enableSeparateDataOutput ? false,
|
||||
enableSeparateDocOutput ? doHaddock,
|
||||
@@ -355,6 +356,9 @@ let
|
||||
(enableFeature (!dontStrip) "library-stripping")
|
||||
(enableFeature (!dontStrip) "executable-stripping")
|
||||
]
|
||||
++ optionals enableObjectDeterminism [
|
||||
"--ghc-option=-fobject-determinism"
|
||||
]
|
||||
++ optionals isCross (
|
||||
[
|
||||
"--configure-option=--host=${stdenv.hostPlatform.config}"
|
||||
|
||||
@@ -121,9 +121,9 @@ let
|
||||
in
|
||||
{
|
||||
ogre_14 = common {
|
||||
version = "14.4.1";
|
||||
hash = "sha256-G7Pf4vYoZhTmsG2AJhIR+xxtj0SHbN0dCkhtieBWm8Q=";
|
||||
# https://github.com/OGRECave/ogre/blob/v14.4.1/Components/Overlay/CMakeLists.txt
|
||||
version = "14.5.1";
|
||||
hash = "sha256-UTjyOeDCZy+J9qkch1g1X/6x5/K2+1MWJ2v7r0trZqY=";
|
||||
# https://github.com/OGRECave/ogre/blob/v14.5.1/Components/Overlay/CMakeLists.txt
|
||||
imguiVersion = "1.91.9b";
|
||||
imguiHash = "sha256-dkukDP0HD8CHC2ds0kmqy7KiGIh4148hMCyA1QF3IMo=";
|
||||
};
|
||||
|
||||
@@ -358,13 +358,13 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "boto3-stubs";
|
||||
version = "1.42.31";
|
||||
version = "1.42.32";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "boto3_stubs";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-uw2Mk24pOB04y3JL9SGXsf22OBFwfgUuhCwSI1RaDfc=";
|
||||
hash = "sha256-b+nI/Rauxo5Gk9U7IVWtXBHQoZhGEGIrzTpusAN4dkg=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "botocore-stubs";
|
||||
version = "1.42.31";
|
||||
version = "1.42.32";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "botocore_stubs";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-5+di43sgXHunl4LGfMXDUVF0jOJnRwpwrJwCYINlXZ8=";
|
||||
hash = "sha256-UwJ/N//X1EDZotjdhFcXF+EdhATx6Nu+dRGWQK0/yPk=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -20,16 +20,16 @@
|
||||
trio,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "cyclopts";
|
||||
version = "4.4.1";
|
||||
version = "4.4.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BrianPugh";
|
||||
repo = "cyclopts";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-kp/mnqa2difEA3s1jtXF1fDluQhLCJ4f6rFRruRbE9k=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-DX/mh1vgoSQoqzKRQg+NcCjfPPwy8WDJG7AfMYtPUSA=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -61,7 +61,7 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
syrupy
|
||||
]
|
||||
++ lib.concatAttrValues optional-dependencies;
|
||||
++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies);
|
||||
|
||||
pythonImportsCheck = [ "cyclopts" ];
|
||||
|
||||
@@ -80,8 +80,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Module to create CLIs based on Python type hints";
|
||||
homepage = "https://github.com/BrianPugh/cyclopts";
|
||||
changelog = "https://github.com/BrianPugh/cyclopts/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/BrianPugh/cyclopts/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -16,14 +16,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gwcs";
|
||||
version = "0.26.1";
|
||||
version = "1.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spacetelescope";
|
||||
repo = "gwcs";
|
||||
tag = version;
|
||||
hash = "sha256-S7+jDWCyQPQJAVgb/+BHC03+1aYyw2TK6SmkEz+k6u4=";
|
||||
hash = "sha256-aiC+uJ5S2HggBsou4vbjxxNtilRVC4eklRgML/lLK+4=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "hdfury";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "glenndehaan";
|
||||
repo = "python-hdfury";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-cL6KE3qkOgG61ewgIInbaIw6ygb5jWVrjl8ooFrCv+k=";
|
||||
hash = "sha256-prqaH868nC5b7+1TrVRDxCcAt4v1dyF3bQAnkQgjKx0=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -148,6 +148,8 @@ buildPythonPackage (finalAttrs: {
|
||||
++ lib.optionals (pythonAtLeast "3.14") [
|
||||
# DeprecationWarning: '_UnionGenericAlias' is deprecated and slated for removal in Python 3.17
|
||||
"-Wignore::DeprecationWarning"
|
||||
# Multiple tests with warnings fail without it
|
||||
"-Wignore::pytest.PytestUnraisableExceptionWarning"
|
||||
];
|
||||
|
||||
enabledTestMarks = testBackends ++ [ "core" ];
|
||||
|
||||
@@ -3,24 +3,24 @@
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
unittestCheckHook,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "logging-tree";
|
||||
version = "1.10";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brandon-rhodes";
|
||||
repo = "logging_tree";
|
||||
tag = version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-9MeCx708EUe5dmFkol+HISzdBX+yar1HjKIAwmg1msA=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
nativeCheckInputs = [ unittestCheckHook ];
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "logging_tree" ];
|
||||
|
||||
@@ -30,4 +30,4 @@ buildPythonPackage rec {
|
||||
license = [ lib.licenses.bsd2 ];
|
||||
maintainers = [ lib.maintainers.rskew ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -331,8 +331,8 @@ in
|
||||
"sha256-M8vUOtM7Q5gnwi9ZPGu6n+I4Twl02Su4eRGqq2+Ow1o=";
|
||||
|
||||
mypy-boto3-config =
|
||||
buildMypyBoto3Package "config" "1.42.15"
|
||||
"sha256-zMNP1LXKSynkfJSLn19sz5UoT8LiswD5qSZCn1y5GsA=";
|
||||
buildMypyBoto3Package "config" "1.42.32"
|
||||
"sha256-HQUL0R1NWP6DXQ26iS9k6lIAVdwK899fwLGH4/Z4U8Q=";
|
||||
|
||||
mypy-boto3-connect =
|
||||
buildMypyBoto3Package "connect" "1.42.30"
|
||||
@@ -443,8 +443,8 @@ in
|
||||
"sha256-92qhSUqTiLgbtvCdi/Mmgve18mcYR00ABL+bNy7/OnY=";
|
||||
|
||||
mypy-boto3-ec2 =
|
||||
buildMypyBoto3Package "ec2" "1.42.29"
|
||||
"sha256-o7pABpOci5Z0fblGTcpep7FnFTW37OQWTnxbIk8CZJo=";
|
||||
buildMypyBoto3Package "ec2" "1.42.32"
|
||||
"sha256-E0cOl5NqHnsKd3UHgKsZKHNqif7ZJ6a4ct9O5d54yiI=";
|
||||
|
||||
mypy-boto3-ec2-instance-connect =
|
||||
buildMypyBoto3Package "ec2-instance-connect" "1.42.3"
|
||||
@@ -1070,8 +1070,8 @@ in
|
||||
"sha256-YrrEKl3aGz//5Z5JGapHhWtk6hBXQ4cuRQmLqGYztzg=";
|
||||
|
||||
mypy-boto3-quicksight =
|
||||
buildMypyBoto3Package "quicksight" "1.42.18"
|
||||
"sha256-6gYCSoGVbd2hw/NktDiLo1QlOO23LrwlaJ3gm30gpDQ=";
|
||||
buildMypyBoto3Package "quicksight" "1.42.32"
|
||||
"sha256-HwzkZUZBuCfDa8EYrn+A+sm2qkgQktgeR7j4k3waFds=";
|
||||
|
||||
mypy-boto3-ram =
|
||||
buildMypyBoto3Package "ram" "1.42.3"
|
||||
|
||||
@@ -3,6 +3,8 @@
|
||||
buildPythonPackage,
|
||||
decorator,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
formencode,
|
||||
httpretty,
|
||||
libxml2,
|
||||
@@ -12,7 +14,7 @@
|
||||
nocaselist,
|
||||
pbr,
|
||||
ply,
|
||||
pytest,
|
||||
pytestCheckHook,
|
||||
pytz,
|
||||
pyyaml,
|
||||
requests,
|
||||
@@ -24,14 +26,24 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pywbem";
|
||||
version = "1.7.3";
|
||||
version = "1.8.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-0fCi69T/7e+NBnrzhVIW21GQx/byfI0tzUZ+CXAckLA=";
|
||||
hash = "sha256-P+/sNPckpVHkLKOJ0ILQKf7QO0/xSsyO9cfLkv3aE1s=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "setuptools-scm>=9.2.0" "setuptools-scm"
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
mock
|
||||
nocasedict
|
||||
@@ -50,7 +62,7 @@ buildPythonPackage rec {
|
||||
httpretty
|
||||
libxml2
|
||||
lxml
|
||||
pytest
|
||||
pytestCheckHook
|
||||
pytz
|
||||
requests-mock
|
||||
testfixtures
|
||||
@@ -58,6 +70,11 @@ buildPythonPackage rec {
|
||||
|
||||
pythonImportsCheck = [ "pywbem" ];
|
||||
|
||||
disabledTestPaths = [
|
||||
"tests/leaktest" # requires 'yagot'
|
||||
"tests/end2endtest" # requires 'pytest_easy_server'
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Support for the WBEM standard for systems management";
|
||||
homepage = "https://pywbem.github.io";
|
||||
|
||||
@@ -26,16 +26,16 @@
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "sagemaker-core";
|
||||
version = "1.0.73";
|
||||
version = "1.0.74";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "sagemaker-core";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-0pjz5XKiHe4ReDSeDeKpuT9hmv+XkM6ut3AbiWQDAlE=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-1wQvytoIMeBpFZfP88CfHXy0sJdg3+D0P7vXcltNAWs=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -76,7 +76,7 @@ buildPythonPackage rec {
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
]
|
||||
++ lib.concatAttrValues optional-dependencies;
|
||||
++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies;
|
||||
|
||||
disabledTestPaths = [
|
||||
# Tries to import deprecated `sklearn`
|
||||
@@ -89,8 +89,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Python object-oriented interface for interacting with Amazon SageMaker resources";
|
||||
homepage = "https://github.com/aws/sagemaker-core";
|
||||
changelog = "https://github.com/aws/sagemaker-core/blob/${src.tag}/CHANGELOG.md";
|
||||
changelog = "https://github.com/aws/sagemaker-core/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -38,16 +38,16 @@
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "uiprotect";
|
||||
version = "8.0.0";
|
||||
version = "10.0.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uilibs";
|
||||
repo = "uiprotect";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-YYF7YERl9pKpnfD1Q00NlL8zWfEohMBO3UuidedLHn0=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-pxxl/NhvJh2Ur8g+25padewvshqSUZmB7vpGmVlH15k=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
@@ -97,8 +97,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Python API for UniFi Protect (Unofficial)";
|
||||
homepage = "https://github.com/uilibs/uiprotect";
|
||||
changelog = "https://github.com/uilibs/uiprotect/blob/${src.tag}/CHANGELOG.md";
|
||||
changelog = "https://github.com/uilibs/uiprotect/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ hexa ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -12,35 +12,35 @@
|
||||
},
|
||||
"37": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "62d8cd68fec502201db9d4aa940ef9e3ad0004f27e46d6f56c8cf8924da477e7",
|
||||
"aarch64-linux": "deebbca4a0348ff7dd8564ee413bf7ed0d99c8d71951881286115e82bc4f22ba",
|
||||
"armv7l-linux": "1c53701c915b4180bf09557374944a93050a601c2d36ec5ef014f1f1f620e4ab",
|
||||
"aarch64-darwin": "24529be1f2f87c587d06c7474607f1b57d1184b3f45d916cac33791de3a70014",
|
||||
"aarch64-linux": "37a228821184136fa86a8727bec19ab400524dd7d4bca78937de5d50704592d1",
|
||||
"armv7l-linux": "db4c1f6c8f012ddd15965c5f8837a61b65d0c3f8f296d81e3f0bf7158ef9779f",
|
||||
"headers": "0lwcdw882hjb2vhj9vvngkwq5l6nrh7d2hr9adpqdm1any4rssl5",
|
||||
"x86_64-darwin": "334478ae40a5a1ea2bc33ec787352073d15f50eb7a164dfbc1f9e7abb203ded8",
|
||||
"x86_64-linux": "f773866342de11ba59ca73bb3cf373302839cc3e41c94f6a3ed7c13c110b3b5c"
|
||||
"x86_64-darwin": "e545e2a41e5fd7d28bf1349b4f60f1bcfd8e4c216f57b2d3e698ec1c00b719cf",
|
||||
"x86_64-linux": "c0b4edd6bd9858cda4cf7ab299e69a2d3ecd2e5fcca78507bc0851ba35614660"
|
||||
},
|
||||
"version": "37.10.2"
|
||||
"version": "37.10.3"
|
||||
},
|
||||
"38": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "90ac7f8b3a6b6efb83fb5e3b85498456932a2897b862b689312ddde8d9d203c1",
|
||||
"aarch64-linux": "0aa21bf35d9c7214b0809f85a101472a92bc7b93cf6bc0fd019b94ba309c9b09",
|
||||
"armv7l-linux": "6ea202c53a5db24c1a50a939e54aa0ba87987eea462e33c5a25530bd243e8532",
|
||||
"headers": "03ml730a2gli6cmr2lnzbjw9apx2zpgviap4xzw5xa9m76jvdc8h",
|
||||
"x86_64-darwin": "c72b7b42b53f154a928b3b6778422ec27ac4123040366aabda80cdce67038470",
|
||||
"x86_64-linux": "d43bd3ff3f7f9f56825f66a29165ff620d84695d4d06769855acf02c4baa7b9c"
|
||||
"aarch64-darwin": "b91e12ec6695f969ccf792d95dc7ea5da35f399cec2bed4d7b25d8a1f545b5de",
|
||||
"aarch64-linux": "73e87c432fa52b9005e12e23a1fcffcfada853de19492f905c50dbb46fd778df",
|
||||
"armv7l-linux": "a78ff548aa93586ce01c6406f49d1f8979a30542f286d05adb56e61a3147bba5",
|
||||
"headers": "1f1381qc705fv50sbm0g5f6wm8pkwqvrbhb1kvi3i9mk2910y14m",
|
||||
"x86_64-darwin": "459dd05f00c29d435112596f87bc5bd0aeb16796dff0744e5421086417877d24",
|
||||
"x86_64-linux": "fe428cd212680e1d6df61fa67efc260b9221d089c7a14c9863f18bcbeace5628"
|
||||
},
|
||||
"version": "38.7.1"
|
||||
"version": "38.7.2"
|
||||
},
|
||||
"39": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "2128a27c1b0fd80be9d608fb293639f76611b4108eca1e045c933fd04097a7b1",
|
||||
"aarch64-linux": "c58c5904d6015cbbfa5f04fbda5c83b9a276a3565b5f3fa166795c789b055cdd",
|
||||
"armv7l-linux": "d7c2f0b5038c49b1e637f8dbda945be4e6f3a6d7ebf802543e6ef5093c9641ff",
|
||||
"headers": "0gaz44jv57aava01fvl35kqdl5yaf6ca7dzsx5f279qkpfyrhx2k",
|
||||
"x86_64-darwin": "f8085a04dc35bfe0c32c36e6feffde07de16459bf36dfab422760181717f5ac0",
|
||||
"x86_64-linux": "5eb51ebcb60487c4fc3a5b74ffb57a03eefd48def32200adf310ffaba4153d64"
|
||||
"aarch64-darwin": "064edf951e0ab546809e217a417401023fd7e3b662de8be0316e8173f6f3db6d",
|
||||
"aarch64-linux": "468d3096630953a52fc051abd48714004b58ac550f9c7e798c256c774811b0f2",
|
||||
"armv7l-linux": "37a889a488e7a64d86961ad774f20e3cbb5dd965d76a6efd98c83488c33964e0",
|
||||
"headers": "0ywhsg295d390mgm1dd64jgzag35gib65b3ybzilsg58d4gvvp5g",
|
||||
"x86_64-darwin": "484c7f39235ea6c2c87b2ce5149436daa4eec97c9a6b11dc662f01ec1b81969e",
|
||||
"x86_64-linux": "a676357322bdf28153ba3ad67e8558dd54d76757fe2b1ad48c53f4a5e20614c6"
|
||||
},
|
||||
"version": "39.2.3"
|
||||
"version": "39.3.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,35 +12,35 @@
|
||||
},
|
||||
"37": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "30cfb8b90b0fad7cd0ef473fc03e761d28f98e1a398ff255956e3704c6da0727",
|
||||
"aarch64-linux": "8a536ad3e2d2f0b9e99fc3085a9990f6d70c1de676d0f57219d2094ef1805ffd",
|
||||
"armv7l-linux": "b8d774cf0188324538412201be8827d4224d658129eaf5e66f91c0448cc633f2",
|
||||
"aarch64-darwin": "aa9dda4d536fd98e2620eb39de689e441fe799869c29e53db5c2c4351f1b4aba",
|
||||
"aarch64-linux": "e7e4b0b21d8e685ef5ad32d8281025fc80cf4cb5bd9476642c26d702c8f3a59e",
|
||||
"armv7l-linux": "f14f0122e94d6df6f04f682c4e14d1f21608b256b5c90c34c6567e3487b904dc",
|
||||
"headers": "0lwcdw882hjb2vhj9vvngkwq5l6nrh7d2hr9adpqdm1any4rssl5",
|
||||
"x86_64-darwin": "9d3655a3c4a409c9d422e762a913bf6d19c5ca728ac1de5a13e6c6e98c4b263a",
|
||||
"x86_64-linux": "2a1fcc98587a23b4022c4d921016f24126ab1071b395760a0339de5f019f9771"
|
||||
"x86_64-darwin": "20e0fa9b41808153dbf54c1c44d3c6f136a35295b9f7d5ee3b3f32397cbc6319",
|
||||
"x86_64-linux": "ced6d8721ce57a3fa10d2bc614e4d49ab031c46629ed5af03a253ce7def8b747"
|
||||
},
|
||||
"version": "37.10.2"
|
||||
"version": "37.10.3"
|
||||
},
|
||||
"38": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "3faa6337db37dbb0e3e11fe66a6c93087bb5db79df25d2f1296a28edad8b2958",
|
||||
"aarch64-linux": "bf0078dd84a4af9c636ecad448f824ebc2a99da10376746d8b1b600746e84de0",
|
||||
"armv7l-linux": "8d41e3c53f5ab9d06b36a2a456cb35604802f1246adb100490a7770bef29a165",
|
||||
"headers": "03ml730a2gli6cmr2lnzbjw9apx2zpgviap4xzw5xa9m76jvdc8h",
|
||||
"x86_64-darwin": "c4ff20f9b683e1907072302c0cfc38ec0c47eca75b71098d916a6a82d87ff1bb",
|
||||
"x86_64-linux": "997ab3fd934c1ac0ab479565e1def9b2eb6fe6d8a23fd585c8d62250ef05c704"
|
||||
"aarch64-darwin": "6327236404c59f28ae0892d3898d240fe5e40c944019196afd1c9f03b3cc4a5a",
|
||||
"aarch64-linux": "1e29832d58ed5582869cee4739b442b6641a4d36bdf350e12cfbd54b9ab7f773",
|
||||
"armv7l-linux": "016b3f9d1f526f6943440379d431185f69ac4501d0f8acfa3b728dcc8944ab03",
|
||||
"headers": "1f1381qc705fv50sbm0g5f6wm8pkwqvrbhb1kvi3i9mk2910y14m",
|
||||
"x86_64-darwin": "4a5e11cf313bc337b1ba373643b55801869f7245ddff1287fee3dfa1d3d8c0be",
|
||||
"x86_64-linux": "e083831cec7c952bab51cf49ff380558195edd01678a21eb71a67eddbebf87c1"
|
||||
},
|
||||
"version": "38.7.1"
|
||||
"version": "38.7.2"
|
||||
},
|
||||
"39": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "1e88807c749e69c9a1b2abef105cf30dbec4fddc365afcaa624b1e2df80fe636",
|
||||
"aarch64-linux": "8de5ed25a12029ca999455c1cadf28341ec5e0de87a3a0c27dbb24df99f154b1",
|
||||
"armv7l-linux": "766b16d8b1297738a0d1fa7e44d992142558f6e12820197746913385590f033e",
|
||||
"headers": "0gaz44jv57aava01fvl35kqdl5yaf6ca7dzsx5f279qkpfyrhx2k",
|
||||
"x86_64-darwin": "5cadee0db7684ae48a7f9f4f1310c3f6e1518b0fa88cf3efb36f58984763d43d",
|
||||
"x86_64-linux": "f35049fe3d8dbfdb7c541b59bdca6982b571761bb8cb7fc85515ceaea9451de9"
|
||||
"aarch64-darwin": "3d5ef8b78ce4f35320a76a241bbc67f7a1922cedbfe338de111e5fd617677ca8",
|
||||
"aarch64-linux": "e0f1fa67b9f1ba8f15b2fc0aa0570e80d68261286a19862638a4f26c6966ecf2",
|
||||
"armv7l-linux": "8a4f46da6a51c97e3296c13aa480a7714e7bd5e8fa46876526ece89c8ae5b182",
|
||||
"headers": "0ywhsg295d390mgm1dd64jgzag35gib65b3ybzilsg58d4gvvp5g",
|
||||
"x86_64-darwin": "ed1951ecc55949c65452e1f8cd29b2348c8fd7932c2b1e11279987525b4658bc",
|
||||
"x86_64-linux": "44e15ac6c421e7bc7b36c55721085e5ccd4996c0770785dc78c55baaf4f73322"
|
||||
},
|
||||
"version": "39.2.3"
|
||||
"version": "39.3.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,31 +2,34 @@
|
||||
lib,
|
||||
stdenv,
|
||||
chromium,
|
||||
nodejs,
|
||||
fetchYarnDeps,
|
||||
fetchNpmDeps,
|
||||
fetchpatch,
|
||||
fixup-yarn-lock,
|
||||
npmHooks,
|
||||
yarn,
|
||||
libnotify,
|
||||
unzip,
|
||||
|
||||
pkgsBuildHost,
|
||||
pipewire,
|
||||
libsecret,
|
||||
libpulseaudio,
|
||||
speechd-minimal,
|
||||
info,
|
||||
gclient2nix,
|
||||
nodejs,
|
||||
npmHooks,
|
||||
yarn-berry_4,
|
||||
unzip,
|
||||
|
||||
libnotify,
|
||||
libpulseaudio,
|
||||
libsecret,
|
||||
pipewire,
|
||||
speechd-minimal,
|
||||
|
||||
info,
|
||||
}:
|
||||
|
||||
let
|
||||
gclientDeps = gclient2nix.importGclientDeps info.deps;
|
||||
yarn-berry = yarn-berry_4;
|
||||
in
|
||||
|
||||
((chromium.override { upstream-info = info.chromium; }).mkDerivation (base: {
|
||||
packageName = "electron";
|
||||
inherit (info) version;
|
||||
|
||||
buildTargets = [
|
||||
"electron:copy_node_headers"
|
||||
"electron:electron_dist_zip"
|
||||
@@ -41,19 +44,16 @@ in
|
||||
moveToDev = false;
|
||||
|
||||
nativeBuildInputs = base.nativeBuildInputs ++ [
|
||||
nodejs
|
||||
yarn
|
||||
fixup-yarn-lock
|
||||
unzip
|
||||
npmHooks.npmConfigHook
|
||||
gclient2nix.gclientUnpackHook
|
||||
nodejs
|
||||
npmHooks.npmConfigHook
|
||||
yarn-berry
|
||||
yarn-berry.yarnBerryConfigHook
|
||||
unzip
|
||||
];
|
||||
|
||||
buildInputs = base.buildInputs ++ [ libnotify ];
|
||||
|
||||
electronOfflineCache = fetchYarnDeps {
|
||||
yarnLock = gclientDeps."src/electron".path + "/yarn.lock";
|
||||
sha256 = info.electron_yarn_hash;
|
||||
};
|
||||
npmDeps = fetchNpmDeps rec {
|
||||
src = gclientDeps."src".path;
|
||||
# Assume that the fetcher always unpack the source,
|
||||
@@ -61,6 +61,16 @@ in
|
||||
sourceRoot = "${src.name}/third_party/node";
|
||||
hash = info.chromium_npm_hash;
|
||||
};
|
||||
|
||||
npmRoot = "third_party/node";
|
||||
|
||||
yarnOfflineCache = yarn-berry.fetchYarnBerryDeps {
|
||||
src = gclientDeps."src/electron".path;
|
||||
hash = info.electron_yarn_hash;
|
||||
};
|
||||
|
||||
dontYarnBerryInstallDeps = true; # we'll run the hook manually
|
||||
|
||||
inherit gclientDeps;
|
||||
unpackPhase = null; # prevent chromium's unpackPhase from being used
|
||||
sourceRoot = "src";
|
||||
@@ -136,8 +146,6 @@ in
|
||||
})
|
||||
];
|
||||
|
||||
npmRoot = "third_party/node";
|
||||
|
||||
postPatch = ''
|
||||
mkdir -p third_party/jdk/current/bin
|
||||
|
||||
@@ -186,15 +194,10 @@ in
|
||||
EOF
|
||||
''
|
||||
+ ''
|
||||
|
||||
(
|
||||
cd electron
|
||||
export HOME=$TMPDIR/fake_home
|
||||
yarn config --offline set yarn-offline-mirror $electronOfflineCache
|
||||
fixup-yarn-lock yarn.lock
|
||||
yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive
|
||||
YARN_ENABLE_SCRIPTS=0 yarnBerryConfigHook
|
||||
)
|
||||
|
||||
(
|
||||
cd ..
|
||||
PATH=$PATH:${
|
||||
|
||||
@@ -56,10 +56,10 @@
|
||||
},
|
||||
"src/electron": {
|
||||
"args": {
|
||||
"hash": "sha256-I8C0lT1VnNP4fSMp5LReFe8tQj/3IM1Ko6SohY187Cc=",
|
||||
"hash": "sha256-ssEFUO6UFZI5/a49oPbYXMhYCyHnE+HGK8H26jKN5JE=",
|
||||
"owner": "electron",
|
||||
"repo": "electron",
|
||||
"tag": "v37.10.2"
|
||||
"tag": "v37.10.3"
|
||||
},
|
||||
"fetcher": "fetchFromGitHub"
|
||||
},
|
||||
@@ -1326,10 +1326,10 @@
|
||||
"fetcher": "fetchFromGitiles"
|
||||
}
|
||||
},
|
||||
"electron_yarn_hash": "0hm126bl9cscs2mjb3yx2yr4b22agqp9r0c5kv25r3lvc020r9pk",
|
||||
"electron_yarn_hash": "sha256-ouaxVsLQ+IapxTJxM7KFuLq9PSsMRhPwrWYT/opxE0I=",
|
||||
"modules": "136",
|
||||
"node": "22.21.1",
|
||||
"version": "37.10.2"
|
||||
"version": "37.10.3"
|
||||
},
|
||||
"38": {
|
||||
"chrome": "140.0.7339.249",
|
||||
@@ -1388,10 +1388,10 @@
|
||||
},
|
||||
"src/electron": {
|
||||
"args": {
|
||||
"hash": "sha256-1C17jQP8TFxBTHhIz+fHB83OFOykzZToPOrwzl+NN9Q=",
|
||||
"hash": "sha256-gSW1dI2PBGaLleuekWEI8Om/HE+V7w7QPy3wWxfN0V0=",
|
||||
"owner": "electron",
|
||||
"repo": "electron",
|
||||
"tag": "v38.7.1"
|
||||
"tag": "v38.7.2"
|
||||
},
|
||||
"fetcher": "fetchFromGitHub"
|
||||
},
|
||||
@@ -2650,13 +2650,13 @@
|
||||
"fetcher": "fetchFromGitiles"
|
||||
}
|
||||
},
|
||||
"electron_yarn_hash": "1knhw3blk3bl2a8nl58ik272qj2q0cpqiih5gcsds1na3bbkbn2z",
|
||||
"electron_yarn_hash": "sha256-R5AHeNFOeH7ZXipzM9u08KG5zJhkDDTW4kGt3BYYN64=",
|
||||
"modules": "139",
|
||||
"node": "22.21.1",
|
||||
"version": "38.7.1"
|
||||
"version": "38.7.2"
|
||||
},
|
||||
"39": {
|
||||
"chrome": "142.0.7444.175",
|
||||
"chrome": "142.0.7444.265",
|
||||
"chromium": {
|
||||
"deps": {
|
||||
"gn": {
|
||||
@@ -2665,15 +2665,15 @@
|
||||
"version": "0-unstable-2025-09-18"
|
||||
}
|
||||
},
|
||||
"version": "142.0.7444.175"
|
||||
"version": "142.0.7444.265"
|
||||
},
|
||||
"chromium_npm_hash": "sha256-i1eQ4YlrWSgY522OlFtGDDPmxE2zd1hDM03AzR8RafE=",
|
||||
"deps": {
|
||||
"src": {
|
||||
"args": {
|
||||
"hash": "sha256-nRZWCvoGYS4gxoJidkKGqTMGUuFfXfhIrHc3j/xRlaI=",
|
||||
"hash": "sha256-VJKx61JTIGg4j/kNqtOWkYOsy0xYYZbuyoiKFVcbZgc=",
|
||||
"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": "142.0.7444.175",
|
||||
"tag": "142.0.7444.265",
|
||||
"url": "https://chromium.googlesource.com/chromium/src.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
@@ -2712,10 +2712,10 @@
|
||||
},
|
||||
"src/electron": {
|
||||
"args": {
|
||||
"hash": "sha256-Zvu8Puh7j/u84cigKtfhOjBcxIYKJAv1mmbmIFRwdNY=",
|
||||
"hash": "sha256-udrEpPg2LDThZDTXJ1jpkIEiDwlD7lRUJsV6HSwN0i8=",
|
||||
"owner": "electron",
|
||||
"repo": "electron",
|
||||
"tag": "v39.2.3"
|
||||
"tag": "v39.3.0"
|
||||
},
|
||||
"fetcher": "fetchFromGitHub"
|
||||
},
|
||||
@@ -2745,8 +2745,8 @@
|
||||
},
|
||||
"src/third_party/angle": {
|
||||
"args": {
|
||||
"hash": "sha256-PM7msE9678QFyr7qp47Bc0vTntsSCeB/cirg9ME6TZk=",
|
||||
"rev": "7b27cb13556246035dfc7b308702b1b20710df47",
|
||||
"hash": "sha256-CCjQue8xv/t81I3ncqS6Ib3hjcs+FKCB+yvNUE+A+Dc=",
|
||||
"rev": "7628a2726022fc768f2464ed5060bbc97e13f77a",
|
||||
"url": "https://chromium.googlesource.com/angle/angle.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
@@ -3009,8 +3009,8 @@
|
||||
},
|
||||
"src/third_party/devtools-frontend/src": {
|
||||
"args": {
|
||||
"hash": "sha256-qiucde85rKA7TefveIa++sOF+MzT56pe8pHUUCj9Zeo=",
|
||||
"rev": "f063edc91e3610a60fb9d486ae8694f2a11fcd17",
|
||||
"hash": "sha256-4SIqiDQtelkjdzTSDfB5GCymh+24MoiN77NNCxTV6qU=",
|
||||
"rev": "747b0d1aebe33e5fc3d32677eb88315ab000eb5e",
|
||||
"url": "https://chromium.googlesource.com/devtools/devtools-frontend"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
@@ -3991,16 +3991,16 @@
|
||||
},
|
||||
"src/v8": {
|
||||
"args": {
|
||||
"hash": "sha256-jECAfgeAgdkhbI/8BgT9TakR9Ylha2zPznjZzibPQbE=",
|
||||
"rev": "baea8d627b70725fb777ebc1074f8ec4110ef6cb",
|
||||
"hash": "sha256-FNEyH9sT59A0SFRloRMbK1YOy/slwtAz2/+T4mlCdWs=",
|
||||
"rev": "8fa4e7c7469cd4d321e2241b86f684d52197a615",
|
||||
"url": "https://chromium.googlesource.com/v8/v8.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
}
|
||||
},
|
||||
"electron_yarn_hash": "19mpwfjb85d9kw1awiymj47h06rjk6vxqcgfajh612cgwkbz4m6f",
|
||||
"electron_yarn_hash": "sha256-veyZGCQJO23iQk4gmFo5oLASxamiYm4tAQSUS12IGxg=",
|
||||
"modules": "140",
|
||||
"node": "22.21.1",
|
||||
"version": "39.2.3"
|
||||
"version": "39.3.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i python -p python3.pkgs.joblib python3.pkgs.click python3.pkgs.click-log nix nurl prefetch-yarn-deps prefetch-npm-deps gclient2nix
|
||||
#! nix-shell -i python -p python3.pkgs.joblib python3.pkgs.click python3.pkgs.click-log nix nurl prefetch-npm-deps yarn-berry_4.yarn-berry-fetcher nix-prefetch-git gclient2nix
|
||||
"""
|
||||
electron updater
|
||||
|
||||
@@ -115,12 +115,12 @@ def get_chromium_gn_source(chromium_tag: str) -> dict:
|
||||
|
||||
@memory.cache
|
||||
def get_electron_yarn_hash(electron_tag: str) -> str:
|
||||
print(f"prefetch-yarn-deps", file=sys.stderr)
|
||||
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(["prefetch-yarn-deps", tmp_dir + "/yarn.lock"])
|
||||
subprocess.check_output(["yarn-berry-fetcher", "prefetch", tmp_dir + "/yarn.lock"])
|
||||
.decode("utf-8")
|
||||
.strip()
|
||||
)
|
||||
|
||||
@@ -23,9 +23,9 @@ let
|
||||
};
|
||||
# ./update-zen.py lqx
|
||||
lqx = {
|
||||
version = "6.18.4"; # lqx
|
||||
version = "6.18.6"; # lqx
|
||||
suffix = "lqx1"; # lqx
|
||||
sha256 = "1ihg5mzh6ns43r4s7bzz9lna7hyqj1br9mc79whpbhpb6pj0xvvg"; # lqx
|
||||
sha256 = "18b5yw91k4m9cfa2gw6n07sw3xfnzs9xx7hb0ls26r4d8jn01lsq"; # lqx
|
||||
isLqx = true;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1525,11 +1525,6 @@ with pkgs;
|
||||
|
||||
certipy = with python3Packages; toPythonApplication certipy-ad;
|
||||
|
||||
chipsec = callPackage ../tools/security/chipsec {
|
||||
kernel = null;
|
||||
withDriver = false;
|
||||
};
|
||||
|
||||
fedora-backgrounds = recurseIntoAttrs (callPackage ../data/misc/fedora-backgrounds { });
|
||||
|
||||
coconut = with python312Packages; toPythonApplication coconut;
|
||||
|
||||
@@ -373,7 +373,7 @@ in
|
||||
|
||||
ch9344 = callPackage ../os-specific/linux/ch9344 { };
|
||||
|
||||
chipsec = callPackage ../tools/security/chipsec {
|
||||
chipsec = callPackage ../by-name/ch/chipsec/package.nix {
|
||||
inherit kernel;
|
||||
withDriver = true;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user