mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
Compare commits
14 commits
c8ece7def6
...
55a15e1f03
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
55a15e1f03 |
||
|
|
736070fcf2 |
||
|
|
d56e845ed2 |
||
|
|
e726a48228 |
||
|
|
6962c72f2e | ||
|
|
b8e319966c |
||
|
|
49cd7d7ebf |
||
|
|
27b2adf0e0 | ||
|
|
0f40be3ba0 |
||
|
|
f29510d730 | ||
|
|
f967783fb7 | ||
|
|
15061a39c9 | ||
|
|
42b17b7fbf | ||
|
|
15a8dc0f13 |
7 changed files with 24 additions and 17 deletions
|
|
@ -79,6 +79,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||||
__structuredAttrs = true;
|
__structuredAttrs = true;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
# Fails to build on darwin due to libiconv linking failure (ld: library not found for -liconv)
|
||||||
|
# See https://github.com/NixOS/nixpkgs/pull/523442 for a (failed) attempt at fixing the issue
|
||||||
|
broken = stdenv.buildPlatform.isDarwin;
|
||||||
changelog = "https://github.com/extism/js-pdk/releases/tag/${finalAttrs.src.tag}";
|
changelog = "https://github.com/extism/js-pdk/releases/tag/${finalAttrs.src.tag}";
|
||||||
description = "Write Extism plugins in JavaScript & TypeScript (WASM core)";
|
description = "Write Extism plugins in JavaScript & TypeScript (WASM core)";
|
||||||
homepage = "https://github.com/extism/js-pdk";
|
homepage = "https://github.com/extism/js-pdk";
|
||||||
|
|
|
||||||
|
|
@ -56,6 +56,12 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } (finalAttrs: {
|
||||||
|
|
||||||
cargoHash = "sha256-rmt2b8lk/9ts8v33yguuSFcbFvUX00icg1onmhCbDTQ=";
|
cargoHash = "sha256-rmt2b8lk/9ts8v33yguuSFcbFvUX00icg1onmhCbDTQ=";
|
||||||
|
|
||||||
|
# don't use lld on aarch64-linux
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace .cargo/config.toml \
|
||||||
|
--replace-fail 'rustflags = ["-C", "link-arg=-fuse-ld=lld"]' ""
|
||||||
|
'';
|
||||||
|
|
||||||
env = {
|
env = {
|
||||||
# See pkgs/by-name/ne/neovide/package.nix
|
# See pkgs/by-name/ne/neovide/package.nix
|
||||||
SKIA_SOURCE_DIR =
|
SKIA_SOURCE_DIR =
|
||||||
|
|
|
||||||
|
|
@ -10,13 +10,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "rlottie";
|
pname = "rlottie";
|
||||||
version = "0.2-unstable-2025-10-01";
|
version = "0.2-unstable-2026-07-03";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Samsung";
|
owner = "Samsung";
|
||||||
repo = "rlottie";
|
repo = "rlottie";
|
||||||
rev = "671c561130ead1c6e44805a7ec1263573a3440fd";
|
rev = "f487eff2f8086b84ae1c7faa0418abec909e874b";
|
||||||
hash = "sha256-od3zatv4ZxUIoLkwy0TT8lAsDcjoPS4plci+ZDyz34Y=";
|
hash = "sha256-/Sv5qX1V6VltJN0+bkKU2utaj8Yw1owb0KjJFWv41Js=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
||||||
|
|
@ -21,13 +21,13 @@
|
||||||
}:
|
}:
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "vicinae";
|
pname = "vicinae";
|
||||||
version = "0.21.7";
|
version = "0.22.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "vicinaehq";
|
owner = "vicinaehq";
|
||||||
repo = "vicinae";
|
repo = "vicinae";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-r4BuhKyW4sxin0YG3/EJjed/MiP5NwN7QGiM1ySozjE=";
|
hash = "sha256-f1d88cdqe1PfeuzY90JIRCoHKLV1Uuakc4TpSNvNBKA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
apiDeps = fetchNpmDeps {
|
apiDeps = fetchNpmDeps {
|
||||||
|
|
|
||||||
|
|
@ -58,17 +58,13 @@ buildPythonPackage rec {
|
||||||
export LOCUSTCLOUD_PASSWORD=dummy
|
export LOCUSTCLOUD_PASSWORD=dummy
|
||||||
'';
|
'';
|
||||||
|
|
||||||
disabledTests = [
|
|
||||||
# AssertionError
|
|
||||||
"test_recursive_imports"
|
|
||||||
"test_from_import_file"
|
|
||||||
];
|
|
||||||
|
|
||||||
disabledTestPaths = [
|
disabledTestPaths = [
|
||||||
# Tests require network access
|
# Tests require network access
|
||||||
"tests/web_login_test.py"
|
"tests/web_login_test.py"
|
||||||
"tests/cloud_test.py"
|
"tests/cloud_test.py"
|
||||||
"tests/websocket_test.py"
|
"tests/websocket_test.py"
|
||||||
|
# AssertionError
|
||||||
|
"tests/import_finder_test.py"
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
|
|
||||||
|
|
@ -29,6 +29,9 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
|
sphinxSupported = !sphinx.disabled;
|
||||||
|
|
||||||
self = buildPythonPackage rec {
|
self = buildPythonPackage rec {
|
||||||
pname = "pip";
|
pname = "pip";
|
||||||
version = "25.3";
|
version = "25.3";
|
||||||
|
|
@ -51,9 +54,8 @@ let
|
||||||
flit-core
|
flit-core
|
||||||
installShellFiles
|
installShellFiles
|
||||||
]
|
]
|
||||||
++ lib.optionals (pythonAtLeast "3.11") [
|
++ lib.optionals sphinxSupported [
|
||||||
# docs
|
# docs
|
||||||
# (sphinx requires Python 3.11)
|
|
||||||
sphinx
|
sphinx
|
||||||
sphinx-issues
|
sphinx-issues
|
||||||
];
|
];
|
||||||
|
|
@ -61,13 +63,13 @@ let
|
||||||
outputs = [
|
outputs = [
|
||||||
"out"
|
"out"
|
||||||
]
|
]
|
||||||
++ lib.optionals (pythonAtLeast "3.11") [
|
++ lib.optionals sphinxSupported [
|
||||||
"man"
|
"man"
|
||||||
];
|
];
|
||||||
|
|
||||||
# pip uses a custom sphinx extension and unusual conf.py location, mimic the internal build rather than attempting
|
# pip uses a custom sphinx extension and unusual conf.py location, mimic the internal build rather than attempting
|
||||||
# to fit sphinxHook see https://github.com/pypa/pip/blob/0778c1c153da7da457b56df55fb77cbba08dfb0c/noxfile.py#L129-L148
|
# to fit sphinxHook see https://github.com/pypa/pip/blob/0778c1c153da7da457b56df55fb77cbba08dfb0c/noxfile.py#L129-L148
|
||||||
postBuild = lib.optionalString (pythonAtLeast "3.11") ''
|
postBuild = lib.optionalString sphinxSupported ''
|
||||||
cd docs
|
cd docs
|
||||||
|
|
||||||
# remove references to sphinx extentions only required for html doc generation
|
# remove references to sphinx extentions only required for html doc generation
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "26.03";
|
version = "26.06";
|
||||||
|
|
||||||
commonMeta = {
|
commonMeta = {
|
||||||
description = "Various coreboot-related tools";
|
description = "Various coreboot-related tools";
|
||||||
|
|
@ -47,7 +47,7 @@ let
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "https://review.coreboot.org/coreboot";
|
url = "https://review.coreboot.org/coreboot";
|
||||||
rev = finalAttrs.version;
|
rev = finalAttrs.version;
|
||||||
hash = "sha256-gaJ9AP7g0KxOzZfg1dyNatC8/pl83pypeq5Lg+Qp1ys=";
|
hash = "sha256-rL9txaDXUzjkC2ioYmunoNq2+9rz9wpEJ7z3GZrqOH4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue