mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-09-29 19:30:11 +00:00
Merge staging-next into staging
This commit is contained in:
nixpkgs-ci[bot]
@@ -2066,6 +2066,7 @@ in
|
||||
xautolock = runTest ./xautolock.nix;
|
||||
xfce = runTest ./xfce.nix;
|
||||
xfce-wayland = runTest ./xfce-wayland.nix;
|
||||
xinetd = runTest ./xinetd.nix;
|
||||
xmonad = runTest ./xmonad.nix;
|
||||
xmonad-xdg-autostart = runTest ./xmonad-xdg-autostart.nix;
|
||||
xpadneo = runTest ./xpadneo.nix;
|
||||
|
||||
65
nixos/tests/xinetd.nix
Normal file
65
nixos/tests/xinetd.nix
Normal file
@@ -0,0 +1,65 @@
|
||||
{ lib, pkgs, ... }:
|
||||
{
|
||||
name = "xinetd";
|
||||
meta.maintainers = [ lib.maintainers.h7x4 ];
|
||||
|
||||
containers.machine = {
|
||||
environment.systemPackages = [ pkgs.netcat ];
|
||||
|
||||
services.xinetd = {
|
||||
enable = true;
|
||||
services = [
|
||||
{
|
||||
name = "ping-pong-tcp";
|
||||
protocol = "tcp";
|
||||
port = 8765;
|
||||
unlisted = true;
|
||||
server =
|
||||
let
|
||||
pingPongTcp = pkgs.writeShellScript "ping-pong-tcp" ''
|
||||
read -r line
|
||||
if [ "$line" = "ping" ]; then
|
||||
echo "pong"
|
||||
fi
|
||||
'';
|
||||
in
|
||||
"${pingPongTcp}";
|
||||
}
|
||||
{
|
||||
name = "ping-pong-udp";
|
||||
protocol = "udp";
|
||||
port = 8766;
|
||||
unlisted = true;
|
||||
server =
|
||||
let
|
||||
pingPongUdp = pkgs.writers.writePython3 "ping-pong-udp" { } ''
|
||||
import socket
|
||||
|
||||
sock = socket.socket(fileno=0)
|
||||
data, peer = sock.recvfrom(1024)
|
||||
sock.connect(peer)
|
||||
if data.strip() == b"ping":
|
||||
sock.send(b"pong\n")
|
||||
'';
|
||||
in
|
||||
"${pingPongUdp}";
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
start_all()
|
||||
|
||||
machine.wait_for_unit("xinetd.service")
|
||||
machine.wait_for_open_port(8765)
|
||||
|
||||
with subtest("Query TCP"):
|
||||
output = machine.succeed("nc -w5 localhost 8765 <<<ping")
|
||||
assert "pong" in output, f"Unexpected output: {output}"
|
||||
|
||||
with subtest("Query UDP"):
|
||||
output = machine.succeed("nc -u -w5 localhost 8766 <<<ping")
|
||||
assert "pong" in output, f"Unexpected output: {output}"
|
||||
'';
|
||||
}
|
||||
@@ -9,11 +9,11 @@
|
||||
"vendorHash": "sha256-RTfj2Omiqe92Ad0swEY/aGIMvcXb39bdQoObYKiekiw="
|
||||
},
|
||||
"a10networks_thunder": {
|
||||
"hash": "sha256-jwk2DKNYlYB6VJ9Y73SbLOcRzELqJTKbD0KOsrTqT3I=",
|
||||
"hash": "sha256-wqTaX8tJvQa4P2VyirjyaPiWtvLMqrAhmi0oeKJPYD4=",
|
||||
"homepage": "https://registry.terraform.io/providers/a10networks/thunder",
|
||||
"owner": "a10networks",
|
||||
"repo": "terraform-provider-thunder",
|
||||
"rev": "v1.6.1",
|
||||
"rev": "v1.6.2",
|
||||
"spdx": "BSD-2-Clause",
|
||||
"vendorHash": null
|
||||
},
|
||||
@@ -328,11 +328,11 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"digitalocean_digitalocean": {
|
||||
"hash": "sha256-pv2Suo2PpX0+D5rYno6sprrirt70mwx+lBjGPW8UTmA=",
|
||||
"hash": "sha256-fmSMSvmJKFVeZwXUoy+hLjC3rk1mRenhx9206FdIe2E=",
|
||||
"homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean",
|
||||
"owner": "digitalocean",
|
||||
"repo": "terraform-provider-digitalocean",
|
||||
"rev": "v2.100.0",
|
||||
"rev": "v2.102.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@@ -526,13 +526,13 @@
|
||||
"vendorHash": "sha256-qRX2liR1MQy8JuOuUknV70dibU4mgih3nJOy7/raBug="
|
||||
},
|
||||
"hashicorp_awscc": {
|
||||
"hash": "sha256-juctslCHuUr3pL9VTOET/s3P0SGbtlInZESmvgNL+7M=",
|
||||
"hash": "sha256-K2F3+jf1kTbduP87bxsy00Z1bJSMsNENTjCLMCYGtiA=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/awscc",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-awscc",
|
||||
"rev": "v1.101.0",
|
||||
"rev": "v1.102.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-YTTTjXGnWNBD4oA1mLdumXd8ZGZ03M5tXrW9OFao1pM="
|
||||
"vendorHash": "sha256-JEPUJRuVkvZe6XEQWAe++4eUGE8/q3kMzr85LLR9qsE="
|
||||
},
|
||||
"hashicorp_azuread": {
|
||||
"hash": "sha256-mEYEZIztDjyqWSJFoJPXtV0E9YikumtwGVtZA4Jfw3U=",
|
||||
@@ -941,13 +941,13 @@
|
||||
"vendorHash": "sha256-ulhKT0DaS6gg9Ucz9pqqIg4mxRpGDGz2rN1R0RNuumg="
|
||||
},
|
||||
"mongodb_mongodbatlas": {
|
||||
"hash": "sha256-bSZBt8kPo4rhkgCYIBJvU8EEN5rPrG6EcjMUbdzE6gw=",
|
||||
"hash": "sha256-F0SKTzkM/I4LT2e9kbfmRRBLWp2EI1vKX5Ypu145KA0=",
|
||||
"homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas",
|
||||
"owner": "mongodb",
|
||||
"repo": "terraform-provider-mongodbatlas",
|
||||
"rev": "v2.17.0",
|
||||
"rev": "v2.18.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-6R9s/9SnkTqk9sYZhW/O5U/opqnTTMqx4SRnMF+vpHE="
|
||||
"vendorHash": "sha256-wmA9pSlOnkQ3qvmFkIPS5PPXcLrFrud9bD30vq76ZYg="
|
||||
},
|
||||
"namecheap_namecheap": {
|
||||
"hash": "sha256-eV2K3KHTEXEEt1WXwfYfNMK+gLUY0EoHFQg9kLdAI3s=",
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "claude-powerline";
|
||||
version = "1.30.3";
|
||||
version = "1.31.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Owloops";
|
||||
repo = "claude-powerline";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-MBCISwf1xfiBD172IIl51t3Pun5gkjRnwhpWF0Y9Riw=";
|
||||
hash = "sha256-W1DoOJ6w/9bU3nnrQBwGWeQbVjvuB38kEd67R4Kvufg=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-D3Z5tb4phZUMPQaXvfYiIWuwaX5YGI8ubgyV7sSJqQk=";
|
||||
|
||||
@@ -29,18 +29,18 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "codex";
|
||||
version = "0.155.1";
|
||||
version = "0.156.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openai";
|
||||
repo = "codex";
|
||||
tag = "rust-v${finalAttrs.version}";
|
||||
hash = "sha256-iFW66odceRNBsVG5bD9SdcQGxhpm/QIZwYjGCrfMXiI=";
|
||||
hash = "sha256-H53f57hmnyCtn5yPxtBe/A92qyQyzQBeU/vK2qSBrvI=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/codex-rs";
|
||||
|
||||
cargoHash = "sha256-6IAX/SFSSgSKKFxKsUXoZ9nNQaHJ+EjZ5a4bJwyDdF0=";
|
||||
cargoHash = "sha256-W87rX/W2J1pwqNrihX+Rj6DfagoZYuB6C+l/S4BhyJM=";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -63,6 +63,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
substituteInPlace Cargo.toml \
|
||||
--replace-fail 'lto = "thin"' "" \
|
||||
--replace-fail 'codegen-units = 4' ""
|
||||
|
||||
sed -i '1i#![recursion_limit = "256"]' chatgpt/src/lib.rs
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "dgop";
|
||||
version = "1.6.0";
|
||||
version = "1.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AvengeMedia";
|
||||
repo = "dgop";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-5oGojLTg8DjsKn97EurssiZJlpdUD9AvhaM/jXjK3+o=";
|
||||
hash = "sha256-0zWMFcxLZEVPzCRe5yDgPlPHBNgw3MMq78MAUvGNu/4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-agVGh6togqHNCU7/3xDnmfF6bNlm2TAnXw5JhhUivgs=";
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.315.0";
|
||||
version = "0.315.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evcc-io";
|
||||
repo = "evcc";
|
||||
tag = version;
|
||||
hash = "sha256-lnFsLTEz5tC07fyx95zYnvBfx3FGKKlGLbi0RsTpDBY=";
|
||||
hash = "sha256-PMPj3N1BkVSBqm/rULQhpJvOn2eFcb+WUXDqQgDvyTA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-JUJFOQQpbPkb4aI2SjRaTbZzTxWpV1wbWJH7EgGqmHY=";
|
||||
|
||||
@@ -7,9 +7,9 @@
|
||||
|
||||
buildDotnetGlobalTool (finalAttrs: {
|
||||
pname = "fable";
|
||||
version = "5.17.0";
|
||||
version = "5.17.2";
|
||||
|
||||
nugetHash = "sha256-4PQsqgQmgLmKCNCoI6I/mLqviHQG5Ob1QWlR35jRx1o=";
|
||||
nugetHash = "sha256-XJB59cqLDsEtcyAvbbuhSkjkooFKiHiwp9jrKouPPtk=";
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_10_0;
|
||||
dotnet-runtime = dotnetCorePackages.runtime_10_0;
|
||||
|
||||
@@ -28,7 +28,7 @@ let
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gopass";
|
||||
version = "1.16.1";
|
||||
version = "1.17.3";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
@@ -39,10 +39,10 @@ buildGoModule (finalAttrs: {
|
||||
owner = "gopasspw";
|
||||
repo = "gopass";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Yr66+LUEoONNkSQUQhIWtLvxN0a5YtRVbn/nJRLqn+E=";
|
||||
hash = "sha256-UlnibTEge5eCW7PZqQBWlZUaaYtNLKywbyacTs/Af/M=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ebnnnAD7SQJrSVOPborHUWd8ThOstIgihEIUjrnCztQ=";
|
||||
vendorHash = "sha256-2J0/eyEhMsDCXmRCeQx3vMZZc+1T2oz8p0y2Csv7VU4=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "Jan";
|
||||
version = "0.8.4";
|
||||
|
||||
darwin-src = fetchzip {
|
||||
@@ -25,7 +24,8 @@ let
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract {
|
||||
inherit pname version;
|
||||
pname = "Jan";
|
||||
inherit version;
|
||||
src = linux-src;
|
||||
};
|
||||
|
||||
@@ -45,7 +45,8 @@ let
|
||||
};
|
||||
|
||||
linux = appimageTools.wrapType2 {
|
||||
inherit pname version;
|
||||
pname = "Jan";
|
||||
inherit version;
|
||||
src = linux-src;
|
||||
|
||||
extraInstallCommands = ''
|
||||
@@ -53,17 +54,17 @@ let
|
||||
cp -r ${appimageContents}/usr/share/icons $out/share
|
||||
'';
|
||||
|
||||
extraPkgs =
|
||||
pkgs:
|
||||
lib.optionals cudaSupport [
|
||||
cudaPackages.cudatoolkit
|
||||
];
|
||||
extraPkgs = pkgs: lib.optionals cudaSupport [ cudaPackages.cuda_cudart ];
|
||||
|
||||
inherit passthru meta;
|
||||
};
|
||||
|
||||
darwin = stdenvNoCC.mkDerivation {
|
||||
inherit pname version;
|
||||
pname = "Jan";
|
||||
inherit version;
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = darwin-src;
|
||||
|
||||
@@ -76,11 +77,11 @@ let
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/Applications/${pname}.app
|
||||
mkdir -p $out/Applications/Jan.app
|
||||
mkdir -p $out/bin
|
||||
cp -R $src/. $out/Applications/${pname}.app/
|
||||
if [ -x "$out/Applications/${pname}.app/Contents/MacOS/${pname}" ]; then
|
||||
makeWrapper "$out/Applications/${pname}.app/Contents/MacOS/${pname}" $out/bin/${pname}
|
||||
cp -R $src/. $out/Applications/Jan.app/
|
||||
if [ -x "$out/Applications/Jan.app/Contents/MacOS/Jan" ]; then
|
||||
makeWrapper "$out/Applications/Jan.app/Contents/MacOS/Jan" $out/bin/Jan
|
||||
fi
|
||||
|
||||
runHook postInstall
|
||||
|
||||
@@ -1,23 +1,23 @@
|
||||
diff --git a/kitty/key_names.py b/kitty/key_names.py
|
||||
index 1c4ce3487..00d767d45 100644
|
||||
--- a/kitty/key_names.py
|
||||
+++ b/kitty/key_names.py
|
||||
@@ -59,17 +59,7 @@ if is_macos:
|
||||
else:
|
||||
diff --git i/kitty/key_names.py w/kitty/key_names.py
|
||||
index d496339..2a1d9bc 100644
|
||||
--- i/kitty/key_names.py
|
||||
+++ w/kitty/key_names.py
|
||||
@@ -67,17 +67,7 @@ def get_key_name_lookup() -> LookupFunc:
|
||||
def load_libxkb_lookup() -> LookupFunc:
|
||||
import ctypes
|
||||
|
||||
- for suffix in ('.0', ''):
|
||||
- with suppress(Exception):
|
||||
- lib = ctypes.CDLL(f'libxkbcommon.so{suffix}')
|
||||
- break
|
||||
- else:
|
||||
- from ctypes.util import find_library
|
||||
-
|
||||
- lname = find_library('xkbcommon')
|
||||
- if lname is None:
|
||||
- raise RuntimeError('Failed to find libxkbcommon')
|
||||
- lib = ctypes.CDLL(lname)
|
||||
-
|
||||
+ lib = ctypes.CDLL('@libxkbcommon@')
|
||||
|
||||
f = lib.xkb_keysym_from_name
|
||||
f.argtypes = [ctypes.c_char_p, ctypes.c_int]
|
||||
f.restype = ctypes.c_int
|
||||
|
||||
@@ -46,26 +46,27 @@
|
||||
makeBinaryWrapper,
|
||||
darwin,
|
||||
cairo,
|
||||
shader-slang,
|
||||
}:
|
||||
|
||||
with python3Packages;
|
||||
buildPythonApplication rec {
|
||||
pname = "kitty";
|
||||
version = "0.48.2";
|
||||
version = "0.49.0";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kovidgoyal";
|
||||
repo = "kitty";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-qNgVPpvMm8Y/nbBjVvWVuZ954ZXIuWmXhldP3w8MBhU=";
|
||||
hash = "sha256-C1roiJ+mAm8rEoG5VAQABYUq2FSFVuusNQ0PtLP0tPI=";
|
||||
};
|
||||
|
||||
goModules =
|
||||
(buildGo126Module {
|
||||
pname = "kitty-go-modules";
|
||||
inherit src version;
|
||||
vendorHash = "sha256-BZudfNfREwNrgalaimC5Lp+UIdFS+jHFLl9mEXcHYMI=";
|
||||
vendorHash = "sha256-G+eaFOFMIIu2Qo5Mgr3ejwoYrYmNv3EIdEEraDPIdeY=";
|
||||
}).goModules;
|
||||
|
||||
buildInputs = [
|
||||
@@ -108,11 +109,13 @@ buildPythonApplication rec {
|
||||
sphinx
|
||||
furo
|
||||
sphinx-copybutton
|
||||
sphinx-design
|
||||
sphinxext-opengraph
|
||||
sphinx-inline-tabs
|
||||
go_1_26
|
||||
fontconfig
|
||||
makeBinaryWrapper
|
||||
shader-slang
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
imagemagick
|
||||
@@ -294,6 +297,7 @@ buildPythonApplication rec {
|
||||
lib.makeBinPath [
|
||||
imagemagick
|
||||
ncurses.dev
|
||||
shader-slang
|
||||
]
|
||||
}"
|
||||
|
||||
|
||||
10
pkgs/by-name/mk/mkl-gnulibs/mkl.pc.in
Normal file
10
pkgs/by-name/mk/mkl-gnulibs/mkl.pc.in
Normal file
@@ -0,0 +1,10 @@
|
||||
prefix=@out@
|
||||
includedir=${prefix}/include
|
||||
libdir=${prefix}/lib
|
||||
|
||||
Name: mkl
|
||||
Description: Intel Math Kernel Library
|
||||
URL: https://software.intel.com/en-us/intel-mkl
|
||||
Version: @version@
|
||||
Cflags: -isystem${includedir}
|
||||
Libs: -Wl,-rpath,${libdir} -L${libdir} -lmkl_rt -lpthread -lm -ldl
|
||||
24
pkgs/by-name/mk/mkl-gnulibs/mkl_rt_shim.c
Normal file
24
pkgs/by-name/mk/mkl-gnulibs/mkl_rt_shim.c
Normal file
@@ -0,0 +1,24 @@
|
||||
#include <dlfcn.h>
|
||||
|
||||
__attribute__((constructor))
|
||||
static void preload_mkl()
|
||||
{
|
||||
// MKL libs must be loaded with RTLD_GLOBAL (see comments in mkl-service)
|
||||
// Without forcing it here, things fail at runtime when mkl_core tries to
|
||||
// dlopen libmkl_avx512, etc.
|
||||
dlopen("libmkl_core.so", RTLD_LAZY | RTLD_GLOBAL);
|
||||
dlopen("libmkl_gnu_thread.so", RTLD_LAZY | RTLD_GLOBAL);
|
||||
dlopen("libmkl_intel_lp64.so", RTLD_LAZY | RTLD_GLOBAL);
|
||||
}
|
||||
|
||||
// mkl-service, possibly others link against these, give it something to call
|
||||
|
||||
void MKL_Set_Threading_Layer()
|
||||
{
|
||||
// computer says no
|
||||
}
|
||||
|
||||
void MKL_Set_Interface_Layer()
|
||||
{
|
||||
// computer says no
|
||||
}
|
||||
83
pkgs/by-name/mk/mkl-gnulibs/package.nix
Normal file
83
pkgs/by-name/mk/mkl-gnulibs/package.nix
Normal file
@@ -0,0 +1,83 @@
|
||||
{
|
||||
callPackage,
|
||||
gcc,
|
||||
mkl,
|
||||
patchelf,
|
||||
}:
|
||||
|
||||
# Force MKL to link GNU openmp libs, not intel ones. Intel conflicts with
|
||||
# pytorch, libgbm, anything else compiled with gcc + openmp. We have not found
|
||||
# a way to reliably force this with the intel-provided auto-detecting
|
||||
# libmkl_rt.so. - therefore we replace it with libmkl_gf_lp64.so (which
|
||||
# already exports the full BLAS/LAPACK ABI directly, as well as using the
|
||||
# GNU Fortran conventions for complex scalars that consumers - like scipy -
|
||||
# expect), patched via patchelf to explicitly depend on the GNU-threaded
|
||||
# backend and our preload shim below.
|
||||
# Also, we must delete the libtbb.so in mkl as it ends up being used in rtech,
|
||||
# whilst we want the separate version that we compile against which does
|
||||
# have headers.
|
||||
mkl.overrideAttrs (
|
||||
finalAttrs: o: {
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
nativeBuildInputs = o.nativeBuildInputs ++ [
|
||||
gcc
|
||||
patchelf
|
||||
];
|
||||
|
||||
postFixup = (o.postFixup or "") + ''
|
||||
find $out/lib -name '*tbb*' -delete
|
||||
|
||||
rm $out/lib/libmkl_intel_thread.so
|
||||
rm $out/lib/libmkl_intel_thread.so.2
|
||||
rm $out/lib/pkgconfig/*iomp*.pc
|
||||
|
||||
gcc -shared ${./mkl_rt_shim.c} -o $out/lib/libmkl_rt_shim.so -L$out/lib -fopenmp
|
||||
|
||||
# libmkl_gf_lp64.so already exports the full BLAS/LAPACK ABI, and
|
||||
# (unlike the real libmkl_rt.so.2 we are replacing) leaves resolving
|
||||
# its internal mkl_blas_* etc. symbols up to whatever is linked in via
|
||||
# DT_NEEDED/RTLD_GLOBAL, rather than auto-detecting and dlopen-ing a
|
||||
# threading backend itself. So we base our libmkl_rt.so.2 replacement
|
||||
# on it, and explicitly wire up the GNU-threaded backend and our
|
||||
# preload shim (which also provides MKL_Set_*_Layer stubs, since
|
||||
# libmkl_gf_lp64.so does not). This keeps libmkl_rt.so.2 a real ELF
|
||||
# shared object (unlike a GNU ld linker script), so it still works
|
||||
# with tools that expect that, such as patchelf or dlopen.
|
||||
rm $out/lib/libmkl_rt.so.2
|
||||
cp $out/lib/libmkl_gf_lp64.so.2 $out/lib/libmkl_rt.so.2
|
||||
chmod +w $out/lib/libmkl_rt.so.2
|
||||
patchelf \
|
||||
--set-soname libmkl_rt.so.2 \
|
||||
--add-needed libmkl_core.so \
|
||||
--add-needed libmkl_gnu_thread.so \
|
||||
--add-needed libmkl_rt_shim.so \
|
||||
--add-rpath $out/lib \
|
||||
$out/lib/libmkl_rt.so.2
|
||||
chmod -w $out/lib/libmkl_rt.so.2
|
||||
|
||||
# If we call overrideAttrs on mkl to add the templated pc files later, we lose the extra attributes
|
||||
# we are setting, so we do the pc file generation here.
|
||||
substituteAll ${./mkl.pc.in} $out/lib/pkgconfig/mkl.pc
|
||||
# Need slightly different name for numpy, which special cases "mkl"
|
||||
substituteAll ${./mkl.pc.in} $out/lib/pkgconfig/mkl_rt.pc
|
||||
'';
|
||||
|
||||
# The postFixup above hardcodes .so extensions and relies on a Linux-only
|
||||
# OpenMP conflict (libgomp vs libiomp5), so this only makes sense on Linux,
|
||||
# unlike vanilla mkl which also supports Darwin.
|
||||
meta = (o.meta or { }) // {
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
|
||||
passthru = (o.passthru or { }) // {
|
||||
isILP64 = false;
|
||||
implementation = "mkl";
|
||||
blasProvider = finalAttrs.finalPackage;
|
||||
blasImplementation = "mkl";
|
||||
provider = finalAttrs.finalPackage;
|
||||
tests.gnu-openmp = callPackage ./test { mkl-gnulibs = finalAttrs.finalPackage; };
|
||||
};
|
||||
}
|
||||
)
|
||||
31
pkgs/by-name/mk/mkl-gnulibs/test/default.nix
Normal file
31
pkgs/by-name/mk/mkl-gnulibs/test/default.nix
Normal file
@@ -0,0 +1,31 @@
|
||||
{
|
||||
stdenv,
|
||||
pkg-config,
|
||||
mkl-gnulibs,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "mkl-gnulibs-test";
|
||||
version = mkl-gnulibs.version;
|
||||
|
||||
unpackPhase = ''
|
||||
cp ${./test.c} test.c
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ mkl-gnulibs ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
buildPhase = ''
|
||||
gcc test.c -o test $(pkg-config --cflags --libs mkl_rt) -fopenmp
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
touch $out
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
./test
|
||||
'';
|
||||
}
|
||||
24
pkgs/by-name/mk/mkl-gnulibs/test/test.c
Normal file
24
pkgs/by-name/mk/mkl-gnulibs/test/test.c
Normal file
@@ -0,0 +1,24 @@
|
||||
#include <assert.h>
|
||||
#include <dlfcn.h>
|
||||
#include <mkl_cblas.h>
|
||||
#include <omp.h>
|
||||
|
||||
int main()
|
||||
{
|
||||
/* Verify MKL BLAS computation works via libmkl_rt */
|
||||
float u[] = { 1., 2., 3. };
|
||||
float v[] = { 4., 5., 6. };
|
||||
assert(cblas_sdot(3, u, 1, v, 1) == 32.);
|
||||
|
||||
/* Verify GNU OpenMP is functional alongside MKL (simulates gcc+openmp consumers like pytorch) */
|
||||
int total = 0;
|
||||
#pragma omp parallel reduction(+ : total)
|
||||
total += 1;
|
||||
assert(total >= 1);
|
||||
|
||||
/* Verify Intel OpenMP is NOT loaded — its presence alongside libgomp causes the conflict
|
||||
that mkl-gnulibs exists to prevent */
|
||||
assert(dlopen("libiomp5.so", RTLD_NOLOAD | RTLD_LAZY) == NULL);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -90,7 +90,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mujoco";
|
||||
version = "3.13.0";
|
||||
version = "3.14.0";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
@@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "google-deepmind";
|
||||
repo = "mujoco";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-uf1AGy9OBdZUNOKHzBnQOibIR7yPRDOKwnivIqakkOI=";
|
||||
hash = "sha256-9h2glQJHeXjLgAwFx2g78O9p3euovKLRtlkD++6Qn+A=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -85,6 +85,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
# Tests are hardware-dependent
|
||||
"test_jetson_cuda_runtime_contract"
|
||||
"test_jetson_cuda_offloaded_surgery_contract"
|
||||
"test_policy_rejects_unknown_cpu_exclusion_gate"
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
|
||||
# aarch64-linux fails cpuinfo test, because /sys/devices/system/cpu/ does not exist in the sandbox:
|
||||
|
||||
@@ -32,7 +32,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "omp";
|
||||
version = "18.2.8";
|
||||
version = "18.2.10";
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
@@ -41,12 +41,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "can1357";
|
||||
repo = "oh-my-pi";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-651o7v60Zg6gfHJwpsyhxgKmGFNuDzARMyBjdToD474=";
|
||||
hash = "sha256-hxuGYuPchiLsiV4q8yy7kOrSJ8BJz9GWrSd4XTMx9jY=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-XT1sOG3jR3EkRHnKPUhQS695GrApZ1AAykA5NSVCLZI=";
|
||||
hash = "sha256-2V3Duou64p2Cl13hPOSv/nUHKqj25e4lgvievqQB9FU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# Prevents breaking symlinks in node_modules
|
||||
dontFixup = true;
|
||||
|
||||
outputHash = "sha256-FnXQapSrkrErdbMATY1pEyzkRrXdFlC2xALHL18Lerk=";
|
||||
outputHash = "sha256-dgUjGGHVfwtcS+Nz38NFOT7Xqu3TlDMLhVfRlMvfncI=";
|
||||
outputHashMode = "recursive";
|
||||
};
|
||||
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "scipopt-soplex";
|
||||
version = "8.0.3";
|
||||
version = "8.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scipopt";
|
||||
repo = "soplex";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-5UTlSfnNPVCkAE2oMVukVbbs2drbSh0HfiDqXUktBHQ=";
|
||||
hash = "sha256-Fc/BxyCBUP+a3X/Q0MYg2mvXTzwhn6uoJONg+FvDiXc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -16,16 +16,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "wlr-utils";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sjourdois";
|
||||
repo = "wlr-utils";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-H+XXWFmtjxSZEETUygdJCj0hHWWB/TO3QU83RL2oCqQ=";
|
||||
hash = "sha256-t82lbhTK50oodKyv//0DOJYfmbOxyJRT1Di+sWq3Y4g=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-fz3yVFfCEYq0rBwjeimez3XFIQbVrXvMzTF94X4aqHI=";
|
||||
cargoHash = "sha256-f71BIE2wDzj3D7mWBP0+Ol6yHADKQVAG13Ix/qpDcdM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
fetchurl,
|
||||
pkg-config,
|
||||
libtirpc,
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -25,6 +26,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libtirpc
|
||||
];
|
||||
|
||||
passthru.tests.nixos = nixosTests.xinetd;
|
||||
|
||||
meta = {
|
||||
description = "Secure replacement for inetd";
|
||||
platforms = lib.platforms.linux;
|
||||
|
||||
@@ -10,18 +10,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "zerofs";
|
||||
version = "2.3.3";
|
||||
version = "2.3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Barre";
|
||||
repo = "ZeroFS";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ItrRbZM8aPIHgVoM0tMKDv+H2rhxUUaX2n7HU+qMaWg=";
|
||||
hash = "sha256-uAXfq5LLnSv62IDX9H7j+XqAtOnyofzhkj2F3AY/lws=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/zerofs";
|
||||
|
||||
cargoHash = "sha256-y3ZerOXiQqtQEW4fbocpTBr/5xjryVrhz6VPMLg+1IY=";
|
||||
cargoHash = "sha256-djeu78G0T44mULNieHlC4Dx/Zdrwcyf9DXG1Ia9dTao=";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
backendStdenv,
|
||||
boost178,
|
||||
boost186,
|
||||
buildRedist,
|
||||
cudaAtLeast,
|
||||
e2fsprogs,
|
||||
@@ -47,6 +48,7 @@ buildRedist (
|
||||
lib.getLib qt.qtwayland;
|
||||
qtWaylandPlugins = "${qtwayland}/${qt.qtbase.qtPluginPrefix}";
|
||||
inherit (qt) wrapQtAppsHook qtwebengine;
|
||||
boost = if cudaAtLeast "13.4" then boost186 else boost178;
|
||||
in
|
||||
{
|
||||
redistName = "cuda";
|
||||
@@ -110,7 +112,7 @@ buildRedist (
|
||||
qt6.qttools
|
||||
qtwebengine
|
||||
qt6.qtwayland
|
||||
boost178
|
||||
boost
|
||||
e2fsprogs
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gstreamer
|
||||
|
||||
@@ -14,7 +14,7 @@ buildDunePackage (finalAttrs: {
|
||||
version = "0.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ocamllabs";
|
||||
owner = "yallop";
|
||||
repo = "ocaml-ctypes";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-Wlpk+/MSWmnIRsJfVQMTCYDRixuqLzDpdFNpkQyscA8=";
|
||||
@@ -31,7 +31,7 @@ buildDunePackage (finalAttrs: {
|
||||
checkInputs = [ ounit2 ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/ocamllabs/ocaml-ctypes";
|
||||
homepage = "https://github.com/yallop/ocaml-ctypes";
|
||||
description = "Library for binding to C libraries using pure OCaml";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.ericbmerritt ];
|
||||
|
||||
@@ -8,12 +8,12 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "6.14.3";
|
||||
version = "6.18.0";
|
||||
|
||||
# The PHAR file is only required to get the `composer.lock` file
|
||||
psalm-phar = fetchurl {
|
||||
url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar";
|
||||
hash = "sha256-dqRI73CdY51K1aitIK6R74Y2sLb68l4ndNuTzRv8qRE=";
|
||||
hash = "sha256-I3Yqogy3ge9Apfar6lqcilCgDvh4HNp8qRJLFE6ghAI=";
|
||||
};
|
||||
in
|
||||
php.buildComposerProject2 (finalAttrs: {
|
||||
@@ -24,14 +24,14 @@ php.buildComposerProject2 (finalAttrs: {
|
||||
owner = "vimeo";
|
||||
repo = "psalm";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-6MO16Ch3SR2kn48lTj64c/1DZDpsLjpZcFYmtiBhCCU=";
|
||||
hash = "sha256-J+73nh/5cx0YNGOzMQSTDmRpfUQ1Q57kL3pJRre1J/Q=";
|
||||
};
|
||||
|
||||
composerLock = runCommand "composer.lock" { } ''
|
||||
${lib.getExe php} -r '$phar = new Phar("${psalm-phar}"); $phar->extractTo(".", "composer.lock");'
|
||||
cp composer.lock $out
|
||||
'';
|
||||
vendorHash = "sha256-2LlP0D7b07yXVGc/+pJUUWYXF8rsc4HiErBUt5SfZmw=";
|
||||
vendorHash = "sha256-nHiN9lmp2hEHGRMwYBXcRPpPgOPnjSkStWrdb6Xgxns=";
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
@@ -3,11 +3,12 @@
|
||||
aiormq,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pyprojectVersionPatchHook,
|
||||
uv-build,
|
||||
yarl,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "aio-pika";
|
||||
version = "9.6.2";
|
||||
pyproject = true;
|
||||
@@ -15,7 +16,7 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "mosquito";
|
||||
repo = "aio-pika";
|
||||
tag = version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-N5MjFIolMRTTn4aV1NskBwonB/8FSuEZETumUrAa02Y=";
|
||||
};
|
||||
|
||||
@@ -24,8 +25,12 @@ buildPythonPackage rec {
|
||||
--replace-fail "uv_build>=0.9.26,<0.10.0" uv_build
|
||||
'';
|
||||
|
||||
pythonRelaxDeps = [ "aiormq" ];
|
||||
|
||||
build-system = [ uv-build ];
|
||||
|
||||
nativeBuildInputs = [ pyprojectVersionPatchHook ];
|
||||
|
||||
dependencies = [
|
||||
aiormq
|
||||
yarl
|
||||
@@ -40,8 +45,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "AMQP 0.9 client designed for asyncio and humans";
|
||||
homepage = "https://github.com/mosquito/aio-pika";
|
||||
changelog = "https://github.com/mosquito/aio-pika/blob/${version}/CHANGELOG.md";
|
||||
changelog = "https://github.com/mosquito/aio-pika/blob/${finalAttrs.version}/CHANGELOG.md";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ emilytrau ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
pamqp,
|
||||
uv-build,
|
||||
pyprojectVersionPatchHook,
|
||||
yarl,
|
||||
}:
|
||||
|
||||
@@ -28,6 +29,8 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ uv-build ];
|
||||
|
||||
nativeBuildInputs = [ pyprojectVersionPatchHook ];
|
||||
|
||||
dependencies = [
|
||||
pamqp
|
||||
yarl
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
{
|
||||
lib,
|
||||
async-lru,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools-scm,
|
||||
async-lru,
|
||||
pytestCheckHook,
|
||||
pytest-asyncio,
|
||||
pytestCheckHook,
|
||||
setuptools-scm,
|
||||
typing-extensions,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
@@ -26,6 +27,7 @@ buildPythonPackage (finalAttrs: {
|
||||
|
||||
dependencies = [
|
||||
async-lru
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
@@ -35,6 +37,11 @@ buildPythonPackage (finalAttrs: {
|
||||
|
||||
pythonImportsCheck = [ "aiotools" ];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Fatal Python error: Segmentation fault
|
||||
"tests/test_fork.py"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Idiomatic asyncio utilities";
|
||||
homepage = "https://github.com/achimnol/aiotools";
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
xlwt,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "canmatrix";
|
||||
version = "1.2";
|
||||
pyproject = true;
|
||||
@@ -24,10 +24,16 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "ebroecker";
|
||||
repo = "canmatrix";
|
||||
tag = version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-PfegsFha7ernSqnMeaDoLf1jLx1CiOoiYi34dESEgBY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Allows to skip versioneer and use the version from nixpkgs instead
|
||||
substituteInPlace setup.py \
|
||||
--replace-fail 'version = versioneer.get_version(),' 'version = "${finalAttrs.version}",'
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
@@ -54,7 +60,7 @@ buildPythonPackage rec {
|
||||
pytest-timeout
|
||||
pytestCheckHook
|
||||
]
|
||||
++ lib.concatAttrValues optional-dependencies;
|
||||
++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies);
|
||||
|
||||
pytestFlags = [
|
||||
# long_envvar_name_imports requires stable key value pair ordering
|
||||
@@ -73,8 +79,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Support and convert several CAN (Controller Area Network) database formats";
|
||||
homepage = "https://github.com/ebroecker/canmatrix";
|
||||
changelog = "https://github.com/ebroecker/canmatrix/releases/tag/${version}";
|
||||
changelog = "https://github.com/ebroecker/canmatrix/releases/tag/${finalAttrs.version}";
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = with lib.maintainers; [ sorki ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "dm-control";
|
||||
version = "1.0.46";
|
||||
version = "1.0.47";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -37,7 +37,7 @@ buildPythonPackage (finalAttrs: {
|
||||
owner = "google-deepmind";
|
||||
repo = "dm_control";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Z0Li4o6w0PjFgZ2qESxakUE7Ufaijlo084YlP3/m9Yo=";
|
||||
hash = "sha256-EncReLuIT4WClcsfi5K/KWFw9o5RLywJ15CCTlNgwXg=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "e2b";
|
||||
version = "2.49.1";
|
||||
version = "2.51.0";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -36,7 +36,7 @@ buildPythonPackage (finalAttrs: {
|
||||
owner = "e2b-dev";
|
||||
repo = "E2B";
|
||||
tag = "@e2b/python-sdk@${finalAttrs.version}";
|
||||
hash = "sha256-sM4/nJbgl3ACLl0WAW51mQVVguvwYuKRJlKMUTeoD1M=";
|
||||
hash = "sha256-Q/DhYn2dyzXytgccC6QNBlvkhM+hxqgmMeKAsVlQJuk=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/packages/python-sdk";
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "fastspec";
|
||||
version = "0.2.3";
|
||||
version = "0.2.5";
|
||||
pyproject = true;
|
||||
|
||||
__structuredAttrs = true;
|
||||
@@ -19,7 +19,7 @@ buildPythonPackage (finalAttrs: {
|
||||
owner = "AnswerDotAI";
|
||||
repo = "fastspec";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-bSD3x/oqxfPfUAe5jl5UhXknsvJ39j5voVIX6zDntW4=";
|
||||
hash = "sha256-VpMIf+o5JhMm/wJ7Fysx0bicQ1hg8nHqRo35nB/aXhw=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "iamdata";
|
||||
version = "0.1.202609211";
|
||||
version = "0.1.202609231";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloud-copilot";
|
||||
repo = "iam-data-python";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-4q8CVQ+w+UMTBHX/eJPno0SP5bUpvmDmbnree2AtbEQ=";
|
||||
hash = "sha256-v1KhdlwuHmtd6P2HbRNph3CJ0uU1/wXOmiJB1yM91D8=";
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
mujoco,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
@@ -9,7 +10,6 @@
|
||||
# dependencies
|
||||
absl-py,
|
||||
etils,
|
||||
mujoco,
|
||||
numpy,
|
||||
warp-lang,
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "mujoco-warp";
|
||||
version = "3.13.0";
|
||||
inherit (mujoco) version;
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -31,7 +31,7 @@ buildPythonPackage (finalAttrs: {
|
||||
owner = "google-deepmind";
|
||||
repo = "mujoco_warp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-R+YizRSaPOt4eSy6W0dRsFn+ovn+Ks05wVyd5e9lgYc=";
|
||||
hash = "sha256-2e/Wa3MtJajzp24XyEIOQx5l1/1SMPnecINn9geLrDo=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -21,6 +21,7 @@
|
||||
numpy,
|
||||
pyopengl,
|
||||
typing-extensions,
|
||||
websockets,
|
||||
|
||||
perl,
|
||||
python,
|
||||
@@ -39,7 +40,7 @@ buildPythonPackage (finalAttrs: {
|
||||
# in the project's CI.
|
||||
src = fetchPypi {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-U5F11dsl0Z7BRRcPomR4SmJsXssif3jRh341oKeVX2k=";
|
||||
hash = "sha256-91oHMfb9gpOHobqcmniR7+xCkABRemw/mvmPQXNdO28=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
@@ -60,6 +61,7 @@ buildPythonPackage (finalAttrs: {
|
||||
numpy
|
||||
pyopengl
|
||||
typing-extensions
|
||||
websockets
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "mujoco" ];
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysenz";
|
||||
version = "1.0.2";
|
||||
version = "1.1.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nordicopen";
|
||||
repo = "pysenz";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-gS9dsGQ8waOlUbHWHiJbQrvh4RdFb4SNEH4J4TbT2x8=";
|
||||
hash = "sha256-jUOIapzoDjfX6nVX4Dcc356uRnQNEu2OQIcm4D3ceh8=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "tencentcloud-sdk-python";
|
||||
version = "3.1.178";
|
||||
version = "3.1.180";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TencentCloud";
|
||||
repo = "tencentcloud-sdk-python";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-WduJ/tyGRr0wDOouNEQHkYG4uytNLBrYwkjMhbuBUhY=";
|
||||
hash = "sha256-s1LvhBN2SWisc5SGIZUwZuIArAkuBXnSfcrnVaBTbAQ=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "timm";
|
||||
version = "1.0.29";
|
||||
version = "1.0.30";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -31,7 +31,7 @@ buildPythonPackage (finalAttrs: {
|
||||
owner = "huggingface";
|
||||
repo = "pytorch-image-models";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-kmz6olMnxeD5MMiJnz3mcdz6RYO7T8kaP2+mJI2RAco=";
|
||||
hash = "sha256-NUoyA0q67TU9U5O9sd51q7Q0rvRsHoOfwZ8epiFyKrw=";
|
||||
};
|
||||
|
||||
# Fix torch 2.11.0 compatibility
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "hourly-weather";
|
||||
version = "7.1.0";
|
||||
version = "7.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "decompil3d";
|
||||
repo = "lovelace-hourly-weather";
|
||||
rev = version;
|
||||
hash = "sha256-oxC4w8Ieoz2fwqBalPI2jXBlebmEw3+7DFN2ocmVo1s=";
|
||||
hash = "sha256-dNgQzdwOVl+f8Var+233zAR1Nn/qck+Z1qrIba541oU=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-m/hXymkNJl6IvGWMLnhVc9i5bDc09+Vzt9kuLY20cpI=";
|
||||
npmDepsHash = "sha256-l4Ipnzf6izlz2WrC9tVn/LSkX/m8T/rj8WmiXKNkRuU=";
|
||||
|
||||
env.CYPRESS_INSTALL_BINARY = "0";
|
||||
|
||||
|
||||
Reference in New Issue
Block a user