Merge staging-next into staging
This commit is contained in:
commit
2ca7eb5d4e
|
@ -2,7 +2,6 @@
|
|||
|
||||
let
|
||||
cfg = config.services.joycond;
|
||||
kernelPackages = config.boot.kernelPackages;
|
||||
in
|
||||
|
||||
with lib;
|
||||
|
@ -24,8 +23,6 @@ with lib;
|
|||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
boot.extraModulePackages = optional (versionOlder kernelPackages.kernel.version "5.16") kernelPackages.hid-nintendo;
|
||||
|
||||
services.udev.packages = [ cfg.package ];
|
||||
|
||||
systemd.packages = [ cfg.package ];
|
||||
|
|
|
@ -24,13 +24,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mediaelch";
|
||||
version = "2.10.2";
|
||||
version = "2.10.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Komet";
|
||||
repo = "MediaElch";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-y8NXBPShmhp0QiuSbVA2JvZrv70Z76Kmdw+RuBnMtPY=";
|
||||
hash = "sha256-gNpnmyUKDXf40+1JmJzNyEPIv/DO8b3CdJAphheEvTU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
@ -2,53 +2,25 @@
|
|||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, coreutils
|
||||
, llvmPackages
|
||||
, libxml2
|
||||
, zlib
|
||||
}:
|
||||
, coreutils
|
||||
}@args:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zig";
|
||||
import ./generic.nix args {
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ziglang";
|
||||
repo = "zig";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-69QIkkKzApOGfrBdgtmxFMDytRkSh+0YiaJQPbXsBeo=";
|
||||
};
|
||||
hash = "sha256-69QIkkKzApOGfrBdgtmxFMDytRkSh+0YiaJQPbXsBeo=";
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
llvmPackages.llvm.dev
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
coreutils
|
||||
libxml2
|
||||
zlib
|
||||
] ++ (with llvmPackages; [
|
||||
libclang
|
||||
lld
|
||||
llvm
|
||||
]);
|
||||
|
||||
patches = [
|
||||
# Backport alignment related panics from zig-master to 0.10.
|
||||
# Upstream issue: https://github.com/ziglang/zig/issues/14559
|
||||
./zig_14559.patch
|
||||
];
|
||||
|
||||
# Zig's build looks at /usr/bin/env to find dynamic linking info. This doesn't
|
||||
# work in Nix's sandbox. Use env from our coreutils instead.
|
||||
postPatch = ''
|
||||
substituteInPlace lib/std/zig/system/NativeTargetInfo.zig \
|
||||
--replace "/usr/bin/env" "${coreutils}/bin/env"
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
# file RPATH_CHANGE could not write new RPATH
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=ON"
|
||||
|
@ -60,34 +32,11 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
"-DZIG_TARGET_MCPU=baseline"
|
||||
];
|
||||
|
||||
env.ZIG_GLOBAL_CACHE_DIR = "$TMPDIR/zig-cache";
|
||||
|
||||
postBuild = ''
|
||||
./zig2 build-exe ../doc/docgen.zig
|
||||
./docgen ./zig2 ../doc/langref.html.in ./langref.html
|
||||
./zig2 run ../doc/docgen.zig -- ./zig2 ../doc/langref.html.in langref.html
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 -t $doc/share/doc/zig-${finalAttrs.version}/html ./langref.html
|
||||
install -Dm644 -t $doc/share/doc/zig-$version/html ./langref.html
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
|
||||
$out/bin/zig test --cache-dir "$TMPDIR/cache-dir" -I $src/test $src/test/behavior.zig
|
||||
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://ziglang.org/";
|
||||
description =
|
||||
"General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software";
|
||||
changelog = "https://ziglang.org/download/${finalAttrs.version}/release-notes.html";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ aiotter andrewrk AndersonTorres ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
}
|
||||
|
|
36
pkgs/development/compilers/zig/0.11.nix
Normal file
36
pkgs/development/compilers/zig/0.11.nix
Normal file
|
@ -0,0 +1,36 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, llvmPackages
|
||||
, libxml2
|
||||
, zlib
|
||||
, coreutils
|
||||
}@args:
|
||||
|
||||
import ./generic.nix args {
|
||||
version = "0.11.0";
|
||||
|
||||
hash = "sha256-iuU1fzkbJxI+0N1PiLQM013Pd1bzrgqkbIyTxo5gB2I=";
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
cmakeFlags = [
|
||||
# file RPATH_CHANGE could not write new RPATH
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=ON"
|
||||
|
||||
# always link against static build of LLVM
|
||||
"-DZIG_STATIC_LLVM=ON"
|
||||
|
||||
# ensure determinism in the compiler build
|
||||
"-DZIG_TARGET_MCPU=baseline"
|
||||
];
|
||||
|
||||
postBuild = ''
|
||||
stage3/bin/zig run ../tools/docgen.zig -- ../doc/langref.html.in langref.html --zig $PWD/stage3/bin/zig
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -Dm444 -t $doc/share/doc/zig-$version/html langref.html
|
||||
'';
|
||||
}
|
|
@ -5,18 +5,13 @@
|
|||
, llvmPackages
|
||||
, libxml2
|
||||
, zlib
|
||||
}:
|
||||
, coreutils
|
||||
}@args:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zig";
|
||||
import ./generic.nix args {
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ziglang";
|
||||
repo = "zig";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-x2c4c9RSrNWGqEngio4ArW7dJjW0gg+8nqBwPcR721k=";
|
||||
};
|
||||
hash = "sha256-x2c4c9RSrNWGqEngio4ArW7dJjW0gg+8nqBwPcR721k=";
|
||||
|
||||
patches = [
|
||||
# Fix index out of bounds reading RPATH (cherry-picked from 0.10-dev)
|
||||
|
@ -26,37 +21,21 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
];
|
||||
|
||||
# TODO: remove on next upgrade
|
||||
prePatch = let
|
||||
zig_0_10_0 = fetchFromGitHub {
|
||||
owner = "ziglang";
|
||||
repo = "zig";
|
||||
rev = "0.10.0";
|
||||
hash = "sha256-DNs937N7PLQimuM2anya4npYXcj6cyH+dRS7AiOX7tw=";
|
||||
};
|
||||
in ''
|
||||
cp -R ${zig_0_10_0}/lib/libc/include/any-macos.13-any lib/libc/include/any-macos.13-any
|
||||
cp -R ${zig_0_10_0}/lib/libc/include/aarch64-macos.13-none lib/libc/include/aarch64-macos.13-gnu
|
||||
cp -R ${zig_0_10_0}/lib/libc/include/x86_64-macos.13-none lib/libc/include/x86_64-macos.13-gnu
|
||||
cp ${zig_0_10_0}/lib/libc/darwin/libSystem.13.tbd lib/libc/darwin/
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
llvmPackages.llvm.dev
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libxml2
|
||||
zlib
|
||||
] ++ (with llvmPackages; [
|
||||
libclang
|
||||
lld
|
||||
llvm
|
||||
]);
|
||||
|
||||
preBuild = ''
|
||||
export HOME=$TMPDIR;
|
||||
'';
|
||||
prePatch =
|
||||
let
|
||||
zig_0_10_0 = fetchFromGitHub {
|
||||
owner = "ziglang";
|
||||
repo = "zig";
|
||||
rev = "0.10.0";
|
||||
hash = "sha256-DNs937N7PLQimuM2anya4npYXcj6cyH+dRS7AiOX7tw=";
|
||||
};
|
||||
in
|
||||
''
|
||||
cp -R ${zig_0_10_0}/lib/libc/include/any-macos.13-any lib/libc/include/any-macos.13-any
|
||||
cp -R ${zig_0_10_0}/lib/libc/include/aarch64-macos.13-none lib/libc/include/aarch64-macos.13-gnu
|
||||
cp -R ${zig_0_10_0}/lib/libc/include/x86_64-macos.13-none lib/libc/include/x86_64-macos.13-gnu
|
||||
cp ${zig_0_10_0}/lib/libc/darwin/libSystem.13.tbd lib/libc/darwin/
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
# file RPATH_CHANGE could not write new RPATH
|
||||
|
@ -65,22 +44,4 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
# ensure determinism in the compiler build
|
||||
"-DZIG_TARGET_MCPU=baseline"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
./zig test --cache-dir "$TMPDIR" -I $src/test $src/test/behavior.zig
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://ziglang.org/";
|
||||
description =
|
||||
"General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software";
|
||||
license = lib.licenses.mit;
|
||||
changelog = "https://ziglang.org/download/${finalAttrs.version}/release-notes.html";
|
||||
maintainers = with lib.maintainers; [ aiotter andrewrk AndersonTorres ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
}
|
||||
|
|
64
pkgs/development/compilers/zig/generic.nix
Normal file
64
pkgs/development/compilers/zig/generic.nix
Normal file
|
@ -0,0 +1,64 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, llvmPackages
|
||||
, libxml2
|
||||
, zlib
|
||||
, coreutils
|
||||
, ...
|
||||
}:
|
||||
|
||||
args:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zig";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ziglang";
|
||||
repo = "zig";
|
||||
rev = finalAttrs.version;
|
||||
inherit (args) hash;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
llvmPackages.llvm.dev
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libxml2
|
||||
zlib
|
||||
] ++ (with llvmPackages; [
|
||||
libclang
|
||||
lld
|
||||
llvm
|
||||
]);
|
||||
|
||||
env.ZIG_GLOBAL_CACHE_DIR = "$TMPDIR/zig-cache";
|
||||
|
||||
# Zig's build looks at /usr/bin/env to find dynamic linking info. This doesn't
|
||||
# work in Nix's sandbox. Use env from our coreutils instead.
|
||||
postPatch = ''
|
||||
substituteInPlace lib/std/zig/system/NativeTargetInfo.zig \
|
||||
--replace "/usr/bin/env" "${coreutils}/bin/env"
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
|
||||
$out/bin/zig test --cache-dir "$TMPDIR/zig-test-cache" -I $src/test $src/test/behavior.zig
|
||||
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software";
|
||||
homepage = "https://ziglang.org/";
|
||||
changelog = "https://ziglang.org/download/${finalAttrs.version}/release-notes.html";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ aiotter andrewrk AndersonTorres figsoda ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
} // removeAttrs args [ "hash" ])
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiohomekit";
|
||||
version = "2.6.12";
|
||||
version = "2.6.13";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
@ -28,7 +28,7 @@ buildPythonPackage rec {
|
|||
owner = "Jc2k";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-a1qxj/6VCnTqfcCfvjjnfM53JjJXP672wumGCvXwxUY=";
|
||||
hash = "sha256-33B9BBqvKQugGz4+9EuMPhLRyWd/Sbxwh4d5aMmDt4M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -2,29 +2,27 @@
|
|||
, aiohttp
|
||||
, async-timeout
|
||||
, buildPythonPackage
|
||||
, cryptography
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "millheater";
|
||||
version = "0.10.0";
|
||||
version = "0.11.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Danielhiversen";
|
||||
repo = "pymill";
|
||||
rev = version;
|
||||
hash = "sha256-ImEg+VEiASQPnMeZzbYMMb+ZgcsxagQcN9IDFGO05Vw=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-NECGUosjrhRCVGHOFV+YjY8o3heoA7qi9kKsgXpeHh0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
async-timeout
|
||||
cryptography
|
||||
];
|
||||
|
||||
# Project has no tests
|
||||
|
@ -37,6 +35,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python library for Mill heater devices";
|
||||
homepage = "https://github.com/Danielhiversen/pymill";
|
||||
changelog = "https://github.com/Danielhiversen/pymill/releases/tag/${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, paho-mqtt
|
||||
, poetry-core
|
||||
, psutil
|
||||
|
@ -26,6 +27,14 @@ buildPythonPackage rec {
|
|||
hash = "sha256-h+jZWjDvTfW9XjoGhWYX08hgJ/Qp64MEaqHHwnahnC4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "update-packaging-dependency.patch";
|
||||
url = "https://github.com/greenbone/notus-scanner/commit/bfa7d3d2e63e250ff25a66c60b782eb9da0e89e7.patch";
|
||||
hash = "sha256-hzS8TYBXDEq+cgWlp6fSOtSbyeX9EX2rURmnFMF5jN0=";
|
||||
})
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"python-gnupg"
|
||||
];
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "scrapy";
|
||||
version = "2.9.0";
|
||||
version = "2.10.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -39,7 +39,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "Scrapy";
|
||||
hash = "sha256-VkyXK1blS4MUHzlc4/aiW/4gk9YdE/m4HQU4ThnbmNo=";
|
||||
hash = "sha256-ThajP8jAOli99OjUvcofhnNU6sacz1c2WMf/NPoMrjk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -98,6 +98,7 @@ buildPythonPackage rec {
|
|||
"test_custom_loop_asyncio"
|
||||
"test_custom_loop_asyncio_deferred_signal"
|
||||
"FileFeedStoragePreFeedOptionsTest" # https://github.com/scrapy/scrapy/issues/5157
|
||||
"test_persist"
|
||||
"test_timeout_download_from_spider_nodata_rcvd"
|
||||
"test_timeout_download_from_spider_server_hangs"
|
||||
# Depends on uvloop
|
||||
|
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "trimesh";
|
||||
version = "3.22.5";
|
||||
version = "3.23.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Lk30HShbVSBeiclfxJUkd7W2HfvLsZiUdYqebLI7otw=";
|
||||
hash = "sha256-TjnN5gqzhsN2S/Acqio5pH33RW/Zp3acolI+B+sSaRA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
|
156
pkgs/development/python-modules/txtai/default.nix
Normal file
156
pkgs/development/python-modules/txtai/default.nix
Normal file
|
@ -0,0 +1,156 @@
|
|||
{
|
||||
lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, pythonRelaxDepsHook
|
||||
# propagated build input
|
||||
, faiss
|
||||
, torch
|
||||
, transformers
|
||||
, huggingface-hub
|
||||
, numpy
|
||||
, pyyaml
|
||||
, regex
|
||||
# optional-dependencies
|
||||
, aiohttp
|
||||
, fastapi
|
||||
, uvicorn
|
||||
# TODO add apache-libcloud
|
||||
# , apache-libcloud
|
||||
, rich
|
||||
, duckdb
|
||||
, pillow
|
||||
, networkx
|
||||
, python-louvain
|
||||
, onnx
|
||||
, onnxruntime
|
||||
, soundfile
|
||||
, scipy
|
||||
, ttstokenizer
|
||||
, beautifulsoup4
|
||||
, nltk
|
||||
, pandas
|
||||
, tika
|
||||
, imagehash
|
||||
, timm
|
||||
, fasttext
|
||||
, sentencepiece
|
||||
, accelerate
|
||||
, onnxmltools
|
||||
, annoy
|
||||
, hnswlib
|
||||
# TODO add pymagnitude-lite
|
||||
#, pymagnitude-lite
|
||||
, scikit-learn
|
||||
, sentence-transformers
|
||||
, croniter
|
||||
, openpyxl
|
||||
, requests
|
||||
, xmltodict
|
||||
# native check inputs
|
||||
, unittestCheckHook
|
||||
}:
|
||||
let
|
||||
version = "5.5.1";
|
||||
api = [ aiohttp fastapi uvicorn ];
|
||||
# cloud = [ apache-libcloud ];
|
||||
console = [ rich ];
|
||||
|
||||
database = [ duckdb pillow ];
|
||||
|
||||
graph = [ networkx python-louvain ];
|
||||
|
||||
model = [ onnx onnxruntime ];
|
||||
|
||||
pipeline-audio = [ onnx onnxruntime soundfile scipy ttstokenizer ];
|
||||
pipeline-data = [ beautifulsoup4 nltk pandas tika ];
|
||||
pipeline-image = [ imagehash pillow timm ];
|
||||
pipeline-text = [ fasttext sentencepiece ];
|
||||
pipeline-train = [ accelerate onnx onnxmltools onnxruntime ];
|
||||
pipeline = pipeline-audio ++ pipeline-data ++ pipeline-image ++ pipeline-text ++ pipeline-train;
|
||||
|
||||
similarity = [
|
||||
annoy
|
||||
fasttext
|
||||
hnswlib
|
||||
# pymagnitude-lite
|
||||
scikit-learn
|
||||
sentence-transformers
|
||||
];
|
||||
workflow = [
|
||||
# apache-libcloud
|
||||
croniter
|
||||
openpyxl
|
||||
pandas
|
||||
pillow
|
||||
requests
|
||||
xmltodict
|
||||
];
|
||||
all = api ++ console ++ database ++ graph ++ model ++ pipeline ++ similarity ++ workflow;
|
||||
|
||||
optional-dependencies = {
|
||||
inherit api console database graph model pipeline-audio pipeline-image
|
||||
pipeline-text pipeline-train pipeline similarity workflow all;
|
||||
};
|
||||
in
|
||||
buildPythonPackage {
|
||||
pname = "txtai";
|
||||
inherit version;
|
||||
format = "setuptools";
|
||||
|
||||
disable = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "neuml";
|
||||
repo = "txtai";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-h6TwWzLYfFg5x2QMIstAZ5pkxfHobBU+b4gb0HiayzY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
pythonRemoveDeps = [
|
||||
# We call it faiss, not faiss-cpu.
|
||||
"faiss-cpu"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
faiss
|
||||
torch
|
||||
transformers
|
||||
huggingface-hub
|
||||
numpy
|
||||
pyyaml
|
||||
regex
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = optional-dependencies;
|
||||
|
||||
pythonImportsCheck = [ "txtai" ];
|
||||
|
||||
# some tests hang forever
|
||||
doCheck = false;
|
||||
|
||||
preCheck = ''
|
||||
export TRANSFORMERS_CACHE=$(mktemp -d)
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
unittestCheckHook
|
||||
] ++ optional-dependencies.api ++ optional-dependencies.similarity;
|
||||
|
||||
unittestFlagsArray = [
|
||||
"-s" "test/python" "-v"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Semantic search and workflows powered by language models";
|
||||
changelog = "https://github.com/neuml/txtai/releases/tag/v${version}";
|
||||
homepage = "https://github.com/neuml/txtai";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
};
|
||||
}
|
|
@ -18,13 +18,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nixd";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = "nixd";
|
||||
rev = version;
|
||||
hash = "sha256-3PI/Bzs5WPIKevbRPz6TQ5yo7QpY4HeALrqbUY/zUgY=";
|
||||
hash = "sha256-NqRYFaxa6Y4j7IMAxxVKo7o15Xmx0CiyeG71Uf1SLCI=";
|
||||
};
|
||||
|
||||
mesonBuildType = "release";
|
||||
|
@ -52,7 +52,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
env.CXXFLAGS = "-include ${nix.dev}/include/nix/config.h";
|
||||
|
||||
doCheck = true;
|
||||
# https://github.com/nix-community/nixd/issues/215
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
|
|
@ -1,42 +0,0 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, kernel
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hid-nintendo";
|
||||
version = "3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nicman23";
|
||||
repo = "dkms-hid-nintendo";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-2a+95zwyhJsF/KSo/Pm/JZ7ktDG02UZjsixSnVUXRrA=";
|
||||
};
|
||||
|
||||
setSourceRoot = ''
|
||||
export sourceRoot=$(pwd)/source/src
|
||||
'';
|
||||
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
|
||||
makeFlags = kernel.makeFlags ++ [
|
||||
"-C"
|
||||
"${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
||||
"M=$(sourceRoot)"
|
||||
];
|
||||
|
||||
buildFlags = [ "modules" ];
|
||||
installFlags = [ "INSTALL_MOD_PATH=${placeholder "out"}" ];
|
||||
installTargets = [ "modules_install" ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/nicman23/dkms-hid-nintendo";
|
||||
description = "A Nintendo HID kernel module";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
broken = lib.versionOlder kernel.version "4.14";
|
||||
};
|
||||
})
|
|
@ -16,14 +16,14 @@ let
|
|||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "esphome";
|
||||
version = "2023.7.0";
|
||||
version = "2023.7.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-zJ00Ypb//b+SndzMC/QGzxtu9GZefaJvr5tKYp68hhc=";
|
||||
hash = "sha256-warrNm07YXD0TEb91JQPr9ouDh7lC+YCQYOM3fed3Es=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -9,14 +9,14 @@ with python3.pkgs;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "yutto";
|
||||
version = "2.0.0b24";
|
||||
version = "2.0.0b28";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-ZnRDGgJu78KoSHvznYhBNEDJihUm9rUdlb5tXmcpuTc=";
|
||||
hash = "sha256-jN9KDQjEaTf7BUDtGd07W3TtijRKzD+StMReLmX4QI0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -27,7 +27,7 @@ buildPythonApplication rec {
|
|||
aiohttp
|
||||
aiofiles
|
||||
biliass
|
||||
dicttoxml
|
||||
dict2xml
|
||||
colorama
|
||||
];
|
||||
|
||||
|
|
38
pkgs/tools/networking/globalping-cli/default.nix
Normal file
38
pkgs/tools/networking/globalping-cli/default.nix
Normal file
|
@ -0,0 +1,38 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, nix-update-script }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "globalping-cli";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jsdelivr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-UY+SAmkE8h/K92Em5iikcMiNixkqnDVkhlrKVq1ZkVM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-fUB7WIEAPBot8A2f7WQ5wUDtCrOydZd4nd4qDuy1vzg=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/${pname} $out/bin/globalping
|
||||
installShellCompletion --cmd globalping \
|
||||
--bash <($out/bin/globalping completion bash) \
|
||||
--fish <($out/bin/globalping completion fish) \
|
||||
--zsh <($out/bin/globalping completion zsh)
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple CLI tool to run networking commands remotely from hundreds of globally distributed servers";
|
||||
homepage = "https://www.jsdelivr.com/globalping/cli";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ xyenon ];
|
||||
mainProgram = "globalping";
|
||||
};
|
||||
}
|
|
@ -1,12 +1,14 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, python3
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "maigret";
|
||||
version = "0.4.4";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "soxoj";
|
||||
|
@ -15,7 +17,17 @@ python3.pkgs.buildPythonApplication rec {
|
|||
hash = "sha256-Z8SnA7Z5+oKW0AOaNf+c/zR30lrPFmXaxxKkbnDXNNs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/soxoj/maigret/pull/1117
|
||||
(fetchpatch {
|
||||
name = "pytest-7.3-compatibility.patch";
|
||||
url = "https://github.com/soxoj/maigret/commit/ecb33de9e6eec12b6b45a1152199177f32c85be2.patch";
|
||||
hash = "sha256-nFx3j1Q37YLtYhb0QS34UgZFgAc5Z/RVgbO9o1n1ONE=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ python3.pkgs.pythonRelaxDepsHook ];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
aiodns
|
||||
aiohttp
|
||||
|
@ -57,6 +69,8 @@ python3.pkgs.buildPythonApplication rec {
|
|||
yarl
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
nativeCheckInputs = with python3.pkgs; [
|
||||
pytest-httpserver
|
||||
pytest-asyncio
|
||||
|
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "bottom";
|
||||
version = "0.9.3";
|
||||
version = "0.9.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ClementTsang";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-hKgk2wIfFvYOKYo90rzGlntvRRWId4UUgSevY1KLhik=";
|
||||
hash = "sha256-9WQdudO2tIvxDHfJ87zvJeMfpuFSr4D5zGteL7Od2fQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-2iMjxjObh3V+HM79y8hQF+i7eQ+sjNl3kDopCbCsSZg=";
|
||||
cargoHash = "sha256-aRN6V6r+JYi6yUcXei2f7l7oZ+8IkUmw1sgOwZJOtIE=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
@ -3,13 +3,13 @@
|
|||
let
|
||||
self = stdenv.mkDerivation rec {
|
||||
pname = "highlight";
|
||||
version = "4.6";
|
||||
version = "4.7";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "saalen";
|
||||
repo = "highlight";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wMNmc7UIpvYPREpPK/2aKaqUDc6uifuxsXTNFH5SHyI=";
|
||||
sha256 = "sha256-WblpRrvfFp4PlyH4RS2VNKXYD911H+OcnSL5rctyxiM=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
@ -2363,6 +2363,8 @@ with pkgs;
|
|||
|
||||
glitter = callPackage ../applications/version-management/glitter { };
|
||||
|
||||
globalping-cli = callPackage ../tools/networking/globalping-cli { };
|
||||
|
||||
gst = callPackage ../applications/version-management/gst { };
|
||||
|
||||
gut = callPackage ../applications/version-management/gut { };
|
||||
|
@ -25481,6 +25483,10 @@ with pkgs;
|
|||
zig_0_10 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.10.nix {
|
||||
llvmPackages = llvmPackages_15;
|
||||
};
|
||||
# requires a newer Apple SDK
|
||||
zig_0_11 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.11.nix {
|
||||
llvmPackages = llvmPackages_16;
|
||||
};
|
||||
zig = zig_0_10;
|
||||
|
||||
zigHook = callPackage ../development/compilers/zig/hook.nix { };
|
||||
|
|
|
@ -347,7 +347,6 @@ in {
|
|||
fwts-efi-runtime = callPackage ../os-specific/linux/fwts/module.nix { };
|
||||
|
||||
gcadapter-oc-kmod = callPackage ../os-specific/linux/gcadapter-oc-kmod { };
|
||||
hid-nintendo = callPackage ../os-specific/linux/hid-nintendo { };
|
||||
|
||||
hyperv-daemons = callPackage ../os-specific/linux/hyperv-daemons { };
|
||||
|
||||
|
@ -556,6 +555,7 @@ in {
|
|||
|
||||
} // lib.optionalAttrs config.allowAliases {
|
||||
ati_drivers_x11 = throw "ati drivers are no longer supported by any kernel >=4.1"; # added 2021-05-18;
|
||||
hid-nintendo = throw "hid-nintendo was added in mainline kernel version 5.16"; # Added 2023-07-30
|
||||
sch_cake = throw "sch_cake was added in mainline kernel version 4.19"; # Added 2023-06-14
|
||||
rtl8723bs = throw "rtl8723bs was added in mainline kernel version 4.12"; # Added 2023-06-14
|
||||
xmm7360-pci = throw "Support for the XMM7360 WWAN card was added to the iosm kmod in mainline kernel version 5.18";
|
||||
|
|
|
@ -12938,6 +12938,8 @@ self: super: with self; {
|
|||
|
||||
txrequests = callPackage ../development/python-modules/txrequests { };
|
||||
|
||||
txtai = callPackage ../development/python-modules/txtai { };
|
||||
|
||||
txtorcon = callPackage ../development/python-modules/txtorcon { };
|
||||
|
||||
txzmq = callPackage ../development/python-modules/txzmq { };
|
||||
|
|
Loading…
Reference in a new issue