Merge master into staging-next
This commit is contained in:
github-actions[bot]
@@ -150,3 +150,6 @@ ff5c8f6cc3d1f2e017e86d50965c14b71f00567b
|
||||
|
||||
# ollama: format with nixfmt-rfc-style (#329353)
|
||||
bdfde18037f8d9f9b641a4016c8ada4dc4cbf856
|
||||
|
||||
# nixos/ollama: format with nixfmt-rfc-style (#329561)
|
||||
246d1ee533810ac1946d863bbd9de9b525818d56
|
||||
|
||||
@@ -1,22 +1,37 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
inherit (lib) literalExpression types mkBefore;
|
||||
|
||||
cfg = config.services.ollama;
|
||||
ollamaPackage = cfg.package.override {
|
||||
inherit (cfg) acceleration;
|
||||
};
|
||||
ollamaPackage = cfg.package.override { inherit (cfg) acceleration; };
|
||||
|
||||
staticUser = cfg.user != null && cfg.group != null;
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
(lib.mkRemovedOptionModule [ "services" "ollama" "listenAddress" ]
|
||||
"Use `services.ollama.host` and `services.ollama.port` instead.")
|
||||
(lib.mkRemovedOptionModule [ "services" "ollama" "sandbox" ]
|
||||
"Set `services.ollama.user` and `services.ollama.group` instead.")
|
||||
(lib.mkRemovedOptionModule [ "services" "ollama" "writablePaths" ]
|
||||
"The `models` directory is now always writable. To make other directories writable, use `systemd.services.ollama.serviceConfig.ReadWritePaths`." )
|
||||
(lib.mkRemovedOptionModule [
|
||||
"services"
|
||||
"ollama"
|
||||
"listenAddress"
|
||||
] "Use `services.ollama.host` and `services.ollama.port` instead.")
|
||||
(lib.mkRemovedOptionModule [
|
||||
"services"
|
||||
"ollama"
|
||||
"sandbox"
|
||||
] "Set `services.ollama.user` and `services.ollama.group` instead.")
|
||||
(lib.mkRemovedOptionModule
|
||||
[
|
||||
"services"
|
||||
"ollama"
|
||||
"writablePaths"
|
||||
]
|
||||
"The `models` directory is now always writable. To make other directories writable, use `systemd.services.ollama.serviceConfig.ReadWritePaths`."
|
||||
)
|
||||
];
|
||||
|
||||
options = {
|
||||
@@ -84,7 +99,13 @@ in
|
||||
'';
|
||||
};
|
||||
acceleration = lib.mkOption {
|
||||
type = types.nullOr (types.enum [ false "rocm" "cuda" ]);
|
||||
type = types.nullOr (
|
||||
types.enum [
|
||||
false
|
||||
"rocm"
|
||||
"cuda"
|
||||
]
|
||||
);
|
||||
default = null;
|
||||
example = "rocm";
|
||||
description = ''
|
||||
@@ -150,83 +171,89 @@ in
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
users = lib.mkIf staticUser {
|
||||
users = lib.mkIf staticUser {
|
||||
users.${cfg.user} = {
|
||||
inherit (cfg) home;
|
||||
isSystemUser = true;
|
||||
group = cfg.group;
|
||||
};
|
||||
groups.${cfg.group} = {};
|
||||
groups.${cfg.group} = { };
|
||||
};
|
||||
|
||||
systemd.services.ollama = {
|
||||
description = "Server for local large language models";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network.target" ];
|
||||
environment = cfg.environmentVariables // {
|
||||
HOME = cfg.home;
|
||||
OLLAMA_MODELS = cfg.models;
|
||||
OLLAMA_HOST = "${cfg.host}:${toString cfg.port}";
|
||||
HSA_OVERRIDE_GFX_VERSION = lib.mkIf (cfg.rocmOverrideGfx != null) cfg.rocmOverrideGfx;
|
||||
};
|
||||
serviceConfig = lib.optionalAttrs staticUser {
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
} // {
|
||||
DynamicUser = true;
|
||||
ExecStart = "${lib.getExe ollamaPackage} serve";
|
||||
WorkingDirectory = cfg.home;
|
||||
StateDirectory = [ "ollama" ];
|
||||
ReadWritePaths = [
|
||||
cfg.home
|
||||
cfg.models
|
||||
];
|
||||
environment =
|
||||
cfg.environmentVariables
|
||||
// {
|
||||
HOME = cfg.home;
|
||||
OLLAMA_MODELS = cfg.models;
|
||||
OLLAMA_HOST = "${cfg.host}:${toString cfg.port}";
|
||||
}
|
||||
// lib.optionalAttrs (cfg.rocmOverrideGfx != null) {
|
||||
HSA_OVERRIDE_GFX_VERSION = cfg.rocmOverrideGfx;
|
||||
};
|
||||
serviceConfig =
|
||||
lib.optionalAttrs staticUser {
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
}
|
||||
// {
|
||||
DynamicUser = true;
|
||||
ExecStart = "${lib.getExe ollamaPackage} serve";
|
||||
WorkingDirectory = cfg.home;
|
||||
StateDirectory = [ "ollama" ];
|
||||
ReadWritePaths = [
|
||||
cfg.home
|
||||
cfg.models
|
||||
];
|
||||
|
||||
CapabilityBoundingSet = [ "" ];
|
||||
DeviceAllow = [
|
||||
# CUDA
|
||||
# https://docs.nvidia.com/dgx/pdf/dgx-os-5-user-guide.pdf
|
||||
"char-nvidiactl"
|
||||
"char-nvidia-caps"
|
||||
"char-nvidia-uvm"
|
||||
# ROCm
|
||||
"char-drm"
|
||||
"char-kfd"
|
||||
];
|
||||
DevicePolicy = "closed";
|
||||
LockPersonality = true;
|
||||
MemoryDenyWriteExecute = true;
|
||||
NoNewPrivileges = true;
|
||||
PrivateDevices = false; # hides acceleration devices
|
||||
PrivateTmp = true;
|
||||
PrivateUsers = true;
|
||||
ProcSubset = "all"; # /proc/meminfo
|
||||
ProtectClock = true;
|
||||
ProtectControlGroups = true;
|
||||
ProtectHome = true;
|
||||
ProtectHostname = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelTunables = true;
|
||||
ProtectProc = "invisible";
|
||||
ProtectSystem = "strict";
|
||||
RemoveIPC = true;
|
||||
RestrictNamespaces = true;
|
||||
RestrictRealtime = true;
|
||||
RestrictSUIDSGID = true;
|
||||
RestrictAddressFamilies = [
|
||||
"AF_INET"
|
||||
"AF_INET6"
|
||||
"AF_UNIX"
|
||||
];
|
||||
SupplementaryGroups = [ "render" ]; # for rocm to access /dev/dri/renderD* devices
|
||||
SystemCallArchitectures = "native";
|
||||
SystemCallFilter = [
|
||||
"@system-service @resources"
|
||||
"~@privileged"
|
||||
];
|
||||
UMask = "0077";
|
||||
};
|
||||
CapabilityBoundingSet = [ "" ];
|
||||
DeviceAllow = [
|
||||
# CUDA
|
||||
# https://docs.nvidia.com/dgx/pdf/dgx-os-5-user-guide.pdf
|
||||
"char-nvidiactl"
|
||||
"char-nvidia-caps"
|
||||
"char-nvidia-uvm"
|
||||
# ROCm
|
||||
"char-drm"
|
||||
"char-kfd"
|
||||
];
|
||||
DevicePolicy = "closed";
|
||||
LockPersonality = true;
|
||||
MemoryDenyWriteExecute = true;
|
||||
NoNewPrivileges = true;
|
||||
PrivateDevices = false; # hides acceleration devices
|
||||
PrivateTmp = true;
|
||||
PrivateUsers = true;
|
||||
ProcSubset = "all"; # /proc/meminfo
|
||||
ProtectClock = true;
|
||||
ProtectControlGroups = true;
|
||||
ProtectHome = true;
|
||||
ProtectHostname = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelTunables = true;
|
||||
ProtectProc = "invisible";
|
||||
ProtectSystem = "strict";
|
||||
RemoveIPC = true;
|
||||
RestrictNamespaces = true;
|
||||
RestrictRealtime = true;
|
||||
RestrictSUIDSGID = true;
|
||||
RestrictAddressFamilies = [
|
||||
"AF_INET"
|
||||
"AF_INET6"
|
||||
"AF_UNIX"
|
||||
];
|
||||
SupplementaryGroups = [ "render" ]; # for rocm to access /dev/dri/renderD* devices
|
||||
SystemCallArchitectures = "native";
|
||||
SystemCallFilter = [
|
||||
"@system-service @resources"
|
||||
"~@privileged"
|
||||
];
|
||||
UMask = "0077";
|
||||
};
|
||||
postStart = mkBefore ''
|
||||
set -x
|
||||
export OLLAMA_HOST=${lib.escapeShellArg cfg.host}:${builtins.toString cfg.port}
|
||||
@@ -242,5 +269,8 @@ in
|
||||
environment.systemPackages = [ ollamaPackage ];
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ abysssol onny ];
|
||||
meta.maintainers = with lib.maintainers; [
|
||||
abysssol
|
||||
onny
|
||||
];
|
||||
}
|
||||
|
||||
-3
@@ -1,6 +1,5 @@
|
||||
{
|
||||
lib,
|
||||
color-theme,
|
||||
fetchFromGitHub,
|
||||
melpaBuild,
|
||||
unstableGitUpdater,
|
||||
@@ -17,8 +16,6 @@ melpaBuild {
|
||||
hash = "sha256-7E8r56dzfD06tsQEnqU5mWSbwz9x9QPbzken2J/fhlg=";
|
||||
};
|
||||
|
||||
packageRequires = [ color-theme ];
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
{ lib, stdenv, socat, fetchFromGitHub, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mpvc";
|
||||
version = "1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lwilletts";
|
||||
repo = "mpvc";
|
||||
rev = version;
|
||||
sha256 = "sha256-wPETEG0BtNBEj3ZyP70byLzIP+NMUKbnjQ+kdvrvK3s=";
|
||||
};
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/mpvc --prefix PATH : "${socat}/bin/"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ socat ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Mpc-like control interface for mpv";
|
||||
mainProgram = "mpvc";
|
||||
homepage = "https://github.com/lwilletts/mpvc";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.neeasade ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -13,7 +13,7 @@
|
||||
let
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
pname = "obsidian";
|
||||
version = "1.6.5";
|
||||
version = "1.6.7";
|
||||
appname = "Obsidian";
|
||||
meta = with lib; {
|
||||
description = "Powerful knowledge base that works on top of a local folder of plain text Markdown files";
|
||||
@@ -26,7 +26,7 @@ let
|
||||
filename = if stdenv.isDarwin then "Obsidian-${version}.dmg" else "obsidian-${version}.tar.gz";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}";
|
||||
hash = if stdenv.isDarwin then "sha256-gA6FkCalGw0pgnCbOJliItLzMGr+CG9r6mSMdvVUAoQ=" else "sha256-9goJnKOgJk5TrFUNz4vff8704cvHfqZpGL/iBkcU2GY=";
|
||||
hash = if stdenv.isDarwin then "sha256-rFXmhlxXlVz5nCrXMmfYGaxe4/wnBRdFxsfiwiIDHgw=" else "sha256-ok1fedN8+OXBisFpVXbKRW2OhE4o9MC9lJmtMMST6V8=";
|
||||
};
|
||||
|
||||
icon = fetchurl {
|
||||
|
||||
@@ -165,9 +165,9 @@ rec {
|
||||
mkTerraform = attrs: pluggable (generic attrs);
|
||||
|
||||
terraform_1 = mkTerraform {
|
||||
version = "1.9.2";
|
||||
hash = "sha256-g1CsDWjwjBVfSNFZ9PRGlPlJOrqXP2eMYk1P+ohtYNU=";
|
||||
vendorHash = "sha256-cPWJtrGad8VsvyjJHQwpfDitsJY/Q0iCtp1MRyzGT+U=";
|
||||
version = "1.9.3";
|
||||
hash = "sha256-5xtTjT+AP7Db3bhzhHkzmRIJpJB3UFZs+4cTgDB7Ihc=";
|
||||
vendorHash = "sha256-FnjCJilPuhYs/JTuEyb4Grn4t40Ox2uqwQf2h9B227Q=";
|
||||
patches = [ ./provider-path-0_15.patch ];
|
||||
passthru = {
|
||||
inherit plugins;
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
@@ -17,6 +19,8 @@ buildGoModule rec {
|
||||
vendorHash = "sha256-+3VYBvcA8TzO9uBl0863uATOavPY9cjt8xtgW7N7C4w=";
|
||||
proxyVendor = true;
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
preBuild = ''
|
||||
mkdir -p build/ui
|
||||
touch build/ui/index.html
|
||||
@@ -26,6 +30,14 @@ buildGoModule rec {
|
||||
|
||||
ldflags = [ "-s" "-w" "-X" "github.com/defenseunicorns/zarf/src/config.CLIVersion=${src.rev}" "-X" "k8s.io/component-base/version.gitVersion=v0.0.0+zarf${src.rev}" "-X" "k8s.io/component-base/version.gitCommit=${src.rev}" "-X" "k8s.io/component-base/version.buildDate=1970-01-01T00:00:00Z" ];
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
export K9S_LOGS_DIR=$(mktemp -d)
|
||||
installShellCompletion --cmd zarf \
|
||||
--bash <($out/bin/zarf completion --no-log-file bash) \
|
||||
--fish <($out/bin/zarf completion --no-log-file fish) \
|
||||
--zsh <($out/bin/zarf completion --no-log-file zsh)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "DevSecOps for Air Gap & Limited-Connection Systems. https://zarf.dev";
|
||||
mainProgram = "zarf";
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ fetchurl, lib, stdenv, pkg-config, makeWrapper, meson, ninja, installShellFiles, libxcb, xcbutilkeysyms
|
||||
, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre2, libev
|
||||
, yajl, xcb-util-cursor, perl, pango, perlPackages, libxkbcommon
|
||||
, xvfb-run
|
||||
, xorgserver, xvfb-run, xdotool, xorg, which
|
||||
, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs
|
||||
}:
|
||||
|
||||
@@ -29,27 +29,42 @@ stdenv.mkDerivation rec {
|
||||
libstartup_notification libX11 pcre2 libev yajl xcb-util-cursor perl pango
|
||||
perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun
|
||||
perlPackages.ExtUtilsPkgConfig perlPackages.InlineC
|
||||
xvfb-run
|
||||
] ++ lib.optionals doCheck [
|
||||
xorgserver xvfb-run xdotool xorg.setxkbmap xorg.xrandr which
|
||||
];
|
||||
|
||||
configureFlags = [ "--disable-builddir" ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
|
||||
# This testcase generates a Perl executable file with a shebang, and
|
||||
# patchShebangs can't replace a shebang in the middle of a file.
|
||||
if [ -f testcases/t/318-i3-dmenu-desktop.t ]; then
|
||||
substituteInPlace testcases/t/318-i3-dmenu-desktop.t \
|
||||
--replace-fail "#!/usr/bin/env perl" "#!${perl}/bin/perl"
|
||||
fi
|
||||
'';
|
||||
|
||||
# Tests have been failing (at least for some people in some cases)
|
||||
# and have been disabled until someone wants to fix them. Some
|
||||
# initial digging uncovers that the tests call out to `git`, which
|
||||
# they shouldn't, and then even once that's fixed have some
|
||||
# perl-related errors later on. For more, see
|
||||
# https://github.com/NixOS/nixpkgs/issues/7957
|
||||
doCheck = false; # stdenv.hostPlatform.system == "x86_64-linux";
|
||||
# xvfb-run is available only on Linux
|
||||
doCheck = stdenv.isLinux;
|
||||
|
||||
checkPhase = lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux")
|
||||
''
|
||||
(cd testcases && xvfb-run ./complete-run.pl -p 1 --keep-xserver-output)
|
||||
! grep -q '^not ok' testcases/latest/complete-run.log
|
||||
checkPhase = ''
|
||||
test_failed=
|
||||
# "| cat" disables fancy progress reporting which makes the log unreadable.
|
||||
./complete-run.pl -p 1 --keep-xserver-output | cat || test_failed="complete-run.pl returned $?"
|
||||
if [ -z "$test_failed" ]; then
|
||||
# Apparently some old versions of `complete-run.pl` did not return a
|
||||
# proper exit code, so check the log for signs of errors too.
|
||||
grep -q '^not ok' latest/complete-run.log && test_failed="test log contains errors" ||:
|
||||
fi
|
||||
if [ -n "$test_failed" ]; then
|
||||
echo "***** Error: $test_failed"
|
||||
echo "===== Test log ====="
|
||||
cat latest/complete-run.log
|
||||
echo "===== End of test log ====="
|
||||
false
|
||||
fi
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -13,6 +13,9 @@ i3.overrideAttrs (oldAttrs: rec {
|
||||
|
||||
buildInputs = oldAttrs.buildInputs ++ [ pcre ];
|
||||
|
||||
# Some tests are failing.
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fork of i3-gaps that adds rounding to window corners";
|
||||
homepage = "https://github.com/LinoBigatti/i3-rounded";
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "Boogie";
|
||||
version = "3.2.0";
|
||||
version = "3.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "boogie-org";
|
||||
repo = "boogie";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3+9zOoKk8IdqkxoMzjZofizyx+294mer3t6illXUr2M=";
|
||||
sha256 = "sha256-89S3yBjEUHbQbuWWLe/pTMaDOCqDR04hNJwIRzh5xaI=";
|
||||
};
|
||||
|
||||
projectFile = [ "Source/Boogie.sln" ];
|
||||
|
||||
@@ -0,0 +1,71 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
python3,
|
||||
wrapGAppsHook4,
|
||||
pkg-config,
|
||||
meson,
|
||||
ninja,
|
||||
appstream-glib,
|
||||
desktop-file-utils,
|
||||
gobject-introspection,
|
||||
libadwaita,
|
||||
libportal-gtk4,
|
||||
libnotify,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "coulr";
|
||||
version = "2.1.0";
|
||||
|
||||
pyproject = false;
|
||||
dontWrapGApps = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Huluti";
|
||||
repo = "Coulr";
|
||||
rev = version;
|
||||
hash = "sha256-1xnL5AWl/rLQu3i9m6uxbS4QT+690hmEW8kYTwkg7Gw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
meson
|
||||
ninja
|
||||
appstream-glib
|
||||
desktop-file-utils
|
||||
gobject-introspection
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libadwaita
|
||||
libportal-gtk4
|
||||
libnotify
|
||||
];
|
||||
|
||||
dependencies = [ python3.pkgs.pygobject3 ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs build-aux/meson/postinstall.py
|
||||
substituteInPlace build-aux/meson/postinstall.py \
|
||||
--replace-fail gtk-update-icon-cache gtk4-update-icon-cache
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Color box to help developers and designers";
|
||||
homepage = "https://github.com/Huluti/Coulr";
|
||||
changelog = "https://github.com/Huluti/Coulr/blob/${src.rev}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ jaredmontoya ];
|
||||
mainProgram = "coulr";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -1,21 +1,22 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "httm";
|
||||
version = "0.39.1";
|
||||
version = "0.40.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kimono-koans";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-Wlmr2xI3RRiV8z+AhD1If3TSD/tBBFg3b9YNAximRk8=";
|
||||
hash = "sha256-iJs151HdwcSNlgbbSX/CKBOeGvfEJes8Q8nm/HDfssg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-9N+Yo82fx2mFrClk7H1fHhVS4lOX+us5Hs2EXmCbY4o=";
|
||||
cargoHash = "sha256-n/UKM+/rXuf4vbc+1TGUTZzmRyYjLNMttmYnUs7HZPw=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
makeWrapper,
|
||||
socat,
|
||||
stdenv,
|
||||
testers,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mpvc";
|
||||
version = "1.4-unstable-2024-07-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gmt4";
|
||||
repo = "mpvc";
|
||||
rev = "966156dacd026cde220951d41c4ac5915cd6ad64";
|
||||
hash = "sha256-/M3xOb0trUaxJGXmV2+sOCbrHGyP4jpyo+S/oBoDkO0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
buildInputs = [ socat ];
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/mpvc --prefix PATH : "${lib.getBin socat}/"
|
||||
'';
|
||||
|
||||
# This is not Archlinux :)
|
||||
postFixup = ''
|
||||
rm -r $out/share/licenses
|
||||
rmdir $out/share || true
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/gmt4/mpvc";
|
||||
description = "Mpc-like control interface for mpv";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "mpvc";
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -1,15 +1,25 @@
|
||||
{ lib, stdenv, fetchurl, libpcap, pkg-config, openssl, lua5_4
|
||||
, pcre, libssh2
|
||||
, withLua ? true
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
libpcap,
|
||||
pkg-config,
|
||||
openssl,
|
||||
lua5_4,
|
||||
pcre2,
|
||||
liblinear,
|
||||
libssh2,
|
||||
zlib,
|
||||
withLua ? true,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nmap";
|
||||
version = "7.94";
|
||||
version = "7.95";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://nmap.org/dist/nmap-${version}.tar.bz2";
|
||||
sha256 = "sha256-1xvhie7EPX4Jm6yFcVCdMWxFd8p5SRgyrD4SF7yPksw=";
|
||||
sha256 = "sha256-4Uq1MOR7Wv2I8ciiusf4nNj+a0eOItJVxbm923ocV3g=";
|
||||
};
|
||||
|
||||
prePatch = lib.optionalString stdenv.isDarwin ''
|
||||
@@ -21,7 +31,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
configureFlags = [
|
||||
(if withLua then "--with-liblua=${lua5_4}" else "--without-liblua")
|
||||
"--with-liblinear=included"
|
||||
"--without-ndiff"
|
||||
"--without-zenmap"
|
||||
];
|
||||
@@ -37,17 +46,27 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ pcre libssh2 libpcap openssl ];
|
||||
buildInputs = [
|
||||
pcre2
|
||||
liblinear
|
||||
libssh2
|
||||
libpcap
|
||||
openssl
|
||||
zlib
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doCheck = false; # fails 3 tests, probably needs the net
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Free and open source utility for network discovery and security auditing";
|
||||
homepage = "http://www.nmap.org";
|
||||
license = licenses.gpl2Only;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ thoughtpolice fpletz ];
|
||||
homepage = "http://www.nmap.org";
|
||||
license = lib.licenses.gpl2Only;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [
|
||||
thoughtpolice
|
||||
fpletz
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -1,13 +1,12 @@
|
||||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
, dnsutils
|
||||
, nmap
|
||||
, qtbase
|
||||
, qtscript
|
||||
, qtwebengine
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
dnsutils,
|
||||
nmap,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -21,9 +20,17 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-q3XfwJ4TGK4E58haN0Q0xRH4GDpKD8VZzyxHe/VwBqY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [ qtbase qtscript qtwebengine ];
|
||||
buildInputs = with libsForQt5; [
|
||||
qtbase
|
||||
qtscript
|
||||
qtwebengine
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/platform/digmanager.cpp \
|
||||
@@ -51,11 +58,11 @@ stdenv.mkDerivation rec {
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Qt frontend for nmap";
|
||||
mainProgram = "nmapsi4";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ peterhoeg ];
|
||||
inherit (src.meta) homepage;
|
||||
};
|
||||
}
|
||||
@@ -3,6 +3,7 @@
|
||||
stdenvNoCC,
|
||||
fetchurl,
|
||||
makeWrapper,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
@@ -30,7 +31,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = ./update.sh;
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl jq gnused common-updater-scripts
|
||||
|
||||
set -eou pipefail
|
||||
|
||||
LATEST_VERSION="$(curl --silent --fail ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/PCSX2/pcsx2/releases" | jq '.[0].tag_name' --raw-output | sed 's/^v//')"
|
||||
|
||||
update-source-version pcsx2-bin "$LATEST_VERSION"
|
||||
@@ -15,23 +15,24 @@
|
||||
, libadwaita
|
||||
, dmidecode
|
||||
, util-linux
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "resources";
|
||||
version = "1.5.0";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nokyan";
|
||||
repo = "resources";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-Xj8c8ZVhlS2h4ZygeCOaT1XHEbgTSkseinofP9X+5qY=";
|
||||
hash = "sha256-uzZCczayJ5C0TZznA2wjGNYF3nB6fh/rrBKvv9s3J5g=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit (finalAttrs) src;
|
||||
name = "resources-${finalAttrs.version}";
|
||||
hash = "sha256-PZ91xSiWt9rMnSy8KZOmWbUL5Y0Nf3Kk577ZwkdnHwg=";
|
||||
hash = "sha256-a0VdSNy8E7qen+6yFXuQBmYnDD/DMUgrZqJK6BJja60=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -65,6 +66,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(lib.mesonOption "profile" "default")
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/nokyan/resources/releases/tag/${finalAttrs.version}";
|
||||
description = "Monitor your system resources and processes";
|
||||
|
||||
@@ -14,16 +14,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "seabird";
|
||||
version = "0.4.2";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getseabird";
|
||||
repo = "seabird";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-GfoP3TeSzA4Hi3fCUR3Y3yWUAj3ogxTRsD4hXuERPio=";
|
||||
hash = "sha256-y+QIBqU3kAxedhWLnu07m9HQOCgHfOvVscIxxWtUcZo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-uUMQ2AddIfPvD7B3KOfN7fWL8oIEK6G5L+NPYo+em5k=";
|
||||
vendorHash = "sha256-4o9z4XjtW7kNHAb8L0kuq9rgQzTwvAAXcl6+RIGjmqI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "trrntzip";
|
||||
version = "1.1";
|
||||
version = "1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "0-wiz-0";
|
||||
repo = "trrntzip";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-7BrTJCQH9x9cNqm7tGOLxQlbTmlxs5S2hAD4ZWIady8=";
|
||||
hash = "sha256-whxPqXT6w91jWv9aoTE4ITbjqohgwytzA0HN7WXKcTA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -621,7 +621,8 @@ let
|
||||
++ lib.optional (lib.versionAtLeast metadata.release_version "19") (
|
||||
fetchpatch {
|
||||
url = "https://github.com/llvm/llvm-project/pull/99837/commits/14ae0a660a38e1feb151928a14f35ff0f4487351.patch";
|
||||
hash = "sha256-1CkA+RzI+645uG/QXsmOMKrLAjhVpfLUjNtgZ0QTv1E=";
|
||||
hash = "sha256-JykABCaNNhYhZQxCvKiBn54DZ5ZguksgCHnpdwWF2no=";
|
||||
relative = "compiler-rt";
|
||||
}
|
||||
);
|
||||
in
|
||||
|
||||
@@ -18,6 +18,7 @@ makeSetupHook {
|
||||
zig_default_flags = [
|
||||
"-Dcpu=baseline"
|
||||
"--release=safe"
|
||||
"--color off" # Turn off progress output
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
@@ -12,27 +12,40 @@
|
||||
pyarrow,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
pythonAtLeast,
|
||||
sqlalchemy,
|
||||
thrift,
|
||||
requests,
|
||||
urllib3,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "databricks-sql-connector";
|
||||
version = "3.2.0";
|
||||
version = "3.3.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
# Depends on thrift that at the moment do not work in Python 3.12
|
||||
# see PR 328415 fix this.
|
||||
disabled = pythonOlder "3.7" || pythonAtLeast "3.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "databricks";
|
||||
repo = "databricks-sql-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Sk/tYgFnWWHAsMSHhEUIwUagc6femAzQpQGyzJGXW1E=";
|
||||
hash = "sha256-a3OeKJ3c2UCClsPMah7iJY2YvIVLfHmmBuHAx8vdXZs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-pandas.patch";
|
||||
url = "https://patch-diff.githubusercontent.com/raw/databricks/databricks-sql-python/pull/416.patch";
|
||||
sha256 = "sha256-sNCp8xSSmKP2yNzDK4wyWC5Hoe574AeHnKTeNcIxaek=";
|
||||
})
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"numpy"
|
||||
"thrift"
|
||||
"pyarrow"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -49,6 +62,8 @@ buildPythonPackage rec {
|
||||
pyarrow
|
||||
sqlalchemy
|
||||
thrift
|
||||
requests
|
||||
urllib3
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
@@ -63,8 +78,5 @@ buildPythonPackage rec {
|
||||
changelog = "https://github.com/databricks/databricks-sql-python/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ harvidsen ];
|
||||
# No SQLAlchemy 2.0 support
|
||||
# https://github.com/databricks/databricks-sql-python/issues/91
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hikari-crescent";
|
||||
version = "0.6.6";
|
||||
version = "1.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hikari-crescent";
|
||||
repo = "hikari-crescent";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-PZAmz7Wofg6jnF25p/8leJQ9PeZaE3q5q2GUJG7NEB0=";
|
||||
hash = "sha256-0eDPdN+3lalgHiBNXuZUEJllAKFxdKK6paTFNHU5jIM=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "hikari";
|
||||
version = "2.0.0.dev125";
|
||||
version = "2.0.0.dev126";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hikari-py";
|
||||
repo = "hikari";
|
||||
rev = version;
|
||||
hash = "sha256-qxgIYquXUWrm8bS8EamERMHOnjI2aPyK7bQieVG66uA=";
|
||||
hash = "sha256-KpF9P92IciILV7zlYTCgtMqhudT9uOR2SQJdWDtxYaA=";
|
||||
# The git commit is part of the `hikari.__git_sha1__` original output;
|
||||
# leave that output the same in nixpkgs. Use the `.git` directory
|
||||
# to retrieve the commit SHA, and remove the directory afterwards,
|
||||
@@ -64,7 +64,8 @@ buildPythonPackage rec {
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace hikari/_about.py --replace "__git_sha1__: typing.Final[str] = \"HEAD\"" "__git_sha1__: typing.Final[str] = \"$(cat $src/COMMIT)\""
|
||||
substituteInPlace hikari/_about.py \
|
||||
--replace-fail "__git_sha1__: typing.Final[str] = \"HEAD\"" "__git_sha1__: typing.Final[str] = \"$(cat $src/COMMIT)\""
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
@@ -72,6 +73,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://www.hikari-py.dev/";
|
||||
changelog = "https://github.com/hikari-py/hikari/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ tomodachi94 ];
|
||||
maintainers = with maintainers; [ tomodachi94 sigmanificient ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "huggingface-hub";
|
||||
version = "0.23.5";
|
||||
version = "0.24.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "huggingface";
|
||||
repo = "huggingface_hub";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Nncyi9u72aq1142wBpz3M/ji2GlCbdEqCZ9+kRRnMT4=";
|
||||
hash = "sha256-tbv5ri37udhx9qhPhCRFe0GOc62n0e7uF0EjDpF2TIQ=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "litellm";
|
||||
version = "1.41.21";
|
||||
version = "1.41.28";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -46,7 +46,7 @@ buildPythonPackage rec {
|
||||
owner = "BerriAI";
|
||||
repo = "litellm";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-JVW60jq+C/eSaB5E6D/1cTE9LOqz/HT+bV9KJKdN+zs=";
|
||||
hash = "sha256-DNFzBl2K4liphEMVPRbLWMzzCxtIcvUgQxvppAnv/10=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@@ -0,0 +1,76 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
pythonOlder,
|
||||
oldest-supported-numpy,
|
||||
setuptools,
|
||||
ansitable,
|
||||
matplotlib,
|
||||
numpy,
|
||||
scipy,
|
||||
typing-extensions,
|
||||
coverage,
|
||||
flake8,
|
||||
pytest,
|
||||
pytest-timeout,
|
||||
pytest-xvfb,
|
||||
sympy,
|
||||
pytestCheckHook,
|
||||
pythonRelaxDepsHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "spatialmath-python";
|
||||
version = "1.1.10";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "spatialmath_python";
|
||||
inherit version;
|
||||
hash = "sha256-7h29RHCrxdexpabtxMQx/7RahQmCDGHhdJ1WETvtfYg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
oldest-supported-numpy
|
||||
setuptools
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
pythonRemoveDeps = [ "pre-commit" ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ansitable
|
||||
matplotlib
|
||||
numpy
|
||||
scipy
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
dev = [
|
||||
coverage
|
||||
flake8
|
||||
pytest
|
||||
pytest-timeout
|
||||
pytest-xvfb
|
||||
sympy
|
||||
];
|
||||
};
|
||||
|
||||
pythonImportsCheck = [ "spatialmath" ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Provides spatial maths capability for Python";
|
||||
homepage = "https://pypi.org/project/spatialmath-python/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [
|
||||
djacu
|
||||
a-camarillo
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -8,7 +8,7 @@
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "tika-client";
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "stumpylog";
|
||||
repo = "tika-client";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-fFibRF3SoDOje6M9YmZI0dwYVn/cvgXqmClvqvNy5f8=";
|
||||
hash = "sha256-1Gc/WF8eEGT17z2CiuSLUIngDZVoHdBhfsUddNUBwWo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -3,8 +3,11 @@
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pythonOlder,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
# propagated build inputs
|
||||
|
||||
# dependencies
|
||||
filelock,
|
||||
huggingface-hub,
|
||||
numpy,
|
||||
@@ -16,7 +19,8 @@
|
||||
tokenizers,
|
||||
safetensors,
|
||||
tqdm,
|
||||
# optional dependencies
|
||||
|
||||
# optional-dependencies
|
||||
diffusers,
|
||||
scikit-learn,
|
||||
tensorflow,
|
||||
@@ -55,7 +59,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "transformers";
|
||||
version = "4.42.4";
|
||||
version = "4.43.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -64,7 +68,7 @@ buildPythonPackage rec {
|
||||
owner = "huggingface";
|
||||
repo = "transformers";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-v5p63D8j1CNx3dCPa121auny5StEUpNK9IkPSugzAjg=";
|
||||
hash = "sha256-TOuwdmuHUW/RoYl7XYLjjBuz7nAuvJWigka2Bf7yNuQ=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -82,7 +86,7 @@ buildPythonPackage rec {
|
||||
tqdm
|
||||
];
|
||||
|
||||
passthru.optional-dependencies =
|
||||
optional-dependencies =
|
||||
let
|
||||
audio = [
|
||||
librosa
|
||||
|
||||
+608
-627
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"version": "2.2.10",
|
||||
"integrity": "sha512-VTuZLREjLMzUDD/s0QEvJFF18A2mvYgxbEfGFr22vDS1se47bxgPcvvuDGQCQvVWC6OG+f75qkwtp8jPkYWa4w==",
|
||||
"filename": "mongosh-2.2.10.tgz",
|
||||
"deps": "sha256-iSbFG/Xh2EtGCJfcTLLTJm4BMrTHnnhYuk+FIVE/TJI="
|
||||
"version": "2.2.12",
|
||||
"integrity": "sha512-xdjUc5p7ccHHpigT4dQb8OKRFF6rxDu8T8cMHLAHmJV3YhQdh2j+3NPn4Cj0JQQ5J1nmzPKM6jp+SlyUbs+2xg==",
|
||||
"filename": "mongosh-2.2.12.tgz",
|
||||
"deps": "sha256-yM9C4joROSyX02noNS4n5bUhWyDDXzFttGyyyFAubPM="
|
||||
}
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "weaviate";
|
||||
version = "1.25.6";
|
||||
version = "1.25.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "weaviate";
|
||||
repo = "weaviate";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jXnCICtw5NYnqfiBeM8aZkpnTd30IcQJMH2CUqPGMlY=";
|
||||
hash = "sha256-MmOA0kO5OCXz5MIqz1netXFUShZc0TkMCFKNfbD1uEM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-40O6MF1Tk9ZhGVLcKGzoUTaUFjKuXdpIHbB1GuRgyL8=";
|
||||
vendorHash = "sha256-D+/gB1HbwXWHJ6e5J6s+HgN4yPQX1nYbvMY2oLIQFwQ=";
|
||||
|
||||
subPackages = [ "cmd/weaviate-server" ];
|
||||
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "murex";
|
||||
version = "6.1.8300";
|
||||
version = "6.2.3000";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lmorg";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-16eaPxmTauuttpjHUSQlBu/d/S3CWKgQYttqQWp0lkU=";
|
||||
sha256 = "sha256-Y9FVmIYipEkKXHU7TcRX7s/8/50b5fYnPLalFXHPomM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-/qK7Zgdz48vmz+tIMZmo1M5Glr842fOCinMoLAeQasg=";
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bdf2psf";
|
||||
version = "1.229";
|
||||
version = "1.230";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb";
|
||||
sha256 = "sha256-RQz3ny2a77jzR4wrGpXOl7Gvkw2dGae4xwnwu3EeeeY=";
|
||||
sha256 = "sha256-W7eFrzuDcjm9P2hAP7+u9YPIhCqF3pbWb9+ynmKjs5M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg ];
|
||||
|
||||
@@ -1849,8 +1849,6 @@ with pkgs;
|
||||
|
||||
hsd = callPackage ../tools/misc/hsd { };
|
||||
|
||||
httm = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/httm { };
|
||||
|
||||
hyperpotamus = callPackage ../tools/misc/hyperpotamus { };
|
||||
|
||||
immich-cli = callPackage ../tools/misc/immich-cli { };
|
||||
@@ -10906,12 +10904,8 @@ with pkgs;
|
||||
|
||||
npth = callPackage ../development/libraries/npth { };
|
||||
|
||||
nmap = callPackage ../tools/security/nmap { };
|
||||
|
||||
nmap-formatter = callPackage ../tools/security/nmap-formatter { };
|
||||
|
||||
nmapsi4 = libsForQt5.callPackage ../tools/security/nmap/qt.nix { };
|
||||
|
||||
noise-repellent = callPackage ../applications/audio/noise-repellent { };
|
||||
|
||||
noisetorch = callPackage ../applications/audio/noisetorch { };
|
||||
@@ -39905,8 +39899,6 @@ with pkgs;
|
||||
|
||||
mg = callPackage ../applications/editors/mg { };
|
||||
|
||||
mpvc = callPackage ../applications/misc/mpvc { };
|
||||
|
||||
# Overriding does not work when using callPackage on discord using import instead. (https://github.com/NixOS/nixpkgs/pull/179906)
|
||||
discord = import ../applications/networking/instant-messengers/discord {
|
||||
inherit lib stdenv;
|
||||
|
||||
@@ -14537,6 +14537,8 @@ self: super: with self; {
|
||||
|
||||
spatial-image = callPackage ../development/python-modules/spatial-image { };
|
||||
|
||||
spatialmath-python = callPackage ../development/python-modules/spatialmath-python { };
|
||||
|
||||
spdx = callPackage ../development/python-modules/spdx { };
|
||||
|
||||
spdx-lookup = callPackage ../development/python-modules/spdx-lookup { };
|
||||
|
||||
Reference in New Issue
Block a user