Merge master into staging-nixos

This commit is contained in:
nixpkgs-ci[bot]
2025-12-29 00:21:19 +00:00
committed by GitHub
38 changed files with 2707 additions and 4997 deletions
+4 -2
View File
@@ -152,7 +152,10 @@ in
RuntimeDirectory = "keyd";
# Hardening
CapabilityBoundingSet = [ "CAP_SYS_NICE" ];
CapabilityBoundingSet = [
"CAP_SYS_NICE"
"CAP_IPC_LOCK"
];
DeviceAllow = [
"char-input rw"
"/dev/uinput rw"
@@ -170,7 +173,6 @@ in
ProtectKernelTunables = true;
ProtectControlGroups = true;
MemoryDenyWriteExecute = true;
RestrictRealtime = true;
LockPersonality = true;
ProtectProc = "invisible";
SystemCallFilter = [
+1 -1
View File
@@ -312,5 +312,5 @@ in
inherit buildNeovimPlugin;
}
// lib.optionalAttrs config.allowAliases {
buildNeovimPluginFrom2Nix = lib.warn "buildNeovimPluginFrom2Nix was renamed to buildNeovimPlugin" buildNeovimPlugin;
buildNeovimPluginFrom2Nix = throw "buildNeovimPluginFrom2Nix was renamed to buildNeovimPlugin" buildNeovimPlugin; # converted to throw on 2025-12-30
}
@@ -1130,11 +1130,11 @@
"vendorHash": "sha256-33NOGIvqLpgndG68GxAeoiISjWV7ApR4jmvqyZHjPKo="
},
"rootlyhq_rootly": {
"hash": "sha256-FfGASW8NlaGHbJXIwrJQ9DokLIDTXrdaojLnfsV0wHw=",
"hash": "sha256-aAZTcZ97/rPOfvBwmPTp3BF/G0IkrCrx0u4yPiTfXrY=",
"homepage": "https://registry.terraform.io/providers/rootlyhq/rootly",
"owner": "rootlyhq",
"repo": "terraform-provider-rootly",
"rev": "v5.2.0",
"rev": "v5.2.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-H0ohTNvSeFYEhHFIJoY37asNWwe+s2RKsDzYbx1CkJw="
},
+2 -2
View File
@@ -26,7 +26,7 @@ buildGoModule (finalAttrs: {
# Use only versions specified in anytype-ts middleware.version file:
# https://github.com/anyproto/anytype-ts/blob/v<anytype-ts-version>/middleware.version
version = "0.46.3";
version = "0.44.0-nightly.20251220.1";
# Update only together with 'anytype' package.
# nixpkgs-update: no auto update
@@ -34,7 +34,7 @@ buildGoModule (finalAttrs: {
owner = "anyproto";
repo = "anytype-heart";
tag = "v${finalAttrs.version}";
hash = "sha256-g3YAi7T6E0o2xjCpmnwmKUugEKyziJIYRaPU4dQH9xw=";
hash = "sha256-eQ7fPD/8tQBdAnu1Ze7Pn9HL4sOq0rcqG7ofhwn6OwM=";
};
vendorHash = "sha256-s/otpfRwXFUOek8oVr5eUcKH4Vwd5BbtB0GH+hjzjwI=";
+5 -5
View File
@@ -14,23 +14,23 @@
buildNpmPackage (finalAttrs: {
pname = "anytype";
version = "0.52.4";
version = "0.53.1";
src = fetchFromGitHub {
owner = "anyproto";
repo = "anytype-ts";
tag = "v${finalAttrs.version}";
hash = "sha256-4R0ROpMH49BrUcjd9Xcgs7wRo1flMg7kEsZS51uL5nE=";
hash = "sha256-GDx40UA+Grc/xvlfwqtN1WNonm9c0dci1rereWpfhjs=";
};
locales = fetchFromGitHub {
owner = "anyproto";
repo = "l10n-anytype-ts";
rev = "910cbb5b05cc390e53205fe275768166c946c041";
hash = "sha256-H6f/3paRKJd/GdZBJt0IHLbaGbbXpsbqjvDPu628JGE=";
rev = "f9dc9286757c2544fe801a1e31067cbe708cc6f1";
hash = "sha256-/rZCpeKGtPttYbuJbhbOV4P1sXSvIYve0WO/SL20isw=";
};
npmDepsHash = "sha256-k6iAWWbLmKSoqvWFyd//zlNy/LrdD77qlngL9QeP+nw=";
npmDepsHash = "sha256-hJJK/RJnSm8QpjGcnxUsemrAsRNYCHSGSH8iUZZYXJI=";
env = {
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
+5 -4
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "arping";
version = "2.26";
version = "2.27";
src = fetchFromGitHub {
owner = "ThomasHabets";
repo = "arping";
rev = "arping-${version}";
hash = "sha256-uZsUo12ez6sz95fmOg5cmVBJNRH3eEhio8V2efQ29BU=";
tag = "arping-${version}";
hash = "sha256-GfIH38LWSayaFXIxi3M3QDkkoYzJoAHMK+hvQgXL1iQ=";
};
nativeBuildInputs = [
@@ -30,7 +30,8 @@ stdenv.mkDerivation rec {
meta = {
description = "Broadcasts a who-has ARP packet on the network and prints answers";
homepage = "https://github.com/ThomasHabets/arping";
license = with lib.licenses; [ gpl2Plus ];
changelog = "https://github.com/ThomasHabets/arping/releases/tag/${src.tag}";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ michalrus ];
platforms = lib.platforms.unix;
mainProgram = "arping";
+3 -3
View File
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-binstall";
version = "1.16.5";
version = "1.16.6";
src = fetchFromGitHub {
owner = "cargo-bins";
repo = "cargo-binstall";
tag = "v${version}";
hash = "sha256-BDXGv3oXruz+g6Y3pqvNYfeiDVM9JEfrHm0uCqeF7VA=";
hash = "sha256-6acLC+ufODhCvHn7g+yzaN+qnTDjUrCBIX8uOj0PPgg=";
};
cargoHash = "sha256-yS3nq6vzPWZLPqQZkXGT8bPweFpS6KyoY1NpBeHvT3M=";
cargoHash = "sha256-IPDhTbYRtL4nBdNgaQfZ2M+RwZYC5eJfs/+VNlOXodo=";
nativeBuildInputs = [
pkg-config
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "cdncheck";
version = "1.2.15";
version = "1.2.16";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "cdncheck";
tag = "v${version}";
hash = "sha256-o6QPCv8c8ssMyKqcZN3HfbnEGy7Wps104pKL+3d+RNk=";
hash = "sha256-wwBVFADPjN1KydWDsZO5tea0aRJlyIU6zTEDXLXm6P8=";
};
vendorHash = "sha256-sS91wOiFUH6dh3O6icTRnwHRIq5Q1B+j9j33IUehAc0=";
vendorHash = "sha256-0aaneqeIlp+vBRdR5REOq3JOvFS0DOSH6RBo+OmaytU=";
subPackages = [ "cmd/cdncheck/" ];
+58
View File
@@ -0,0 +1,58 @@
{
lib,
fetchFromGitea,
python3Packages,
wrapGAppsHook4,
gobject-introspection,
libadwaita,
meson,
ninja,
pkg-config,
desktop-file-utils,
}:
python3Packages.buildPythonApplication rec {
pname = "censor";
version = "0.3.0";
pyproject = false;
src = fetchFromGitea {
domain = "codeberg.org";
owner = "censor";
repo = "Censor";
tag = "v${version}";
hash = "sha256-16Cy9yNOLvdVZ234kTB8fa585eI4f7yVnbMoPcHtGHk=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
gobject-introspection
wrapGAppsHook4
desktop-file-utils
];
buildInputs = [
libadwaita
];
dependencies = with python3Packages; [
pygobject3
pymupdf
];
dontWrapGApps = true;
preFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
meta = {
description = "PDF document redaction for the GNOME desktop";
homepage = "https://codeberg.org/censor/Censor";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ onny ];
mainProgram = "censor";
};
}
+3 -3
View File
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "gfold";
version = "2025.9.0";
version = "2025.12.0";
src = fetchFromGitHub {
owner = "nickgerace";
repo = "gfold";
tag = finalAttrs.version;
hash = "sha256-sPvhZaDGInXH2PT8fg28m7wyDZiIE4fFScNO8WIjV9s=";
hash = "sha256-lqDKPIWvwu60S6miSQ3TvHxhI9xuiN8VwmEz670UR78=";
};
cargoHash = "sha256-pbIE8QXY8lYsDGdmGVsOPesVTaHRjDBSd7ihQhN2XrI=";
cargoHash = "sha256-g4keAwNMPmhthbKF8uiPcciOVa1gUe1bDsvWtKc/M5I=";
nativeBuildInputs = [ mold ];
+3 -3
View File
@@ -62,12 +62,12 @@ let
};
};
unstable = {
version = "2.4-unstable-2025-10-26";
version = "2.4.0-unstable-2025-12-23";
src = fetchFromGitHub {
owner = "gpac";
repo = "gpac";
rev = "e1a54e81b3befba2b0bffd1d4c1cf50da516c5f3";
hash = "sha256-jSMBPuWPmTDCebImdmAcCZl0hEQpJK4QMNGcEXgs3A4=";
rev = "035540740e7a9901cd5f5b08ff5df4f31ac28ec2";
hash = "sha256-CAP6NYSU+ctjl9BMD22rybNcWVm3eAVDAiZKfp8/xDc=";
};
updateScript = unstableGitUpdater {
tagFormat = "v*";
+2 -2
View File
@@ -9,13 +9,13 @@
}:
let
version = "2.5.0";
version = "2.6.0";
src = fetchFromGitHub {
owner = "rvaiya";
repo = "keyd";
rev = "v" + version;
hash = "sha256-pylfQjTnXiSzKPRJh9Jli1hhin/MIGIkZxLKxqlReVo=";
hash = "sha256-l7yjGpicX1ly4UwF7gcOTaaHPRnxVUMwZkH70NDLL5M=";
};
pypkgs = python3.pkgs;
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "postfix-tlspol";
version = "1.8.23";
version = "1.8.24";
src = fetchFromGitHub {
owner = "Zuplu";
repo = "postfix-tlspol";
tag = "v${version}";
hash = "sha256-JNWSt1q/rI9JT10xD04hR0zhSb8tHyFqE5WwAPTyY8c=";
hash = "sha256-uWtpNdI4rbNEc3Ix0KMxwKEHtpDR7Atshut1DmPLxxc=";
};
vendorHash = null;
+3 -3
View File
@@ -7,16 +7,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "prmt";
version = "0.1.8";
version = "0.2.2";
src = fetchFromGitHub {
repo = "prmt";
owner = "3axap4eHko";
tag = "v${finalAttrs.version}";
hash = "sha256-XQazhPdBosQEPn5yvHdLh4ux6I8xjtM2Xtm7wBMQGss=";
hash = "sha256-n5Tq6fnImE744/QaQzkqrRsqk76YNrQUp8/cOEly06I=";
};
cargoHash = "sha256-QXDBZjBjNXZVvL83x9b5oNfwgBnkyYCb+e4HKGu2/g0=";
cargoHash = "sha256-6meuA7D5JoSvG9aAGy+rglt66qckvJBn0FhmYFAiTdA=";
# Fail to run in sandbox environment
checkFlags = map (t: "--skip ${t}") [
+2 -2
View File
@@ -14,13 +14,13 @@ assert (!blas.isILP64) && (!lapack.isILP64);
stdenv.mkDerivation (finalAttrs: {
pname = "scs";
version = "3.2.9";
version = "3.2.10";
src = fetchFromGitHub {
owner = "cvxgrp";
repo = "scs";
tag = finalAttrs.version;
hash = "sha256-/PJKZvYYPHGuByIf70oa2U53fY2W46/lp+OXXBM1vTU=";
hash = "sha256-HrKtl9GO0olH+AUgpkIDfz7jtYyREJCGZAM+0xVTmgE=";
};
# Actually link and add libgfortran to the rpath
+8 -8
View File
@@ -12,18 +12,18 @@
let
isCross = stdenv.hostPlatform != stdenv.buildPlatform;
in
rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage (finalAttrs: {
pname = "texlab";
version = "5.24.0";
version = "5.25.0";
src = fetchFromGitHub {
owner = "latex-lsp";
repo = "texlab";
tag = "v${version}";
hash = "sha256-gwF4cBlS43u2PfOQBxD7iq2JL9tUo8TPJqR0tWNdW9k=";
tag = "v${finalAttrs.version}";
hash = "sha256-UI88DQjLRJRPgKX3A+PoLNzgm/9uJeNERTrzh5mnAEk=";
};
cargoHash = "sha256-9sAurVJSpLNgQvJOG7kSXHIr38MHsw3BhGAaxi9xjUE=";
cargoHash = "sha256-xDLKuAfLyo3V++OKb+anw9oHxehwUxqfnDCuT2GSDWw=";
outputs = [ "out" ] ++ lib.optional (!isCross) "man";
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec {
# generate the man page
postInstall = lib.optionalString (!isCross) ''
# TexLab builds man page separately in CI:
# https://github.com/latex-lsp/texlab/blob/v5.24.0/.github/workflows/publish.yml#L110-L114
# https://github.com/latex-lsp/texlab/blob/v5.25.0/.github/workflows/publish.yml#L110-L114
help2man --no-info "$out/bin/texlab" > texlab.1
installManPage texlab.1
'';
@@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec {
meta = {
description = "Implementation of the Language Server Protocol for LaTeX";
homepage = "https://github.com/latex-lsp/texlab";
changelog = "https://github.com/latex-lsp/texlab/blob/v${version}/CHANGELOG.md";
changelog = "https://github.com/latex-lsp/texlab/blob/v${finalAttrs.version}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
doronbehar
@@ -56,4 +56,4 @@ rustPlatform.buildRustPackage rec {
platforms = lib.platforms.all;
mainProgram = "texlab";
};
}
})
+2 -2
View File
@@ -40,13 +40,13 @@ effectiveStdenv.mkDerivation (finalAttrs: {
strictDeps = true;
pname = "ucc";
version = "1.5.1";
version = "1.6.0";
src = fetchFromGitHub {
owner = "openucx";
repo = "ucc";
tag = "v${finalAttrs.version}";
hash = "sha256-gNLpcVvOsBCR0+KL21JSdWZyt/Z8EjQQTiHJw5vzOOo=";
hash = "sha256-xt138R3lSArfkxi/qJgR2xMlhhtm0hAwIUZBLpwFwvc=";
};
outputs = [
+2 -2
View File
@@ -42,13 +42,13 @@ stdenv.mkDerivation (finalAttrs: {
strictDeps = true;
pname = "ucx";
version = "1.19.0";
version = "1.19.1";
src = fetchFromGitHub {
owner = "openucx";
repo = "ucx";
tag = "v${finalAttrs.version}";
hash = "sha256-n3xJmbvUXZzfhotOBJRyH2OEL4NFZIKyB808HwEQSYo=";
hash = "sha256-54yLejOFdCa2KYstZuo+hZ5lSQR8WTZMa7lS0prc5NY=";
};
outputs = [
@@ -1,32 +1,37 @@
{
lib,
config,
buildPythonPackage,
fetchFromGitHub,
pytestCheckHook,
# build-system
setuptools,
setuptools-scm,
numpy,
jaxlib,
jax,
torch,
dask,
sparse,
# tests
array-api-strict,
config,
cudaSupport ? config.cudaSupport,
dask,
jax,
jaxlib,
numpy,
pytestCheckHook,
sparse,
torch,
cupy,
cudaSupport ? config.cudaSupport,
}:
buildPythonPackage rec {
pname = "array-api-compat";
version = "1.12";
version = "1.13";
pyproject = true;
src = fetchFromGitHub {
owner = "data-apis";
repo = "array-api-compat";
tag = version;
hash = "sha256-Hb0bFjVMl4CBI3gN3abTO2QUPAOvUaFE0GdPjdops5E=";
hash = "sha256-4ZoYtqkY/xPRyBP1xeMR80zMfwiaKtXX/3XzqiweCtc=";
};
build-system = [
@@ -35,14 +40,14 @@ buildPythonPackage rec {
];
nativeCheckInputs = [
pytestCheckHook
numpy
jaxlib
jax
torch
dask
sparse
array-api-strict
dask
jax
jaxlib
numpy
pytestCheckHook
sparse
torch
]
++ lib.optionals cudaSupport [ cupy ];
@@ -56,6 +56,16 @@ buildPythonPackage rec {
pytestCheckHook
];
disabledTests = [
# Jax 0.8.2 incompatibility (reported at https://github.com/google-deepmind/chex/issues/422)
# AssertionError: AssertionError not raised
"test_assert_tree_is_on_device"
# AssertionError: "\[Chex\]\ [\s\S]*sharded arrays are disallowed" does not match ...
"test_assert_tree_is_on_host"
# AssertionError: [Chex] Assertion assert_tree_is_sharded failed: ...
"test_assert_tree_is_sharded"
];
meta = {
description = "Library of utilities for helping to write reliable JAX code";
homepage = "https://github.com/deepmind/chex";
@@ -1,23 +1,25 @@
{
buildPythonPackage,
fetchPypi,
lib,
flit-core,
buildPythonPackage,
click,
colorama,
deprecation-alias,
domdf-python-tools,
fetchPypi,
flit-core,
mistletoe,
psutil,
typing-extensions,
}:
buildPythonPackage rec {
pname = "consolekit";
version = "1.9.0";
version = "1.11.0";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-gePFFOq6jQF0QA0gls1+cjdNMRutZfM2Og6/FpP0w3Q=";
hash = "sha256-PZGrN5GJVtDruZkW3bJJpOfTi1nT3lN6XoBaaMLJE8E=";
};
build-system = [ flit-core ];
@@ -31,9 +33,16 @@ buildPythonPackage rec {
typing-extensions
];
optional-dependencies = {
terminals = [ psutil ];
};
pythonImportsCheck = [ "consolekit" ];
meta = {
description = "Additional utilities for click";
homepage = "https://github.com/domdfcoding/consolekit";
changelog = "https://github.com/domdfcoding/consolekit/releases/tag/v${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ tyberius-prime ];
};
@@ -25,7 +25,7 @@
buildPythonPackage rec {
pname = "debugpy";
version = "1.8.17";
version = "1.8.19";
pyproject = true;
src = fetchFromGitHub {
@@ -42,7 +42,7 @@ buildPythonPackage rec {
sed -i 's/git_refnames = "[^"]*"/git_refnames = " (tag: ${src.tag})"/' "$out/src/debugpy/_version.py"
'';
hash = "sha256-eAiCtSJUqLASapxnYCyq1UCiGz6QmKQum7Vs3MoU1s8=";
hash = "sha256-O9RHqyV7xMMnouCp4t18CNH/z2jBxZBUkybAw1c2gY0=";
};
patches = [
@@ -79,20 +79,21 @@ buildPythonPackage rec {
# Derived from linux_and_mac/compile_linux.sh & linux_and_mac/compile_mac.sh
preBuild = ''
(
set -x
cd src/debugpy/_vendored/pydevd/pydevd_attach_to_process
$CXX linux_and_mac/attach.cpp -Ilinux_and_mac -std=c++11 -fPIC -nostartfiles ${
{
"x86_64-linux" = "-shared -o attach_linux_amd64.so";
"i686-linux" = "-shared -o attach_linux_x86.so";
"aarch64-linux" = "-shared -o attach_linux_arm64.so";
"riscv64-linux" = "-shared -o attach_linux_riscv64.so";
"x86_64-darwin" = "-D_REENTRANT -dynamiclib -lc -o attach.dylib";
"aarch64-darwin" = "-D_REENTRANT -dynamiclib -lc -o attach.dylib";
}
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")
set -x
cd src/debugpy/_vendored/pydevd/pydevd_attach_to_process
$CXX linux_and_mac/attach.cpp -Ilinux_and_mac -std=c++11 -fPIC -nostartfiles ${
{
"x86_64-linux" = "-shared -o attach_linux_amd64.so";
"i686-linux" = "-shared -o attach_linux_x86.so";
"aarch64-linux" = "-shared -o attach_linux_arm64.so";
"riscv64-linux" = "-shared -o attach_linux_riscv64.so";
"x86_64-darwin" = "-D_REENTRANT -dynamiclib -lc -o attach.dylib";
"aarch64-darwin" = "-D_REENTRANT -dynamiclib -lc -o attach.dylib";
}
)'';
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")
}
)
'';
build-system = [ setuptools ];
@@ -39,6 +39,12 @@ buildPythonPackage rec {
--replace-fail "speed < 0.5" "speed < 1" \
--replace-fail "speed < 1" "speed < 20" \
--replace-fail "speed < 2" "speed < 20"
''
# Fix jax 0.8.2 compat
# Fix submitted upstream: https://github.com/patrick-kidger/equinox/pull/1162
+ ''
substituteInPlace equinox/_ad.py equinox/internal/_primitive.py \
--replace-fail "jax.core.get_aval(" "jax.typeof("
'';
build-system = [ hatchling ];
@@ -50,8 +50,8 @@ buildPythonPackage rec {
.${stdenv.hostPlatform.system};
hash =
{
x86_64-linux = "sha256-RStw7hDLmsXX38pV/7zbibbIvGunCkWvfEkNHc6pjrc=";
aarch64-linux = "sha256-pjHQaJkDNUr9ez0uxZW32gamIwp22gD/lUj1QrIbYlA=";
x86_64-linux = "sha256-47q0HKfEjkFj255+/ScbOqhfD+RfXtBwjWu+2TpZ+Xc=";
aarch64-linux = "sha256-cXobGWpkJAnOGV3fAxwgu+rcyIb1Xkmh0/SSc3Ou7a4=";
}
.${stdenv.hostPlatform.system};
};
@@ -39,32 +39,42 @@ let
"3.11-x86_64-linux" = getSrcFromPypi {
platform = "manylinux_2_27_x86_64";
dist = "cp311";
hash = "sha256-R5ykONVVAk2sjdEFg3Hvv49HmBmnCuohPz8wN+zpnXQ=";
hash = "sha256-CwozBM5+SUrNjZxZNJDBEqMs22AQ/hr8WE2eQf2GMWc=";
};
"3.11-aarch64-linux" = getSrcFromPypi {
platform = "manylinux_2_27_aarch64";
dist = "cp311";
hash = "sha256-szg73AufYmDZrcTKDR9ovyQRWN/mnXJrJnsGgTgup6c=";
hash = "sha256-cNMyIkhK1cN1uPg1e3wjysuET27Pw5Vn+N1H/eboeFg=";
};
"3.12-x86_64-linux" = getSrcFromPypi {
platform = "manylinux_2_27_x86_64";
dist = "cp312";
hash = "sha256-tgvwu9okzsb6cRcL1pthM1nwGjdtjgn+NL9n7MmjFk8=";
hash = "sha256-IBZYYbPT5m67LA9jpUfR1e4X6kSsO+cVPHkIycqMiPM=";
};
"3.12-aarch64-linux" = getSrcFromPypi {
platform = "manylinux_2_27_aarch64";
dist = "cp312";
hash = "sha256-OFAB9W+FKVnwYa4VrRV8OcxEccjR0lRN/D+AVoSsIhM=";
hash = "sha256-QD1eB3MbXNrDvZ+z9Ei9hIAGLLLAq2HqKtI/zQplR5o=";
};
"3.13-x86_64-linux" = getSrcFromPypi {
platform = "manylinux_2_27_x86_64";
dist = "cp313";
hash = "sha256-c0LIgQzJR9548oxyh6MLLiAbD1FXhUPdJVNpK3mkmUI=";
hash = "sha256-gsZ5i+Zr+MdzOGkY5MjlzYEZdT87+zyku8RoGCg3UMY=";
};
"3.13-aarch64-linux" = getSrcFromPypi {
platform = "manylinux_2_27_aarch64";
dist = "cp313";
hash = "sha256-2nwPLvHGl/mt5Rpxz60hHiv/JUB6aFXd3eNywBkPxGg=";
hash = "sha256-Y3OH3DQIzSBFYmaFAvnpX3bG7d4KbS5I8FUWLcKuvw0=";
};
"3.14-x86_64-linux" = getSrcFromPypi {
platform = "manylinux_2_27_x86_64";
dist = "cp314";
hash = "sha256-pYmLrB2KtgILVFRkQCVkCfLGa8u7OhCZykc8hIQ63a0=";
};
"3.14-aarch64-linux" = getSrcFromPypi {
platform = "manylinux_2_27_aarch64";
dist = "cp314";
hash = "sha256-WMUUc/xiLgMTgDWYX3QYM1ZNcKS9WiF49htizaoy/5Q=";
};
};
in
@@ -41,7 +41,7 @@ let
in
buildPythonPackage rec {
pname = "jax";
version = "0.8.1";
version = "0.8.2";
pyproject = true;
src = fetchFromGitHub {
@@ -49,7 +49,7 @@ buildPythonPackage rec {
repo = "jax";
# google/jax contains tags for jax and jaxlib. Only use jax tags!
tag = "jax-v${version}";
hash = "sha256-e1XqcecIl8TGOZmA1FuWg8uwVUvgSdp8uYltXm9cJpQ=";
hash = "sha256-WKdFEhOxJPLjOXOChZbLRGcw0GFeg/TT/FT6M72C6bo=";
};
patches = [
@@ -187,6 +187,7 @@ buildPythonPackage rec {
meta = {
description = "Source-built JAX frontend: differentiate, compile, and transform Numpy code";
homepage = "https://github.com/google/jax";
changelog = "https://docs.jax.dev/en/latest/changelog.html";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [
GaetanLepage
+26 -10
View File
@@ -18,7 +18,7 @@
}:
let
version = "0.8.1";
version = "0.8.2";
inherit (python) pythonVersion;
# As of 2023-06-06, google/jax upstream is no longer publishing CPU-only wheels to their GCS bucket. Instead the
@@ -49,49 +49,65 @@ let
"3.11-x86_64-linux" = getSrcFromPypi {
platform = "manylinux_2_27_x86_64";
dist = "cp311";
hash = "sha256-IvSJ+1yL4Np75eSVehCTazdgoWlmj4slxdCcUcPvR/Y=";
hash = "sha256-zPd9qReiCTUkfJkGkd7Py90Gwl7wrJTZFKBKrbIvcUw=";
};
"3.11-aarch64-linux" = getSrcFromPypi {
platform = "manylinux_2_27_aarch64";
dist = "cp311";
hash = "sha256-/zK2Mg1ykTHvryKTmCW1LXWVfITDKvKwsb2zPPJ7p18=";
hash = "sha256-u4m+RSsbgI0/iPwBxBWzZKJgvkzHrBIMA4AJ9hUKMtw=";
};
"3.11-aarch64-darwin" = getSrcFromPypi {
platform = "macosx_11_0_arm64";
dist = "cp311";
hash = "sha256-hlrdVhOYg0BfPxXJsN5qZKuPSqVJ3/GWty28hr5szB8=";
hash = "sha256-SQvwywKcc8ZclDESS4bNyVCC28H7dvxUnSTXXaM+VFQ=";
};
"3.12-x86_64-linux" = getSrcFromPypi {
platform = "manylinux_2_27_x86_64";
dist = "cp312";
hash = "sha256-r0kkGJ/FO2kjdxW1bry/xxu5HKFhhBQ9zvDUMMgXPeY=";
hash = "sha256-K5eJvQj4sMxaXBKuiW/kMtWULjLkFwkbi1qWqab9XPE=";
};
"3.12-aarch64-linux" = getSrcFromPypi {
platform = "manylinux_2_27_aarch64";
dist = "cp312";
hash = "sha256-vtHpSujHwWvKRHbY1/WC8NGhAqTmnDqb0gaaDcQidKk=";
hash = "sha256-OxblDFtzDJ3QpJ5V8az6pyKwCxrwUipZFVjcwEZCUvI=";
};
"3.12-aarch64-darwin" = getSrcFromPypi {
platform = "macosx_11_0_arm64";
dist = "cp312";
hash = "sha256-iL3g9TXu6maJ4M1X1At2YNUgaslcfULglWKhCbljpJ8=";
hash = "sha256-Aj3m8/Vtoq9wN5cJllAFhjMf21C1MOy7VLlmbaYzvQA=";
};
"3.13-x86_64-linux" = getSrcFromPypi {
platform = "manylinux_2_27_x86_64";
dist = "cp313";
hash = "sha256-0kW9aieccspfeW34TN1k18nIq8S42JrfSs9FiY2rlYs=";
hash = "sha256-G/vPbD3iIXhPpM22dloJ1xy0KYsVYms9BAmz382Khmc=";
};
"3.13-aarch64-linux" = getSrcFromPypi {
platform = "manylinux_2_27_aarch64";
dist = "cp313";
hash = "sha256-vWl8FxrOHi6dbtkQp484WzxAlc7ikLAlWqWISPKs3qs=";
hash = "sha256-fDBPOgFpZbnR9SOaigOZpzkl9WBP6RTFymbs9zS/ZCI=";
};
"3.13-aarch64-darwin" = getSrcFromPypi {
platform = "macosx_11_0_arm64";
dist = "cp313";
hash = "sha256-oDSfboF53Il9M665DsZrSoBBMw+7uo0HHcYWfNInFTk=";
hash = "sha256-TQBtuWvgIMgWUhKhIWNy+KysT/T4+wZ3Q9aU7yswGs4=";
};
"3.14-x86_64-linux" = getSrcFromPypi {
platform = "manylinux_2_27_x86_64";
dist = "cp314";
hash = "sha256-5ql9+wIy7tmiu244KOT2gtusGn/qhAv9pXTK4tv1+vk=";
};
"3.14-aarch64-linux" = getSrcFromPypi {
platform = "manylinux_2_27_aarch64";
dist = "cp314";
hash = "sha256-aBCN/w3nStxGgBa+mhn4Dv5IxmDA1aEiKHCUtEsJKvw=";
};
"3.14-aarch64-darwin" = getSrcFromPypi {
platform = "macosx_11_0_arm64";
dist = "cp314";
hash = "sha256-vv+wBOfutcmvskQ54rLPRaTuPj6K30XjVe3yr2Ks+Lg=";
};
};
in
@@ -2,22 +2,22 @@
#! nix-shell -i sh -p jq
prefetch() {
expr="(import <nixpkgs> { system = \"$2\"; config.cudaSupport = true; }).python$1.pkgs.$3.src.url"
url=$(NIX_PATH=.. nix-instantiate --eval -E "$expr" | jq -r)
echo "$url"
sha256=$(nix-prefetch-url "$url")
nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$sha256"
echo
expr="(import <nixpkgs> { system = \"$2\"; config.cudaSupport = true; }).python$1.pkgs.$3.src.url"
url=$(NIX_PATH=.. nix-instantiate --eval -E "$expr" | jq -r)
echo "$url"
sha256=$(nix-prefetch-url "$url")
nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$sha256"
echo
}
for py in "311" "312" "313"; do
prefetch "$py" "x86_64-linux" "jaxlib-bin"
prefetch "$py" "aarch64-linux" "jaxlib-bin"
prefetch "$py" "aarch64-darwin" "jaxlib-bin"
prefetch "$py" "x86_64-linux" "jax-cuda12-plugin"
prefetch "$py" "aarch64-linux" "jax-cuda12-plugin"
for py in "311" "312" "313" "314"; do
prefetch "$py" "x86_64-linux" "jaxlib-bin"
prefetch "$py" "aarch64-linux" "jaxlib-bin"
prefetch "$py" "aarch64-darwin" "jaxlib-bin"
prefetch "$py" "x86_64-linux" "jax-cuda12-plugin"
prefetch "$py" "aarch64-linux" "jax-cuda12-plugin"
done
for arch in "x86_64-linux" "aarch64-linux"; do
prefetch "312" "$arch" "jax-cuda12-pjrt"
prefetch "312" "$arch" "jax-cuda12-pjrt"
done
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "pypck";
version = "0.9.8";
version = "0.9.9";
pyproject = true;
src = fetchFromGitHub {
owner = "alengwenus";
repo = "pypck";
tag = version;
hash = "sha256-UQL56CUeHhW9aPOv0stAfvW4ZbFZaylsPgdI++EuSCY=";
hash = "sha256-EsPfPRYp75GML9JMoFPf5U8obh51LjIkg/FFRNkrEOY=";
};
postPatch = ''
File diff suppressed because it is too large Load Diff
@@ -0,0 +1 @@
node_modules
@@ -56,9 +56,9 @@ if (json.type !== "success") {
let pkgs = R.pipe(
mapObjIndexedReturnArray((value, key) => ({
...value,
nameWithVersion: key
nameWithVersion: key,
})),
R.uniqBy(R.prop("resolved"))
R.uniqBy(R.prop("resolved")),
)(json.object);
(async () => {
@@ -83,7 +83,7 @@ let pkgs = R.pipe(
// print to stdout
console.log(generateNix(pkgs, options["--builtin-fetchgit"]));
}
})().catch(error => {
})().catch((error) => {
console.error(error);
process.exit(1);
@@ -0,0 +1,24 @@
import js from "@eslint/js";
import globals from "globals";
import { defineConfig } from "eslint/config";
export default defineConfig([
{ files: ["**/*.{js,mjs,cjs}"],
plugins: { js },
extends: ["js/recommended"],
rules: {
"no-unused-vars": [
"error",
{
"argsIgnorePattern": "^_",
"varsIgnorePattern": "^_",
"caughtErrorsIgnorePattern": "^_",
"destructuredArrayIgnorePattern": "^_"
}
]
},
},
{ files: ["**/*.js"], languageOptions: { sourceType: "commonjs" } },
{ files: ["**/*.{js,mjs,cjs}"], languageOptions: { globals: globals.node } },
]);
@@ -7,7 +7,7 @@ const crypto = require("crypto");
function getSha1(url) {
return new Promise((resolve, reject) => {
https.get(url, res => {
https.get(url, (res) => {
const { statusCode } = res;
const hash = crypto.createHash("sha1");
@@ -20,7 +20,7 @@ function getSha1(url) {
reject(err);
}
res.on("data", chunk => {
res.on("data", (chunk) => {
hash.update(chunk);
});
@@ -39,7 +39,7 @@ async function fixPkgAddMissingSha1(pkg) {
if (!pkg.resolved) {
console.error(
`yarn2nix: can't find "resolved" field for package ${pkg.nameWithVersion}, you probably required it using "file:...", this feature is not supported, ignoring`
`yarn2nix: can't find "resolved" field for package ${pkg.nameWithVersion}, you probably required it using "file:...", this feature is not supported, ignoring`,
);
return pkg;
}
@@ -57,7 +57,7 @@ async function fixPkgAddMissingSha1(pkg) {
return {
...pkg,
resolved: `${url}#${newSha1}`
resolved: `${url}#${newSha1}`,
};
}
@@ -39,9 +39,9 @@ function prefetchgit(url, rev) {
["--rev", rev, url, "--fetch-submodules"],
{
stdio: ["ignore", "pipe", "ignore"],
timeout: 60000
}
)
timeout: 60000,
},
),
).sha256;
}
@@ -90,18 +90,18 @@ function parseIntegrity(maybeIntegrity, fallbackHash) {
}
}
algo = integrities.pickAlgorithm();
hash = integrities[algo][0].digest;
const algo = integrities.pickAlgorithm();
const hash = integrities[algo][0].digest;
return { algo, hash };
}
function fetchLockedDep(builtinFetchGit) {
return function(pkg) {
return function (pkg) {
const { integrity, nameWithVersion, resolved } = pkg;
if (!resolved) {
console.error(
`yarn2nix: can't find "resolved" field for package ${nameWithVersion}, you probably required it using "file:...", this feature is not supported, ignoring`
`yarn2nix: can't find "resolved" field for package ${nameWithVersion}, you probably required it using "file:...", this feature is not supported, ignoring`,
);
return "";
}
@@ -122,7 +122,7 @@ function fetchLockedDep(builtinFetchGit) {
githubUrl,
githubRev,
branch || "master",
builtinFetchGit
builtinFetchGit,
);
}
@@ -138,7 +138,7 @@ function fetchLockedDep(builtinFetchGit) {
urlForGit,
rev,
branch || "master",
builtinFetchGit
builtinFetchGit,
);
}
@@ -165,12 +165,12 @@ const HEAD = `
function generateNix(pkgs, builtinFetchGit) {
const nameWithVersionAndPackageNix = R.map(
fetchLockedDep(builtinFetchGit),
pkgs
pkgs,
);
const packagesDefinition = R.join(
"\n",
R.values(nameWithVersionAndPackageNix)
R.values(nameWithVersionAndPackageNix),
);
return R.join("\n", [HEAD, packagesDefinition, " ];", "}"]);
@@ -15,7 +15,7 @@ const keys = require("ramda/src/keys");
*/
const mapObjIndexedReturnArray = _curry2((fn, obj) =>
_map(key => fn(obj[key], key, obj), keys(obj))
_map((key) => fn(obj[key], key, obj), keys(obj)),
);
module.exports = mapObjIndexedReturnArray;
@@ -15,30 +15,31 @@
"yarn2nix": "bin/yarn2nix.js"
},
"engines": {
"node": ">=8.0.0"
"node": ">=22.0.0"
},
"dependencies": {
"@yarnpkg/lockfile": "^1.1.0",
"deep-equal": "^1.0.1",
"deep-equal": "^2.2.3",
"docopt": "^0.6.2",
"ramda": "^0.26.1",
"ssri": "^10.0.0"
"ramda": "^0.32",
"ssri": "^13.0.0"
},
"devDependencies": {
"@eslint/js": "^9.39.1",
"babel-eslint": "^10.0.1",
"eslint": "^5.11.1",
"eslint-config-airbnb": "^17.1.0",
"eslint-config-prettier": "^3.3.0",
"eslint-config-standard": "^12.0.0",
"eslint": "^9.39.1",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-prettier": "^10.1.8",
"eslint-config-standard": "^17.1.0",
"eslint-plugin-import": "^2.14.0",
"eslint-plugin-jsx-a11y": "^6.1.2",
"eslint-plugin-node": "^8.0.0",
"eslint-plugin-promise": "^4.0.1",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^7.2.1",
"eslint-plugin-react": "^7.12.2",
"eslint-plugin-standard": "^4.0.0",
"husky": "^1.3.1",
"lint-staged": "^8.1.0",
"prettier-eslint-cli": "^4.7.1"
"globals": "^16.5.0",
"husky": "^9.1.7",
"lint-staged": "^16.2.7",
"prettier-eslint-cli": "^8.0.1"
},
"husky": {
"hooks": {
File diff suppressed because it is too large Load Diff