Merge staging-next into staging
This commit is contained in:
@@ -9711,6 +9711,12 @@
|
||||
githubId = 3661115;
|
||||
name = "Ingo Blechschmidt";
|
||||
};
|
||||
icedborn = {
|
||||
email = "github.envenomed@dralias.com";
|
||||
github = "icedborn";
|
||||
githubId = 51162078;
|
||||
name = "IceDBorn";
|
||||
};
|
||||
icewind1991 = {
|
||||
name = "Robin Appelman";
|
||||
email = "robin@icewind.nl";
|
||||
|
||||
@@ -4039,6 +4039,8 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
platformio.platformio-vscode-ide = callPackage ./platformio.platformio-vscode-ide { };
|
||||
|
||||
pollywoggames.pico8-ls = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "pico8-ls";
|
||||
|
||||
@@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "mongodb-vscode";
|
||||
publisher = "mongodb";
|
||||
version = "1.11.0";
|
||||
hash = "sha256-JlAfoYLFja60zNmNS0T8YK6WUrw/oOq/uurP48ad9bY=";
|
||||
version = "1.12.0";
|
||||
hash = "sha256-Lb4eixqR/ifwZD3cV1rSJ8mK2dH4ZFghLHINGJILmRQ=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
+20
@@ -0,0 +1,20 @@
|
||||
{
|
||||
lib,
|
||||
vscode-utils,
|
||||
}:
|
||||
vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "platformio-ide";
|
||||
publisher = "platformio";
|
||||
version = "3.3.4";
|
||||
hash = "sha256-qfNz4IYjCmCMFLtAkbGTW5xnsVT8iDnFWjrgkmr2Slk=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/platformio.platformio-ide/changelog";
|
||||
description = "Open source ecosystem for IoT development in VSCode";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=platformio.platformio-ide";
|
||||
homepage = "https://platformio.org/";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.therobot2105 ];
|
||||
};
|
||||
}
|
||||
@@ -226,6 +226,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# injected by the pkgsStatic stdenv
|
||||
# <https://github.com/NixOS/nixpkgs/issues/83667>
|
||||
rm -f $out/nix-support/propagated-build-inputs
|
||||
'' + lib.optionalString finalAttrs.separateDebugInfo ''
|
||||
# HACK: remove broken symlink created by hook
|
||||
rm $debug/lib/debug/s390-ccw.img
|
||||
'';
|
||||
preBuild = "cd build";
|
||||
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
mkHyprlandPlugin hyprland {
|
||||
pluginName = "hyprscroller";
|
||||
version = "0-unstable-2024-12-17";
|
||||
version = "0-unstable-2025-01-30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dawsers";
|
||||
repo = "hyprscroller";
|
||||
rev = "9dc46c3c98e875a8f3b2a118ef3859a3c714c887";
|
||||
hash = "sha256-CifZc4Ev+CG4qHHOH6e6NLBLQNbFVn4gZEFNCX8e0QQ=";
|
||||
rev = "e4b13544ef3cc235eb9ce51e0856ba47eb36e8ac";
|
||||
hash = "sha256-OYCcIsE25HqVBp8z76Tk1v+SuYR7W1nemk9mDS9GHM8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -5,10 +5,8 @@ export PATH
|
||||
|
||||
addBinToPath () {
|
||||
# shellcheck disable=SC2154
|
||||
if [ -d "$out/bin" ]; then
|
||||
PATH="$out/bin:$PATH"
|
||||
export PATH
|
||||
fi
|
||||
PATH="$out/bin:$PATH"
|
||||
export PATH
|
||||
}
|
||||
|
||||
# shellcheck disable=SC2154
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
crystal,
|
||||
crystal_1_11,
|
||||
copyDesktopItems,
|
||||
linkFarm,
|
||||
fetchgit,
|
||||
@@ -22,7 +22,7 @@
|
||||
# NOTICE: AHK_X11 from this package does not support compiling scripts into portable executables.
|
||||
let
|
||||
pname = "ahk_x11";
|
||||
version = "1.0.4";
|
||||
version = "1.0.4-unstable-2025-01-30"; # 1.0.4 cannot build on Crystal 1.12 or below.
|
||||
|
||||
inherit (xorg)
|
||||
libXinerama
|
||||
@@ -31,6 +31,9 @@ let
|
||||
libXi
|
||||
;
|
||||
|
||||
# See upstream README. Crystal 1.11 or below is needed to work around phil294/AHK_X11#89.
|
||||
crystal = crystal_1_11;
|
||||
|
||||
in
|
||||
crystal.buildCrystalPackage {
|
||||
inherit pname version;
|
||||
@@ -38,8 +41,8 @@ crystal.buildCrystalPackage {
|
||||
src = fetchFromGitHub {
|
||||
owner = "phil294";
|
||||
repo = "AHK_X11";
|
||||
rev = version;
|
||||
hash = "sha256-Kxe0tLbER1XFnnfUUIiy9CgCgz2qK21AIk4DfHymKlI=";
|
||||
rev = "66eb5208d95f4239822053c7d35f32bc62d57573"; # tag = version;
|
||||
hash = "sha256-KzD5ExYPRYgsYO+/hlnoQpBJwokjaK5lYL2kobI2XQ0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "amazon-cloudwatch-agent";
|
||||
version = "1.300051.0";
|
||||
version = "1.300052.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "amazon-cloudwatch-agent";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-gJrK+ai+EEKvBErjOyvu677WykUPuxYy9NrR+qV2yyo=";
|
||||
hash = "sha256-YxmWh14efLSo6G8pujXzKmXYROhIAHYTczzY5tMgbLE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-OQSl7nFvnDjJbs756QN5ZE/Dx/AZqxsijG0Ks7FYCB8=";
|
||||
vendorHash = "sha256-EyhT1gfrd189jqcEQ97CSKziKrT2bBeQ9pWIEK039Io=";
|
||||
|
||||
# See the list in https://github.com/aws/amazon-cloudwatch-agent/blob/v1.300049.1/Makefile#L68-L77.
|
||||
subPackages = [
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
libgit2,
|
||||
darwin,
|
||||
curl,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@@ -20,7 +21,7 @@ rustPlatform.buildRustPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "jmacdonald";
|
||||
repo = "amp";
|
||||
rev = version;
|
||||
tag = version;
|
||||
hash = "sha256-xNadwz2agPbxvgUqrUf1+KsWTmeNh8hJIWcNwTzzM/M=";
|
||||
};
|
||||
|
||||
@@ -49,8 +50,9 @@ rustPlatform.buildRustPackage rec {
|
||||
]
|
||||
);
|
||||
|
||||
# Tests need to write to the theme directory in HOME.
|
||||
preCheck = "export HOME=`mktemp -d`";
|
||||
nativeCheckInputs = [
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Modern text editor inspired by Vim";
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
installShellFiles,
|
||||
distrobox,
|
||||
podman,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
@@ -14,7 +15,7 @@ buildGoModule rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "Vanilla-OS";
|
||||
repo = "apx";
|
||||
rev = "v${version}";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-60z6wbbXQp7MA5l7LP/mToZftX+nbcs2Mewg5jCFwFk=";
|
||||
};
|
||||
|
||||
@@ -26,6 +27,10 @@ buildGoModule rec {
|
||||
podman
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
@@ -46,8 +51,6 @@ buildGoModule rec {
|
||||
install -Dm444 README.md -t $out/share/docs/apx
|
||||
install -Dm444 COPYING.md $out/share/licenses/apx/LICENSE
|
||||
|
||||
# Create a temp writable home-dir so apx outputs completions without error
|
||||
export HOME=$(mktemp -d)
|
||||
# apx command now works (for completions)
|
||||
# though complains "Error: no such file or directory"
|
||||
installShellCompletion --cmd apx \
|
||||
@@ -56,12 +59,12 @@ buildGoModule rec {
|
||||
--zsh <($out/bin/apx completion zsh)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Vanilla OS package manager";
|
||||
homepage = "https://github.com/Vanilla-OS/apx";
|
||||
changelog = "https://github.com/Vanilla-OS/apx/releases/tag/v${version}";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
dit7ya
|
||||
chewblacka
|
||||
];
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
awscli,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
@@ -38,12 +39,9 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
pytestCheckHook
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/awslabs/aws-shell";
|
||||
description = "Integrated shell for working with the AWS CLI";
|
||||
|
||||
@@ -10,6 +10,8 @@
|
||||
nix-update-script,
|
||||
testers,
|
||||
awscli2,
|
||||
addBinToPathHook,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -121,9 +123,11 @@ py.pkgs.buildPythonApplication rec {
|
||||
];
|
||||
|
||||
nativeCheckInputs = with py.pkgs; [
|
||||
addBinToPathHook
|
||||
jsonschema
|
||||
mock
|
||||
pytestCheckHook
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
postInstall =
|
||||
@@ -136,11 +140,6 @@ py.pkgs.buildPythonApplication rec {
|
||||
rm $out/bin/aws.cmd
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
export PATH=$PATH:$out/bin
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
# Propagating dependencies leaks them through $PYTHONPATH which causes issues
|
||||
# when used in nix-shell.
|
||||
postFixup = ''
|
||||
|
||||
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
meta = {
|
||||
description = "A nice terminal nCurses (tui) internet radio player for Linux, browse and search from api.radio-browser.info";
|
||||
homepage = " https://github.com/An7ar35/ctune";
|
||||
homepage = "https://github.com/An7ar35/ctune";
|
||||
changelog = "https://github.com/An7ar35/ctune/blob/master/CHANGELOG.md";
|
||||
license = lib.licenses.agpl3Plus;
|
||||
maintainers = with lib.maintainers; [ theobori ];
|
||||
|
||||
+7
-14
@@ -7,7 +7,7 @@
|
||||
cudaPackages ? { },
|
||||
cudaSupport ? config.cudaSupport,
|
||||
pythonSupport ? true,
|
||||
pythonPackages,
|
||||
python3Packages,
|
||||
llvmPackages,
|
||||
blas,
|
||||
swig,
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
let
|
||||
pname = "faiss";
|
||||
version = "1.9.0";
|
||||
version = "1.10.0";
|
||||
|
||||
inherit (cudaPackages) flags backendStdenv;
|
||||
|
||||
@@ -50,16 +50,9 @@ stdenv.mkDerivation {
|
||||
owner = "facebookresearch";
|
||||
repo = "faiss";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-P8TynU6jz5NbcWLdI7n4LX5Gdz0Ks72bmOzQ3LGjQCQ=";
|
||||
hash = "sha256-Jws6AW0rj6N/MOoaxK6N7KaPkjCYN47Il0xzyKZ7Wc0=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString pythonSupport ''
|
||||
substituteInPlace faiss/python/loader.py \
|
||||
--replace-fail \
|
||||
"# platform-dependent legacy fallback using numpy.distutils.cpuinfo" \
|
||||
"return False"
|
||||
'';
|
||||
|
||||
nativeBuildInputs =
|
||||
[ cmake ]
|
||||
++ lib.optionals cudaSupport [
|
||||
@@ -67,9 +60,9 @@ stdenv.mkDerivation {
|
||||
autoAddDriverRunpath
|
||||
]
|
||||
++ lib.optionals pythonSupport [
|
||||
pythonPackages.python
|
||||
pythonPackages.setuptools
|
||||
pythonPackages.pip
|
||||
python3Packages.python
|
||||
python3Packages.setuptools
|
||||
python3Packages.pip
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
@@ -77,7 +70,7 @@ stdenv.mkDerivation {
|
||||
blas
|
||||
swig
|
||||
]
|
||||
++ lib.optionals pythonSupport [ pythonPackages.numpy ]
|
||||
++ lib.optionals pythonSupport [ python3Packages.numpy ]
|
||||
++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]
|
||||
++ lib.optionals cudaSupport cudaComponents;
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchurl,
|
||||
electron,
|
||||
dpkg,
|
||||
makeWrapper,
|
||||
commandLineArgs ? "",
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "falkor";
|
||||
version = "0.0.92";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Team-Falkor/falkor/releases/download/v${finalAttrs.version}/falkor.deb";
|
||||
hash = "sha256-yDpYu2ehrRQuD29jcyTQla2R2IT1zfBDeWDDRnmqc8Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
dpkg
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
mv usr/share $out/share
|
||||
mkdir -p $out/share/falkor
|
||||
sed -i "s|Exec=.*|Exec=falkor|" $out/share/applications/*.desktop
|
||||
mv opt/falkor/{resources,resources.pak,locales} $out/share/falkor
|
||||
|
||||
makeWrapper ${lib.getExe electron} $out/bin/falkor \
|
||||
--argv0 "falkor" \
|
||||
--add-flags "$out/share/falkor/resources/app.asar" \
|
||||
--add-flags ${lib.escapeShellArg commandLineArgs}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Electron-based gaming hub";
|
||||
homepage = "https://github.com/Team-Falkor/falkor";
|
||||
license = with lib.licenses; [ mit ];
|
||||
maintainers = with lib.maintainers; [ icedborn ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
hydraPlatforms = [ ];
|
||||
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
|
||||
mainProgram = "falkor";
|
||||
};
|
||||
})
|
||||
Generated
-5908
File diff suppressed because it is too large
Load Diff
@@ -10,8 +10,10 @@
|
||||
rustc,
|
||||
pkg-config,
|
||||
glib,
|
||||
grass-sass,
|
||||
gtk4,
|
||||
gtksourceview5,
|
||||
lcms2,
|
||||
libadwaita,
|
||||
gst_all_1,
|
||||
desktop-file-utils,
|
||||
@@ -28,22 +30,19 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fractal";
|
||||
version = "9";
|
||||
version = "10";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World";
|
||||
repo = "fractal";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-3UI727LUYw7wUKbGRCtgpkF9NNw4XuZ3tl3KV3Ku9r4=";
|
||||
tag = version;
|
||||
hash = "sha256-dXmdoEBvHhOoICIDCpi2JTPo7j/kQzlv+Q/S/7LNyv0=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"matrix-sdk-0.7.1" = "sha256-AmODDuNLpI6gXuu+oPl3MqcOnywqR8lqJ0bVOIiz02E=";
|
||||
"ruma-0.10.1" = "sha256-6U2LKMYyY7SLOh2jJcVuDBsfcidNoia1XU+JsmhMHGY=";
|
||||
};
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
hash = "sha256-qRxJvlorS5S3Wj3HjfvvR2nM/ZWzefz4x791UeSXm0w=";
|
||||
};
|
||||
|
||||
# Dirty approach to add patches after cargoSetupPostUnpackHook
|
||||
@@ -56,6 +55,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
glib
|
||||
grass-sass
|
||||
gtk4
|
||||
meson
|
||||
ninja
|
||||
@@ -74,6 +74,7 @@ stdenv.mkDerivation rec {
|
||||
glib
|
||||
gtk4
|
||||
gtksourceview5
|
||||
lcms2
|
||||
libadwaita
|
||||
openssl
|
||||
pipewire
|
||||
@@ -87,6 +88,7 @@ stdenv.mkDerivation rec {
|
||||
gst-plugins-base
|
||||
gst-plugins-bad
|
||||
gst-plugins-good
|
||||
gst-plugins-rs
|
||||
]);
|
||||
|
||||
preFixup = ''
|
||||
|
||||
@@ -0,0 +1,81 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitea,
|
||||
makeWrapper,
|
||||
bash,
|
||||
|
||||
git,
|
||||
nix-prefetch-git,
|
||||
rWrapper,
|
||||
rPackages,
|
||||
|
||||
unstableGitUpdater,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "git-unroll";
|
||||
version = "0-unstable-2024-11-04";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "gm6k";
|
||||
repo = "git-unroll";
|
||||
rev = "9243bb8a6a9f6875e21a5c64320b66f7fdaf9b3f";
|
||||
hash = "sha256-1MjbB1EVgmU0HlUibrKOkjmxQ8wseocSJENiAqyHcjU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace unroll \
|
||||
--replace-fail "#! /usr/bin/env nix-shell" "#!/usr/bin/env bash" \
|
||||
--replace-fail \
|
||||
"#! nix-shell -i bash -p git nix rWrapper rPackages.jsonlite rPackages.processx rPackages.dplyr rPackages.plyr rPackages.stringr -I nixpkgs=." \
|
||||
"" \
|
||||
--replace-fail '"$PWD/pkgs/build-support/fetchgit/nix-prefetch-git",' '"nix-prefetch-git"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
bash
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 unroll $out/bin/unroll
|
||||
wrapProgram $out/bin/unroll \
|
||||
--prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
git
|
||||
nix-prefetch-git
|
||||
(rWrapper.override {
|
||||
packages = with rPackages; [
|
||||
jsonlite
|
||||
processx
|
||||
dplyr
|
||||
plyr
|
||||
stringr
|
||||
];
|
||||
})
|
||||
]
|
||||
}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = unstableGitUpdater { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Convert Git repositories with submodules to a Nix expression based on non-recursive Git sources";
|
||||
homepage = "https://codeberg.org/gm6k/git-unroll";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
mainProgram = "unroll";
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,38 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gojo";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "itchyny";
|
||||
repo = "gojo";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-DMFTB5CgJTWf+P9ntgBgzdmcF2qjS9t3iUQ1Rer+Ab4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-iVAPuc+83WZCs5WAAZIKEExDdwXQqswgso2XRVJB/bE=";
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
versionCheckProgramArg = [ "-v" ];
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Yet another Go implementation of jo";
|
||||
homepage = "https://github.com/itchyny/gojo";
|
||||
changelog = "https://github.com/itchyny/gojo/releases/tag/v${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ xiaoxiangmoe ];
|
||||
mainProgram = "gojo";
|
||||
};
|
||||
}
|
||||
@@ -7,6 +7,7 @@
|
||||
git,
|
||||
cargo,
|
||||
versionCheckHook,
|
||||
writableTmpDirAsHomeHook,
|
||||
darwin,
|
||||
nix-update-script,
|
||||
}:
|
||||
@@ -63,6 +64,7 @@ python3Packages.buildPythonApplication rec {
|
||||
++ [
|
||||
cargo
|
||||
versionCheckHook
|
||||
writableTmpDirAsHomeHook
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
darwin.ps
|
||||
@@ -70,10 +72,6 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
versionCheckProgramArg = [ "--version" ];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d);
|
||||
'';
|
||||
|
||||
pytestFlagsArray =
|
||||
[
|
||||
# AssertionError on the version metadata
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
nodejs,
|
||||
python3,
|
||||
nixosTests,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -17,7 +18,7 @@ let
|
||||
src = fetchFromGitHub {
|
||||
owner = "hedgedoc";
|
||||
repo = "hedgedoc";
|
||||
rev = version;
|
||||
tag = version;
|
||||
hash = "sha256-cRIpcoD9WzLYxKYpkvhRxUmeyJR5z2QyqApzWvQND+s=";
|
||||
};
|
||||
|
||||
@@ -31,10 +32,10 @@ let
|
||||
gitMinimal # needed to download git dependencies
|
||||
nodejs # needed for npm to download git dependencies
|
||||
yarn
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
export HOME=$(mktemp -d)
|
||||
yarn config set enableTelemetry 0
|
||||
yarn config set cacheFolder $out
|
||||
yarn config set --json supportedArchitectures.os '[ "linux" ]'
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "hyprprop";
|
||||
version = "0.1-unstable-2024-12-01";
|
||||
version = "0.1-unstable-2025-01-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "contrib";
|
||||
rev = "d7c55140f1785b8d9fef351f1cd2a4c9e1eaa466";
|
||||
hash = "sha256-sp14z0mrqrtmouz1+bU4Jh8/0xi+xwQHF2l7mhGSSVU=";
|
||||
rev = "d449f6e1fc31084437ebc0c45057ee656f593efd";
|
||||
hash = "sha256-8ytokHHcKusbspRaiGP38s7fHU105JRvO9GRTzcRklg=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/hyprprop";
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
mandoc,
|
||||
rustfmt,
|
||||
file,
|
||||
writableTmpDirAsHomeHook,
|
||||
|
||||
# build inputs
|
||||
openssl,
|
||||
@@ -59,6 +60,7 @@ rustPlatform.buildRustPackage rec {
|
||||
nativeCheckInputs = [
|
||||
file
|
||||
gnum4
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
@@ -69,10 +71,6 @@ rustPlatform.buildRustPackage rec {
|
||||
--prefix PATH : ${lib.makeBinPath [ gnum4 ]}
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
checkFlags = [
|
||||
"--skip=test_cli_subcommands" # panicking due to sandbox
|
||||
];
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
nix-update-script,
|
||||
testers,
|
||||
menulibre,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
@@ -19,7 +20,7 @@ python3Packages.buildPythonApplication rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "bluesabre";
|
||||
repo = "menulibre";
|
||||
rev = "menulibre-${version}";
|
||||
tag = "menulibre-${version}";
|
||||
hash = "sha256-IfsuOYP/H3r1GDWMVVSBfYvQS+01VJaAlZu+c05geWg=";
|
||||
};
|
||||
|
||||
@@ -35,6 +36,7 @@ python3Packages.buildPythonApplication rec {
|
||||
intltool
|
||||
gobject-introspection
|
||||
wrapGAppsHook3
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
@@ -43,10 +45,6 @@ python3Packages.buildPythonApplication rec {
|
||||
--replace-fail 'update_desktop_file(desktop_file, script_path)' ""
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
export HOME=$TMPDIR
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests.version = testers.testVersion {
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nix-search-tv";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "3timeslazy";
|
||||
repo = "nix-search-tv";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-SKLvN67GHLHGj0bUYdFutiLzRVCCtxNokWP0z3Za9UU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-uzNDhkovlXx0tIgSJ3E08d0TNmktSrlOOe8Iwi4ZfmU=";
|
||||
|
||||
subPackages = [ "cmd/nix-search-tv" ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Nixpkgs channel for television";
|
||||
homepage = "https://github.com/3timeslazy/nix-search-tv";
|
||||
changelog = "https://github.com/3timeslazy/nix-search-tv/releases/tag/v${version}";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
mainProgram = "nix-search-tv";
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
set -l containercmds destroy restart start stop terminate status update login root-login run show-ip show-host-key
|
||||
set -l subcommands list create $containercmds
|
||||
|
||||
complete -c nixos-container -f
|
||||
complete -c nixos-container -n "not __fish_seen_subcommand_from $subcommands" -a "$subcommands"
|
||||
complete -c nixos-container \
|
||||
-n "__fish_seen_subcommand_from $containercmds" \
|
||||
-n "test 2 -eq (__fish_number_of_cmd_args_wo_opts)" \
|
||||
-a "(nixos-container list)"
|
||||
|
||||
# create flags
|
||||
for flag in nixos-path system-path config-file;
|
||||
complete -c nixos-container -n "__fish_seen_subcommand_from create" -l $flag -Fr
|
||||
end
|
||||
|
||||
for flag in config flake ensure-unique-name auto-start bridge port host-address local-address;
|
||||
complete -c nixos-container -n "__fish_seen_subcommand_from create" -l $flag
|
||||
end
|
||||
|
||||
# update flags
|
||||
for flag in nixos-path config-file;
|
||||
complete -c nixos-container -n "__fish_seen_subcommand_from update" -l $flag -Fr
|
||||
end
|
||||
|
||||
for flag in config flake;
|
||||
complete -c nixos-container -n "__fish_seen_subcommand_from update" -l $flag
|
||||
end
|
||||
@@ -1,12 +1,13 @@
|
||||
{ replaceVarsWith
|
||||
, perl
|
||||
, shadow
|
||||
, util-linux
|
||||
, configurationDirectory ? "/etc/nixos-containers"
|
||||
, stateDirectory ? "/var/lib/nixos-containers"
|
||||
, nixosTests
|
||||
{
|
||||
replaceVarsWith,
|
||||
perl,
|
||||
shadow,
|
||||
util-linux,
|
||||
installShellFiles,
|
||||
configurationDirectory ? "/etc/nixos-containers",
|
||||
stateDirectory ? "/var/lib/nixos-containers",
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
replaceVarsWith {
|
||||
name = "nixos-container";
|
||||
dir = "bin";
|
||||
@@ -32,10 +33,13 @@ replaceVarsWith {
|
||||
};
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = ''
|
||||
t=$out/share/bash-completion/completions
|
||||
mkdir -p $t
|
||||
cp ${./nixos-container-completion.sh} $t/nixos-container
|
||||
installShellCompletion --cmd nixos-container \
|
||||
--bash ${./nixos-container-completion.sh} \
|
||||
--fish ${./nixos-container-completion.fish}
|
||||
'';
|
||||
|
||||
meta.mainProgram = "nixos-container";
|
||||
}
|
||||
|
||||
@@ -18,11 +18,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "oils-for-unix";
|
||||
version = "0.24.0";
|
||||
version = "0.26.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.oilshell.org/download/oils-for-unix-${version}.tar.gz";
|
||||
hash = "sha256-30r+2U1TswOngs4DgMOT1g9tIZIe8qJZIrQAgordmPM=";
|
||||
url = "https://www.oils.pub/download/oils-for-unix-${version}.tar.gz";
|
||||
hash = "sha256-K1spWld6J2OBQgO0o0iAygMGeinuuAr0hXtgkjFNbu0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
description = "Unix shell with JSON-compatible structured data. It's our upgrade path from bash to a better language and runtime";
|
||||
homepage = "https://www.oilshell.org/";
|
||||
homepage = "https://www.oils.pub/";
|
||||
|
||||
license = lib.licenses.asl20;
|
||||
|
||||
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
|
||||
mkg20001
|
||||
melkor333
|
||||
];
|
||||
changelog = "https://www.oilshell.org/release/${version}/changelog.html";
|
||||
changelog = "https://www.oils.pub/release/${version}/changelog.html";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "pmtiles";
|
||||
version = "1.23.1";
|
||||
version = "1.25.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "protomaps";
|
||||
repo = "go-pmtiles";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-W8TlMUAzEeHYrVxJTS3CeBkZzshpuDbFD8lC/ITJMKI=";
|
||||
hash = "sha256-eOcjJPQ5a9d1iDaTa+oZgMmyaOszd2ORaKKr3Td4WP0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Oi099KdfSSVDKuWektEucigwchjEHCsOxbCe48DICF8=";
|
||||
vendorHash = "sha256-NQ74rLYhzacOrw6Tl6WoERfqbx2aF9X18rh0oOjCotE=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -1,4 +1,11 @@
|
||||
{ lib, stdenv, fetchFromGitHub, buildGoModule, testers, podman-tui }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
buildGoModule,
|
||||
testers,
|
||||
podman-tui,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "podman-tui";
|
||||
@@ -15,15 +22,15 @@ buildGoModule rec {
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
tags = [ "containers_image_openpgp" "remote" ]
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin "darwin";
|
||||
tags = [
|
||||
"containers_image_openpgp"
|
||||
"remote"
|
||||
] ++ lib.optional stdenv.hostPlatform.isDarwin "darwin";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
preCheck = ''
|
||||
export USER="$(whoami)"
|
||||
export HOME="$(mktemp -d)"
|
||||
'';
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
];
|
||||
|
||||
checkFlags =
|
||||
let
|
||||
|
||||
@@ -3,12 +3,13 @@
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
git,
|
||||
gitMinimal,
|
||||
python3,
|
||||
makeWrapper,
|
||||
writeScriptBin,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@@ -26,19 +27,16 @@ rustPlatform.buildRustPackage rec {
|
||||
cargoHash = "sha256-mi4pCYA0dQnv3MIpZxVVY0qLdIts/qvxS4og0Tyxk3w=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
git
|
||||
gitMinimal
|
||||
python3
|
||||
makeWrapper
|
||||
writableTmpDirAsHomeHook
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ (writeScriptBin "diskutil" "") ];
|
||||
|
||||
buildInputs = [
|
||||
python3
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/lib
|
||||
cp -r $HOME/.erg/ $out/lib/erg
|
||||
|
||||
@@ -3,14 +3,13 @@
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
|
||||
# nativeBuildInputs
|
||||
binaryen,
|
||||
lld,
|
||||
pkg-config,
|
||||
protobuf,
|
||||
rustfmt,
|
||||
|
||||
nasm,
|
||||
# buildInputs
|
||||
freetype,
|
||||
glib,
|
||||
@@ -19,12 +18,19 @@
|
||||
openssl,
|
||||
vulkan-loader,
|
||||
wayland,
|
||||
|
||||
versionCheckHook,
|
||||
|
||||
# passthru
|
||||
nix-update-script,
|
||||
python3Packages,
|
||||
# Expose features to the user for the wasm web viewer build
|
||||
# So he can easily override them
|
||||
# We omit the "analytics" feature because it is opt-out and not opt-in.
|
||||
# More information can be found in there README:
|
||||
# https://raw.githubusercontent.com/rerun-io/rerun/5a9794990c4903c088ad77174e65eb2573162d97/crates/utils/re_analytics/README.md
|
||||
buildWebViewerFeatures ? [
|
||||
"grpc"
|
||||
"map_view"
|
||||
],
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@@ -50,7 +56,38 @@ rustPlatform.buildRustPackage rec {
|
||||
cargoBuildFlags = [ "--package rerun-cli" ];
|
||||
cargoTestFlags = [ "--package rerun-cli" ];
|
||||
buildNoDefaultFeatures = true;
|
||||
buildFeatures = [ "native_viewer" ];
|
||||
buildFeatures = [
|
||||
"native_viewer"
|
||||
"web_viewer"
|
||||
"nasm"
|
||||
];
|
||||
|
||||
# Forward as a bash environment variable to the preBuild hook
|
||||
inherit buildWebViewerFeatures;
|
||||
|
||||
# When web_viewer is compiled, the wasm webviewer first needs to be built
|
||||
# If this doesn't exist, the build will fail. More information: https://github.com/rerun-io/rerun/issues/6028
|
||||
# The command is taken from https://github.com/rerun-io/rerun/blob/dd025f1384f9944d785d0fb75ca4ca1cd1792f17/pixi.toml#L198C72-L198C187
|
||||
# Note that cargoBuildFeatures reference what buildFeatures is set to in stdenv.mkDerivation,
|
||||
# so that user can easily create an overlay to set cargoBuildFeatures to what he needs
|
||||
preBuild = ''
|
||||
if [[ " $cargoBuildFeatures " == *" web_viewer "* ]]; then
|
||||
# transform the environment variable that is a space separated list into a comma separated list
|
||||
buildWebViewerFeatures=$(echo $buildWebViewerFeatures | tr ' ' ',')
|
||||
# Create the features option only if there are features to pass
|
||||
buildWebViewerFeaturesCargoOption=""
|
||||
if [[ ! -z "$buildWebViewerFeatures" ]]; then
|
||||
buildWebViewerFeaturesCargoOption="--features $buildWebViewerFeatures"
|
||||
echo "Features passed to the web viewer build: $buildWebViewerFeatures"
|
||||
else
|
||||
echo "No features will be passed to the web viewer build"
|
||||
fi
|
||||
echo "Building the wasm web viewer for rerun's web_viewer feature"
|
||||
cargo run -p re_dev_tools -- build-web-viewer --no-default-features $buildWebViewerFeaturesCargoOption --release -g
|
||||
else
|
||||
echo "web_viewer feature not enabled, skipping web viewer build."
|
||||
fi
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
(lib.getBin binaryen) # wasm-opt
|
||||
@@ -61,6 +98,7 @@ rustPlatform.buildRustPackage rec {
|
||||
pkg-config
|
||||
protobuf
|
||||
rustfmt
|
||||
nasm
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -14,7 +14,7 @@ buildGoModule rec {
|
||||
src = fetchFromGitHub {
|
||||
repo = "shopware-cli";
|
||||
owner = "FriendsOfShopware";
|
||||
rev = version;
|
||||
tag = version;
|
||||
hash = "sha256-nFjm1z7QXuUkZ4sVRY0KdFpo0SXBTmJNA28YJpAyG2w=";
|
||||
};
|
||||
|
||||
@@ -30,7 +30,6 @@ buildGoModule rec {
|
||||
vendorHash = "sha256-7DVC68tKoEwaTbF6Lkv1Ib1imZojTPW3G/QS3W6N8ys=";
|
||||
|
||||
postInstall = ''
|
||||
export HOME="$(mktemp -d)"
|
||||
installShellCompletion --cmd shopware-cli \
|
||||
--bash <($out/bin/shopware-cli completion bash) \
|
||||
--zsh <($out/bin/shopware-cli completion zsh) \
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
fetchFromGitHub,
|
||||
git,
|
||||
gitMinimal,
|
||||
glibc,
|
||||
lib,
|
||||
makeWrapper,
|
||||
@@ -8,6 +8,7 @@
|
||||
python3Packages,
|
||||
squashfsTools,
|
||||
stdenv,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
@@ -138,17 +139,13 @@ python3Packages.buildPythonApplication rec {
|
||||
pytestCheckHook
|
||||
responses
|
||||
setuptools
|
||||
writableTmpDirAsHomeHook
|
||||
]
|
||||
++ [
|
||||
git
|
||||
gitMinimal
|
||||
squashfsTools
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
mkdir -p check-phase
|
||||
export HOME="$(pwd)/check-phase"
|
||||
'';
|
||||
|
||||
pytestFlagsArray = [ "tests/unit" ];
|
||||
|
||||
disabledTests = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tektoncd-cli";
|
||||
version = "0.39.0";
|
||||
version = "0.39.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tektoncd";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-yEtHPA1MG+Cud9KhTrsvhQp1Q+Mu073AoNwOvZH8xBU=";
|
||||
sha256 = "sha256-84pbohnO9AFrYDKGNKOEyuzKDa6xunXTrhQgwkQlia4=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tig";
|
||||
version = "2.5.10";
|
||||
version = "2.5.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jonas";
|
||||
repo = pname;
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "sha256-WTrw7WaSqC2fp76fPvfogWTibev0Hg0LW2x4umc3+1Q=";
|
||||
sha256 = "sha256-LFuuhivEg5J7TmrAv/WsKWMsbip0PszuKLPgLLeRzkA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,19 +11,19 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "trivy";
|
||||
version = "0.58.2";
|
||||
version = "0.59.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = "trivy";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-td0FYnrfq+bBpH3YdNbLJp3MG6hiGD5fU77+sO6HP9k=";
|
||||
hash = "sha256-DIBpuSW8igkpZxhve77fzJ1u3sp3iWHmi7746F0cKEQ=";
|
||||
};
|
||||
|
||||
# Hash mismatch on across Linux and Darwin
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-6RUPSYSvhGqtnX/eeOtIdBZVsv+faGOimYt74f598qM=";
|
||||
vendorHash = "sha256-kRKGX3hRbjLb/thhFcX4/y1ty0EGME63VGOsPaUcZKc=";
|
||||
|
||||
subPackages = [ "cmd/trivy" ];
|
||||
|
||||
|
||||
@@ -64,11 +64,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "uclibc-ng";
|
||||
version = "1.0.50";
|
||||
version = "1.0.51";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.uclibc-ng.org/releases/${finalAttrs.version}/uClibc-ng-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-rthnJR9II6dOpeOjmT06fBIygKvhXjjcIGdww5aPIc8=";
|
||||
hash = "sha256-NITIx6BQPAj35fp0c8mHQUBQcm8x6Fk9AtmE9RLRoMs=";
|
||||
};
|
||||
|
||||
# 'ftw' needed to build acl, a coreutils dependency
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kde-rounded-corners";
|
||||
version = "0.7.0";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matinlotfali";
|
||||
repo = "KDE-Rounded-Corners";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6uSgYFY+JV8UCy3j9U/hjk6wJpD1XqpnXBqmKVi/2W0=";
|
||||
hash = "sha256-iJNEwDsGOOqWQgG3iwrZt9mpbKWHOw7zkEORURcAGLQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1 +1 @@
|
||||
WGET_ARGS=( https://download.qt.io/official_releases/qt/6.8/6.8.1/submodules/ -A '*.tar.xz' )
|
||||
WGET_ARGS=( https://download.qt.io/official_releases/qt/6.8/6.8.2/submodules/ -A '*.tar.xz' )
|
||||
|
||||
@@ -226,11 +226,6 @@ stdenv.mkDerivation rec {
|
||||
./qmlimportscanner-import-path.patch
|
||||
# don't pass qtbase's QML directory to qmlimportscanner if it's empty
|
||||
./skip-missing-qml-directory.patch
|
||||
|
||||
# Qt treats linker flags without known suffix as libraries since 6.7.2 (see qt/qtbase commit ea0f00d).
|
||||
# Don't do this for absolute paths (like `/nix/store/…/QtMultimedia.framework/Versions/A/QtMultimedia`).
|
||||
# Upcoming upstream fix: https://codereview.qt-project.org/c/qt/qtbase/+/613683.
|
||||
./dont-treat-abspaths-without-suffix-as-libraries.patch
|
||||
];
|
||||
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
|
||||
-13
@@ -1,13 +0,0 @@
|
||||
diff --git a/cmake/QtGenerateLibHelpers.cmake b/cmake/QtGenerateLibHelpers.cmake
|
||||
index c9d4a69497..dc1a290cfc 100644
|
||||
--- a/cmake/QtGenerateLibHelpers.cmake
|
||||
+++ b/cmake/QtGenerateLibHelpers.cmake
|
||||
@@ -10,7 +10,7 @@ function(qt_get_library_name_without_prefix_and_suffix out_var file_path)
|
||||
if(NOT file_path MATCHES "^-") # not a linker flag
|
||||
get_filename_component(basename "${file_path}" NAME_WE)
|
||||
get_filename_component(ext "${file_path}" EXT)
|
||||
- if(NOT ext) # seems like a library name without prefix and suffix
|
||||
+ if(NOT ext AND NOT IS_ABSOLUTE "${file_path}") # seems like a library name without prefix and suffix
|
||||
set(${out_var} "${file_path}" PARENT_SCOPE)
|
||||
return()
|
||||
endif()
|
||||
@@ -3,7 +3,6 @@
|
||||
qtbase,
|
||||
qtdeclarative,
|
||||
openssl,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
qtModule {
|
||||
@@ -13,12 +12,4 @@ qtModule {
|
||||
qtdeclarative
|
||||
];
|
||||
buildInputs = [ openssl ];
|
||||
patches = [
|
||||
# should be able to remove on next update
|
||||
(fetchpatch {
|
||||
name = "fix-clang-19-build.patch";
|
||||
url = "https://github.com/qt/qtquick3d/commit/636a5558470ba0e0a4db1ca23dc72d96dfabeccf.patch";
|
||||
hash = "sha256-xBzOoVWDWvpxbSHKWeeWY1ZVldsjoUeJqFcfpvjEWAg=";
|
||||
})
|
||||
];
|
||||
}
|
||||
|
||||
@@ -29,25 +29,12 @@ qtModule {
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
patches = [
|
||||
# backport fix for crashes when hotplugging a graphics tablet, as recommended by upstream
|
||||
# FIXME: remove in 6.8.2
|
||||
(fetchpatch2 {
|
||||
url = "https://invent.kde.org/qt/qt/qtwayland/-/commit/24002ac6cbd01dbde4944b63c1f7c87ed2bd72b5.patch";
|
||||
hash = "sha256-Lz4Gv6FLhFGv7dVpqqcss6/w5jsGA8SKaNeWMHT0A/A=";
|
||||
})
|
||||
|
||||
# run waylandscanner with private-code to avoid conflict with symbols from libwayland
|
||||
# better solution for https://github.com/NixOS/nixpkgs/pull/337913
|
||||
(fetchpatch2 {
|
||||
url = "https://invent.kde.org/qt/qt/qtwayland/-/commit/67f121cc4c3865aa3a93cf563caa1d9da3c92695.patch";
|
||||
hash = "sha256-uh5lecHlHCWyO1/EU5kQ00VS7eti3PEvPA2HBCL9K0k=";
|
||||
})
|
||||
|
||||
# fix crash when attach differ shellsurface to the same shellsurfaceitem
|
||||
(fetchpatch2 {
|
||||
url = "https://invent.kde.org/qt/qt/qtwayland/-/commit/070414dd4155e13583e5e8b16bed1a5b68d32910.patch";
|
||||
hash = "sha256-JLTdSEbqM6OSijk0cgC419AdLE+PF5KbFh3ypgYUKz8=";
|
||||
})
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -4,315 +4,315 @@
|
||||
|
||||
{
|
||||
qt3d = {
|
||||
version = "6.8.1";
|
||||
version = "6.8.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qt3d-everywhere-src-6.8.1.tar.xz";
|
||||
sha256 = "0dj2gh6lrcy096g0f9cyawg16c7n46lqqn3bgicr5bbv3f3hdc08";
|
||||
name = "qt3d-everywhere-src-6.8.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qt3d-everywhere-src-6.8.2.tar.xz";
|
||||
sha256 = "0i4cgcvhngq716009r4yjn1ma67vpr4cj2ks13yxba4iy1966yjp";
|
||||
name = "qt3d-everywhere-src-6.8.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qt5compat = {
|
||||
version = "6.8.1";
|
||||
version = "6.8.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qt5compat-everywhere-src-6.8.1.tar.xz";
|
||||
sha256 = "1z34289x0j40f3jylwz62aqqq21aqkvpz2wwibx330ydnj4c1j05";
|
||||
name = "qt5compat-everywhere-src-6.8.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qt5compat-everywhere-src-6.8.2.tar.xz";
|
||||
sha256 = "05jk959ykc96gp1chszr5pmv916nzd8g5gk6qbfy427cjny58cdm";
|
||||
name = "qt5compat-everywhere-src-6.8.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtactiveqt = {
|
||||
version = "6.8.1";
|
||||
version = "6.8.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtactiveqt-everywhere-src-6.8.1.tar.xz";
|
||||
sha256 = "1mwc5incb7hy33d0jskxl3yliw6jvgky8qxq9cgmplx5p7m48scj";
|
||||
name = "qtactiveqt-everywhere-src-6.8.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtactiveqt-everywhere-src-6.8.2.tar.xz";
|
||||
sha256 = "09dr5jr1qavy9795jzrf9my9ffcwf4n4arkjb5jkk1m1274nvhil";
|
||||
name = "qtactiveqt-everywhere-src-6.8.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtbase = {
|
||||
version = "6.8.1";
|
||||
version = "6.8.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtbase-everywhere-src-6.8.1.tar.xz";
|
||||
sha256 = "1bywb2nxdqdwnc68qvpaz0sq58lgw0mfl6041sy7kmrvxxi4bca0";
|
||||
name = "qtbase-everywhere-src-6.8.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtbase-everywhere-src-6.8.2.tar.xz";
|
||||
sha256 = "01gy1p8zvxq8771x6iqkrc7s3kzdddgf1i7xj656w7j1dp746801";
|
||||
name = "qtbase-everywhere-src-6.8.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtcharts = {
|
||||
version = "6.8.1";
|
||||
version = "6.8.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtcharts-everywhere-src-6.8.1.tar.xz";
|
||||
sha256 = "0abxy1b42rzvg1yksbmzvdpapxdp8n37jclkv44gb3i4dvqs7pif";
|
||||
name = "qtcharts-everywhere-src-6.8.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtcharts-everywhere-src-6.8.2.tar.xz";
|
||||
sha256 = "0py56kxmp766jp4vxxn91nclhg7sjgwzc3b1xa62yysx3bd88z7c";
|
||||
name = "qtcharts-everywhere-src-6.8.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtconnectivity = {
|
||||
version = "6.8.1";
|
||||
version = "6.8.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtconnectivity-everywhere-src-6.8.1.tar.xz";
|
||||
sha256 = "0724lq45jjw223n681rnrsjxh97jn5gi8ki7i03p3412mpkldzfc";
|
||||
name = "qtconnectivity-everywhere-src-6.8.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtconnectivity-everywhere-src-6.8.2.tar.xz";
|
||||
sha256 = "0al1a86q0cd1xrs1f7wsk3cjq74yvrvw3wk4c3ynkhsa107145z6";
|
||||
name = "qtconnectivity-everywhere-src-6.8.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtdatavis3d = {
|
||||
version = "6.8.1";
|
||||
version = "6.8.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtdatavis3d-everywhere-src-6.8.1.tar.xz";
|
||||
sha256 = "03jba3d5arysrw1drz4a5kj2kjrb6lrwfrrhvgg3mamqdph8zrns";
|
||||
name = "qtdatavis3d-everywhere-src-6.8.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtdatavis3d-everywhere-src-6.8.2.tar.xz";
|
||||
sha256 = "09hyqnaqsc0li5sp8s9y3r945pmz1y9a8r4q5hy9hvszmx0r58nd";
|
||||
name = "qtdatavis3d-everywhere-src-6.8.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtdeclarative = {
|
||||
version = "6.8.1";
|
||||
version = "6.8.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtdeclarative-everywhere-src-6.8.1.tar.xz";
|
||||
sha256 = "1z1rq2j4cwhz5wgibdb8a6xw339vs6d231b4vyqyvp3a3df5vlcm";
|
||||
name = "qtdeclarative-everywhere-src-6.8.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtdeclarative-everywhere-src-6.8.2.tar.xz";
|
||||
sha256 = "0mkd6hqvg21dg63022iq1b6sskp2s5wfchsifc4mkdcbvim8fk8l";
|
||||
name = "qtdeclarative-everywhere-src-6.8.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtdoc = {
|
||||
version = "6.8.1";
|
||||
version = "6.8.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtdoc-everywhere-src-6.8.1.tar.xz";
|
||||
sha256 = "1ckvrpn32v20vd0m06s46vxcrhn8plq738bzahz9329rvdild9vh";
|
||||
name = "qtdoc-everywhere-src-6.8.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtdoc-everywhere-src-6.8.2.tar.xz";
|
||||
sha256 = "1iaxangaskc8v0mwqxn27pq1k4wjlq6d2ixja8qfsl69ql25pkmk";
|
||||
name = "qtdoc-everywhere-src-6.8.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtgraphs = {
|
||||
version = "6.8.1";
|
||||
version = "6.8.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtgraphs-everywhere-src-6.8.1.tar.xz";
|
||||
sha256 = "102asm1c2pmn3xb784l74qgafkl2yp5gh3ml59jkas4kd7gf6ihy";
|
||||
name = "qtgraphs-everywhere-src-6.8.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtgraphs-everywhere-src-6.8.2.tar.xz";
|
||||
sha256 = "1m267jp6xns7aipxkk13s2k64h33mfslp5h5j1zgsvrg92is9iq5";
|
||||
name = "qtgraphs-everywhere-src-6.8.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtgrpc = {
|
||||
version = "6.8.1";
|
||||
version = "6.8.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtgrpc-everywhere-src-6.8.1.tar.xz";
|
||||
sha256 = "102y1gs7r9097cvym8zds03cj8ffs8hc8mza5bsfa4mhjrq5qqdi";
|
||||
name = "qtgrpc-everywhere-src-6.8.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtgrpc-everywhere-src-6.8.2.tar.xz";
|
||||
sha256 = "1nrnd6y5ip1yv6k15qq183ghcgacfdfhngk03jm2840qv86z2rcc";
|
||||
name = "qtgrpc-everywhere-src-6.8.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qthttpserver = {
|
||||
version = "6.8.1";
|
||||
version = "6.8.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qthttpserver-everywhere-src-6.8.1.tar.xz";
|
||||
sha256 = "09qbkg1lx0rdq6bjvlw5n61q8hawg1b4cd0y9p3v2nf3vl7vk32x";
|
||||
name = "qthttpserver-everywhere-src-6.8.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qthttpserver-everywhere-src-6.8.2.tar.xz";
|
||||
sha256 = "14h6j3cf36lylb01drpbzmbm7nyq4vgc3bgp64436nws0k0ig59d";
|
||||
name = "qthttpserver-everywhere-src-6.8.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtimageformats = {
|
||||
version = "6.8.1";
|
||||
version = "6.8.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtimageformats-everywhere-src-6.8.1.tar.xz";
|
||||
sha256 = "0dyj7n8dh8fawaxgxd537ifn4ppb6qwyndiy53vmz3x9ka8c530k";
|
||||
name = "qtimageformats-everywhere-src-6.8.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtimageformats-everywhere-src-6.8.2.tar.xz";
|
||||
sha256 = "1qf88gjff2bdb51ijdpjzf1l7w00prqb29wjqapa1f078ywbp8fj";
|
||||
name = "qtimageformats-everywhere-src-6.8.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtlanguageserver = {
|
||||
version = "6.8.1";
|
||||
version = "6.8.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtlanguageserver-everywhere-src-6.8.1.tar.xz";
|
||||
sha256 = "0zkdiqy26fji2mqh827m7xap5gv0xrn5nqihibim6aj3q4v98pl6";
|
||||
name = "qtlanguageserver-everywhere-src-6.8.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtlanguageserver-everywhere-src-6.8.2.tar.xz";
|
||||
sha256 = "1yw54x6g291z88ib7g0ydz9y5940vr71xh28fmvhhk1k2nn79swy";
|
||||
name = "qtlanguageserver-everywhere-src-6.8.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtlocation = {
|
||||
version = "6.8.1";
|
||||
version = "6.8.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtlocation-everywhere-src-6.8.1.tar.xz";
|
||||
sha256 = "1vsr9fpdsslz78fh6vb3qrqjgqip5s9amls99qfkm1xvp1gdnw4h";
|
||||
name = "qtlocation-everywhere-src-6.8.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtlocation-everywhere-src-6.8.2.tar.xz";
|
||||
sha256 = "068pgnds6hgmj6lmxwlapc9nx69cz2bzndgksvm051kb875hnjck";
|
||||
name = "qtlocation-everywhere-src-6.8.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtlottie = {
|
||||
version = "6.8.1";
|
||||
version = "6.8.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtlottie-everywhere-src-6.8.1.tar.xz";
|
||||
sha256 = "0jhpf3hmhzr0ns4qd0zsdblxadmparmcj6n24js95pxzzk2l8hw2";
|
||||
name = "qtlottie-everywhere-src-6.8.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtlottie-everywhere-src-6.8.2.tar.xz";
|
||||
sha256 = "085yiqihp54m94nw2r82dfnjpf5kvr43bywhr02xv4q31nr3xm2y";
|
||||
name = "qtlottie-everywhere-src-6.8.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtmultimedia = {
|
||||
version = "6.8.1";
|
||||
version = "6.8.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtmultimedia-everywhere-src-6.8.1.tar.xz";
|
||||
sha256 = "0lzrfg8vscjc3n79rlb0jm8pkb4r8xsa8m9clvqbgyls9w9qgykm";
|
||||
name = "qtmultimedia-everywhere-src-6.8.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtmultimedia-everywhere-src-6.8.2.tar.xz";
|
||||
sha256 = "0s8mxd7pwm9v8x5qa3h6124w91k0zjbbah6h9b68n5bvq3yn3x9l";
|
||||
name = "qtmultimedia-everywhere-src-6.8.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtnetworkauth = {
|
||||
version = "6.8.1";
|
||||
version = "6.8.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtnetworkauth-everywhere-src-6.8.1.tar.xz";
|
||||
sha256 = "0920qx3zw0567la4wl1fx3z4qrs3pmlvsf14hbgvnpwwjax691hi";
|
||||
name = "qtnetworkauth-everywhere-src-6.8.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtnetworkauth-everywhere-src-6.8.2.tar.xz";
|
||||
sha256 = "1mxlam2fzh8arfq7iypsvlk4h2pbj41f5a7ibakap1zc4ysv95fl";
|
||||
name = "qtnetworkauth-everywhere-src-6.8.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtpositioning = {
|
||||
version = "6.8.1";
|
||||
version = "6.8.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtpositioning-everywhere-src-6.8.1.tar.xz";
|
||||
sha256 = "13gpglkgacmpjikga5wsbvghnhvp7vzzizsvg2qvxm4i4liyf473";
|
||||
name = "qtpositioning-everywhere-src-6.8.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtpositioning-everywhere-src-6.8.2.tar.xz";
|
||||
sha256 = "1rdqbp4yxzyd3c77bf4y9klvbvv1pimg4zqmw6kncr4k9r7ncc6z";
|
||||
name = "qtpositioning-everywhere-src-6.8.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtquick3d = {
|
||||
version = "6.8.1";
|
||||
version = "6.8.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtquick3d-everywhere-src-6.8.1.tar.xz";
|
||||
sha256 = "1rqcy8ds8kidccp193paklims7l1676kfskync5d9z4mdig38g9z";
|
||||
name = "qtquick3d-everywhere-src-6.8.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtquick3d-everywhere-src-6.8.2.tar.xz";
|
||||
sha256 = "0v8bkx51b6lhaknrdsfj1k127vccn24snmkpzfxcdcf5p36fnk08";
|
||||
name = "qtquick3d-everywhere-src-6.8.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtquick3dphysics = {
|
||||
version = "6.8.1";
|
||||
version = "6.8.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtquick3dphysics-everywhere-src-6.8.1.tar.xz";
|
||||
sha256 = "0vhabyblidy7wf80jl27bq25rpq5f9pys8dj9bxj40rgazdqwbk5";
|
||||
name = "qtquick3dphysics-everywhere-src-6.8.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtquick3dphysics-everywhere-src-6.8.2.tar.xz";
|
||||
sha256 = "0gvrp9060k6d7jmjj0hialhigpv0c0c42szijsbs56bn98njc66z";
|
||||
name = "qtquick3dphysics-everywhere-src-6.8.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtquickeffectmaker = {
|
||||
version = "6.8.1";
|
||||
version = "6.8.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtquickeffectmaker-everywhere-src-6.8.1.tar.xz";
|
||||
sha256 = "1xjizd15q2pgvaikw5vjkf2chvkdrfy3c66cfar91gba6l9xykrd";
|
||||
name = "qtquickeffectmaker-everywhere-src-6.8.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtquickeffectmaker-everywhere-src-6.8.2.tar.xz";
|
||||
sha256 = "0z301rr7svga92ncbfdfsjpmxq85n6vd92s3vkgica0pjdc3rksg";
|
||||
name = "qtquickeffectmaker-everywhere-src-6.8.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtquicktimeline = {
|
||||
version = "6.8.1";
|
||||
version = "6.8.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtquicktimeline-everywhere-src-6.8.1.tar.xz";
|
||||
sha256 = "18qjzvnhx24lhfp9fv53wq3jd4w1dqrzlg7v044cwyzx4y71kg7x";
|
||||
name = "qtquicktimeline-everywhere-src-6.8.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtquicktimeline-everywhere-src-6.8.2.tar.xz";
|
||||
sha256 = "1ahspk05h676j8vlf2kgpc25mb9bc3p8m9iicxzkvfzsv7pbqgf3";
|
||||
name = "qtquicktimeline-everywhere-src-6.8.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtremoteobjects = {
|
||||
version = "6.8.1";
|
||||
version = "6.8.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtremoteobjects-everywhere-src-6.8.1.tar.xz";
|
||||
sha256 = "1y2riwh227s1krp4l96s8fy4lagmrqmc2ynxrz8p2jv10l7qgwky";
|
||||
name = "qtremoteobjects-everywhere-src-6.8.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtremoteobjects-everywhere-src-6.8.2.tar.xz";
|
||||
sha256 = "0adnbqdppawy4k8j5d87h59v9mdfhdrj4yfbhy0vy2qvw7nx6anh";
|
||||
name = "qtremoteobjects-everywhere-src-6.8.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtscxml = {
|
||||
version = "6.8.1";
|
||||
version = "6.8.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtscxml-everywhere-src-6.8.1.tar.xz";
|
||||
sha256 = "1mjgc49gr7fsgqm1m8h5xij7m7frs6ji5026j3dyvmmcrx26yh1g";
|
||||
name = "qtscxml-everywhere-src-6.8.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtscxml-everywhere-src-6.8.2.tar.xz";
|
||||
sha256 = "14x1iv7wdaifly06dh5w0iqa46va0hikg1c4rh0yj0a0l88llg38";
|
||||
name = "qtscxml-everywhere-src-6.8.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtsensors = {
|
||||
version = "6.8.1";
|
||||
version = "6.8.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtsensors-everywhere-src-6.8.1.tar.xz";
|
||||
sha256 = "0l4p3lh5g8w2dymy7k661b4qz7kmpvv0xrw0gdj0rm2h91hrpx21";
|
||||
name = "qtsensors-everywhere-src-6.8.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtsensors-everywhere-src-6.8.2.tar.xz";
|
||||
sha256 = "1jplvcnpp7xc8d1lpw7qzrk6pvm8lrn84r2hy7dspl0s02dpr0ca";
|
||||
name = "qtsensors-everywhere-src-6.8.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtserialbus = {
|
||||
version = "6.8.1";
|
||||
version = "6.8.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtserialbus-everywhere-src-6.8.1.tar.xz";
|
||||
sha256 = "1nhmxm44achdagfqvzd39yjriqr1kpm9x7wfh6by4fjwxj98sy20";
|
||||
name = "qtserialbus-everywhere-src-6.8.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtserialbus-everywhere-src-6.8.2.tar.xz";
|
||||
sha256 = "04m1p69rbsjhngnlpdf60k0y7zyjrqvrg732vdzmhdfrsaxdc68r";
|
||||
name = "qtserialbus-everywhere-src-6.8.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtserialport = {
|
||||
version = "6.8.1";
|
||||
version = "6.8.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtserialport-everywhere-src-6.8.1.tar.xz";
|
||||
sha256 = "15c3jdncjvc172sqk7nbm4z8wc6pfbnv18gfwc1v0zbdq2jp53h9";
|
||||
name = "qtserialport-everywhere-src-6.8.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtserialport-everywhere-src-6.8.2.tar.xz";
|
||||
sha256 = "1rrv3snfc5r08q5dx37vrns1vwk6rnw1l0ldym4z32g9c4iy05zd";
|
||||
name = "qtserialport-everywhere-src-6.8.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtshadertools = {
|
||||
version = "6.8.1";
|
||||
version = "6.8.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtshadertools-everywhere-src-6.8.1.tar.xz";
|
||||
sha256 = "0ij8khb8k9qzmvkn1g2ks90m175syw897a2bqx1q0fj76bb0rdsm";
|
||||
name = "qtshadertools-everywhere-src-6.8.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtshadertools-everywhere-src-6.8.2.tar.xz";
|
||||
sha256 = "0w8qamghycprmz20n01s0di8as52v7j4qnn57bb71z45i07gkmfi";
|
||||
name = "qtshadertools-everywhere-src-6.8.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtspeech = {
|
||||
version = "6.8.1";
|
||||
version = "6.8.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtspeech-everywhere-src-6.8.1.tar.xz";
|
||||
sha256 = "1pxcw468f003qx645xv377rm55jkbqrddl49xg6b1c2pq4vgxidh";
|
||||
name = "qtspeech-everywhere-src-6.8.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtspeech-everywhere-src-6.8.2.tar.xz";
|
||||
sha256 = "1hq2y8dwr57gcqq1zj3w42ykwmzphjh2yf1ab3s9005rdcrm56z0";
|
||||
name = "qtspeech-everywhere-src-6.8.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtsvg = {
|
||||
version = "6.8.1";
|
||||
version = "6.8.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtsvg-everywhere-src-6.8.1.tar.xz";
|
||||
sha256 = "1l0darn7apr142kzn4k9hm91f2dv4r27rms8gjm2ssz3jqsyf39x";
|
||||
name = "qtsvg-everywhere-src-6.8.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtsvg-everywhere-src-6.8.2.tar.xz";
|
||||
sha256 = "1yn1kl5cvpnl7619r1inbmik4yg0cy87xn1irz5ijvd63kr7j9da";
|
||||
name = "qtsvg-everywhere-src-6.8.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qttools = {
|
||||
version = "6.8.1";
|
||||
version = "6.8.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qttools-everywhere-src-6.8.1.tar.xz";
|
||||
sha256 = "0ba37hl5pp3zpf3n9vqsq4zrm75n2i8wdaam04d6if08pq4x8hwx";
|
||||
name = "qttools-everywhere-src-6.8.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qttools-everywhere-src-6.8.2.tar.xz";
|
||||
sha256 = "1h6jacmzyb4qrsmk68if72avsydfk31ap4gj28v921rzsjvq2qrj";
|
||||
name = "qttools-everywhere-src-6.8.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qttranslations = {
|
||||
version = "6.8.1";
|
||||
version = "6.8.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qttranslations-everywhere-src-6.8.1.tar.xz";
|
||||
sha256 = "0jjs0c1j62rlp4sv3b6lhr3xvsjw91vi1rbxh0xj8llix69n0nk3";
|
||||
name = "qttranslations-everywhere-src-6.8.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qttranslations-everywhere-src-6.8.2.tar.xz";
|
||||
sha256 = "1ld3sv309shkm267ab0f5f849lw8j8ll062c5iq7gz8bb256w46j";
|
||||
name = "qttranslations-everywhere-src-6.8.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtvirtualkeyboard = {
|
||||
version = "6.8.1";
|
||||
version = "6.8.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtvirtualkeyboard-everywhere-src-6.8.1.tar.xz";
|
||||
sha256 = "0r52i57lfzy6yvjg9zhdppn1x8vhia61andnhlp77v4k82ya68hh";
|
||||
name = "qtvirtualkeyboard-everywhere-src-6.8.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtvirtualkeyboard-everywhere-src-6.8.2.tar.xz";
|
||||
sha256 = "09ybfxi9fpmv7jjvqmkbg432l5ymp6my23bvr42dmdbqd4aybp1d";
|
||||
name = "qtvirtualkeyboard-everywhere-src-6.8.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwayland = {
|
||||
version = "6.8.1";
|
||||
version = "6.8.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtwayland-everywhere-src-6.8.1.tar.xz";
|
||||
sha256 = "00x2xhlp3iyxvxkk9rl9wxa6lw7x727rq8sbpzw15p9d9vggn9i2";
|
||||
name = "qtwayland-everywhere-src-6.8.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtwayland-everywhere-src-6.8.2.tar.xz";
|
||||
sha256 = "0iwnvjas5vqzi48finff72iqnl5hal48qba64kwjnpr911wiaijy";
|
||||
name = "qtwayland-everywhere-src-6.8.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwebchannel = {
|
||||
version = "6.8.1";
|
||||
version = "6.8.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtwebchannel-everywhere-src-6.8.1.tar.xz";
|
||||
sha256 = "0fknlmlaajrf7cmkk4wnswmr51zam0zh4id19n99wc18j5zry4vb";
|
||||
name = "qtwebchannel-everywhere-src-6.8.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtwebchannel-everywhere-src-6.8.2.tar.xz";
|
||||
sha256 = "1b5pd0f3zbz4q6cygjn8fbrsbfb7rlwi4nq0f1vaaws6yi9ix7w6";
|
||||
name = "qtwebchannel-everywhere-src-6.8.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwebengine = {
|
||||
version = "6.8.1";
|
||||
version = "6.8.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtwebengine-everywhere-src-6.8.1.tar.xz";
|
||||
sha256 = "1g4imqhd3rnkq5sjjiapczlj5pl3p4yvcj8fhg751kzdr0xf1a0v";
|
||||
name = "qtwebengine-everywhere-src-6.8.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtwebengine-everywhere-src-6.8.2.tar.xz";
|
||||
sha256 = "00j8wlz6fbg4ivkc6w7dbc67835hv7w74sfrshdb75y12rzri5gz";
|
||||
name = "qtwebengine-everywhere-src-6.8.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwebsockets = {
|
||||
version = "6.8.1";
|
||||
version = "6.8.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtwebsockets-everywhere-src-6.8.1.tar.xz";
|
||||
sha256 = "0gqy6kgixyvpwayldjwd072i3k48pz4sca84n31d3v8bfvldmkz4";
|
||||
name = "qtwebsockets-everywhere-src-6.8.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtwebsockets-everywhere-src-6.8.2.tar.xz";
|
||||
sha256 = "1glczsi3pgrhgb6v20pqm8invnfjb8415lcj74wwhiilp9igb7ci";
|
||||
name = "qtwebsockets-everywhere-src-6.8.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwebview = {
|
||||
version = "6.8.1";
|
||||
version = "6.8.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtwebview-everywhere-src-6.8.1.tar.xz";
|
||||
sha256 = "08lyas1zvc2yj8h7d75yf9n6jmjm0qvvlwaqjprhdyl4kjgc0szm";
|
||||
name = "qtwebview-everywhere-src-6.8.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtwebview-everywhere-src-6.8.2.tar.xz";
|
||||
sha256 = "0hyhpr3ai77pwdc69q73r1wkibdn2vn6v1pqkc8minck24kkdd46";
|
||||
name = "qtwebview-everywhere-src-6.8.2.tar.xz";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -21,12 +21,14 @@
|
||||
torch,
|
||||
|
||||
# tests
|
||||
addBinToPathHook,
|
||||
evaluate,
|
||||
parameterized,
|
||||
pytestCheckHook,
|
||||
transformers,
|
||||
config,
|
||||
cudatoolkit,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -56,19 +58,17 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
addBinToPathHook
|
||||
evaluate
|
||||
parameterized
|
||||
pytestCheckHook
|
||||
transformers
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
preCheck =
|
||||
''
|
||||
export HOME=$(mktemp -d)
|
||||
export PATH=$out/bin:$PATH
|
||||
''
|
||||
+ lib.optionalString config.cudaSupport ''
|
||||
export TRITON_PTXAS_PATH="${cudatoolkit}/bin/ptxas"
|
||||
'';
|
||||
|
||||
preCheck = lib.optionalString config.cudaSupport ''
|
||||
export TRITON_PTXAS_PATH="${cudatoolkit}/bin/ptxas"
|
||||
'';
|
||||
pytestFlagsArray = [ "tests" ];
|
||||
disabledTests =
|
||||
[
|
||||
|
||||
@@ -1,31 +1,38 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
|
||||
# dependencies
|
||||
embedding-reader,
|
||||
faiss,
|
||||
fetchFromGitHub,
|
||||
fire,
|
||||
fsspec,
|
||||
lib,
|
||||
numpy,
|
||||
pyarrow,
|
||||
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "autofaiss";
|
||||
version = "2.17.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "criteo";
|
||||
repo = pname;
|
||||
repo = "autofaiss";
|
||||
tag = version;
|
||||
hash = "sha256-pey3wrW7CDLMiPPKnmYrcSJqGuy6ecA2SE9m3Jtt6DU=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
pythonRemoveDeps = [
|
||||
# The `dataclasses` packages is a python2-only backport, unnecessary in
|
||||
# python3.
|
||||
@@ -41,14 +48,17 @@ buildPythonPackage rec {
|
||||
# As of v2.15.3, autofaiss asks for pyarrow<8 but we have pyarrow v9.0.0 in
|
||||
# nixpkgs at the time of writing (2022-12-15).
|
||||
"pyarrow"
|
||||
|
||||
# No official numpy2 support yet
|
||||
"numpy"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
embedding-reader
|
||||
fsspec
|
||||
numpy
|
||||
faiss
|
||||
fire
|
||||
fsspec
|
||||
numpy
|
||||
pyarrow
|
||||
];
|
||||
|
||||
@@ -61,14 +71,20 @@ buildPythonPackage rec {
|
||||
"test_index_correctness_in_distributed_mode_with_multiple_indices"
|
||||
"test_index_correctness_in_distributed_mode"
|
||||
"test_quantize_with_pyspark"
|
||||
|
||||
# TypeError: Object of type float32 is not JSON serializable
|
||||
"test_quantize"
|
||||
"test_quantize_with_empty_and_non_empty_files"
|
||||
"test_quantize_with_ids"
|
||||
"test_quantize_with_multiple_inputs"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Automatically create Faiss knn indices with the most optimal similarity search parameters";
|
||||
mainProgram = "autofaiss";
|
||||
homepage = "https://github.com/criteo/autofaiss";
|
||||
changelog = "https://github.com/criteo/autofaiss/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ samuela ];
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ samuela ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
poetry-core,
|
||||
pycryptodome,
|
||||
py-datastruct,
|
||||
pyserial,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bk7231tools";
|
||||
version = "2.0.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tuya-cloudcutter";
|
||||
repo = "bk7231tools";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Ag63VNBSKEPDaxhS40SVB8rKIJRS1IsrZ9wSD0FglSU=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"pycryptodome"
|
||||
"py-datastruct"
|
||||
"pyserial"
|
||||
];
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
dependencies = [
|
||||
pycryptodome
|
||||
py-datastruct
|
||||
pyserial
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "bk7231tools" ];
|
||||
|
||||
meta = {
|
||||
description = "Tools to interact with and analyze artifacts for BK7231 MCUs";
|
||||
homepage = "https://github.com/tuya-cloudcutter/bk7231tools";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ mevatron ];
|
||||
mainProgram = "bk7231tools";
|
||||
};
|
||||
}
|
||||
@@ -1,10 +1,12 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
pythonOlder,
|
||||
fetchFromGitHub,
|
||||
writeText,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
|
||||
# dependencies
|
||||
filelock,
|
||||
huggingface-hub,
|
||||
importlib-metadata,
|
||||
@@ -13,6 +15,7 @@
|
||||
regex,
|
||||
requests,
|
||||
safetensors,
|
||||
|
||||
# optional dependencies
|
||||
accelerate,
|
||||
datasets,
|
||||
@@ -24,7 +27,9 @@
|
||||
protobuf,
|
||||
tensorboard,
|
||||
torch,
|
||||
# test dependencies
|
||||
|
||||
# tests
|
||||
writeText,
|
||||
parameterized,
|
||||
pytest-timeout,
|
||||
pytest-xdist,
|
||||
@@ -43,8 +48,6 @@ buildPythonPackage rec {
|
||||
version = "0.32.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "huggingface";
|
||||
repo = "diffusers";
|
||||
@@ -90,8 +93,6 @@ buildPythonPackage rec {
|
||||
# it takes a few hours
|
||||
doCheck = false;
|
||||
|
||||
passthru.tests.pytest = diffusers.overridePythonAttrs { doCheck = true; };
|
||||
|
||||
nativeCheckInputs = [
|
||||
parameterized
|
||||
pytest-timeout
|
||||
@@ -102,7 +103,7 @@ buildPythonPackage rec {
|
||||
sentencepiece
|
||||
torchsde
|
||||
transformers
|
||||
] ++ optional-dependencies.torch;
|
||||
] ++ lib.flatten (builtins.attrValues optional-dependencies);
|
||||
|
||||
preCheck =
|
||||
let
|
||||
@@ -128,7 +129,7 @@ buildPythonPackage rec {
|
||||
'';
|
||||
in
|
||||
''
|
||||
export HOME=$TMPDIR
|
||||
export HOME=$(mktemp -d)
|
||||
cat ${conftestSkipNetworkErrors} >> tests/conftest.py
|
||||
'';
|
||||
|
||||
@@ -139,22 +140,32 @@ buildPythonPackage rec {
|
||||
# depends on current working directory
|
||||
"test_deprecate_stacklevel"
|
||||
# fails due to precision of floating point numbers
|
||||
"test_full_loop_no_noise"
|
||||
"test_model_cpu_offload_forward_pass"
|
||||
# tries to run ruff which we have intentionally removed from nativeCheckInputs
|
||||
"test_is_copy_consistent"
|
||||
]
|
||||
++ lib.optionals (pythonAtLeast "3.12") [
|
||||
|
||||
# Require unpackaged torchao:
|
||||
# importlib.metadata.PackageNotFoundError: No package metadata was found for torchao
|
||||
"test_load_attn_procs_raise_warning"
|
||||
"test_save_attn_procs_raise_warning"
|
||||
"test_save_load_lora_adapter_0"
|
||||
"test_save_load_lora_adapter_1"
|
||||
"test_wrong_adapter_name_raises_error"
|
||||
]
|
||||
++ lib.optionals (pythonAtLeast "3.13") [
|
||||
# RuntimeError: Dynamo is not supported on Python 3.12+
|
||||
"test_from_save_pretrained_dynamo"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
passthru.tests.pytest = diffusers.overridePythonAttrs { doCheck = true; };
|
||||
|
||||
meta = {
|
||||
description = "State-of-the-art diffusion models for image and audio generation in PyTorch";
|
||||
mainProgram = "diffusers-cli";
|
||||
homepage = "https://github.com/huggingface/diffusers";
|
||||
changelog = "https://github.com/huggingface/diffusers/releases/tag/${src.tag}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ natsukium ];
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ natsukium ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,156 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools-scm,
|
||||
accelerate,
|
||||
aiohttp,
|
||||
antlr4-python3-runtime,
|
||||
causal-conv1d,
|
||||
datasets,
|
||||
dill,
|
||||
evaluate,
|
||||
hf-transfer,
|
||||
immutabledict,
|
||||
jsonlines,
|
||||
langdetect,
|
||||
mamba-ssm,
|
||||
more-itertools,
|
||||
nltk,
|
||||
numexpr,
|
||||
numpy,
|
||||
optimum,
|
||||
pandas,
|
||||
peft,
|
||||
pybind11,
|
||||
pytablewriter,
|
||||
pytestCheckHook,
|
||||
requests,
|
||||
rouge-score,
|
||||
sacrebleu,
|
||||
scikit-learn,
|
||||
sentencepiece,
|
||||
sqlitedict,
|
||||
sympy,
|
||||
tenacity,
|
||||
tiktoken,
|
||||
torch,
|
||||
tqdm,
|
||||
tqdm-multiprocess,
|
||||
transformers,
|
||||
vllm,
|
||||
wandb,
|
||||
word2number,
|
||||
zstandard,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "lm-eval";
|
||||
version = "0.4.7";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EleutherAI";
|
||||
repo = "lm-evaluation-harness";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-UEY0KrsgWoyj0fnKBca2yYjVTBFje6DdLfvnNFVYFHU=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
accelerate
|
||||
datasets
|
||||
dill
|
||||
evaluate
|
||||
jsonlines
|
||||
more-itertools
|
||||
numexpr
|
||||
peft
|
||||
pybind11
|
||||
pytablewriter
|
||||
rouge-score
|
||||
sacrebleu
|
||||
scikit-learn
|
||||
sqlitedict
|
||||
torch
|
||||
tqdm-multiprocess
|
||||
transformers
|
||||
word2number
|
||||
zstandard
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
api = [
|
||||
requests
|
||||
aiohttp
|
||||
tenacity
|
||||
tqdm
|
||||
tiktoken
|
||||
];
|
||||
hf_transfer = [ hf-transfer ];
|
||||
ifeval = [
|
||||
langdetect
|
||||
immutabledict
|
||||
nltk
|
||||
];
|
||||
neuronx = [ optimum ] ++ optimum.optional-dependencies.neuronx;
|
||||
mamba = [
|
||||
mamba-ssm
|
||||
causal-conv1d
|
||||
];
|
||||
math = [
|
||||
sympy
|
||||
antlr4-python3-runtime
|
||||
];
|
||||
optimum = [ optimum ] ++ optimum.optional-dependencies.openvino;
|
||||
sentencepiece = [ sentencepiece ];
|
||||
vllm = [ vllm ];
|
||||
wandb = [
|
||||
wandb
|
||||
pandas
|
||||
numpy
|
||||
];
|
||||
# Still missing dependencies for the following:
|
||||
# deepsparse, gptq, ibm_watsonx_ai, multilingual, promptsource, sparseml,
|
||||
# zeno, gptqmodel, japanese_leaderboard; all = [...];
|
||||
};
|
||||
|
||||
pythonImportsCheck = [ "lm_eval" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
] ++ optional-dependencies.api;
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$TMP
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
"test_deepsparse" # deepsparse is not available
|
||||
"test_model_tokenized_call_usage" # downloads a model
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# attempts to download models
|
||||
"tests/models/test_huggingface.py"
|
||||
"tests/test_evaluator.py"
|
||||
"tests/test_include_path.py"
|
||||
"tests/test_prompt.py"
|
||||
"tests/test_task_manager.py"
|
||||
"tests/test_tasks.py"
|
||||
|
||||
# optimum-intel is not available
|
||||
"tests/models/test_openvino.py"
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/EleutherAI/lm-evaluation-harness/releases/tag/v${version}";
|
||||
description = "A framework for few-shot evaluation of language models";
|
||||
homepage = "https://github.com/EleutherAI/lm-evaluation-harness";
|
||||
license = [ lib.licenses.mit ];
|
||||
maintainers = [ lib.maintainers.booxter ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
poetry-core,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "py-datastruct";
|
||||
version = "1.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kuba2k2";
|
||||
repo = "datastruct";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-KEIvibGnQnIDMpmodWN2Az/ypc37ZyGvgVPC7voFmlA=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
pythonImportsCheck = [ "datastruct" ];
|
||||
|
||||
# Add nativeCheckInputs = [ pytestCheckHook ]; once we update to v2.0.0 tag and remove below line
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "Combination of struct and dataclasses for easy parsing of binary formats";
|
||||
homepage = "https://github.com/kuba2k2/datastruct";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ mevatron ];
|
||||
};
|
||||
}
|
||||
@@ -3,7 +3,7 @@
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchFromGitLab,
|
||||
fetchFromGitea,
|
||||
git-unroll,
|
||||
buildPythonPackage,
|
||||
python,
|
||||
runCommand,
|
||||
@@ -228,14 +228,6 @@ let
|
||||
rocmSupport;
|
||||
};
|
||||
|
||||
git-unroll = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "gm6k";
|
||||
repo = "git-unroll";
|
||||
rev = "9243bb8a6a9f6875e21a5c64320b66f7fdaf9b3f";
|
||||
hash = "sha256-1MjbB1EVgmU0HlUibrKOkjmxQ8wseocSJENiAqyHcjU=";
|
||||
};
|
||||
|
||||
unroll-src = writeShellScript "unroll-src" ''
|
||||
echo "{
|
||||
version,
|
||||
@@ -244,7 +236,7 @@ let
|
||||
runCommand,
|
||||
}:
|
||||
assert version == "'"'$1'"'";"
|
||||
${git-unroll}/unroll https://github.com/pytorch/pytorch v$1
|
||||
${lib.getExe git-unroll} https://github.com/pytorch/pytorch v$1
|
||||
echo
|
||||
echo "# Update using: unroll-src [version]"
|
||||
'';
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools-scm,
|
||||
tqdm,
|
||||
colorama,
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
pname = "tqdm-multiprocess";
|
||||
version = "0.0.11";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EleutherAI";
|
||||
repo = "tqdm-multiprocess";
|
||||
rev = "fccefc473595055bf3a5e74bcf8a75b3a9517638";
|
||||
hash = "sha256-nQeFPwF5OasOYrVs7kLG/Uz6pf1FKxar4ygggo8s4ZM=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
colorama
|
||||
tqdm
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"tqdm_multiprocess"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Support multiple worker processes, each with multiple tqdm progress bars, displaying them cleanly through the main process";
|
||||
homepage = "https://github.com/EleutherAI/tqdm-multiprocess";
|
||||
license = [ lib.licenses.mit ];
|
||||
maintainers = [ lib.maintainers.booxter ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,45 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools-scm,
|
||||
future,
|
||||
python,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "word2number";
|
||||
version = "1.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "akshaynagpal";
|
||||
repo = "w2n";
|
||||
tag = version;
|
||||
hash = "sha256-dgHPEfieNDZnP6+YvywvN3ZzmeICav0WMYKkWDSJ/LE=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
future
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"word2number"
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
${lib.getExe python} unit_testing.py
|
||||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/akshaynagpal/w2n/releases/tag/${version}";
|
||||
description = "Convert number words (eg. twenty one) to numeric digits (21)";
|
||||
homepage = "http://w2n.readthedocs.io/";
|
||||
license = [ lib.licenses.mit ];
|
||||
maintainers = [ lib.maintainers.booxter ];
|
||||
};
|
||||
}
|
||||
@@ -38,8 +38,8 @@ let
|
||||
pyyaml
|
||||
];
|
||||
|
||||
mysqlShellVersion = "9.1.0";
|
||||
mysqlServerVersion = "9.1.0";
|
||||
mysqlShellVersion = "9.2.0";
|
||||
mysqlServerVersion = "9.2.0";
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mysql-shell-innovation";
|
||||
@@ -48,11 +48,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
srcs = [
|
||||
(fetchurl {
|
||||
url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor mysqlServerVersion}/mysql-${mysqlServerVersion}.tar.gz";
|
||||
hash = "sha256-UsNnUjm/2dPIMiT/IAKqbihvq5e/WytcoahcnDR3Zvw=";
|
||||
hash = "sha256-o50R/fbPjRsDtwjVN6kTLeS5mp601hApOTfwaHzTehI=";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "https://dev.mysql.com/get/Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz";
|
||||
hash = "sha256-YHlM/heqV8vQnIGxwEESXx+wRVr++TFjSb00tPwBb2s=";
|
||||
hash = "sha256-xuKXV8YllhDo7+6i5UYHAH7m7Jn5E/k0YdeN5MZSzl8=";
|
||||
})
|
||||
];
|
||||
|
||||
@@ -118,10 +118,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# Build MySQL
|
||||
echo "Building mysqlclient mysqlxclient"
|
||||
|
||||
cmake -DWITH_SYSTEM_LIBS=ON -DWITH_FIDO=system -DWITH_ROUTER=OFF -DWITH_UNIT_TESTS=OFF \
|
||||
cmake -DWITH_SYSTEM_LIBS=ON -DWITH_FIDO=system -DWITH_ROUTER=ON -DWITH_UNIT_TESTS=OFF \
|
||||
-DFORCE_UNSUPPORTED_COMPILER=1 -S ../mysql -B ../mysql/build
|
||||
|
||||
cmake --build ../mysql/build --parallel ''${NIX_BUILD_CORES:-1} --target mysqlclient mysqlxclient
|
||||
cmake --build ../mysql/build --parallel ''${NIX_BUILD_CORES:-1} \
|
||||
--target mysqlclient mysqlxclient mysqlbinlog mysql_binlog_event_standalone mysqlrouter_all
|
||||
|
||||
cmakeFlagsArray+=(
|
||||
"-DMYSQL_SOURCE_DIR=''${NIX_BUILD_TOP}/mysql"
|
||||
|
||||
@@ -162,6 +162,8 @@ in rec {
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
dontCheckForBrokenSymlinks = true;
|
||||
};
|
||||
|
||||
# This can be used as a shellHook in mkYarnPackage. It brings the built node_modules into
|
||||
@@ -374,6 +376,8 @@ in rec {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
dontCheckForBrokenSymlinks = true;
|
||||
|
||||
doDist = attrs.doDist or true;
|
||||
|
||||
distPhase = attrs.distPhase or ''
|
||||
|
||||
@@ -325,6 +325,10 @@ let
|
||||
else "install"))
|
||||
];
|
||||
|
||||
# We remove a bunch of stuff that is symlinked from other places to save space,
|
||||
# which trips the broken symlink check. So, just skip it. We'll know if it explodes.
|
||||
dontCheckForBrokenSymlinks = true;
|
||||
|
||||
postInstall = optionalString isModular ''
|
||||
mkdir -p $dev
|
||||
cp vmlinux $dev/
|
||||
|
||||
@@ -19,6 +19,16 @@
|
||||
"agpl"
|
||||
]
|
||||
},
|
||||
"collectives": {
|
||||
"hash": "sha256-IAnJZuaj6KW6kF4daIKxvCEDCViWu30gogm8q2/ooQs=",
|
||||
"url": "https://github.com/nextcloud/collectives/releases/download/v2.16.0/collectives-2.16.0.tar.gz",
|
||||
"version": "2.16.0",
|
||||
"description": "Collectives is a Nextcloud App for activist and community projects to organize together.\nCome and gather in collectives to build shared knowledge.\n\n* 👥 **Collective and non-hierarchical workflow by heart**: Collectives are\n tied to a [Nextcloud Team](https://github.com/nextcloud/circles) and\n owned by the collective.\n* 📝 **Collaborative page editing** like known from Etherpad thanks to the\n [Text app](https://github.com/nextcloud/text).\n* 🔤 **Well-known [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax**\n for page formatting.\n\n## Installation\n\nIn your Nextcloud instance, simply navigate to **»Apps«**, find the\n**»Teams«** and **»Collectives«** apps and enable them.",
|
||||
"homepage": "https://github.com/nextcloud/collectives",
|
||||
"licenses": [
|
||||
"agpl"
|
||||
]
|
||||
},
|
||||
"contacts": {
|
||||
"hash": "sha256-zxmgMiizzXGfReRS9XJ+fb6tJRLH/Z5NvuLpspYARFI=",
|
||||
"url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.5.3/contacts-v5.5.3.tar.gz",
|
||||
|
||||
@@ -19,6 +19,16 @@
|
||||
"agpl"
|
||||
]
|
||||
},
|
||||
"collectives": {
|
||||
"hash": "sha256-IAnJZuaj6KW6kF4daIKxvCEDCViWu30gogm8q2/ooQs=",
|
||||
"url": "https://github.com/nextcloud/collectives/releases/download/v2.16.0/collectives-2.16.0.tar.gz",
|
||||
"version": "2.16.0",
|
||||
"description": "Collectives is a Nextcloud App for activist and community projects to organize together.\nCome and gather in collectives to build shared knowledge.\n\n* 👥 **Collective and non-hierarchical workflow by heart**: Collectives are\n tied to a [Nextcloud Team](https://github.com/nextcloud/circles) and\n owned by the collective.\n* 📝 **Collaborative page editing** like known from Etherpad thanks to the\n [Text app](https://github.com/nextcloud/text).\n* 🔤 **Well-known [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax**\n for page formatting.\n\n## Installation\n\nIn your Nextcloud instance, simply navigate to **»Apps«**, find the\n**»Teams«** and **»Collectives«** apps and enable them.",
|
||||
"homepage": "https://github.com/nextcloud/collectives",
|
||||
"licenses": [
|
||||
"agpl"
|
||||
]
|
||||
},
|
||||
"contacts": {
|
||||
"hash": "sha256-hqCDr7qEqsi8tZ9Woz9hsUm1HENK16FNz4pcQCto8S4=",
|
||||
"url": "https://github.com/nextcloud-releases/contacts/releases/download/v6.0.2/contacts-v6.0.2.tar.gz",
|
||||
|
||||
@@ -19,6 +19,16 @@
|
||||
"agpl"
|
||||
]
|
||||
},
|
||||
"collectives": {
|
||||
"hash": "sha256-IAnJZuaj6KW6kF4daIKxvCEDCViWu30gogm8q2/ooQs=",
|
||||
"url": "https://github.com/nextcloud/collectives/releases/download/v2.16.0/collectives-2.16.0.tar.gz",
|
||||
"version": "2.16.0",
|
||||
"description": "Collectives is a Nextcloud App for activist and community projects to organize together.\nCome and gather in collectives to build shared knowledge.\n\n* 👥 **Collective and non-hierarchical workflow by heart**: Collectives are\n tied to a [Nextcloud Team](https://github.com/nextcloud/circles) and\n owned by the collective.\n* 📝 **Collaborative page editing** like known from Etherpad thanks to the\n [Text app](https://github.com/nextcloud/text).\n* 🔤 **Well-known [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax**\n for page formatting.\n\n## Installation\n\nIn your Nextcloud instance, simply navigate to **»Apps«**, find the\n**»Teams«** and **»Collectives«** apps and enable them.",
|
||||
"homepage": "https://github.com/nextcloud/collectives",
|
||||
"licenses": [
|
||||
"agpl"
|
||||
]
|
||||
},
|
||||
"contacts": {
|
||||
"hash": "sha256-5h94RmmJcM7P0Wjx/hHDbUA55x3H/klOjkmH3qxMbpQ=",
|
||||
"url": "https://github.com/nextcloud-releases/contacts/releases/download/v6.1.3/contacts-v6.1.3.tar.gz",
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
"bookmarks": "agpl3Plus"
|
||||
, "calendar": "agpl3Plus"
|
||||
, "collectives": "agpl3Plus"
|
||||
, "contacts": "agpl3Plus"
|
||||
, "cookbook": "agpl3Plus"
|
||||
, "cospend": "agpl3Plus"
|
||||
|
||||
@@ -1,21 +1,13 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
version,
|
||||
suffix ? "",
|
||||
hash ? null,
|
||||
src ? fetchFromGitHub {
|
||||
owner = "lix-project";
|
||||
repo = "lix";
|
||||
rev = version;
|
||||
inherit hash;
|
||||
},
|
||||
docCargoHash ? null,
|
||||
docCargoLock ? null,
|
||||
version,
|
||||
src,
|
||||
docCargoDeps,
|
||||
patches ? [ ],
|
||||
maintainers ? lib.teams.lix.members,
|
||||
}@args:
|
||||
assert (hash == null) -> (src != null);
|
||||
{
|
||||
stdenv,
|
||||
meson,
|
||||
@@ -60,8 +52,7 @@ assert (hash == null) -> (src != null);
|
||||
lix-doc ? callPackage ./doc {
|
||||
inherit src;
|
||||
version = "${version}${suffix}";
|
||||
cargoHash = docCargoHash;
|
||||
cargoLock = docCargoLock;
|
||||
cargoDeps = docCargoDeps;
|
||||
},
|
||||
|
||||
enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform,
|
||||
@@ -76,8 +67,6 @@ assert (hash == null) -> (src != null);
|
||||
stateDir,
|
||||
storeDir,
|
||||
}:
|
||||
assert lib.assertMsg (docCargoHash != null || docCargoLock != null)
|
||||
"Either `lix-doc`'s cargoHash using `docCargoHash` or `lix-doc`'s `cargoLock.lockFile` using `docCargoLock` must be set!";
|
||||
let
|
||||
isLegacyParser = lib.versionOlder version "2.91";
|
||||
in
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
callPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
rustPlatform,
|
||||
Security,
|
||||
|
||||
storeDir ? "/nix/store",
|
||||
@@ -54,18 +55,42 @@ lib.makeExtensible (self: {
|
||||
buildLix = common;
|
||||
|
||||
lix_2_90 = (
|
||||
common {
|
||||
common rec {
|
||||
version = "2.90.0";
|
||||
hash = "sha256-f8k+BezKdJfmE+k7zgBJiohtS3VkkriycdXYsKOm3sc=";
|
||||
docCargoHash = "sha256-vSf9MyD2XzofZlbzsmh6NP69G+LiX72GX4Um9UJp3dc=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lix-project";
|
||||
repo = "lix";
|
||||
rev = version;
|
||||
hash = "sha256-f8k+BezKdJfmE+k7zgBJiohtS3VkkriycdXYsKOm3sc=";
|
||||
};
|
||||
|
||||
docCargoDeps = rustPlatform.fetchCargoVendor {
|
||||
name = "lix-doc-${version}";
|
||||
inherit src;
|
||||
sourceRoot = "${src.name or src}/lix-doc";
|
||||
hash = "sha256-VPcrf78gfLlkTRrcbLkPgLOk0o6lsOJBm6HYLvavpNU=";
|
||||
};
|
||||
}
|
||||
);
|
||||
|
||||
lix_2_91 = (
|
||||
common {
|
||||
common rec {
|
||||
version = "2.91.1";
|
||||
hash = "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=";
|
||||
docCargoHash = "sha256-F6Ld0HfRvW9r5zn8eMTP6djnV/jvwjYQet4Ghp2T90k=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lix-project";
|
||||
repo = "lix";
|
||||
rev = version;
|
||||
hash = "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=";
|
||||
};
|
||||
|
||||
docCargoDeps = rustPlatform.fetchCargoVendor {
|
||||
name = "lix-doc-${version}";
|
||||
inherit src;
|
||||
sourceRoot = "${src.name or src}/lix-doc";
|
||||
hash = "sha256-U820gvcbQIBaFr2OWPidfFIDXycDFGgXX1NpWDDqENs=";
|
||||
};
|
||||
}
|
||||
);
|
||||
|
||||
|
||||
@@ -2,8 +2,7 @@
|
||||
src,
|
||||
rustPlatform,
|
||||
version,
|
||||
cargoHash ? null,
|
||||
cargoLock ? null,
|
||||
cargoDeps,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
@@ -12,7 +11,6 @@ rustPlatform.buildRustPackage {
|
||||
inherit
|
||||
version
|
||||
src
|
||||
cargoHash
|
||||
cargoLock
|
||||
cargoDeps
|
||||
;
|
||||
}
|
||||
|
||||
@@ -514,6 +514,7 @@ with pkgs;
|
||||
antlr = antlr4_10;
|
||||
icu = icu73;
|
||||
protobuf = protobuf_24;
|
||||
stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_18.stdenv else stdenv;
|
||||
};
|
||||
|
||||
fetchpatch = callPackage ../build-support/fetchpatch {
|
||||
@@ -17367,10 +17368,6 @@ with pkgs;
|
||||
jre = openjdk17;
|
||||
};
|
||||
|
||||
faiss = callPackage ../development/libraries/science/math/faiss {
|
||||
pythonPackages = python3Packages;
|
||||
};
|
||||
|
||||
faissWithCuda = faiss.override {
|
||||
cudaSupport = true;
|
||||
};
|
||||
|
||||
@@ -1727,6 +1727,8 @@ self: super: with self; {
|
||||
|
||||
bjoern = callPackage ../development/python-modules/bjoern { };
|
||||
|
||||
bk7231tools = callPackage ../development/python-modules/bk7231tools { };
|
||||
|
||||
bkcharts = callPackage ../development/python-modules/bkcharts { };
|
||||
|
||||
black = callPackage ../development/python-modules/black { };
|
||||
@@ -4466,7 +4468,7 @@ self: super: with self; {
|
||||
faiss = callPackage ../development/python-modules/faiss {
|
||||
faiss-build = pkgs.faiss.override {
|
||||
pythonSupport = true;
|
||||
pythonPackages = self;
|
||||
python3Packages = self;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -7675,6 +7677,8 @@ self: super: with self; {
|
||||
llvm = pkgs.llvm_15;
|
||||
};
|
||||
|
||||
lm-eval = callPackage ../development/python-modules/lm-eval { };
|
||||
|
||||
lm-format-enforcer = callPackage ../development/python-modules/lm-format-enforcer { };
|
||||
|
||||
lmdb = callPackage ../development/python-modules/lmdb {
|
||||
@@ -9526,6 +9530,8 @@ self: super: with self; {
|
||||
|
||||
py-ccm15 = callPackage ../development/python-modules/py-ccm15 { };
|
||||
|
||||
py-datastruct = callPackage ../development/python-modules/py-datastruct { };
|
||||
|
||||
py-deprecate = callPackage ../development/python-modules/py-deprecate { };
|
||||
|
||||
py-ecc = callPackage ../development/python-modules/py-ecc { };
|
||||
@@ -16479,6 +16485,8 @@ self: super: with self; {
|
||||
|
||||
tqdm = callPackage ../development/python-modules/tqdm { };
|
||||
|
||||
tqdm-multiprocess = callPackage ../development/python-modules/tqdm-multiprocess { };
|
||||
|
||||
traceback2 = callPackage ../development/python-modules/traceback2 { };
|
||||
|
||||
tracerite = callPackage ../development/python-modules/tracerite { };
|
||||
@@ -18234,6 +18242,8 @@ self: super: with self; {
|
||||
|
||||
woodblock = callPackage ../development/python-modules/woodblock { };
|
||||
|
||||
word2number = callPackage ../development/python-modules/word2number { };
|
||||
|
||||
wordcloud = callPackage ../development/python-modules/wordcloud { };
|
||||
|
||||
wordfreq = callPackage ../development/python-modules/wordfreq { };
|
||||
|
||||
Reference in New Issue
Block a user