Merge master into staging-nixos
This commit is contained in:
@@ -57,6 +57,8 @@
|
||||
|
||||
- [OpenThread Border Router](https://openthread.io/), a Thread border router for POSIX-based platforms that bridges Thread mesh networks to IP networks. Available as [services.openthread-border-router](#opt-services.openthread-border-router.enable).
|
||||
|
||||
- [Atuin](https://atuin.sh), magical shell history — sync, search and backup your terminal history. Available as [programs.atuin](#opt-programs.atuin.enable).
|
||||
|
||||
- [Meshtastic](https://meshtastic.org), an open-source, off-grid, decentralised mesh network
|
||||
designed to run on affordable, low-power devices. Available as [services.meshtasticd]
|
||||
(#opt-services.meshtasticd.enable).
|
||||
|
||||
@@ -168,6 +168,7 @@
|
||||
./programs/appimage.nix
|
||||
./programs/arp-scan.nix
|
||||
./programs/atop.nix
|
||||
./programs/atuin.nix
|
||||
./programs/ausweisapp.nix
|
||||
./programs/autoenv.nix
|
||||
./programs/autojump.nix
|
||||
|
||||
@@ -0,0 +1,195 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
inherit (lib) escapeShellArgs;
|
||||
|
||||
cfg = config.programs.atuin;
|
||||
|
||||
tomlFormat = pkgs.formats.toml { };
|
||||
|
||||
settingsFile = tomlFormat.generate "atuin-config" cfg.settings;
|
||||
in
|
||||
{
|
||||
options.programs.atuin = {
|
||||
enable = lib.mkEnableOption "atuin";
|
||||
|
||||
package = lib.mkPackageOption pkgs "atuin" { };
|
||||
|
||||
enableBashIntegration = lib.mkEnableOption "Bash integration" // {
|
||||
default = config.programs.bash.enable;
|
||||
defaultText = lib.literalExpression "config.programs.bash.enable";
|
||||
};
|
||||
|
||||
enableZshIntegration = lib.mkEnableOption "Zsh integration" // {
|
||||
default = config.programs.zsh.enable;
|
||||
defaultText = lib.literalExpression "config.programs.zsh.enable";
|
||||
};
|
||||
|
||||
enableFishIntegration = lib.mkEnableOption "Fish integration" // {
|
||||
default = config.programs.fish.enable;
|
||||
defaultText = lib.literalExpression "config.programs.fish.enable";
|
||||
};
|
||||
|
||||
flags = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.str;
|
||||
default = [ ];
|
||||
example = [
|
||||
"--disable-up-arrow"
|
||||
"--disable-ctrl-r"
|
||||
];
|
||||
description = ''
|
||||
Flags to append to the shell hook.
|
||||
'';
|
||||
};
|
||||
|
||||
settings = lib.mkOption {
|
||||
type = tomlFormat.type;
|
||||
default = { };
|
||||
example = lib.literalExpression ''
|
||||
{
|
||||
auto_sync = true;
|
||||
sync_frequency = "5m";
|
||||
sync_address = "https://api.atuin.sh";
|
||||
search_mode = "prefix";
|
||||
}
|
||||
'';
|
||||
description = ''
|
||||
Configuration written to {file}`/etc/atuin/config.toml`.
|
||||
|
||||
See <https://docs.atuin.sh/configuration/config/> for the full list
|
||||
of options.
|
||||
'';
|
||||
};
|
||||
|
||||
daemon = {
|
||||
enable = lib.mkEnableOption "the Atuin daemon" // {
|
||||
default = pkgs.stdenv.hostPlatform.isLinux;
|
||||
defaultText = lib.literalExpression "pkgs.stdenv.hostPlatform.isLinux";
|
||||
};
|
||||
|
||||
logLevel = lib.mkOption {
|
||||
type = lib.types.enum [
|
||||
"trace"
|
||||
"debug"
|
||||
"info"
|
||||
"warn"
|
||||
"error"
|
||||
];
|
||||
default = "info";
|
||||
description = ''
|
||||
Log level for the Atuin daemon.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
themes = lib.mkOption {
|
||||
type = lib.types.attrsOf (
|
||||
lib.types.oneOf [
|
||||
tomlFormat.type
|
||||
lib.types.path
|
||||
lib.types.lines
|
||||
]
|
||||
);
|
||||
description = ''
|
||||
Each theme is written to
|
||||
{file}`/etc/atuin/themes/theme-name.toml`
|
||||
where the name of each attribute is the theme-name
|
||||
|
||||
See <https://docs.atuin.sh/guide/theming/> for the full list
|
||||
of options.
|
||||
'';
|
||||
default = { };
|
||||
example = lib.literalExpression ''
|
||||
{
|
||||
"my-theme" = {
|
||||
theme.name = "My Theme";
|
||||
colors = {
|
||||
Base = "#000000";
|
||||
Title = "#FFFFFF";
|
||||
};
|
||||
};
|
||||
}
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
# Atuin only reads from ATUIN_CONFIG_DIR or XDG_CONFIG_HOME, not XDG_CONFIG_DIRS,
|
||||
# so we must set ATUIN_CONFIG_DIR to point to the system-wide config location.
|
||||
environment.variables.ATUIN_CONFIG_DIR = "/etc/atuin";
|
||||
|
||||
environment.etc = lib.mkMerge [
|
||||
(lib.mkIf (cfg.settings != { }) {
|
||||
"atuin/config.toml".source = settingsFile;
|
||||
})
|
||||
|
||||
(lib.mkIf (cfg.themes != { }) (
|
||||
builtins.mapAttrs' (
|
||||
name: theme:
|
||||
lib.nameValuePair "atuin/themes/${name}.toml" {
|
||||
source =
|
||||
if builtins.isString theme then
|
||||
pkgs.writeText "atuin-theme-${name}" theme
|
||||
else if builtins.isPath theme || lib.isStorePath theme then
|
||||
theme
|
||||
else
|
||||
tomlFormat.generate "atuin-theme-${name}" theme;
|
||||
}
|
||||
) cfg.themes
|
||||
))
|
||||
];
|
||||
|
||||
programs.bash.interactiveShellInit = lib.mkIf cfg.enableBashIntegration ''
|
||||
if [[ :$SHELLOPTS: =~ :(vi|emacs): ]]; then
|
||||
eval "$(${lib.getExe cfg.package} init bash ${escapeShellArgs cfg.flags})"
|
||||
fi
|
||||
'';
|
||||
|
||||
programs.zsh.interactiveShellInit = lib.mkIf cfg.enableZshIntegration ''
|
||||
if [[ $options[zle] = on ]]; then
|
||||
eval "$(${lib.getExe cfg.package} init zsh ${escapeShellArgs cfg.flags})"
|
||||
fi
|
||||
'';
|
||||
|
||||
programs.fish.interactiveShellInit = lib.mkIf cfg.enableFishIntegration ''
|
||||
${lib.getExe cfg.package} init fish ${escapeShellArgs cfg.flags} | source
|
||||
'';
|
||||
|
||||
systemd = lib.mkIf (cfg.daemon.enable && pkgs.stdenv.hostPlatform.isLinux) {
|
||||
user.services.atuin-daemon = {
|
||||
unitConfig = {
|
||||
Description = "Atuin daemon";
|
||||
Requires = [ "atuin-daemon.socket" ];
|
||||
};
|
||||
serviceConfig = {
|
||||
ExecStart = "${lib.getExe cfg.package} daemon start";
|
||||
Environment = [ "ATUIN_LOG=${cfg.daemon.logLevel}" ];
|
||||
Restart = "on-failure";
|
||||
RestartSteps = 3;
|
||||
RestartMaxDelaySec = 6;
|
||||
};
|
||||
};
|
||||
|
||||
user.sockets.atuin-daemon = {
|
||||
unitConfig = {
|
||||
Description = "Atuin daemon socket";
|
||||
};
|
||||
socketConfig = {
|
||||
ListenStream = "%t/atuin/atuin.sock";
|
||||
SocketMode = "0640";
|
||||
DirectoryMode = "0740";
|
||||
RemoveOnStop = true;
|
||||
};
|
||||
wantedBy = [ "sockets.target" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
meta.maintainers = cfg.package.meta.maintainers;
|
||||
}
|
||||
@@ -5,6 +5,8 @@
|
||||
...
|
||||
}:
|
||||
let
|
||||
inherit (lib.types) listOf oneOf str;
|
||||
|
||||
cfg = config.services.epmd;
|
||||
in
|
||||
{
|
||||
@@ -21,7 +23,10 @@ in
|
||||
};
|
||||
package = lib.mkPackageOption pkgs "erlang" { };
|
||||
listenStream = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
type = oneOf [
|
||||
str
|
||||
(listOf str)
|
||||
];
|
||||
default = "[::]:4369";
|
||||
description = ''
|
||||
the listenStream used by the systemd socket.
|
||||
|
||||
@@ -236,6 +236,7 @@ in
|
||||
atticd = runTest ./atticd.nix;
|
||||
attr = pkgs.callPackage ./attr.nix { };
|
||||
atuin = runTest ./atuin.nix;
|
||||
atuin-programs = runTest ./atuin-programs.nix;
|
||||
audiobookshelf = runTest ./audiobookshelf.nix;
|
||||
audit = runTest ./audit.nix;
|
||||
audit-testsuite = runTest ./audit-testsuite.nix;
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
name = "atuin";
|
||||
meta.maintainers = pkgs.atuin.meta.maintainers;
|
||||
|
||||
nodes.machine = {
|
||||
programs = {
|
||||
bash.enable = true;
|
||||
fish.enable = true;
|
||||
zsh.enable = true;
|
||||
|
||||
atuin = {
|
||||
enable = true;
|
||||
settings = {
|
||||
auto_sync = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
start_all()
|
||||
machine.wait_for_unit("default.target")
|
||||
|
||||
# Check atuin is installed
|
||||
machine.succeed("atuin --version")
|
||||
|
||||
# Check shell integration - verify the init scripts can be sourced without error
|
||||
machine.succeed("bash -c 'eval \"$(atuin init bash)\"'")
|
||||
machine.succeed("zsh -c 'eval \"$(atuin init zsh)\"'")
|
||||
machine.succeed("fish -c 'atuin init fish | source'")
|
||||
|
||||
# Verify config file was created
|
||||
machine.succeed("grep -q 'auto_sync = false' /etc/atuin/config.toml")
|
||||
|
||||
# Verify daemon socket unit is enabled
|
||||
machine.succeed("systemctl --user --machine=root@ is-enabled atuin-daemon.socket")
|
||||
'';
|
||||
}
|
||||
@@ -12,26 +12,26 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
sources = {
|
||||
"x86_64-linux" = {
|
||||
arch = "linux-x64";
|
||||
hash = "sha256-IoBA0fuy9XxZgswN1j9DfwDI218h2huapl1Bfs2AscI=";
|
||||
hash = "sha256-YeF6LyQzVAXgZ5Iqr6YvNcACfiUukUsq7cybeCQdSYc=";
|
||||
};
|
||||
"x86_64-darwin" = {
|
||||
arch = "darwin-x64";
|
||||
hash = "sha256-EfoRRJFTNr+0JAkqWJ2pXwhBtmAXs9cANLzXb4obOMs=";
|
||||
hash = "sha256-SjirNvI83eh3Gt5rGsaiLT6TJMH6LRQAasOFNy9OMCY=";
|
||||
};
|
||||
"aarch64-linux" = {
|
||||
arch = "linux-arm64";
|
||||
hash = "sha256-p2AjXFqoptxAwOdsievcjD/WLm0J03Rx/sT4ejUd6xM=";
|
||||
hash = "sha256-FjE3xTp5Mj1584bepVc4nZr3rxCR3CV+jplmA45VF44=";
|
||||
};
|
||||
"aarch64-darwin" = {
|
||||
arch = "darwin-arm64";
|
||||
hash = "sha256-C1nbQxL5YDWenLQ82tABuEWKWl/LoEizTWo/YnBQJFw=";
|
||||
hash = "sha256-SAf3+0QSFUDq09AZQnw78ps55RM/RwoAeQuVly7vn10=";
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
publisher = "kilocode";
|
||||
name = "Kilo-Code";
|
||||
version = "7.2.0";
|
||||
version = "7.2.20";
|
||||
}
|
||||
// sources.${stdenv.hostPlatform.system}
|
||||
or (throw "Unsupported system ${stdenv.hostPlatform.system}");
|
||||
|
||||
@@ -995,13 +995,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"nutanix_nutanix": {
|
||||
"hash": "sha256-C24sSIslSPLLh49B2rgc9cTfUUi21HcjmAaEFESVAe0=",
|
||||
"hash": "sha256-4YoF45LqIbEteRG2nftYT67EcuLx3kxxqU6R8KoZ5Xs=",
|
||||
"homepage": "https://registry.terraform.io/providers/nutanix/nutanix",
|
||||
"owner": "nutanix",
|
||||
"repo": "terraform-provider-nutanix",
|
||||
"rev": "v2.4.0",
|
||||
"rev": "v2.4.2",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-ucXmHK7jrahc78nE2cf5p5PPCSNV5DAQ53KM2SfJnjo="
|
||||
"vendorHash": "sha256-/4mktOn7qjWIkpyqeEW4vzY0w0pG+0qx7KRYBkE1IkQ="
|
||||
},
|
||||
"okta_okta": {
|
||||
"hash": "sha256-Ub41ML88NKsMC6q1C67DCBTrG9qD0cBhAkizZdIRRBc=",
|
||||
@@ -1049,11 +1049,11 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"oracle_oci": {
|
||||
"hash": "sha256-U4Laml29samuCVGCaLSH/nR/o9jbn8lK/c73OsDeE7c=",
|
||||
"hash": "sha256-Uv63hWyUzjZncV01WVpoHR+OYMf7qIDdyGmdMlBkZzU=",
|
||||
"homepage": "https://registry.terraform.io/providers/oracle/oci",
|
||||
"owner": "oracle",
|
||||
"repo": "terraform-provider-oci",
|
||||
"rev": "v8.9.0",
|
||||
"rev": "v8.10.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
||||
@@ -58,7 +58,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
inherit (nixosTests) atuin;
|
||||
inherit (nixosTests) atuin atuin-programs;
|
||||
};
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "forgejo-mcp";
|
||||
version = "2.17.0";
|
||||
version = "2.18.0";
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
owner = "goern";
|
||||
repo = "forgejo-mcp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-DcpS2467MCFfIVsdYEfd5t6kPjMeLElMQbDyuXI04XE=";
|
||||
hash = "sha256-KWNRQJHW9+21+azIKjO2ryAPEDS7Ka0BuFnCFIko+FY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-5CV4drUaYKtZ/RoydAatblhsqU8VWYzYByjhcb9KZVY=";
|
||||
|
||||
@@ -47,10 +47,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
description = "CLI tool to convert local HTML files to PDF";
|
||||
homepage = "https://github.com/ilaborie/html2pdf";
|
||||
changelog = "https://github.com/ilaborie/html2pdf/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
license = with lib.licenses; [
|
||||
mit
|
||||
asl20
|
||||
];
|
||||
license =
|
||||
with lib.licenses;
|
||||
OR [
|
||||
mit
|
||||
asl20
|
||||
];
|
||||
maintainers = with lib.maintainers; [
|
||||
kachick
|
||||
];
|
||||
|
||||
@@ -30,7 +30,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
mainProgram = "hbd";
|
||||
homepage = "https://github.com/xtream1101/humblebundle-downloader";
|
||||
changelog = "https://github.com/xtream1101/humblebundle-downloader/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
license = with lib.licenses; [ mit ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ jopejoe1 ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -43,7 +43,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
mainProgram = "itch-dl";
|
||||
homepage = "https://github.com/DragoonAethis/itch-dl";
|
||||
changelog = "https://github.com/DragoonAethis/itch-dl/releases/tag/${finalAttrs.src.tag}";
|
||||
license = with lib.licenses; [ mit ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ jopejoe1 ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
From fb223fceeb81f481316694560ceacc473ad04b4a Mon Sep 17 00:00:00 2001
|
||||
From: natsukium <tomoya.otabi@gmail.com>
|
||||
Date: Thu, 23 Apr 2026 16:46:54 +0900
|
||||
Subject: [PATCH] cmake: allow overriding hardcoded libomp path on macOS
|
||||
|
||||
The OpenMP workaround hardcoded /opt/homebrew/opt/libomp, which locked
|
||||
out a custom build.
|
||||
Introduce LIBOMP_ROOT (defaulting to Homebrew) so the prefix can be
|
||||
overridden on the cmake command line.
|
||||
|
||||
While here, restrict the block to AppleClang. The flags inside are
|
||||
AppleClang-specific (-Xpreprocessor -fopenmp, linking against the LLVM
|
||||
libomp runtime) and were previously forced on any compiler targeting
|
||||
Apple Silicon, silently breaking GCC and mis-configuring Homebrew LLVM
|
||||
Clang builds.
|
||||
---
|
||||
CMakeLists.txt | 14 +++++++-------
|
||||
1 file changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 5a7d3f0..d76453d 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -75,15 +75,15 @@ set(KALIGN_KMEANS_UPGMA_THRESHOLD "50" CACHE STRING "Number of sequences thresho
|
||||
|
||||
|
||||
if(USE_OPENMP)
|
||||
- # Configure OpenMP for macOS with Homebrew (only for arm64 native builds)
|
||||
- if(APPLE AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "arm64" AND NOT CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
|
||||
- list(APPEND CMAKE_PREFIX_PATH /opt/homebrew)
|
||||
- # Set OpenMP flags for Apple Clang + Homebrew libomp
|
||||
- set(OpenMP_C_FLAGS "-Xpreprocessor -fopenmp -I/opt/homebrew/opt/libomp/include")
|
||||
+ # Configure OpenMP for macOS with external libomp (only for Apple Clang on arm64 native builds)
|
||||
+ if(APPLE AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "arm64" AND NOT CMAKE_OSX_ARCHITECTURES MATCHES "x86_64" AND CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
|
||||
+ # Defaults to Homebrew
|
||||
+ set(LIBOMP_ROOT "/opt/homebrew/opt/libomp" CACHE PATH "libomp install prefix")
|
||||
+ set(OpenMP_C_FLAGS "-Xpreprocessor -fopenmp -I${LIBOMP_ROOT}/include")
|
||||
set(OpenMP_C_LIB_NAMES "omp")
|
||||
- set(OpenMP_CXX_FLAGS "-Xpreprocessor -fopenmp -I/opt/homebrew/opt/libomp/include")
|
||||
+ set(OpenMP_CXX_FLAGS "-Xpreprocessor -fopenmp -I${LIBOMP_ROOT}/include")
|
||||
set(OpenMP_CXX_LIB_NAMES "omp")
|
||||
- set(OpenMP_omp_LIBRARY /opt/homebrew/opt/libomp/lib/libomp.dylib)
|
||||
+ set(OpenMP_omp_LIBRARY "${LIBOMP_ROOT}/lib/libomp.dylib")
|
||||
endif()
|
||||
|
||||
find_package(OpenMP)
|
||||
@@ -11,15 +11,23 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kalign";
|
||||
version = "3.4.0";
|
||||
version = "3.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TimoLassmann";
|
||||
repo = "kalign";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-QcFNaCTqj6CFiOzQ6ezfBL0mu8PDU11hyNdkcsLOPzA=";
|
||||
hash = "sha256-wcVzKedd8IFKql+TU4wJ4jEGDPdDfpyC5iGXrPYa0oY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Allow overriding the hardcoded Homebrew libomp path on macOS and
|
||||
# restrict the workaround to AppleClang so other compilers fall back
|
||||
# to the standard OpenMP detection path.
|
||||
# https://github.com/TimoLassmann/kalign/pull/65
|
||||
./macos-openmp-config.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "kor";
|
||||
version = "0.6.7";
|
||||
version = "0.6.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yonahd";
|
||||
repo = "kor";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-d8/b1O/dEeJzf9xaTHvAUbx2tFk7LjuOnACXYEIFsME=";
|
||||
hash = "sha256-B3YKmexo41Ms7MrjoTBdeVaIeN4YuCO7WBrkhoGzP2c=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-nFgf1eGbIQ1R/cj+ikYIaw2dqOSoEAG4sFPAqF1CFAQ=";
|
||||
vendorHash = "sha256-vC5GgJI80HsDIYP0oZZk/Tlvy36QZZZDNxz68EDyb8Y=";
|
||||
|
||||
nativeCheckInputs = [ writableTmpDirAsHomeHook ];
|
||||
|
||||
|
||||
@@ -29,13 +29,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "labwc";
|
||||
version = "0.9.3";
|
||||
version = "0.9.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "labwc";
|
||||
repo = "labwc";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-C/u11vxHmWWb8/kl0tZTOgosAvbSNb3tCvp2r0Bcb+Q=";
|
||||
hash = "sha256-3svQnSFdzKTfGLSjiNjswb4B5n0htQTltxhRmUbZD20=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -39,13 +39,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "linyaps";
|
||||
version = "1.12.1";
|
||||
version = "1.12.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenAtom-Linyaps";
|
||||
repo = finalAttrs.pname;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-hNXpJCz7px8uw2mbBhou3+Gb5InlMXJT2PjWmUycX5A=";
|
||||
hash = "sha256-Pm0ijMAwDiQpotxuAgrCXiA3Z0FCejsqYIJ89/GKR9o=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -78,7 +78,7 @@ let
|
||||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "llama-cpp";
|
||||
version = "8770";
|
||||
version = "8864";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -89,7 +89,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
owner = "ggml-org";
|
||||
repo = "llama.cpp";
|
||||
tag = "b${finalAttrs.version}";
|
||||
hash = "sha256-f2LQzQkv5UymRzqtdbgmVTlA8gdpwXu7H7pRyKGzlzk=";
|
||||
hash = "sha256-IHVBwnjMVKSaDGyA9AYy7dHM9EI1XtCMmXjiKUFXDmg=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C "$out" rev-parse --short HEAD > $out/COMMIT
|
||||
|
||||
@@ -17,7 +17,7 @@ let
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "llama-swap";
|
||||
version = "199";
|
||||
version = "204";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -28,7 +28,7 @@ buildGoModule (finalAttrs: {
|
||||
owner = "mostlygeek";
|
||||
repo = "llama-swap";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-tAWXhfOWPLBuEgd+32CbuIkn1hN+4VI4xkyx7E2a81I=";
|
||||
hash = "sha256-vgtPqgPWU3LWokGvbisbajyXkB5Sg5khncG0D20f6lY=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
@@ -41,7 +41,7 @@ buildGoModule (finalAttrs: {
|
||||
'';
|
||||
};
|
||||
|
||||
vendorHash = "sha256-XiDYlw/byu8CWvg4KSPC7m8PGCZXtp08Y1velx4BR8U=";
|
||||
vendorHash = "sha256-bgDrXNuudKhdwOCBLodG1cTLSRKban+69wA9hWEKkoI=";
|
||||
|
||||
passthru.ui = callPackage ./ui.nix { llama-swap = finalAttrs.finalPackage; };
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "${llama-swap.pname}-ui";
|
||||
inherit (llama-swap) version src;
|
||||
npmDepsHash = "sha256-gTDsuWPLCWsPltioziygFmSQFdLqjkZpmmVWIWoZwoc=";
|
||||
npmDepsHash = "sha256-6D4F58sSBkr7FKKO34gDhnZ9uN/SfsyYn1xJjYsMeq4=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace vite.config.ts \
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "moor";
|
||||
version = "2.12.0";
|
||||
version = "2.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "walles";
|
||||
repo = "moor";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-qDUIgAGO4jUtyBeHSZ59+7bpLkNWIG8nH84nOGe5bUw=";
|
||||
hash = "sha256-Z2N8zEeP3wSrq3PPBXQgEEGz6EZnuzdLAu/Ce5c9JvA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-fHOatNwedbDNGp7V8ynW1NiTkqSJmo8vrv6S64gUQqM=";
|
||||
|
||||
@@ -17,7 +17,7 @@ buildGoModule (
|
||||
ui = buildNpmPackage {
|
||||
inherit (finalAttrs) src version;
|
||||
pname = "ntfy-sh-ui";
|
||||
npmDepsHash = "sha256-p6zuQ8UE121OPLRBK8rUlZ64aBVWp/9Hgx9dx2Mzya8=";
|
||||
npmDepsHash = "sha256-sIlEGN6zpbwQdW5HBI6F42nV6k7xapzsNfFujhohyYk=";
|
||||
|
||||
prePatch = ''
|
||||
cd web/
|
||||
@@ -37,16 +37,16 @@ buildGoModule (
|
||||
in
|
||||
{
|
||||
pname = "ntfy-sh";
|
||||
version = "2.21.0";
|
||||
version = "2.22.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "binwiederhier";
|
||||
repo = "ntfy";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-x05z9CU4mzZ8FGe4++EoUWeUWv+wBNN8hyYz6u3SoU8=";
|
||||
hash = "sha256-TcxXlAAihVbvdeTHMU4Z2f1ySiNIjX5Gogcq8JlWUa0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-jLMZnah0vI/VlRuMSVzSTGdPVJgM6VM0y8kmQKvbRAs=";
|
||||
vendorHash = "sha256-d96NzjYDG7EyriTYgHHvxC7LRXawud0cgj1Rqr1DXus=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nvc";
|
||||
version = "1.20.0";
|
||||
version = "1.20.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nickg";
|
||||
repo = "nvc";
|
||||
tag = "r${finalAttrs.version}";
|
||||
hash = "sha256-DtJyGzrs6G1eZ9xFgBp/2PLlzMiRp/ePTINv0lLZauw=";
|
||||
hash = "sha256-IFuJvNOHE5qOjWgTbi5Ba5fUgEbM4FzNJRoZApnoaKw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -35,13 +35,13 @@ let
|
||||
in
|
||||
maven.buildMavenPackage rec {
|
||||
pname = "nzbhydra2";
|
||||
version = "8.5.4";
|
||||
version = "8.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "theotherp";
|
||||
repo = "nzbhydra2";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-chP++0ve734wOO7qNy4f+4KyYgBWlkzjaMJiueW4LkM=";
|
||||
hash = "sha256-RYX5YS0fKepP9UAArtlwdjAo7HFYQWqBgNDl5K59SXo=";
|
||||
};
|
||||
|
||||
mvnHash = "sha256-dodZT40zNqfaPd8VxfNYY10VrFNlL4xESDdTrgcFaaY=";
|
||||
|
||||
@@ -95,7 +95,7 @@ let
|
||||
|
||||
cudaToolkit = buildEnv {
|
||||
# ollama hardcodes the major version in the Makefile to support different variants.
|
||||
# - https://github.com/ollama/ollama/blob/v0.21.0/CMakePresets.json#L21-L47
|
||||
# - https://github.com/ollama/ollama/blob/v0.21.1/CMakePresets.json#L21-L47
|
||||
name = "cuda-merged-${cudaMajorVersion}";
|
||||
paths = map lib.getLib cudaLibs ++ [
|
||||
(lib.getOutput "static" cudaPackages.cuda_cudart)
|
||||
@@ -141,13 +141,13 @@ let
|
||||
in
|
||||
goBuild (finalAttrs: {
|
||||
pname = "ollama";
|
||||
version = "0.21.0";
|
||||
version = "0.21.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ollama";
|
||||
repo = "ollama";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-DtrYopNtndQXq9Xjriw5Bqell9A8RHPOvgDF8BlKtdU=";
|
||||
hash = "sha256-t/c2oba/y1IUh460+P3MQHGLnExrKcOcQpiMg0mFLBs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Lc1Ktdqtv2VhJQssk8K1UOimeEjVNvDWePE9WkamCos=";
|
||||
@@ -199,6 +199,10 @@ goBuild (finalAttrs: {
|
||||
--replace-fail '/bin/mkdir' '${coreutils}/bin/mkdir' \
|
||||
--replace-fail '/bin/cat' '${coreutils}/bin/cat' \
|
||||
--replace-fail '/bin/chmod' '${coreutils}/bin/chmod'
|
||||
substituteInPlace cmd/launch/kimi_test.go \
|
||||
--replace-fail '/bin/mkdir' '${coreutils}/bin/mkdir' \
|
||||
--replace-fail '/bin/cat' '${coreutils}/bin/cat' \
|
||||
--replace-fail '/bin/chmod' '${coreutils}/bin/chmod'
|
||||
rm -r app
|
||||
''
|
||||
# disable tests that fail in sandbox due to Metal init failure
|
||||
@@ -241,7 +245,7 @@ goBuild (finalAttrs: {
|
||||
'';
|
||||
|
||||
# ollama looks for acceleration libs in ../lib/ollama/ (now also for CPU-only with arch specific optimizations)
|
||||
# https://github.com/ollama/ollama/blob/v0.21.0/docs/development.md#library-detection
|
||||
# https://github.com/ollama/ollama/blob/v0.21.1/docs/development.md#library-detection
|
||||
postInstall = ''
|
||||
mkdir -p $out/lib
|
||||
cp -r build/lib/ollama $out/lib/
|
||||
|
||||
@@ -24,11 +24,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pdns";
|
||||
version = "5.0.3";
|
||||
version = "5.0.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.powerdns.com/releases/pdns-${finalAttrs.version}.tar.bz2";
|
||||
hash = "sha256-7DEgUBlQp3LHhcYA9Zno9NcR9wOgLL0b7ELtwaBfgcw=";
|
||||
hash = "sha256-NultkpmZ78iLy3NPlNxF+OKS0QQM7QiR5mS9Co7fnQ4=";
|
||||
};
|
||||
# redact configure flags from version output to reduce closure size
|
||||
patches = [ ./version.patch ];
|
||||
|
||||
@@ -66,11 +66,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Small speech recognizer";
|
||||
homepage = "https://github.com/cmusphinx/pocketsphinx";
|
||||
changelog = "https://github.com/cmusphinx/pocketsphinx/blob/v${finalAttrs.version}/NEWS";
|
||||
license = with lib.licenses; [
|
||||
bsd2
|
||||
bsd3
|
||||
mit
|
||||
];
|
||||
license =
|
||||
with lib.licenses;
|
||||
AND [
|
||||
bsd2
|
||||
bsd3
|
||||
mit
|
||||
];
|
||||
pkgConfigModules = [ "pocketsphinx" ];
|
||||
mainProgram = "pocketsphinx";
|
||||
maintainers = with lib.maintainers; [ jopejoe1 ];
|
||||
|
||||
+8
-8
@@ -7,7 +7,7 @@
|
||||
"name": "pyright-root",
|
||||
"devDependencies": {
|
||||
"glob": "^8.1.0",
|
||||
"jsonc-parser": "^3.3.1"
|
||||
"jsonc-parser": "^3.2.0"
|
||||
}
|
||||
},
|
||||
"node_modules/balanced-match": {
|
||||
@@ -18,9 +18,9 @@
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/brace-expansion": {
|
||||
"version": "2.0.2",
|
||||
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
|
||||
"integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
|
||||
"version": "2.1.0",
|
||||
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.0.tgz",
|
||||
"integrity": "sha512-TN1kCZAgdgweJhWWpgKYrQaMNHcDULHkWwQIspdtjV4Y5aurRdZpjAqn6yX3FPqTA9ngHCc4hJxMAMgGfve85w==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
@@ -38,7 +38,7 @@
|
||||
"version": "8.1.0",
|
||||
"resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
|
||||
"integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
|
||||
"deprecated": "Glob versions prior to v9 are no longer supported",
|
||||
"deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
|
||||
"dev": true,
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
@@ -82,9 +82,9 @@
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/minimatch": {
|
||||
"version": "5.1.6",
|
||||
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
|
||||
"integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
|
||||
"version": "5.1.9",
|
||||
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz",
|
||||
"integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==",
|
||||
"dev": true,
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.1.408";
|
||||
version = "1.1.409";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Microsoft";
|
||||
repo = "pyright";
|
||||
tag = version;
|
||||
hash = "sha256-+tU4BiAqKsX+4dX1k3JvygrzCoHaoXcCXKJgecvfN60=";
|
||||
hash = "sha256-h0sXYwRCIQlrnNIp/a7ow55McA9fdHP2FcvrRCqWROg=";
|
||||
};
|
||||
|
||||
patchedPackageJSON =
|
||||
@@ -32,7 +32,7 @@ let
|
||||
pname = "pyright-root";
|
||||
inherit version src;
|
||||
sourceRoot = "${src.name}"; # required for update.sh script
|
||||
npmDepsHash = "sha256-4DVWWoLnNXoJ6eWeQuOzAVjcvo75Y2nM/HwQvAEN4ME=";
|
||||
npmDepsHash = "sha256-OpXxcALwMyBJEcZz5WTnjAysufbgWkW/VKAg1zIJgDE=";
|
||||
dontNpmBuild = true;
|
||||
postPatch = ''
|
||||
cp ${patchedPackageJSON} ./package.json
|
||||
@@ -49,7 +49,7 @@ let
|
||||
pname = "pyright-internal";
|
||||
inherit version src;
|
||||
sourceRoot = "${src.name}/packages/pyright-internal";
|
||||
npmDepsHash = "sha256-/Y+DhyWC34Rco6qSQTZBm3Kqh2fKrk+kaHH9x+C6wP8=";
|
||||
npmDepsHash = "sha256-HG2714eCHWD6aQAKGpGClMg+XDPQ08Q0ofXf3wMafg0=";
|
||||
dontNpmBuild = true;
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
@@ -63,7 +63,7 @@ buildNpmPackage rec {
|
||||
inherit version src;
|
||||
|
||||
sourceRoot = "${src.name}/packages/pyright";
|
||||
npmDepsHash = "sha256-3w2XEURdfriVaQ2ruSbxVfwcZEEXKt0/51TFR3rR8tc=";
|
||||
npmDepsHash = "sha256-wyswu6pTtZmksj1hZUhaZLWuJnf8WKofo1htLtgKm9w=";
|
||||
|
||||
postPatch = ''
|
||||
chmod +w ../../
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "qpwgraph";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "rncbc";
|
||||
repo = "qpwgraph";
|
||||
tag = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-cBypvVr/DwnzeKX32PCHKg3vR/7fReRiJB5Pfh11blA=";
|
||||
sha256 = "sha256-RU6FD8/H4Z/IxaP+eTHNqkcP63nJ1Tos4PXpZE+i9d4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "scalingo";
|
||||
version = "1.44.0";
|
||||
version = "1.44.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scalingo";
|
||||
repo = "cli";
|
||||
rev = version;
|
||||
hash = "sha256-2E7tHdj74G+vZbkWL0e0E2Deayg5WANVUVIuYBPEBvo=";
|
||||
hash = "sha256-fLP7t1cgLOgU+xHLPFqDH+KbNuVxupuit5FBZ5iuQBE=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -158,10 +158,12 @@ buildNpmPackage (finalAttrs: {
|
||||
meta = {
|
||||
description = "Shogi frontend supporting USI engines";
|
||||
homepage = "https://sunfish-shogi.github.io/shogihome/";
|
||||
license = with lib.licenses; [
|
||||
mit
|
||||
asl20 # for icons
|
||||
];
|
||||
license =
|
||||
with lib.licenses;
|
||||
AND [
|
||||
mit
|
||||
asl20 # for icons
|
||||
];
|
||||
maintainers = with lib.maintainers; [
|
||||
kachick
|
||||
];
|
||||
|
||||
@@ -33,22 +33,17 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin $out/lib $out/libexec $out/share
|
||||
mkdir -p $out/bin $out/share/tfenv $out/share/doc/tfenv
|
||||
|
||||
cp -r lib/* $out/lib/
|
||||
cp -r libexec/* $out/libexec/
|
||||
cp -r share/* $out/share/
|
||||
cp -r bin lib libexec share CHANGELOG.md $out/share/tfenv/
|
||||
|
||||
install -m0644 CHANGELOG.md $out/CHANGELOG.md
|
||||
|
||||
install -m0755 bin/tfenv $out/bin/tfenv
|
||||
install -m0755 bin/terraform $out/bin/terraform
|
||||
ln -s $out/share/tfenv/CHANGELOG.md $out/share/doc/tfenv/CHANGELOG.md
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
for f in $out/bin/* $out/libexec/*; do
|
||||
for f in $out/share/tfenv/bin/* $out/share/tfenv/libexec/*; do
|
||||
[ -f "$f" ] || continue
|
||||
wrapProgram "$f" \
|
||||
--prefix PATH : "${
|
||||
@@ -62,6 +57,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
]
|
||||
}"
|
||||
done
|
||||
|
||||
ln -s $out/share/tfenv/bin/tfenv $out/bin/tfenv
|
||||
ln -s $out/share/tfenv/bin/terraform $out/bin/terraform
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "url-parser";
|
||||
version = "2.1.15";
|
||||
version = "2.1.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thegeeklab";
|
||||
repo = "url-parser";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-lWEzzCR4EuiaFJ4kAfzV0qZlGWVLCclXjwPm5ZEHZrM=";
|
||||
hash = "sha256-Y3tbEpAp3kTjkAuB0gjRPD+gWskTzOKdB4/rilHbyxU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Do+zP+dZQE0piuzAzbr0GN4Qw/JJQEhht6AOInFVi0A=";
|
||||
vendorHash = "sha256-smSFWfuQ3wq/ZfDwUBIUdb4DBu9TPKtJ5Ttys5xFAsE=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -34,10 +34,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
meta = {
|
||||
description = "GNU autoconf macros shared across X.Org projects";
|
||||
homepage = "https://gitlab.freedesktop.org/xorg/util/macros";
|
||||
license = with lib.licenses; [
|
||||
hpndSellVariant
|
||||
mit
|
||||
];
|
||||
license =
|
||||
with lib.licenses;
|
||||
AND [
|
||||
hpndSellVariant
|
||||
mit
|
||||
];
|
||||
maintainers = with lib.maintainers; [
|
||||
raboof
|
||||
jopejoe1
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "x42-avldrums";
|
||||
version = "0.7.3";
|
||||
version = "0.7.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "x42";
|
||||
repo = "avldrums.lv2";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-AZKHjzgw0TtLHh4TF+yOUSa+GlNVwyHCpJWAZikXTy4=";
|
||||
hash = "sha256-4/orNlNTPSGdCBmb35i77i9L/rsuFDyWLKTG6h4zE0k=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -19,11 +19,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "x42-plugins";
|
||||
version = "20260125";
|
||||
version = "20260420";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gareus.org/misc/x42-plugins/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-wcIShcFc91BVZQ1rz55+AN+7R5b0fClOzT1thXSz1ug=";
|
||||
hash = "sha256-wBl+lp2ZcVohlukjuOwhAaoYnEx/D9FktMW9kjmwflE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@@ -64,7 +64,7 @@ swiftPackages.stdenv.mkDerivation (finalAttrs: {
|
||||
meta = {
|
||||
description = "Swift command line tool for generating your Xcode project";
|
||||
homepage = "https://github.com/yonaskolb/XcodeGen";
|
||||
changelog = "https://github.com/XcodeGen/blob/${finalAttrs.version}/CHANGELOG.md";
|
||||
changelog = "https://github.com/yonaskolb/XcodeGen/blob/${finalAttrs.version}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.darwin;
|
||||
maintainers = [ lib.maintainers.samasaur ];
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "xfr";
|
||||
version = "0.9.9";
|
||||
version = "0.9.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lance0";
|
||||
repo = "xfr";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-AY+hNVywXWXgpLS0W/mtgfQWH/b647WLzjJCY3HrABM=";
|
||||
hash = "sha256-8vZ/29B7bdiWd+ckwMUPUMWHYtrgoIlzw3wM6khtrZo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-8iW5OSGpoLfa2RWJJigOSwk6Eiv6m4WNUEWyoAqkl0M=";
|
||||
cargoHash = "sha256-Vkh1Rb1/MKN+8Rc00iVfrK4x3AcmyKVQ8FMQX2JhZX4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "zashboard";
|
||||
version = "3.4.0";
|
||||
version = "3.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Zephyruso";
|
||||
repo = "zashboard";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-S5NrXjD34UwbsYQrHWMAgLc10/R1U2ZZ1gW0zkUXg6w=";
|
||||
hash = "sha256-yTLkfNhfmhJ/2oopKQ+F6ycYYwUXpbyz4SSE3IIpTgc=";
|
||||
};
|
||||
|
||||
npmDeps = null;
|
||||
|
||||
@@ -66,15 +66,20 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/zapping-vbi/zvbi";
|
||||
changelog = "https://github.com/zapping-vbi/zvbi/blob/${finalAttrs.src.rev}/ChangeLog";
|
||||
pkgConfigModules = [ "zvbi-0.2" ];
|
||||
license = with lib.licenses; [
|
||||
bsd2
|
||||
bsd3
|
||||
gpl2
|
||||
gpl2Plus
|
||||
lgpl21Plus
|
||||
lgpl2Plus
|
||||
mit
|
||||
];
|
||||
license =
|
||||
with lib.licenses;
|
||||
AND [
|
||||
bsd2
|
||||
(OR [
|
||||
bsd3
|
||||
gpl2Plus
|
||||
])
|
||||
gpl2Only
|
||||
gpl2Plus
|
||||
lgpl21Plus
|
||||
lgpl2Plus
|
||||
mit
|
||||
];
|
||||
maintainers = with lib.maintainers; [ jopejoe1 ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -90,6 +90,7 @@
|
||||
# tests
|
||||
pytestCheckHook,
|
||||
pytest-cov-stub,
|
||||
pytest-factoryboy,
|
||||
pytest-flask,
|
||||
mock,
|
||||
rarfile,
|
||||
@@ -112,12 +113,12 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "beets";
|
||||
version = "2.9.0";
|
||||
version = "2.10.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "beetbox";
|
||||
repo = "beets";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-dJhWKZwhKXyFQVO9xt2v/NSa7bSg0e78zga/t9dlTyE=";
|
||||
hash = "sha256-DbZV8n+2nbILLIi7niXohcIynwza+w5LVo/jy4wmTbw=";
|
||||
};
|
||||
pyproject = true;
|
||||
|
||||
@@ -181,6 +182,7 @@ buildPythonPackage (finalAttrs: {
|
||||
ffmpeg
|
||||
pytestCheckHook
|
||||
pytest-cov-stub
|
||||
pytest-factoryboy
|
||||
pytest-flask
|
||||
mock
|
||||
rarfile
|
||||
|
||||
@@ -2,63 +2,42 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pythonAtLeast,
|
||||
anyio,
|
||||
backoff,
|
||||
httpx,
|
||||
idna,
|
||||
langchain,
|
||||
llama-index,
|
||||
openai,
|
||||
opentelemetry-api,
|
||||
opentelemetry-sdk,
|
||||
opentelemetry-exporter-otlp,
|
||||
packaging,
|
||||
poetry-core,
|
||||
pydantic,
|
||||
requests,
|
||||
wrapt,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "langfuse";
|
||||
version = "3.12.0";
|
||||
version = "4.0.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "langfuse";
|
||||
repo = "langfuse-python";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-LHKNy5KSJhRhxkrp4+pjD0GGHTooaj7adrRA7I4mbdo=";
|
||||
hash = "sha256-JJfVh09ziAnizQcUusjEJPLUBpi9o04gfBysO+hA6Fg=";
|
||||
};
|
||||
|
||||
# https://github.com/langfuse/langfuse/issues/9618
|
||||
disabled = pythonAtLeast "3.14";
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
pythonRelaxDeps = [ "packaging" ];
|
||||
|
||||
dependencies = [
|
||||
anyio
|
||||
backoff
|
||||
httpx
|
||||
idna
|
||||
opentelemetry-api
|
||||
opentelemetry-sdk
|
||||
opentelemetry-exporter-otlp
|
||||
packaging
|
||||
pydantic
|
||||
requests
|
||||
wrapt
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
langchain = [ langchain ];
|
||||
llama-index = [ llama-index ];
|
||||
openai = [ openai ];
|
||||
};
|
||||
|
||||
pythonImportsCheck = [ "langfuse" ];
|
||||
|
||||
# tests require network access and openai api key
|
||||
|
||||
@@ -44,11 +44,13 @@ buildPythonPackage rec {
|
||||
description = "Small speech recognizer";
|
||||
homepage = "https://github.com/cmusphinx/pocketsphinx";
|
||||
changelog = "https://github.com/cmusphinx/pocketsphinx/blob/v${version}/NEWS";
|
||||
license = with lib.licenses; [
|
||||
bsd2
|
||||
bsd3
|
||||
mit
|
||||
];
|
||||
license =
|
||||
with lib.licenses;
|
||||
AND [
|
||||
bsd2
|
||||
bsd3
|
||||
mit
|
||||
];
|
||||
maintainers = with lib.maintainers; [ jopejoe1 ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
nodejs-slim,
|
||||
symlinkJoin,
|
||||
}:
|
||||
(symlinkJoin {
|
||||
symlinkJoin {
|
||||
pname = "nodejs";
|
||||
inherit (nodejs-slim) version passthru meta;
|
||||
paths = [
|
||||
@@ -11,39 +11,4 @@
|
||||
nodejs-slim.npm
|
||||
]
|
||||
++ lib.optional (builtins.hasAttr "corepack" nodejs-slim) nodejs-slim.corepack;
|
||||
}).overrideAttrs
|
||||
(nodejs: {
|
||||
passthru =
|
||||
(builtins.listToAttrs (
|
||||
map
|
||||
(name: {
|
||||
inherit name;
|
||||
value = lib.warn "Use nodejs-slim.${name} instead of nodejs.${name}" nodejs-slim.${name};
|
||||
})
|
||||
(
|
||||
builtins.filter (
|
||||
name:
|
||||
!lib.strings.hasPrefix "__" name
|
||||
&& !(builtins.elem name [
|
||||
"override"
|
||||
"overrideAttrs"
|
||||
"overrideDerivation"
|
||||
"outputs"
|
||||
"system"
|
||||
"type"
|
||||
|
||||
# Filter out arguments of `getOutput`
|
||||
"bin"
|
||||
"dev"
|
||||
"include"
|
||||
"lib"
|
||||
"man"
|
||||
"out"
|
||||
"static"
|
||||
])
|
||||
&& !(builtins.hasAttr name nodejs)
|
||||
) (builtins.attrNames nodejs-slim)
|
||||
)
|
||||
))
|
||||
// nodejs.passthru;
|
||||
})
|
||||
}
|
||||
|
||||
@@ -1231,7 +1231,7 @@ let
|
||||
EFI = lib.mkIf stdenv.hostPlatform.isEfi yes;
|
||||
EFI_STUB = yes; # EFI bootloader in the bzImage itself
|
||||
EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER = whenOlder "6.2" yes; # initrd kernel parameter for EFI
|
||||
EFI_VARS_PSTORE = yes;
|
||||
EFI_VARS_PSTORE = lib.mkIf (!stdenv.hostPlatform.isLoongArch64) yes;
|
||||
|
||||
# Generic compression support for EFI payloads
|
||||
# Add new platforms only after they have been verified to build and boot.
|
||||
|
||||
@@ -15,14 +15,14 @@ let
|
||||
variants = {
|
||||
# ./update-xanmod.sh lts
|
||||
lts = {
|
||||
version = "6.18.23";
|
||||
hash = "sha256-IXR3gSaUsykNbdDxYCawDp6/5otc9wm88ewPGnpd5Kw=";
|
||||
version = "6.18.24";
|
||||
hash = "sha256-BYy5AzTDQIMBJNwWIZ4uGjPKvXGgei7PAOT5gCvlp1Q=";
|
||||
isLTS = true;
|
||||
};
|
||||
# ./update-xanmod.sh main
|
||||
main = {
|
||||
version = "6.19.13";
|
||||
hash = "sha256-r3CXmgMiZtD5ZHmGDsk2O1TwUR01iCX4m06royJMf68=";
|
||||
version = "6.19.14";
|
||||
hash = "sha256-xp5IBA4epb+3SCJIkbxqzymwvz4T9p7NOP9y6iy6DZk=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user