Merge remote-tracking branch 'origin/staging-next' into staging
This commit is contained in:
K900
@@ -6094,6 +6094,12 @@
|
||||
name = "David Wood";
|
||||
keys = [ { fingerprint = "5B08 313C 6853 E5BF FA91 A817 0176 0B4F 9F53 F154"; } ];
|
||||
};
|
||||
davidweisse = {
|
||||
name = "David Weiße";
|
||||
github = "davidweisse";
|
||||
githubId = 98460960;
|
||||
email = "david.weisse@gmx.net";
|
||||
};
|
||||
davisrichard437 = {
|
||||
email = "davisrichard437@gmail.com";
|
||||
github = "davisrichard437";
|
||||
@@ -26614,6 +26620,12 @@
|
||||
githubId = 633969;
|
||||
name = "Miroslav Vadkerti";
|
||||
};
|
||||
ths-on = {
|
||||
email = "thore.sommer@tum.de";
|
||||
github = "THS-on";
|
||||
githubId = 10854414;
|
||||
name = "Thore Sommer";
|
||||
};
|
||||
thtrf = {
|
||||
email = "thtrf@proton.me";
|
||||
github = "thtrf";
|
||||
|
||||
@@ -64,6 +64,10 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
package = lib.mkPackageOption pkgs "terraria" {
|
||||
default = "terraria-server";
|
||||
};
|
||||
|
||||
port = lib.mkOption {
|
||||
type = lib.types.port;
|
||||
default = 7777;
|
||||
@@ -178,7 +182,7 @@ in
|
||||
Type = "forking";
|
||||
GuessMainPID = true;
|
||||
UMask = 7;
|
||||
ExecStart = "${tmuxCmd} new -d ${pkgs.terraria-server}/bin/TerrariaServer ${lib.concatStringsSep " " flags}";
|
||||
ExecStart = "${tmuxCmd} new -d ${lib.getExe cfg.package} ${lib.concatStringsSep " " flags}";
|
||||
ExecStop = "${stopScript} $MAINPID";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -950,7 +950,10 @@ in
|
||||
mealie = runTest ./mealie.nix;
|
||||
mediamtx = runTest ./mediamtx.nix;
|
||||
mediatomb = runTest ./mediatomb.nix;
|
||||
mediawiki = handleTest ./mediawiki.nix { };
|
||||
mediawiki = import ./mediawiki.nix {
|
||||
inherit (pkgs) lib;
|
||||
inherit runTest;
|
||||
};
|
||||
meilisearch = runTest ./meilisearch.nix;
|
||||
memcached = runTest ./memcached.nix;
|
||||
merecat = runTest ./merecat.nix;
|
||||
|
||||
+27
-25
@@ -1,31 +1,33 @@
|
||||
{
|
||||
system ? builtins.currentSystem,
|
||||
config ? { },
|
||||
pkgs ? import ../.. { inherit system config; },
|
||||
}:
|
||||
{ lib, runTest }:
|
||||
|
||||
let
|
||||
shared = {
|
||||
services.mediawiki.enable = true;
|
||||
services.mediawiki.httpd.virtualHost.hostName = "localhost";
|
||||
services.mediawiki.httpd.virtualHost.adminAddr = "root@example.com";
|
||||
services.mediawiki.passwordFile = pkgs.writeText "password" "correcthorsebatterystaple";
|
||||
services.mediawiki.extensions = {
|
||||
Matomo = pkgs.fetchzip {
|
||||
url = "https://github.com/DaSchTour/matomo-mediawiki-extension/archive/v4.0.1.tar.gz";
|
||||
sha256 = "0g5rd3zp0avwlmqagc59cg9bbkn3r7wx7p6yr80s644mj6dlvs1b";
|
||||
shared =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
services.mediawiki.enable = true;
|
||||
services.mediawiki.httpd.virtualHost.hostName = "localhost";
|
||||
services.mediawiki.httpd.virtualHost.adminAddr = "root@example.com";
|
||||
services.mediawiki.passwordFile = pkgs.writeText "password" "correcthorsebatterystaple";
|
||||
services.mediawiki.extensions = {
|
||||
Matomo = pkgs.fetchzip {
|
||||
url = "https://github.com/DaSchTour/matomo-mediawiki-extension/archive/v4.0.1.tar.gz";
|
||||
sha256 = "0g5rd3zp0avwlmqagc59cg9bbkn3r7wx7p6yr80s644mj6dlvs1b";
|
||||
};
|
||||
ParserFunctions = null;
|
||||
};
|
||||
ParserFunctions = null;
|
||||
};
|
||||
};
|
||||
|
||||
testLib = import ../lib/testing-python.nix {
|
||||
inherit system pkgs;
|
||||
extraConfigurations = [ shared ];
|
||||
};
|
||||
makeTest =
|
||||
t:
|
||||
runTest {
|
||||
imports = [
|
||||
{ nodes.machine.imports = [ shared ]; }
|
||||
t
|
||||
];
|
||||
};
|
||||
in
|
||||
{
|
||||
mysql = testLib.makeTest {
|
||||
mysql = makeTest {
|
||||
name = "mediawiki-mysql";
|
||||
nodes.machine = {
|
||||
services.mediawiki.database.type = "mysql";
|
||||
@@ -40,7 +42,7 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
postgresql = testLib.makeTest {
|
||||
postgresql = makeTest {
|
||||
name = "mediawiki-postgres";
|
||||
nodes.machine = {
|
||||
services.mediawiki.database.type = "postgres";
|
||||
@@ -55,7 +57,7 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
nohttpd = testLib.makeTest {
|
||||
nohttpd = makeTest {
|
||||
name = "mediawiki-nohttpd";
|
||||
nodes.machine = {
|
||||
services.mediawiki.webserver = "none";
|
||||
@@ -72,12 +74,12 @@ in
|
||||
'QUERY_STRING=title=Main_Page',
|
||||
"REQUEST_METHOD=GET",
|
||||
);
|
||||
page = machine.succeed(f"{' '.join(env)} ${pkgs.fcgi}/bin/cgi-fcgi -bind -connect ${nodes.machine.services.phpfpm.pools.mediawiki.socket}")
|
||||
page = machine.succeed(f"{' '.join(env)} ${lib.getExe nodes.machine.nixpkgs.pkgs.fcgi} -bind -connect ${nodes.machine.services.phpfpm.pools.mediawiki.socket}")
|
||||
assert "MediaWiki has been installed" in page, f"no 'MediaWiki has been installed' in:\n{page}"
|
||||
'';
|
||||
};
|
||||
|
||||
nginx = testLib.makeTest {
|
||||
nginx = makeTest {
|
||||
name = "mediawiki-nginx";
|
||||
nodes.machine = {
|
||||
services.mediawiki.webserver = "nginx";
|
||||
|
||||
@@ -57,7 +57,7 @@ runTest (
|
||||
stalwart =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
imports = [ ../stalwart/stalwart-mail-config.nix ];
|
||||
imports = [ ../stalwart/stalwart-config.nix ];
|
||||
|
||||
networking.firewall.allowedTCPPorts = [ 587 ];
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
name = "harper";
|
||||
publisher = "elijah-potter";
|
||||
version = harper.version;
|
||||
hash = "sha256-VAQUB2Wi4asJKJddCdIB9rTPbknXDwyJNnYwKOFJUL8=";
|
||||
hash = "sha256-rN8aQXDoUje5flRA1T4rw+CVWW9RQRNKtj6ktaAyJQ0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,79 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
mkDerivationWith,
|
||||
fetchFromGitHub,
|
||||
python3Packages,
|
||||
herbstluftwm,
|
||||
}:
|
||||
|
||||
mkDerivationWith (python3Packages.buildPythonApplication.override { inherit stdenv; }) rec {
|
||||
pname = "webmacs";
|
||||
version = "0.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = python3Packages.isPy27;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "parkouss";
|
||||
repo = "webmacs";
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "1hzb9341hybgrqcy1w20hshm6xaiby4wbjpjkigf4zq389407368";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
pyqtwebengine
|
||||
setuptools
|
||||
dateparser
|
||||
jinja2
|
||||
pygments
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
python3Packages.pytest
|
||||
#python3Packages.pytest-xvfb
|
||||
#python3Packages.pytest-qt
|
||||
python3Packages.pytestCheckHook
|
||||
herbstluftwm
|
||||
|
||||
# The following are listed in test-requirements.txt but appear not
|
||||
# to be needed at present:
|
||||
|
||||
# python3Packages.pytest-mock
|
||||
# python3Packages.flake8
|
||||
];
|
||||
|
||||
# See https://github.com/parkouss/webmacs/blob/1a04fb7bd3f33d39cb4d71621b48c2458712ed39/setup.py#L32
|
||||
# Don't know why they're using CC for g++.
|
||||
preConfigure = ''
|
||||
export CC=$CXX
|
||||
'';
|
||||
|
||||
doCheck = false; # test dependencies not packaged up yet
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Keyboard-based web browser with Emacs/conkeror heritage";
|
||||
mainProgram = "webmacs";
|
||||
longDescription = ''
|
||||
webmacs is yet another browser for keyboard-based web navigation.
|
||||
|
||||
It mainly targets emacs-like navigation, and started as a clone (in terms of
|
||||
features) of conkeror.
|
||||
|
||||
Based on QtWebEngine and Python 3. Fully customizable in Python.
|
||||
'';
|
||||
homepage = "https://webmacs.readthedocs.io/en/latest/";
|
||||
changelog = "https://github.com/parkouss/webmacs/blob/master/CHANGELOG.md";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [ jacg ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
|
||||
}
|
||||
@@ -19,6 +19,7 @@
|
||||
ocamlPackages_4_10,
|
||||
ocamlPackages_4_12,
|
||||
ocamlPackages_4_14,
|
||||
ocamlPackages_5_4,
|
||||
rocqPackages, # for versions >= 9.0 that are transition shims on top of Rocq
|
||||
ncurses,
|
||||
buildIde ? null, # default is true for Coq < 8.14 and false for Coq >= 8.14
|
||||
@@ -73,6 +74,7 @@ let
|
||||
"9.0.0".sha256 = "sha256-GRwYSvrJGiPD+I82gLOgotb+8Ra5xHZUJGcNwxWqZkU=";
|
||||
"9.0.1".sha256 = "sha256-gRgQhFiYvGR/Z46TmTl1bgN9O32nifxQGdrzfw0WHrk=";
|
||||
"9.1.0".sha256 = "sha256-+QL7I1/0BfT87n7lSaOmpHj2jJuDB4idWhAxwzvVQOE=";
|
||||
"9.2+rc1".sha256 = "sha256-zKVhnBid5LOcd7uHWFGmUdHpyNLxIyB7RNNz5btz0mI=";
|
||||
};
|
||||
releaseRev = v: "V${v}";
|
||||
fetched =
|
||||
@@ -111,7 +113,7 @@ let
|
||||
else
|
||||
lib.switch coq-version [
|
||||
{
|
||||
case = lib.versions.range "8.16" "8.18";
|
||||
case = lib.versions.range "8.16" "9.1";
|
||||
out = ocamlPackages_4_14;
|
||||
}
|
||||
{
|
||||
@@ -126,7 +128,7 @@ let
|
||||
case = lib.versions.range "8.7" "8.10";
|
||||
out = ocamlPackages_4_09;
|
||||
}
|
||||
] ocamlPackages_4_14;
|
||||
] ocamlPackages_5_4;
|
||||
ocamlNativeBuildInputs = [
|
||||
ocamlPackages.ocaml
|
||||
ocamlPackages.findlib
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
dune,
|
||||
customOCamlPackages ? null,
|
||||
ocamlPackages_4_14,
|
||||
ocamlPackages_5_4,
|
||||
ncurses,
|
||||
csdp ? null,
|
||||
version,
|
||||
@@ -26,6 +27,7 @@ let
|
||||
"9.0.0".sha256 = "sha256-GRwYSvrJGiPD+I82gLOgotb+8Ra5xHZUJGcNwxWqZkU=";
|
||||
"9.0.1".sha256 = "sha256-gRgQhFiYvGR/Z46TmTl1bgN9O32nifxQGdrzfw0WHrk=";
|
||||
"9.1.0".sha256 = "sha256-+QL7I1/0BfT87n7lSaOmpHj2jJuDB4idWhAxwzvVQOE=";
|
||||
"9.2+rc1".sha256 = "sha256-zKVhnBid5LOcd7uHWFGmUdHpyNLxIyB7RNNz5btz0mI=";
|
||||
};
|
||||
releaseRev = v: "V${v}";
|
||||
fetched =
|
||||
@@ -53,7 +55,17 @@ let
|
||||
substituteInPlace plugins/micromega/sos.ml --replace-warn "; csdp" "; ${csdp}/bin/csdp"
|
||||
substituteInPlace plugins/micromega/coq_micromega.ml --replace-warn "System.is_in_system_path \"csdp\"" "true"
|
||||
'';
|
||||
ocamlPackages = if customOCamlPackages != null then customOCamlPackages else ocamlPackages_4_14;
|
||||
ocamlPackages =
|
||||
if customOCamlPackages != null then
|
||||
customOCamlPackages
|
||||
else
|
||||
let
|
||||
case = case: out: { inherit case out; };
|
||||
inherit (lib.versions) range;
|
||||
in
|
||||
lib.switch rocq-version [
|
||||
(case (range "9.0" "9.1") ocamlPackages_4_14)
|
||||
] ocamlPackages_5_4;
|
||||
ocamlNativeBuildInputs = [
|
||||
ocamlPackages.ocaml
|
||||
ocamlPackages.findlib
|
||||
|
||||
@@ -8,18 +8,23 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "abc-verifier";
|
||||
version = "0.55";
|
||||
version = "0.61";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yosyshq";
|
||||
repo = "abc";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Ib6bZSPQmpI1UOsUG733TH6W6v+UnLyagdjUc8MreKw=";
|
||||
hash = "sha256-j/JmEJa29mT/XQmVL/adVbj4S+AAgpga1jbEinCN16w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ readline ];
|
||||
|
||||
cmakeFlags = [
|
||||
# This prevents CMake from trying to download googletest during the build
|
||||
(lib.cmakeBool "ABC_SKIP_TESTS" true)
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm755 'abc' "$out/bin/abc"
|
||||
@@ -30,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
passthru.rev = finalAttrs.src.rev;
|
||||
|
||||
meta = {
|
||||
description = "Tool for squential logic synthesis and formal verification";
|
||||
description = "Tool for sequential logic synthesis and formal verification";
|
||||
homepage = "https://people.eecs.berkeley.edu/~alanmi/abc";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "acme.sh";
|
||||
version = "3.1.1";
|
||||
version = "3.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "acmesh-official";
|
||||
repo = "acme.sh";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Fgik1TCWDlkyEI9QkXpc/94mGKb7U7hMoamdYU7nTJc=";
|
||||
hash = "sha256-eTNligdr4LV+yer+D2GJ1tdv2APP3I4Revjw1q8WrH0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,106 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
ninja,
|
||||
pkg-config,
|
||||
ncurses,
|
||||
libevdev,
|
||||
SDL2,
|
||||
SDL2_image,
|
||||
libglvnd,
|
||||
libslirp,
|
||||
libdeflate,
|
||||
zlib,
|
||||
boost,
|
||||
libpcap,
|
||||
xxd,
|
||||
libnl,
|
||||
libtiff,
|
||||
libjpeg,
|
||||
libwebp,
|
||||
libpng,
|
||||
xz,
|
||||
libsysprof-capture,
|
||||
lerc,
|
||||
libX11,
|
||||
libXext,
|
||||
qt6Packages,
|
||||
qt6,
|
||||
enableQt6 ? true,
|
||||
enableNcurses ? true,
|
||||
enableSdl2 ? true,
|
||||
enableLibretro ? true,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "applewin";
|
||||
version = "1.30.21.0.b";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "audetto";
|
||||
repo = "AppleWin";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-g1780lODOsnjlUYzapvkmJMGh8ovOHRAfyl+1E1wHNY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
pkg-config
|
||||
xxd
|
||||
]
|
||||
++ lib.optionals enableQt6 [
|
||||
qt6.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
ncurses
|
||||
libevdev
|
||||
SDL2
|
||||
SDL2_image
|
||||
libglvnd
|
||||
libslirp
|
||||
xz
|
||||
lerc
|
||||
libsysprof-capture
|
||||
libdeflate
|
||||
zlib
|
||||
boost
|
||||
libpcap
|
||||
libnl
|
||||
libtiff
|
||||
libjpeg
|
||||
libwebp
|
||||
libpng
|
||||
libX11
|
||||
libXext
|
||||
]
|
||||
++ lib.optionals enableQt6 [
|
||||
qt6Packages.qtbase
|
||||
qt6Packages.qtmultimedia
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "BUILD_APPLEN" enableNcurses)
|
||||
(lib.cmakeBool "BUILD_QAPPLE" enableQt6)
|
||||
(lib.cmakeBool "BUILD_SA2" enableSdl2)
|
||||
(lib.cmakeBool "BUILD_LIBRETRO" enableLibretro)
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Apple II emulator for Linux";
|
||||
longDescription = ''
|
||||
AppleWin on Linux is a linux port of AppleWin that shares 100% of the code
|
||||
of the core emulator and video generation. Audio, UI, scheduling and other
|
||||
peripherals are reimplemented.
|
||||
'';
|
||||
homepage = "https://github.com/audetto/AppleWin";
|
||||
license = lib.licenses.gpl2Only;
|
||||
maintainers = [ lib.maintainers.matthewcroughan ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "qapple";
|
||||
};
|
||||
})
|
||||
+53
@@ -0,0 +1,53 @@
|
||||
From 7534c427f720ce2134a4fba7b7c3f8cddadf9069 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?David=20Chocholat=C3=BD?= <chocholaty.david@protonmail.com>
|
||||
Date: Sat, 31 Jan 2026 11:04:04 +0100
|
||||
Subject: [PATCH] fix: Remove duplicate dependency entry for tauri-build
|
||||
|
||||
---
|
||||
Cargo.lock | 23 -----------------------
|
||||
1 file changed, 23 deletions(-)
|
||||
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index 80a7920f..92a7bef6 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -590,7 +590,6 @@ dependencies = [
|
||||
"sqlx",
|
||||
"syntect",
|
||||
"tauri",
|
||||
- "tauri-build 2.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"tauri-plugin-deep-link",
|
||||
"tauri-plugin-dialog",
|
||||
"tauri-plugin-fs",
|
||||
@@ -8932,28 +8931,6 @@ dependencies = [
|
||||
"windows 0.61.1",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "tauri-build"
|
||||
-version = "2.5.3"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "17fcb8819fd16463512a12f531d44826ce566f486d7ccd211c9c8cebdaec4e08"
|
||||
-dependencies = [
|
||||
- "anyhow",
|
||||
- "cargo_toml",
|
||||
- "dirs 6.0.0",
|
||||
- "glob",
|
||||
- "heck 0.5.0",
|
||||
- "json-patch",
|
||||
- "schemars",
|
||||
- "semver",
|
||||
- "serde",
|
||||
- "serde_json",
|
||||
- "tauri-utils",
|
||||
- "tauri-winres",
|
||||
- "toml 0.9.8",
|
||||
- "walkdir",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "tauri-build"
|
||||
version = "2.5.3"
|
||||
--
|
||||
2.51.2
|
||||
|
||||
@@ -9,9 +9,8 @@
|
||||
cargo-tauri,
|
||||
nodejs,
|
||||
pkg-config,
|
||||
fetchPnpmDeps,
|
||||
pnpmConfigHook,
|
||||
pnpm,
|
||||
bun,
|
||||
writableTmpDirAsHomeHook,
|
||||
|
||||
alsa-lib,
|
||||
glib-networking,
|
||||
@@ -21,31 +20,88 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "atuin-desktop";
|
||||
# TODO When updating the version, check if the version-mismatch workaround in preBuild is still needed
|
||||
version = "0.2.11";
|
||||
version = "0.2.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "atuinsh";
|
||||
repo = "desktop";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-tVIT3GUJ1qcv6HSvO+nqAz+VMfd8g9AjgaqE6+GSa+I=";
|
||||
hash = "sha256-itfpRG8znMz0IRK9n4BMxkhkWR7CIjkEY4JQXBgCeYQ=";
|
||||
};
|
||||
|
||||
cargoRoot = "./.";
|
||||
cargoHash = "sha256-T3cPvwph71lpqlGcugAO4Ua8Y5TNZSySbQatxcvoT4E=";
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs)
|
||||
# TMP: Include patches from root to ensure Cargo.lock consistency between root and deps.
|
||||
patches
|
||||
src
|
||||
;
|
||||
hash = "sha256-bSTBfnSUID1+G4maLqtLEgqYuFkpIi6KN++/QBtte/0=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-XqKGAx2Q9cWO1oG4mP1cKM2Y9Pib5haFYEaq0PAfAdQ=";
|
||||
patches = [
|
||||
# TMP: Until a duplicate entry for `tauri-build` dependency in `Cargo.lock` is resolved
|
||||
# (https://github.com/atuinsh/desktop/issues/364), remove one of the duplicated entries.
|
||||
./0001-fix-Remove-duplicate-dependency-entry-for-tauri-build.patch
|
||||
];
|
||||
|
||||
node_modules = stdenv.mkDerivation {
|
||||
inherit (finalAttrs) src version;
|
||||
pname = "${finalAttrs.pname}-node_modules";
|
||||
|
||||
impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
|
||||
"GIT_PROXY_COMMAND"
|
||||
"SOCKS_SERVER"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
bun
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
dontConfigure = true;
|
||||
dontFixup = true;
|
||||
dontPatchShebangs = true; # Patch shebangs manually in configurePhase after copying node_modules in the main derivation.
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
export BUN_INSTALL_CACHE_DIR=$(mktemp -d)
|
||||
|
||||
# Install dependencies without running lifecycle scripts:
|
||||
# - Skip scripts to avoid running ts-tiny-activerecord's prepare script with unpatched shebangs.
|
||||
# - Rebuild in the main derivation after shebangs are patched there manually.
|
||||
bun install \
|
||||
--force \
|
||||
--no-progress \
|
||||
--frozen-lockfile \
|
||||
--ignore-scripts
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
cp -R ./node_modules $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
outputHash =
|
||||
{
|
||||
aarch64-darwin = "sha256-YbjDAa2KG8U0ODqIYc5h7iNr5px+6+iforDrPomOVDo=";
|
||||
aarch64-linux = "sha256-JoUPAfBF4xdQxtx+J/VNpYomBACNsL7Wes0XXuGByGk=";
|
||||
x86_64-darwin = "sha256-YzxQyZPfcQci8QsGEDRTcc2A9tmvem3cHkv/OBFlWDQ=";
|
||||
x86_64-linux = "sha256-w8fMS6f+F+23EtMjjl0RsHMm6b5jOXSwUDAc21vqLAg=";
|
||||
}
|
||||
.${stdenv.hostPlatform.system}
|
||||
or (throw "${finalAttrs.pname}: Platform ${stdenv.hostPlatform.system} is not packaged yet.");
|
||||
outputHashMode = "recursive";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cargo-tauri.hook
|
||||
pnpmConfigHook
|
||||
pnpm
|
||||
rustPlatform.bindgenHook
|
||||
|
||||
bun
|
||||
nodejs
|
||||
pkg-config
|
||||
]
|
||||
@@ -60,7 +116,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
];
|
||||
|
||||
env = {
|
||||
# Used upstream: https://github.com/atuinsh/desktop/blob/6ddebdf66c70042defe5587f7f6c433f889b9ef4/.envrc#L1
|
||||
# Used upstream: https://github.com/atuinsh/desktop/blob/v0.2.19/.envrc#L1
|
||||
NODE_OPTIONS = "--max-old-space-size=6144";
|
||||
|
||||
# TMP: Fix build failure with GCC 15.
|
||||
@@ -71,16 +127,35 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
tauriConf = builtins.toJSON { bundle.createUpdaterArtifacts = false; };
|
||||
passAsFile = [ "tauriConf" ];
|
||||
preBuild = ''
|
||||
npm rebuild ts-tiny-activerecord
|
||||
tauriBuildFlags+=(
|
||||
"--config"
|
||||
"$tauriConfPath"
|
||||
# Skips the version mismatch check (and accepts the consequences)
|
||||
# ref: https://github.com/atuinsh/desktop/issues/313
|
||||
"--ignore-version-mismatches"
|
||||
)
|
||||
'';
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
|
||||
cp -R ${finalAttrs.node_modules} node_modules/
|
||||
|
||||
# Bun takes executables from this folder
|
||||
chmod -R u+rw node_modules
|
||||
chmod -R u+x node_modules/.bin
|
||||
|
||||
patchShebangs node_modules
|
||||
|
||||
# Run lifecycle scripts for ts-tiny-activerecord with patched shebangs:
|
||||
# - ts-tiny-activerecord has a `prepare` script that compiles TypeScript into JavaScript.
|
||||
cd node_modules/ts-tiny-activerecord
|
||||
npm run prepare
|
||||
cd ../..
|
||||
|
||||
export HOME=$TMPDIR
|
||||
export PATH="$PWD/node_modules/.bin:$PATH"
|
||||
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
checkFlags = [
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "bbedit";
|
||||
version = "15.5.3";
|
||||
version = "15.5.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://s3.amazonaws.com/BBSW-download/BBEdit_${finalAttrs.version}.dmg";
|
||||
hash = "sha256-8TSn0+mbvv+55Jh1VCvTfl+rNSzG9TjlQq5vA71wVmw=";
|
||||
hash = "sha256-GMPgnT14L7bTQ8XlUlV8syrspW1mzUs8yyqr148NLq8=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@@ -28,11 +28,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cardinal";
|
||||
version = "25.06";
|
||||
version = "26.01";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/DISTRHO/Cardinal/releases/download/${finalAttrs.version}/cardinal+deps-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-siZbbYrMGjhiof2M2ZBl2gekePuwsKvR8uZCdjyywiE=";
|
||||
hash = "sha256-KWQc+pcSMebP85yOtQ812qHAwaB6ZOvPpwsxG+myzDo=";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
@@ -97,8 +97,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
PowerUser64
|
||||
];
|
||||
mainProgram = "Cardinal";
|
||||
platforms = lib.platforms.all;
|
||||
# never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cli11";
|
||||
version = "2.5.0";
|
||||
version = "2.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CLIUtils";
|
||||
repo = "CLI11";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-73dfpZDnKl0cADM4LTP3/eDFhwCdiHbEaGRF7ZyWsdQ=";
|
||||
hash = "sha256-q5q6TgSex0xjdWFf/4e6dhrN0qWPDjIgWBpdkCTlLys=";
|
||||
};
|
||||
|
||||
buildInputs = [ catch2 ];
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "dbeaver-bin";
|
||||
version = "25.3.3";
|
||||
version = "25.3.4";
|
||||
|
||||
src =
|
||||
let
|
||||
@@ -32,10 +32,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
aarch64-darwin = "macos-aarch64.dmg";
|
||||
};
|
||||
hash = selectSystem {
|
||||
x86_64-linux = "sha256-dzLwpP/EBYqgsLc5B5HwZvDQUjgvB11/kSPsQ2lBF4g=";
|
||||
aarch64-linux = "sha256-DI8dgcFs3kVrXAx0DVKKA2+SNiQ3ZN3JFwJvkqzQ7Fk=";
|
||||
x86_64-darwin = "sha256-r1T3OU+98DBXgI3Px/nNe7uv7dHzBe+Vl5w2cAaBFMI=";
|
||||
aarch64-darwin = "sha256-OwwTOKHemQQKpPmMXo0yzD1MNqqHh+ELeWW/MmK9UfA=";
|
||||
x86_64-linux = "sha256-iqbpvXSn0jsHNdsn6/C1RV28Xc54o2XnvtG8WujpJFE=";
|
||||
aarch64-linux = "sha256-fku9iDSyM5COrCAy9sIBZUCo7E8/2nIQmlhKAtBbmcw=";
|
||||
x86_64-darwin = "sha256-DJpME9xxFSlRIgJuLtemIdnaskim7S1wPWLlrF0doxo=";
|
||||
aarch64-darwin = "sha256-q/IZHXSAV7TR3EjKoxoB06zLnhEvb6A5TywgEK9uL8o=";
|
||||
};
|
||||
in
|
||||
fetchurl {
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "dbmate";
|
||||
version = "2.29.3";
|
||||
version = "2.29.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "amacneil";
|
||||
repo = "dbmate";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-H/HBDM2uBRrlgetU2S9ZS1c6//Le+DlrYlnnJpTs3XM=";
|
||||
hash = "sha256-ryvg9g9HQSNFSCFr8fbYkI5sydN3Re12xgFe9fRpC20=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-wfcVb8fqnpT8smKuL6SPANAK86tLXglhQPZCA4G8P9E=";
|
||||
vendorHash = "sha256-OMAheQsOaJH6wM0+eL0logh82vYD7M0VPPEXwVQcvqo=";
|
||||
|
||||
tags = [ "fts5" ];
|
||||
|
||||
|
||||
@@ -8,15 +8,15 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "emissary";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "altonen";
|
||||
repo = "emissary";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-A3Kkod2oQdprswoEY9Z6A5r2PsHMUEwqyDB8ycSEUqQ=";
|
||||
hash = "sha256-fLhvMzdxXAuEB99NgIfTLxYezIIZVaC8Z6snK9UUEl0=";
|
||||
};
|
||||
cargoHash = "sha256-alruzRWeLGwfiX/kj7grC7+fgu6i0/T/EJwrF/0VDtw=";
|
||||
cargoHash = "sha256-ZboA5wO3vitts6L/tQc23z7bIFmFdj1freXHBoDl06k=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -3,35 +3,27 @@
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "erigon";
|
||||
version = "3.0.4";
|
||||
version = "3.3.7";
|
||||
in
|
||||
buildGoModule {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ledgerwatch";
|
||||
owner = "erigontech";
|
||||
repo = "erigon";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-MQpHRlKxWCBD2Tj9isxMKwvYBy9HtDkQPyKPse8uB3g=";
|
||||
hash = "sha256-pvwZ71/68jrRqTIPQdmlhJ/BLFhsNjmtcVfiqIC274c=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ocnq97cMsiMgDTZhwZ/fiGzaHiSAiJckPwWZu2q3f58=";
|
||||
vendorHash = "sha256-i/ri6HDaF8Mz7UgO14TPR1GBAxnmYuvWDP/B0L5gRd8=";
|
||||
proxyVendor = true;
|
||||
|
||||
# Build errors in mdbx when format hardening is enabled:
|
||||
# cc1: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security]
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
# Fix error: 'Caught SIGILL in blst_cgo_init'
|
||||
# https://github.com/bnb-chain/bsc/issues/1521
|
||||
CGO_CFLAGS = "-O -D__BLST_PORTABLE__";
|
||||
CGO_CFLAGS_ALLOW = "-O -D__BLST_PORTABLE__";
|
||||
|
||||
subPackages = [
|
||||
"cmd/erigon"
|
||||
"cmd/evm"
|
||||
@@ -40,14 +32,16 @@ buildGoModule {
|
||||
];
|
||||
|
||||
# Matches the tags to upstream's release build configuration
|
||||
# https://github.com/ledgerwatch/erigon/blob/0c0dbe5f3a81cf8f16da8e4838312ab80ebe5302/.goreleaser.yml
|
||||
#
|
||||
# Enabling silkworm also breaks the build as it requires dynamically linked libraries.
|
||||
# If we need it in the future, we should consider packaging silkworm and silkworm-go
|
||||
# as depenedencies explicitly.
|
||||
# https://github.com/erigontech/erigon/blob/0a263a3d989f79310d78c3d42c27beef01d5dcb5/wmake.ps1#L415
|
||||
tags = [
|
||||
"nosqlite"
|
||||
"noboltdb"
|
||||
|
||||
# Enabling silkworm also breaks the build as it requires dynamically linked libraries:
|
||||
# > Some binaries contain forbidden references to /build/.
|
||||
#
|
||||
# If we need it in the future, we should consider packaging silkworm and silkworm-go
|
||||
# as depenedencies explicitly.
|
||||
"nosilkworm"
|
||||
];
|
||||
|
||||
@@ -59,15 +53,17 @@ buildGoModule {
|
||||
];
|
||||
};
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
versionCheckProgram = "${placeholder "out"}/bin/erigon";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/ledgerwatch/erigon/";
|
||||
description = "Ethereum node implementation focused on scalability and modularity";
|
||||
license = with lib.licenses; [
|
||||
lgpl3Plus
|
||||
gpl3Plus
|
||||
];
|
||||
homepage = "https://github.com/erigontech/erigon/";
|
||||
description = "Erigon is an implementation of Ethereum (execution layer with embeddable consensus layer), on the efficiency frontier.";
|
||||
license = lib.licenses.lgpl3;
|
||||
maintainers = with lib.maintainers; [
|
||||
happysalada
|
||||
pmw
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "fluidd";
|
||||
version = "1.34.4";
|
||||
version = "1.36.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fluidd-core";
|
||||
repo = "fluidd";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-EixAax+Bd0IoGdk6Q9FoMQoWAa1U+O3SYeYEnuonHEI=";
|
||||
hash = "sha256-nf0H1yk+BczzvSMw5mcXz6LfcvyMF5q4teYBtwsrLOk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -23,7 +23,7 @@ buildNpmPackage rec {
|
||||
})
|
||||
];
|
||||
|
||||
npmDepsHash = "sha256-08tm+NuDLwilwo7SCmncIGAbEIW0tJLZi1HaoWGgAJA=";
|
||||
npmDepsHash = "sha256-uyrfPXm+bIjjKn4eABlfNowYzvEME0ahVvwlM9+e2Kc=";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/fluidd
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gatekeeper";
|
||||
version = "3.21.0";
|
||||
version = "3.21.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-policy-agent";
|
||||
repo = "gatekeeper";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-lnnV5JhaBH2hZFSWUJPewmPpOmBFvUZwrbY/NSbap48=";
|
||||
hash = "sha256-KzddaF334jhrIyJlfU2iTGBi+Oi67PK2dkIBkHk8oLY=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -26,13 +26,13 @@ let
|
||||
in
|
||||
python3Packages.buildPythonApplication rec {
|
||||
inherit pname;
|
||||
version = "5.5.2";
|
||||
version = "5.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AdityaGarg8";
|
||||
repo = "git-credential-email";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-N4w339MvIOronA4MKS4ipLpQt+0xo+JVbgKWFYP2zP0=";
|
||||
hash = "sha256-pW13tOPOyS5EorR1C/WEpJpu2ilCA4s8N7GkXoyPv7U=";
|
||||
};
|
||||
|
||||
dependencies =
|
||||
|
||||
@@ -19,14 +19,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-commander";
|
||||
version = "1.18.4";
|
||||
version = "1.18.5";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "GNOME";
|
||||
repo = "gnome-commander";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-4l+hw9zPYhkaOpXMEnn4vXF1q0JLE0CB4oRGr2iXqtw=";
|
||||
hash = "sha256-op9EeBj6axgIPvpwoG3aQF3DOQUVGMlBGHhuXsdG+AU=";
|
||||
};
|
||||
|
||||
# hard-coded schema paths
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "grpc-gateway";
|
||||
version = "2.27.6";
|
||||
version = "2.27.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grpc-ecosystem";
|
||||
repo = "grpc-gateway";
|
||||
tag = "v${version}";
|
||||
sha256 = "sha256-Ll4iq8OLDM4UR6ZzVSqqHOzMAd4vwVSb9iKMRcKvIVg=";
|
||||
sha256 = "sha256-6R0EhNnOBEISJddjkbVTcBvUuU5U3r9Hu2UPfAZDep4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-SOAbRrzMf2rbKaG9PGSnPSLY/qZVgbHcNjOLmVonycY=";
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "grpc-health-probe";
|
||||
version = "0.4.44";
|
||||
version = "0.4.45";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grpc-ecosystem";
|
||||
repo = "grpc-health-probe";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-3WzT4lUZUocBr+3BbVoOFlYHtJ+2wmRmytf2V3PlYv0=";
|
||||
hash = "sha256-kzliXJJHVw75wBJ7GKkCxKiuE7tnprIrm1ss9FoHKB8=";
|
||||
};
|
||||
|
||||
tags = [
|
||||
|
||||
@@ -8,18 +8,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "harper";
|
||||
version = "1.5.1";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Automattic";
|
||||
repo = "harper";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Gi9MCwc10aVEjPNNw4nIRwGcQo0uE0Hyd3+RrOaCH4c=";
|
||||
hash = "sha256-NhbgG/ZcVlN6dzoHpwrKkxcIQNvGBsKNomiy/u3vzkc=";
|
||||
};
|
||||
|
||||
buildAndTestSubdir = "harper-ls";
|
||||
|
||||
cargoHash = "sha256-a3W2y9VVp6uHknsCwVkNRekQsxgq/IzcZQ+3m2Q3Rhk=";
|
||||
cargoHash = "sha256-5oITx9AiKULU6wNdzXd30iUzuCb3EmZfjn1oLTNwnEU=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -15,14 +15,14 @@ let
|
||||
in
|
||||
py.pkgs.buildPythonApplication rec {
|
||||
pname = "healthchecks";
|
||||
version = "3.11.2";
|
||||
version = "4.0";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "healthchecks";
|
||||
repo = "healthchecks";
|
||||
tag = "v${version}";
|
||||
sha256 = "sha256-EHXxb5T5+WFvhBZQ6d6abSzpBEUBz6F1ftqMWECmdpg=";
|
||||
sha256 = "sha256-gRFqtxpXvHtiYApIpYbTVl2GrY4VfYktl58ZLNvzXPs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with py.pkgs; [
|
||||
|
||||
@@ -1,28 +1,28 @@
|
||||
{
|
||||
"@esbuild/aix-ppc64@npm:0.25.12": "b2cc7e0cd348bc315907f6ce090ee545d4157a19fc44327ff0262ba9296f0fad19c57dd679b1b526a0a18f34f1971b128e15b41bca794c74a9b2c32238fdd537",
|
||||
"@esbuild/android-arm64@npm:0.25.12": "f770937988ec42e289277abc03800ccf88902684dbda3013a8ab274bb9eca36d35619a75f0f0510e225bdb4c7cf9a426218c7d2641a98fed74287a52d60d8865",
|
||||
"@esbuild/android-arm@npm:0.25.12": "7a5d507aa717d85470c595e11f3c03fbf4f0bffdd10d30f49e1a3f14c2553191f156b214eacd6911fa36719faef23c28be7d88ac876ec300995987964ea16e99",
|
||||
"@esbuild/android-x64@npm:0.25.12": "cd459b0433b0541bae9ffafd274c57529125719a5b78f4ee92aa9f8a1f54b002a18d889bee19084a503c114412269ef4e740d21b4a2de811ec2a076e96b35f48",
|
||||
"@esbuild/darwin-arm64@npm:0.25.12": "067f4588b9b64c93742c4a8cec35282dd076583006ce8089aae3095fcae5b606a2f60d86caf0527be6009be234178fb83d360af82698e2017a6f9fb9345e084d",
|
||||
"@esbuild/darwin-x64@npm:0.25.12": "c29947d07adacadcb29092860b69d1b668d9c5abfaf525e2a7f3ece61c3f4e72a95c1c66ad0e80fbf31d01210ae4e8330d4ae6d9c6c9ad2b8aa159eb115f9a8d",
|
||||
"@esbuild/freebsd-arm64@npm:0.25.12": "c51691aeb04e41c554a59cbb5ab8d917446f352aeec70e3d5a7f25409e9115ff2db930589052df3e7d60f03eff4c298bda89db62f2408d1a49b6a70e69c5d4a0",
|
||||
"@esbuild/freebsd-x64@npm:0.25.12": "9b84c48176350811690751c34d1513005290641923a161f96cb433cbcbb8c072ecb92cef39ba641f48032071f74c6119e5f081b5788242109426c54f3ef1a01e",
|
||||
"@esbuild/linux-arm64@npm:0.25.12": "1e9cc29569890f5944e7dbe2e597eb19d76e85fe07aef6253129b16800ccb5b33a79cea17873d7debdf681d34adf77e06ae99742fe06cab095f3db441b741b1e",
|
||||
"@esbuild/linux-arm@npm:0.25.12": "fcf091d6a51834c9a942ee33b568342990c7fa29d2ff338ce628a41bc415696d09bca7ef502c2b04518973010f73ab3d13e37096030db9c8d393ab29408f104b",
|
||||
"@esbuild/linux-ia32@npm:0.25.12": "ccd563c3189e5f651b479dd80d3bebd9d5c4747ce7448bb80266c804c3141eb3514b8c70445d77301899c54c1ff8c74614f8423704fde475a5c67efe86713235",
|
||||
"@esbuild/linux-loong64@npm:0.25.12": "6df2710d99d84006ad8151a9ca26861dbb97524a15e61f56eb1a5a76786865ad03be838fe3d414a72b239262364964528f3136c2965b3c442c7ed85090b145c4",
|
||||
"@esbuild/linux-mips64el@npm:0.25.12": "883bd8c4afd70b8e372db8a6bdb429d419ae30253a63987ff824994958d8431b6e51ead05e6372b2a233e025ea57f6f65b04ebaff8308e39acf54bfa73a5cae2",
|
||||
"@esbuild/linux-ppc64@npm:0.25.12": "71f8544a3b99b4c95d49604b66d144e9617ae9925914c1bd5bc6731d15d4e48e7f8e9bffd85835e1c93a88c3537b53f3e99b500e4dd2533af9483055b02f9d38",
|
||||
"@esbuild/linux-riscv64@npm:0.25.12": "fe8048262c5c6a040c047a9b7ab8547b0e7a32ce50f622ea8dadc3ec22065676efbc9b36896ca96959f77839757319633a2d05af5f2de7b32389a03b80f027f1",
|
||||
"@esbuild/linux-s390x@npm:0.25.12": "e5c023be1dfd75c915453763f944db8ab3da4f60a00c2b0e6f3b9349bc6c51e5ac5ce928db56e8f316e910213adf2172efd1b37abe070f6cda0c28583d770bab",
|
||||
"@esbuild/linux-x64@npm:0.25.12": "8b2c7f5e00c40058f5c150df267cd303eae5907822f196902cd8e64af70475e800a7f132ac6388aa2b77b877d6314147e67f3fb67d97c867adccd54a2a6caaf6",
|
||||
"@esbuild/netbsd-arm64@npm:0.25.12": "19bc5a1295697aa8787929472323494302d117ea1e592f17cfae443525c1e5917a5f77e6582fc1ec9de3a11a9e296bc12749c6b12cde0aab10695b5c25f29f73",
|
||||
"@esbuild/netbsd-x64@npm:0.25.12": "8eb2ff51aa39b43a021e4b51411789b6299fd0dc38b3896719684333e32fd42ed4508ab67dcc88435631e5333573a4848dbfeec12569de46c2318dcdb39ad3ab",
|
||||
"@esbuild/openbsd-arm64@npm:0.25.12": "5ff26a012d0d35673bc3800d28f284a62c310801a68c55b2d1ed8a7e09ef7568117fb8ab2d7ec7a6e7d73ce6a9e05150ee07335fc6447ba98658469b9da1cb2e",
|
||||
"@esbuild/openbsd-x64@npm:0.25.12": "41dce65493548bc0dc411a6175e9fb109a93bbbf370ef444d1459698226ad2a3096ab7edd420c27eb3d15e6bbd0bc79357bd7c0a59c5527ace0fefac181638f8",
|
||||
"@esbuild/openharmony-arm64@npm:0.25.12": "b3e0502067e760e5b92d3180e20372cbb2dba8267fbb56206d50bdeccd8895feb408020b98c3f17054eea0f1fba365385850cb91d1f79a25dfa3751032278825",
|
||||
"@esbuild/sunos-x64@npm:0.25.12": "50ed9767e00ff74a1d98d94c5fe6027bc5e9e095a64735d1d0676ec72adc4b15b0095e97f5ac71602f2c5fcdcf3e9f6cfe005315e998d9d3e12ca93a2076b639",
|
||||
"@esbuild/win32-arm64@npm:0.25.12": "4969d20da28a0c783ada6116724f51a542fad81dab043c4f6f9b7c8f4a68be558f03beb29d75bd550ab6e63f720535ebacb9ce1760099be7a63d4e1ec8351e2b",
|
||||
"@esbuild/win32-ia32@npm:0.25.12": "60ce7d21c5e01c8b0c8c2c4660ff6d890a32b1acf09f5499f950a86bc5c6da17eee760c6bb7a720a0429f7633bbb38b2db517e444408d8a6ff6fc76157310980",
|
||||
"@esbuild/win32-x64@npm:0.25.12": "bbdc69d57d85a6b8af85731c0979186aba54eb34c8d1de5eab4aa1d8fd45e3b38b5426c287cedf43228bb0794a741d9b2c55284c7db7d79335bc33dc389e7bb3"
|
||||
"@esbuild/aix-ppc64@npm:0.27.2": "9c18cc2e4a03339a55013aac05b4a3fc4b77e75715dc252d034aa3d43b754abc053a7601b95e31249f4b6e69b68db2f5e6cb04b0ed619f825f2f70daff1a78d7",
|
||||
"@esbuild/android-arm64@npm:0.27.2": "a318fc9ffcdad7fda8bb521af8b17f73d93d9a94b4cca9301fbf72cf3f5a6e945edd589a47388de70f3e9582655dcf5b5bb928a11e306368fae4a9106d5143d2",
|
||||
"@esbuild/android-arm@npm:0.27.2": "01114275e096b9177ad2496730087ee081d6e65a75bc087457b527c5baac5a8ccb362435f45232532bf6f97de95e1790dbce127d55abd5e4152c7214682bf4d3",
|
||||
"@esbuild/android-x64@npm:0.27.2": "e92c5b6919081a14c8882f1167cf90b4e4bba745ad6e9a23428f85a1cd5e79dfa3f1d2fc943686b237e4cd09fac52ad3b3791deab6a0419ee10859284d3834aa",
|
||||
"@esbuild/darwin-arm64@npm:0.27.2": "5e99db5037167bad4a095fc445b94a2ce02357870ed58b79e13ae6bc09b5cb33d7e03f925492df940f9e0ad685a889f02beec1431d8fbf4c7ced55b2f48f5659",
|
||||
"@esbuild/darwin-x64@npm:0.27.2": "87f2fbc4cf11724ef805b17cbdc7b0a9498332bc4b61d55e110ecc3b09bc488b88c0bd140ea48924e9c97a2063cf7e440fef13dd56e415c46799619d61086910",
|
||||
"@esbuild/freebsd-arm64@npm:0.27.2": "1ffa23243b913e377a5b09fd97ad9f089be3695aafdd893b60bb7f9be479256d8b7546f0bc96c4e61133fe7aeeaf95a8e941e82a65d99008ff82c99bdec85eee",
|
||||
"@esbuild/freebsd-x64@npm:0.27.2": "44f744b289cf9e115b0adfac1905818d756dfced14213bf144d9016d96f67575ef2a55526f76e29ee775fcfec7274ba3a5e6833f35ed79a4592d3f5eac278267",
|
||||
"@esbuild/linux-arm64@npm:0.27.2": "2b037d74eaff4e9b5a6076760ede873320707636a3495939687cdd0c2c7150883111273bc0a8663fa305c42f439f4748b5ad7f15a1a1ea9fa7db575d9faf2d1b",
|
||||
"@esbuild/linux-arm@npm:0.27.2": "28cfc3a9ca11fc899649e7a706fb4b2ee57999bd92e86c23726b3ed0f832732411dd0aa3e2bcdb4105759f83bc4e5adc98dc195aaafce736c910db4e43694702",
|
||||
"@esbuild/linux-ia32@npm:0.27.2": "ac6cc92b9be2ec6d9d483c53fc973e6381765b784a2e1b71fa93ea0cf976344c2e3e0bfda0140b0829b3ec4304d9b886692b2891e68c17d2121066d06e67f0ac",
|
||||
"@esbuild/linux-loong64@npm:0.27.2": "625f5b6c2218a3acb2cff8f7f02a53ca89d13925f8932260ddad01595c6907beda4a79e4b767b1101f5971049f88d3ec6ab29cf565b4d61d9b0d7277e2cb578d",
|
||||
"@esbuild/linux-mips64el@npm:0.27.2": "0c62692cb3a297b37212dfde52a861861843a716f6b3bdb73da49ba249a4c001b989ea61dc4540c430fac59ce2f8fc45035cdfac80172c5ddaf1b9df8471aecf",
|
||||
"@esbuild/linux-ppc64@npm:0.27.2": "b804d2dd0a6a85fe1c731828c725731a55ab120d2cc16941d560b2e9af5c2ec51586914ce26a84a326a9d46fa61eb8bb1f843953fe29ddd43b3f3099c491b5ff",
|
||||
"@esbuild/linux-riscv64@npm:0.27.2": "03e67e7207a83801363e3637f9a35fb6224ed4dc23bbf6eca41904fc42f5a6806e1e591666bf48dbf62eba97d41ff4355413b14dcb2339007b22c693374c49f6",
|
||||
"@esbuild/linux-s390x@npm:0.27.2": "eb24b9c0a4a1492e4ff34a87933f6a3b348739c12f864b408144efdf949871c1fbb02a1cca741bfa11fd08aebe585d046fd3311b462ce4c795e3064ba3912469",
|
||||
"@esbuild/linux-x64@npm:0.27.2": "ed1542f203329521fb1f308696c76ba59ed4a4616a24e21bf4820685362bba209d5c44c2f4e66c88dc7b7399df9ace625454d4829ee529d076ccaf61566e11cf",
|
||||
"@esbuild/netbsd-arm64@npm:0.27.2": "576dd082047077b9cc41fbeffd728821a4f3b80969c1d2d6c274301122c6de2050f484fd4e946777527b8a15bd2a5ac54f85ca7ab95ea72b5345177e6a888687",
|
||||
"@esbuild/netbsd-x64@npm:0.27.2": "f8994af3e2ff3c9a91e874e58698b66e6f8d4e72dbc0aaf749b74a79420954146ed053359b0a4c213918582cee187d8a371737a33cfb93e624b4d091e5a6c240",
|
||||
"@esbuild/openbsd-arm64@npm:0.27.2": "f710da24beeb747ef3a11b9d99085a14f5c929f942fd9d9a05b7806d5ff1b85631bfa506eb7a6aed9fd01ec99bf91f24736f9f0e0eb6b7c0019fe0dddd2e615c",
|
||||
"@esbuild/openbsd-x64@npm:0.27.2": "62670fbe1f609c5362df7b45968ded512a0860e2ad8a4715a89993abfa2f9f08a28f1294c7857d80e6d3f713639a71d291c06a961b331de67ad350032d1b8e96",
|
||||
"@esbuild/openharmony-arm64@npm:0.27.2": "e279efdc18301add96ea791ba9ef117cae05346688cd521fd225a60ad166add4bc995af985058e3b6ab9e65a7c49a79108a294d6aa26a1d1685ad0db194e2c56",
|
||||
"@esbuild/sunos-x64@npm:0.27.2": "7234302321d36576b5a9f027915417cddc195a67b19cdfb50e69c337ee0dd63a88be6b72d7ef299cd569d1af62e54774303d52d3d6b5e5858db975241ae467d6",
|
||||
"@esbuild/win32-arm64@npm:0.27.2": "36620fddf79da3e8e527ef8331436929fa7a0b23c9b591af8f8573d80ed9c4ef45b24c6fa0abbb01d187dec497efa6c9d9d397d575afc1f28477e9ca16a48d73",
|
||||
"@esbuild/win32-ia32@npm:0.27.2": "96e8c1fa0ec2b5529ead2ba703e5da7644c138b2f9b6e285c05513f0455e99b2b0dcf399f01779fb384e22810e82f892491e44402772c62d3fe094b025bbdc0f",
|
||||
"@esbuild/win32-x64@npm:0.27.2": "1ed08bebd916c16003f3784276ae683ab41d34951a0c272f6e072b8067a2b4bacd6f6f75a8dcea375b8545e15891d305425cf7c8dd31f7deab56ef22cde4a1e2"
|
||||
}
|
||||
|
||||
@@ -2,35 +2,31 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
gitMinimal,
|
||||
cacert,
|
||||
makeBinaryWrapper,
|
||||
nodejs,
|
||||
python3,
|
||||
nixosTests,
|
||||
yarn-berry_4,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.10.4";
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hedgedoc";
|
||||
version = "1.10.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hedgedoc";
|
||||
repo = "hedgedoc";
|
||||
tag = version;
|
||||
hash = "sha256-ysiHvRMOgVFTFKeMWjshZpIZAOTf+EbBQQm3dDeMB3I=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Utun/xGSYV20HJNwvV8q4iekRNE+oBx1kSo3rx5IZTQ=";
|
||||
};
|
||||
|
||||
# Generate this file with:
|
||||
# nix run nixpkgs#yarn-berry_4.yarn-berry-fetcher missing-hashes yarn.lock
|
||||
missingHashes = ./missing-hashes.json;
|
||||
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "hedgedoc";
|
||||
inherit version src missingHashes;
|
||||
|
||||
offlineCache = yarn-berry_4.fetchYarnBerryDeps {
|
||||
inherit src missingHashes;
|
||||
hash = "sha256-jMJXNWvmlweCJu+xs2ucMtB6N+0r1cgP/aGt2zfH4iQ=";
|
||||
inherit (finalAttrs) src missingHashes;
|
||||
hash = "sha256-7QJu6HSXCNameGq/NZpq7V0VHam7qRWzQQfzkzvARs4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -87,4 +83,4 @@ stdenv.mkDerivation {
|
||||
maintainers = with lib.maintainers; [ SuperSandro2000 ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -115,13 +115,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "immich";
|
||||
version = "2.5.2";
|
||||
version = "2.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "immich-app";
|
||||
repo = "immich";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-e3gU2pSnbYQQU3SxGaJs8dwfTMpeGTz7dcFCmc7Pi/o=";
|
||||
hash = "sha256-9jZ2Jpsce56O0kcpugvpn6tDKnNAqu6v/87sH0fdzfs=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "json-patch";
|
||||
version = "5.9.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evanphx";
|
||||
repo = "json-patch";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-lRgz3Bw2mwQSfXvXmKUcWfexEf3YHBFy47tqWB6lzWs=";
|
||||
};
|
||||
|
||||
modRoot = "v5";
|
||||
|
||||
vendorHash = "sha256-W6XVd68MS0ungMgam8jefYMVhyiN6/DB+bliFzs2rdk=";
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
ldflags = [ "-s" ];
|
||||
|
||||
meta = {
|
||||
description = "CLI tool for applying RFC6902 patches";
|
||||
homepage = "https://github.com/evanphx/json-patch";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ davidweisse ];
|
||||
mainProgram = "json-patch";
|
||||
};
|
||||
})
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "lasuite-meet-frontend";
|
||||
version = "1.3.0";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "suitenumerique";
|
||||
repo = "meet";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-YjGceElLsbq6aCs3iC69xVj85WTHVqs9AC5lHpi2SJY=";
|
||||
hash = "sha256-VUOTGRI3U9G4BfZMBk81MifcpALGA6OY3g++rCFZC5U=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/src/frontend";
|
||||
@@ -21,7 +21,7 @@ buildNpmPackage rec {
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit version src;
|
||||
sourceRoot = "source/src/frontend";
|
||||
hash = "sha256-2Lbq7fBfs8szAh+0ylLRRDuGpIXuOaDDO/Q/ziwaG6k=";
|
||||
hash = "sha256-7dSXPkSXiOL43AUtkrYztkH8n8ZzS75LTkQWJIsY/OE=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@@ -13,14 +13,14 @@ in
|
||||
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "lasuite-meet";
|
||||
version = "1.3.0";
|
||||
version = "1.5.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "suitenumerique";
|
||||
repo = "meet";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-YjGceElLsbq6aCs3iC69xVj85WTHVqs9AC5lHpi2SJY=";
|
||||
hash = "sha256-VUOTGRI3U9G4BfZMBk81MifcpALGA6OY3g++rCFZC5U=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/src/backend";
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "mdbook-plantuml";
|
||||
version = "0.8.0-unstable-2022-12-28";
|
||||
version = "v2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sytsereitsma";
|
||||
repo = "mdbook-plantuml";
|
||||
rev = "c156b53aad6d7bce8479e5406a4a3465c12714ef";
|
||||
hash = "sha256-5/6NQO++MsV7GS69jGkdpkiRhadtQyYZeHreft4h6hQ=";
|
||||
rev = "dae70cfd3deb8438127cc369a92ecefe24acb6a2";
|
||||
hash = "sha256-PNVWeXbYDX/PYFCSPKKeqdbhLl9hmDOK7i7lWQlbEK0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-LzzAaWLDODbqGNVeEULLOgrpyLGKzaknIbLjKyF2zBw=";
|
||||
cargoHash = "sha256-8DKnINclcX0WwRtCTv7DUBx/6omRvda3qg3a1g1lyFA=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "mediawiki";
|
||||
version = "1.45.0";
|
||||
version = "1.45.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://releases.wikimedia.org/mediawiki/${lib.versions.majorMinor version}/mediawiki-${version}.tar.gz";
|
||||
hash = "sha256-1Jm8frPXGDXCvsHJyu2IoDCK7DfwcmTnURDSor7wJTQ=";
|
||||
hash = "sha256-4vEmsZrsQiBRoKUODGq36QTzOzmIpHudqK+/0MCiUsw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -18,20 +18,20 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "n8n";
|
||||
version = "2.4.6";
|
||||
version = "2.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "n8n-io";
|
||||
repo = "n8n";
|
||||
tag = "n8n@${finalAttrs.version}";
|
||||
hash = "sha256-9oJvi/Q2VwG2sVuWQXCBrAPVV03d89//78bOFN0IwLU=";
|
||||
hash = "sha256-nViKshhkBL8odVDqKGTJTMjVpYtI0Qp3z59VI+DNsms=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-QtusZm9WaLMjfopsX4t2WiiU++j3V/PQHbelKubhMII=";
|
||||
hash = "sha256-vjgteuMd+lkEL9vT1Ngndk8G3Ad1esa1NBPpEHBFmDg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -28,13 +28,13 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "opencloud";
|
||||
version = "4.1.0";
|
||||
version = "5.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opencloud-eu";
|
||||
repo = "opencloud";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-sZcGDE/CwB/u9LxsfFY/m4o58NjXMgTX0yx719R+wjc=";
|
||||
hash = "sha256-q0K73j69ZzMK2IGHRt8nDaeLxubky62MyKnziNKHiMw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -96,6 +96,8 @@ buildGoModule rec {
|
||||
# avoids 'make generate' calling `git`, otherwise no-op
|
||||
STRING = version;
|
||||
VERSION = version;
|
||||
# avoids weird test failure
|
||||
AUTOMEMLIMIT = "off";
|
||||
};
|
||||
|
||||
excludedPackages = [ "tests/*" ];
|
||||
|
||||
@@ -10,20 +10,20 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "opencloud-web";
|
||||
version = "4.3.0";
|
||||
version = "5.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opencloud-eu";
|
||||
repo = "web";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-oLGmktFeDykpaK8YqMoIl7RrkPvHw2EULkbn1XDS/Yk=";
|
||||
hash = "sha256-ZeIcWeKYa43dyhg8xXdx1vQTPOjqSRPqcoaBRtbnzRc=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 1;
|
||||
hash = "sha256-+oCoK6u46oPVtsvUEksuFFtjogirN370IsM33H5oOA4=";
|
||||
hash = "sha256-KRoZOc61cklG2MflfHpCd9I5fOIuHPuiRR+w6sdRa2U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,97 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
pkg-config,
|
||||
cargo-tauri,
|
||||
bun,
|
||||
nodejs,
|
||||
cargo,
|
||||
rustc,
|
||||
jq,
|
||||
wrapGAppsHook4,
|
||||
makeWrapper,
|
||||
dbus,
|
||||
glib,
|
||||
gtk3,
|
||||
libsoup_3,
|
||||
librsvg,
|
||||
libappindicator-gtk3,
|
||||
glib-networking,
|
||||
openssl,
|
||||
webkitgtk_4_1,
|
||||
opencode,
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "opencode-desktop";
|
||||
inherit (opencode)
|
||||
version
|
||||
src
|
||||
node_modules
|
||||
patches
|
||||
;
|
||||
|
||||
cargoRoot = "packages/desktop/src-tauri";
|
||||
cargoHash = "sha256-bLM/ZcUaaswFrg+WogY81HnTn5do/7tu+JA/+tJNmMw=";
|
||||
buildAndTestSubdir = finalAttrs.cargoRoot;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
cargo-tauri.hook
|
||||
bun
|
||||
nodejs # for patchShebangs node_modules
|
||||
cargo
|
||||
rustc
|
||||
jq
|
||||
makeWrapper
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ wrapGAppsHook4 ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isLinux [
|
||||
dbus
|
||||
glib
|
||||
gtk3
|
||||
libsoup_3
|
||||
librsvg
|
||||
libappindicator-gtk3
|
||||
glib-networking
|
||||
openssl
|
||||
webkitgtk_4_1
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
tauriBuildFlags = [
|
||||
"--config"
|
||||
"tauri.conf.json"
|
||||
"--config"
|
||||
"tauri.prod.conf.json"
|
||||
"--no-sign"
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
cp -a ${finalAttrs.node_modules}/{node_modules,packages} .
|
||||
chmod -R u+w node_modules packages
|
||||
patchShebangs node_modules
|
||||
patchShebangs packages/desktop/node_modules
|
||||
|
||||
mkdir -p packages/desktop/src-tauri/sidecars
|
||||
cp ${opencode}/bin/opencode packages/desktop/src-tauri/sidecars/opencode-cli-${stdenv.hostPlatform.rust.rustcTarget}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "AI coding agent desktop client";
|
||||
homepage = "https://opencode.ai";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [
|
||||
xiaoxiangmoe
|
||||
];
|
||||
mainProgram = "OpenCode";
|
||||
platforms = [
|
||||
"aarch64-linux"
|
||||
"x86_64-linux"
|
||||
"aarch64-darwin"
|
||||
"x86_64-darwin"
|
||||
];
|
||||
};
|
||||
})
|
||||
@@ -20,6 +20,11 @@
|
||||
gnugrep,
|
||||
gnused,
|
||||
makeWrapper,
|
||||
|
||||
# test dependencies
|
||||
which,
|
||||
util-linux,
|
||||
tcpdump,
|
||||
}:
|
||||
let
|
||||
withOpensslConfigureFlag = "--with-openssl=${lib.getLib openssl.dev}";
|
||||
@@ -72,6 +77,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pkg-config
|
||||
python3
|
||||
makeWrapper
|
||||
# NOTE: remove if OVN switches to `command -v`:
|
||||
# https://patchwork.ozlabs.org/project/ovn/patch/20260205004956.84602-3-ihar.hrachyshka@gmail.com/
|
||||
which # used in test suite to detect presence of commands
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -108,8 +116,18 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
doCheck = true;
|
||||
|
||||
nativeCheckInputs = [
|
||||
openssl # used to generate certificates used for test services
|
||||
# used to generate certificates used for test services
|
||||
openssl
|
||||
procps
|
||||
|
||||
# some tests may need tcpdump to run
|
||||
tcpdump
|
||||
|
||||
# scapy-server imports scapy module
|
||||
(python3.withPackages (ps: with ps; [ scapy ]))
|
||||
|
||||
# scapy tests use flock to start scapy-server
|
||||
util-linux
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
@@ -152,6 +170,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# hack to stop tests from trying to read /etc/resolv.conf
|
||||
export OVS_RESOLV_CONF="$PWD/resolv.conf"
|
||||
touch $OVS_RESOLV_CONF
|
||||
|
||||
patchShebangs --build tests/scapy-server.py
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
|
||||
@@ -33,14 +33,14 @@ let
|
||||
in
|
||||
buildPythonApplication rec {
|
||||
pname = "pipenv";
|
||||
version = "2025.0.4";
|
||||
version = "2026.0.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pypa";
|
||||
repo = "pipenv";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-yHbrxhRWo2iD9uBFBQzi5LqUVOc1vpLvXlORtAI32KA=";
|
||||
hash = "sha256-hfkVIYQj6hJ+AB1rUaw2f+M+tAVEAQCXZ4e4ytw07gE=";
|
||||
};
|
||||
|
||||
env.LC_ALL = "en_US.UTF-8";
|
||||
|
||||
@@ -15,12 +15,12 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "ptouch-print";
|
||||
version = "1.5-unstable-2024-02-11";
|
||||
version = "1.7-unstable-2026-01-23";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.familie-radermacher.ch/linux/ptouch-print.git";
|
||||
rev = "8aaeecd84b619587dc3885dd4fea4b7310c82fd4";
|
||||
hash = "sha256-IIq3SmMfsgwSYbgG1w/wrBnFtb6xdFK2lkK27Qqk6mw=";
|
||||
rev = "3e026ef26b48dda338bb983132494935d6aeb626";
|
||||
hash = "sha256-LpBgZWpbOiEf+yA/fDNwsSPxkgMVLnOsrE65Q3lvhwg";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pyenv";
|
||||
version = "2.6.14";
|
||||
version = "2.6.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pyenv";
|
||||
repo = "pyenv";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-yE/D7ycD5IKZltSBUaH41Vg8xptosnJ9Py7SkCch36g=";
|
||||
hash = "sha256-gbj7WI1OVfqDre5PdqEI3yVo/J5YyCexhL/bCa8aEK4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -17,14 +17,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "pywal16";
|
||||
version = "3.8.13";
|
||||
version = "3.8.14";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eylles";
|
||||
repo = "pywal16";
|
||||
tag = version;
|
||||
hash = "sha256-BKLvEmasMTcuH5olgZHzFN3DZT4lXD1FNBU8l8QGQAM=";
|
||||
hash = "sha256-68HbYH4wydaM1yY8kGHNIHTOZuUQRl+9o5ZPaemTlUE=";
|
||||
};
|
||||
|
||||
build-system = [ python3.pkgs.setuptools ];
|
||||
|
||||
@@ -24,7 +24,6 @@
|
||||
}:
|
||||
|
||||
let
|
||||
isQt6 = lib.versions.major qt6Packages.qtbase.version == "6";
|
||||
pdfjs =
|
||||
let
|
||||
version = "5.4.394";
|
||||
@@ -39,7 +38,7 @@ let
|
||||
in
|
||||
|
||||
python3.pkgs.buildPythonApplication {
|
||||
pname = "qutebrowser" + lib.optionalString (!isQt6) "-qt5";
|
||||
pname = "qutebrowser";
|
||||
inherit version;
|
||||
pyproject = true;
|
||||
|
||||
@@ -76,7 +75,7 @@ python3.pkgs.buildPythonApplication {
|
||||
dependencies = with python3.pkgs; [
|
||||
colorama
|
||||
pyyaml
|
||||
(if isQt6 then pyqt6-webengine else pyqtwebengine)
|
||||
pyqt6-webengine
|
||||
jinja2
|
||||
pygments
|
||||
# scripts and userscripts libs
|
||||
@@ -138,7 +137,7 @@ python3.pkgs.buildPythonApplication {
|
||||
let
|
||||
libPath = lib.makeLibraryPath [ pipewire ];
|
||||
resourcesPath =
|
||||
if (isQt6 && stdenv.hostPlatform.isDarwin) then
|
||||
if stdenv.hostPlatform.isDarwin then
|
||||
"${qt6Packages.qtwebengine}/lib/QtWebEngineCore.framework/Resources"
|
||||
else
|
||||
"${qt6Packages.qtwebengine}/resources";
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
{
|
||||
lib,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
basedpyright,
|
||||
# codebook,
|
||||
ruff,
|
||||
ty,
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.3.3";
|
||||
in
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "rassumfrassum";
|
||||
inherit version;
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "joaotavora";
|
||||
repo = "rassumfrassum";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-3Hcews5f7o45GUmFdpLwkAHf0bthC1tUikkxau952Ec=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs rass test/
|
||||
'';
|
||||
|
||||
build-system = [ python3Packages.setuptools ];
|
||||
|
||||
# The test suite is timing-sensitive at present and running it on
|
||||
# Hydra does not add much value in any case, given that this package
|
||||
# depends on nothing but core Python, and that nothing depends on
|
||||
# this package...
|
||||
doCheck = false;
|
||||
|
||||
# ...but let's have the plumbing in place for if/when it becomes
|
||||
# possible to run tests on Hydra reliably.
|
||||
nativeCheckInputs = [
|
||||
# codebook (does not work in sandbox)
|
||||
basedpyright
|
||||
ruff
|
||||
ty
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
test/run-all.sh
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Connect an LSP client to multiple LSP servers";
|
||||
homepage = "https://github.com/joaotavora/rassumfrassum";
|
||||
changelog = "https://github.com/joaotavora/rassumfrassum/releases/tag/v${version}";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = [ lib.maintainers.cmm ];
|
||||
};
|
||||
}
|
||||
@@ -13,19 +13,19 @@
|
||||
lld,
|
||||
}:
|
||||
let
|
||||
version = "0.34.2";
|
||||
version = "0.34.3";
|
||||
pname = "rauthy";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sebadob";
|
||||
repo = "rauthy";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-h7Nd17l/BR7p+b+9AqX8IYf0mfcc9QI9LQnR2cBc2s4=";
|
||||
hash = "sha256-ey6y/EGmz/80s0nbxsk6li9KCJV5IAtBp5QqAj7a6R0=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src pname version;
|
||||
hash = "sha256-jhli1axBU/UV6k5apxbE7g9+F6dsHzY30/QKSgJ22Ws=";
|
||||
hash = "sha256-mkIHup/6aA9QDPlekhdZiXWryhetsJMxl3HAXsabACQ=";
|
||||
};
|
||||
|
||||
# Wasm modules are needed to build the frontend and are part of the main Rust repo.
|
||||
@@ -77,7 +77,7 @@ let
|
||||
"-p2"
|
||||
];
|
||||
|
||||
npmDepsHash = "sha256-pfrT2cXZWOetoquaMMNslo8nTy9DBornLCp48pGHRIM=";
|
||||
npmDepsHash = "sha256-N/tFwQNWMudFtetIKfirXDvWH3CfRwjdpBcxkXZsVig=";
|
||||
|
||||
preBuild = ''
|
||||
mkdir -p ./src/wasm/
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "scap-security-guide";
|
||||
version = "0.1.78";
|
||||
version = "0.1.79";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ComplianceAsCode";
|
||||
repo = "content";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-4A/nM2aJcmWMxvK8/3isyDn/wPS9V+1CHO6Pfy+0FTc=";
|
||||
hash = "sha256-GRjolHyNmgzv5ZBMaVG1mzIX9VsSXzWrgeJxegepjxc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ callPackage, commandLineArgs }:
|
||||
callPackage ./generic.nix { inherit commandLineArgs; } {
|
||||
pname = "signal-desktop-bin";
|
||||
version = "7.86.0";
|
||||
version = "7.88.0";
|
||||
|
||||
libdir = "usr/lib64/signal-desktop";
|
||||
bindir = "usr/bin";
|
||||
@@ -10,6 +10,6 @@ callPackage ./generic.nix { inherit commandLineArgs; } {
|
||||
bsdtar -xf $downloadedFile -C "$out"
|
||||
'';
|
||||
|
||||
url = "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-43-aarch64/10043047-signal-desktop/signal-desktop-7.86.0-1.fc43.aarch64.rpm";
|
||||
hash = "sha256-gInim9c3RBsMH2K9v0ELj9zQ/IxcwlISCajwBq142Js=";
|
||||
url = "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/10095387-signal-desktop/signal-desktop-7.88.0-1.fc42.aarch64.rpm";
|
||||
hash = "sha256-lrBOsvwOIPcgGMraW3cmC6gaRfYY/ml7dmbLnZQ5mNE=";
|
||||
}
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "signal-desktop-bin";
|
||||
version = "7.86.0";
|
||||
version = "7.88.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://updates.signal.org/desktop/signal-desktop-mac-universal-${finalAttrs.version}.dmg";
|
||||
hash = "sha256-Wk5fkJiKWsronC5gjAzpwPQt4bGURb8bU3/XUbI+kBU=";
|
||||
hash = "sha256-ymNFy0LT+sLihldmxnRzADr2kHFd7yHclpMSjd8HkPM=";
|
||||
};
|
||||
sourceRoot = ".";
|
||||
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
{ callPackage, commandLineArgs }:
|
||||
callPackage ./generic.nix { inherit commandLineArgs; } rec {
|
||||
pname = "signal-desktop-bin";
|
||||
version = "7.86.0";
|
||||
version = "7.88.0";
|
||||
|
||||
libdir = "opt/Signal";
|
||||
bindir = libdir;
|
||||
extractPkg = "dpkg-deb -x $downloadedFile $out";
|
||||
|
||||
url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
hash = "sha256-OOnaOnrAWAw3EJS31Wzf83ekWiJab0EvY68UTEOTMjA=";
|
||||
hash = "sha256-5pj4ylQCuMa2xKL9iNvU4+vZzzaJYQUfp5RklhXFT6w=";
|
||||
}
|
||||
|
||||
@@ -28,29 +28,16 @@
|
||||
runtimeShell,
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
# downgrade dpdk because spdk refuses newer versions at runtime
|
||||
# url: https://github.com/spdk/spdk/blob/3e3577a090ed9a084b5909aadcc8bc5fe93c0017/lib/env_dpdk/pci_dpdk.c#L77
|
||||
dpdk' = dpdk.overrideAttrs (oldAttrs: rec {
|
||||
version = "25.03";
|
||||
src = fetchurl {
|
||||
url = "https://fast.dpdk.org/rel/dpdk-${version}.tar.xz";
|
||||
sha256 = "sha256-akCnMTKChuvXloWxj/pZkua3cME4Q9Zf0NEVfPzP9j0=";
|
||||
};
|
||||
});
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "spdk";
|
||||
|
||||
version = "25.05";
|
||||
version = "26.01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spdk";
|
||||
repo = "spdk";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Js78FLkLN4GpJlgO+h4jIiEdThciBugbLTB6elFi2TI=";
|
||||
hash = "sha256-E52VozjnoGnIC7viXrsualaaKXiUU9Fx8zGylTjBzX0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -66,7 +53,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
cunit
|
||||
dpdk'
|
||||
dpdk
|
||||
fuse3
|
||||
jansson
|
||||
libaio
|
||||
@@ -90,24 +77,12 @@ stdenv.mkDerivation rec {
|
||||
python3.pkgs.configshell-fb
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Otherwise the DPDK version is not detected correctly
|
||||
# Fix already upstream: https://github.com/spdk/spdk/commit/c3618c42ac3f6fdfcc9c04e29953fd6cf4f71c11
|
||||
./patches/configure.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
# Override pip install command to use hatchling directly without downloading dependencies
|
||||
# Override uv pip install command to use hatchling directly without downloading dependencies
|
||||
substituteInPlace python/Makefile \
|
||||
--replace-fail "setup_cmd = pip install --prefix=\$(CONFIG_PREFIX)" \
|
||||
"setup_cmd = python3 -m pip install --no-deps --no-build-isolation --prefix=\$(CONFIG_PREFIX)"
|
||||
|
||||
# The nasm detection in the vendored version of isa-l_crypto is broken
|
||||
# Upstream fix: https://github.com/intel/isa-l_crypto/commit/0850c01cc03e45f77d5883372dd6be983ba163ce
|
||||
substituteInPlace isa-l-crypto/configure.ac \
|
||||
--replace-fail "AC_LANG_CONFTEST([AC_LANG_SOURCE([[vpcompressb zmm0, k1, zmm1;]])])" \
|
||||
"AC_LANG_CONFTEST([AC_LANG_SOURCE([[vpcompressb zmm0 {k1}, zmm1;]])])"
|
||||
--replace-fail "uv pip install --prefix=\$(CONFIG_PREFIX)" \
|
||||
"python3 -m pip install --no-deps --no-build-isolation --prefix=\$(CONFIG_PREFIX)"
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
@@ -118,7 +93,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-dpdk=${dpdk'}"
|
||||
"--with-dpdk=${dpdk}"
|
||||
"--with-crypto"
|
||||
]
|
||||
++ lib.optional (!stdenv.hostPlatform.isStatic) "--with-shared";
|
||||
@@ -166,13 +141,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-mssse3"; # Necessary to compile.
|
||||
|
||||
passthru.dpdk = dpdk';
|
||||
|
||||
meta = {
|
||||
description = "Set of libraries for fast user-mode storage";
|
||||
homepage = "https://spdk.io/";
|
||||
license = lib.licenses.bsd3;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ ths-on ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
diff --git a/configure b/configure
|
||||
index b0fdef9ec..413b7a968 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -959,6 +959,9 @@
|
||||
dpdk_ver=$(< "$rootdir/dpdk/VERSION")
|
||||
elif [[ -f "${CONFIG[DPDK_DIR]}"/../VERSION ]]; then
|
||||
dpdk_ver=$(< "${CONFIG[DPDK_DIR]}"/../VERSION)
|
||||
+ elif [[ "${CONFIG[DPDK_LIB_DIR]}" != "" && -e "${CONFIG[DPDK_LIB_DIR]}"/pkgconfig ]]; then
|
||||
+ # Try pkg-config to figure out the module version
|
||||
+ dpdk_ver=$(PKG_CONFIG_PATH="${CONFIG[DPDK_LIB_DIR]}"/pkgconfig pkg-config --modversion libdpdk)
|
||||
fi
|
||||
echo $dpdk_ver
|
||||
}
|
||||
@@ -17,18 +17,18 @@ assert lib.asserts.assertMsg (
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "synapse-admin-etkecc";
|
||||
version = "0.11.1-etke52";
|
||||
version = "0.11.1-etke53";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "etkecc";
|
||||
repo = "synapse-admin";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-iK277gNgeAnv4V4D3J/9ozrw/yEH8jWESb2xJ6gbOfg=";
|
||||
hash = "sha256-VKTOtY8DX1ItPbuVnqoofEnwaq0hjiOTnnL7pVxfc4k=";
|
||||
};
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = finalAttrs.src + "/yarn.lock";
|
||||
hash = "sha256-X26s09KrV37HVd6cImJK9i/emNp7PV2fKq1ys2+t7ak=";
|
||||
hash = "sha256-IziO3+T5xhwCMaD6tsvvgBNwcWjsKEICLgqe0H4il60=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
+5
-7
@@ -1,12 +1,10 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
stdenv,
|
||||
fetchzip,
|
||||
qtbase,
|
||||
qttools,
|
||||
cmake,
|
||||
sqlite,
|
||||
wrapQtAppsHook,
|
||||
qt5,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -24,12 +22,12 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
qttools
|
||||
qt5.qttools
|
||||
cmake
|
||||
wrapQtAppsHook
|
||||
qt5.wrapQtAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qt5.qtbase
|
||||
sqlite
|
||||
];
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "thin-provisioning-tools";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jthornber";
|
||||
repo = "thin-provisioning-tools";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-KjX+qAiHkbv3DicAfJxEFv/4CKdE0ZeB9Ktia93oiaU=";
|
||||
hash = "sha256-hOwW2zda/KdA22A+94A5r2LIezQTZ71eewhkc72u5kI=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
|
||||
udev
|
||||
];
|
||||
|
||||
cargoHash = "sha256-IgP5JehP/mlsjYSTn5hepWVgZmPGoyZix83rgO08WfA=";
|
||||
cargoHash = "sha256-f417GApMA1R7nX75Zkfv28aZskbpTkUHWePX30X22FU=";
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests.lvm2) lvm-thinpool-linux-latest;
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "twm";
|
||||
version = "0.12.3";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinnymeller";
|
||||
repo = "twm";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Hta9IvPViZFEiR+RXRmlPRwIu10D9B5dbXzhflxzBhY=";
|
||||
hash = "sha256-GJTy0uIYALp3tp/ZO+zEQoQk8fF/5R8jbWBy92ID7aU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-buiU+umHqyZ/3YoW2+5QpmF9AGEuNUihro5PFuWFSH4=";
|
||||
cargoHash = "sha256-ctpYZCVGGrnS7eHeia0NnK1uc0rLi8GpmmBhAIz5WzY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -18,16 +18,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "uv";
|
||||
version = "0.9.29";
|
||||
version = "0.9.30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astral-sh";
|
||||
repo = "uv";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-HsMZzn7D2C19Uu9xmz4NRaK+cGcoiyJYaAq1Z9f5nwY=";
|
||||
hash = "sha256-PDp7yktF2ek6KVlJvYsLn7VgV1ulgWnjAXKozJW3JKU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-q+LeKIasQwhgAdq0N43cPK/dHkS45tV73tCCvrjnFfA=";
|
||||
cargoHash = "sha256-KoVAUbVheq/x5e7scqf8ZSyC0ZAXlcZJ7svuiuT7NzQ=";
|
||||
|
||||
buildInputs = [
|
||||
rust-jemalloc-sys
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.12.1";
|
||||
version = "0.13.0";
|
||||
in
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "whatsapp-chat-exporter";
|
||||
@@ -16,15 +16,15 @@ python3Packages.buildPythonApplication {
|
||||
owner = "KnugiHK";
|
||||
repo = "Whatsapp-Chat-Exporter";
|
||||
tag = version;
|
||||
hash = "sha256-AyxRIjcAGjxCe0m2cSESQWd75v5tzpsCmb+3wChbH7c=";
|
||||
hash = "sha256-nD8rpA1BbKbHpjAuIDdhaiMUjQCypDuo0pNAYbkoOxo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
bleach
|
||||
javaobj-py3
|
||||
jinja2
|
||||
pycryptodome
|
||||
javaobj-py3
|
||||
vobject
|
||||
tqdm
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
{
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
lib,
|
||||
stdenv,
|
||||
nix-update-script,
|
||||
testers,
|
||||
whosthere,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
@@ -20,6 +21,16 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
vendorHash = "sha256-YVPsWpIXC5SLm+T2jEGqF4MBcKOAAk0Vpc7zCIFkNw8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-X"
|
||||
"main.versionStr=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
checkFlags =
|
||||
let
|
||||
# Skip tests that require filesystem access
|
||||
@@ -30,8 +41,19 @@ buildGoModule (finalAttrs: {
|
||||
in
|
||||
[ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd whosthere \
|
||||
--bash <("$out/bin/whosthere" completion bash) \
|
||||
--fish <("$out/bin/whosthere" completion fish) \
|
||||
--zsh <("$out/bin/whosthere" completion zsh)
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
passthru.tests.version = testers.testVersion { package = whosthere; };
|
||||
|
||||
meta = {
|
||||
description = "Local Area Network discovery tool";
|
||||
|
||||
@@ -34,13 +34,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xed";
|
||||
version = "2025.06.08";
|
||||
version = "2025.12.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intelxed";
|
||||
repo = "xed";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-FXVWCq7ykuSsVx8iB7WkFD7DDq6o/4bgsS0YJQWE+XM=";
|
||||
hash = "sha256-af0PYWMFLCrDyX7lkyhH1t5obYm9VTIyMtV2BwHhIBo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -13,20 +13,14 @@
|
||||
|
||||
inherit version;
|
||||
defaultVersion =
|
||||
with lib.versions;
|
||||
let
|
||||
case = case: out: { inherit case out; };
|
||||
inherit (lib.versions) range;
|
||||
in
|
||||
lib.switch coq.version [
|
||||
{
|
||||
case = isGe "9.0";
|
||||
out = "0.0.7";
|
||||
}
|
||||
{
|
||||
case = range "8.18" "8.20";
|
||||
out = "0.0.6";
|
||||
}
|
||||
{
|
||||
case = range "8.17" "8.20";
|
||||
out = "0.0.5";
|
||||
}
|
||||
(case (range "9.0" "9.1") "0.0.7")
|
||||
(case (range "8.18" "8.20") "0.0.6")
|
||||
(case (range "8.17" "8.20") "0.0.5")
|
||||
] null;
|
||||
|
||||
releaseRev = v: "v${v}";
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
stdenv,
|
||||
callPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
runCommandLocal,
|
||||
makeWrapper,
|
||||
replaceVars,
|
||||
@@ -50,6 +51,12 @@ stdenv.mkDerivation rec {
|
||||
libipasir = callPackage ./libipasirglucose4 { };
|
||||
|
||||
patches = [
|
||||
# The upstream fix for the input-files macro regression
|
||||
(fetchpatch {
|
||||
url = "https://github.com/acl2/acl2/commit/be39e7835f1c68008c17188d2f65eeaef61632fa.patch";
|
||||
sha256 = "sha256-pZ/r0vlyJz7ymYfrVtHDxsLdw0M/MJStBH42ZLO7Fs4=";
|
||||
})
|
||||
|
||||
(replaceVars ./0001-path-changes-for-nix.patch {
|
||||
libipasir = "${libipasir}/lib/${libipasir.libname}";
|
||||
libssl = "${lib.getLib openssl}/lib/libssl${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
|
||||
@@ -3,9 +3,10 @@ enable cross-compilation of glibc on Darwin (build=Darwin, host=Linux)
|
||||
* use host version of ar, which is given by environment variable
|
||||
* build system uses stamp.os and stamp.oS files, which only differ in case;
|
||||
this fails on macOS, so replace .oS with .o_S
|
||||
--- glibc-2.32/Makefile.in 2018-02-01 17:17:18.000000000 +0100
|
||||
+++ glibc-2.32/Makefile.in 2020-12-27 18:21:30.000000000 +0100
|
||||
@@ -6,9 +6,11 @@
|
||||
|
||||
--- a/Makefile.in 2026-01-26 09:08:32.283335000 +0100
|
||||
+++ b/Makefile.in 2026-01-26 09:08:44.281448649 +0100
|
||||
@@ -17,10 +17,12 @@
|
||||
.PHONY: all install bench
|
||||
|
||||
all .DEFAULT:
|
||||
@@ -13,14 +14,27 @@ enable cross-compilation of glibc on Darwin (build=Darwin, host=Linux)
|
||||
+ ulimit -n 1024; \
|
||||
+ $(MAKE) -r AR=$$AR PARALLELMFLAGS="$(PARALLELMFLAGS)" -C $(srcdir) objdir=`pwd` $@
|
||||
|
||||
check xcheck test:
|
||||
- $(MAKE) -r PARALLELMFLAGS="$(PARALLELMFLAGS)" -C $(srcdir) \
|
||||
+ ulimit -n 1024; \
|
||||
+ $(MAKE) -r AR=$$AR PARALLELMFLAGS="$(PARALLELMFLAGS)" -C $(srcdir) \
|
||||
CC="$(TEST_CC)" CXX="$(TEST_CXX)" \
|
||||
cc-option-wimplicit-fallthrough="$(test-cc-option-wimplicit-fallthrough)" \
|
||||
config-cflags-mprefer-vector-width="$(test-config-cflags-mprefer-vector-width)" \
|
||||
@@ -33,8 +35,9 @@
|
||||
objdir=`pwd` $@
|
||||
|
||||
install:
|
||||
+ ulimit -n 1024; \
|
||||
LC_ALL=C; export LC_ALL; \
|
||||
$(MAKE) -r PARALLELMFLAGS="$(PARALLELMFLAGS)" -C $(srcdir) objdir=`pwd` $@
|
||||
- $(MAKE) -r PARALLELMFLAGS="$(PARALLELMFLAGS)" -C $(srcdir) objdir=`pwd` $@
|
||||
+ $(MAKE) -r AR=$$AR PARALLELMFLAGS="$(PARALLELMFLAGS)" -C $(srcdir) objdir=`pwd` $@
|
||||
|
||||
--- glibc-2.32/Makerules 2018-02-01 17:17:18.000000000 +0100
|
||||
+++ glibc-2.32/Makerules 2020-12-27 18:21:30.000000000 +0100
|
||||
@@ -847,8 +847,8 @@
|
||||
bench bench-clean bench-build:
|
||||
$(MAKE) -C $(srcdir)/benchtests $(PARALLELMFLAGS) objdir=`pwd` $@
|
||||
--- a/Makerules 2026-01-26 09:08:32.283426000 +0100
|
||||
+++ b/Makerules 2026-01-26 09:09:20.363730545 +0100
|
||||
@@ -804,8 +804,8 @@
|
||||
ifndef objects
|
||||
|
||||
# Create the stamp$o files to keep the parent makefile happy.
|
||||
@@ -31,7 +45,7 @@ enable cross-compilation of glibc on Darwin (build=Darwin, host=Linux)
|
||||
$(make-target-directory)
|
||||
rm -f $@; > $@
|
||||
else
|
||||
@@ -859,7 +859,7 @@
|
||||
@@ -816,7 +816,7 @@
|
||||
# The parent will then actually add them all to the archive in the
|
||||
# archive rule, below.
|
||||
define o-iterator-doit
|
||||
@@ -40,7 +54,7 @@ enable cross-compilation of glibc on Darwin (build=Darwin, host=Linux)
|
||||
endef
|
||||
define do-stamp
|
||||
$(make-target-directory)
|
||||
@@ -875,14 +875,14 @@
|
||||
@@ -832,14 +832,14 @@
|
||||
# on the stamp files built above.
|
||||
define o-iterator-doit
|
||||
$(common-objpfx)$(patsubst %,$(libtype$o),c): \
|
||||
@@ -57,7 +71,7 @@ enable cross-compilation of glibc on Darwin (build=Darwin, host=Linux)
|
||||
ifndef subdir
|
||||
$(subdirs-stamps): subdir_lib;
|
||||
endif
|
||||
@@ -893,7 +893,7 @@
|
||||
@@ -850,7 +850,7 @@
|
||||
# This makes all the object files.
|
||||
.PHONY: objects objs libobjs extra-objs
|
||||
objects objs: libobjs extra-objs
|
||||
@@ -66,7 +80,7 @@ enable cross-compilation of glibc on Darwin (build=Darwin, host=Linux)
|
||||
extra-objs: $(addprefix $(objpfx),$(extra-objs))
|
||||
|
||||
# Canned sequence for building an extra library archive.
|
||||
@@ -1499,7 +1499,7 @@
|
||||
@@ -1366,7 +1366,7 @@
|
||||
$(rmobjs)
|
||||
define rmobjs
|
||||
$(foreach o,$(object-suffixes-for-libc),
|
||||
|
||||
@@ -814,15 +814,15 @@ final: prev: {
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "fzf-lua";
|
||||
version = "0.0.2415-1";
|
||||
version = "0.0.2459-1";
|
||||
knownRockspec =
|
||||
(fetchurl {
|
||||
url = "mirror://luarocks/fzf-lua-0.0.2415-1.rockspec";
|
||||
sha256 = "1f6sldmq34d40zf646v9xbff1ndlj7cg63wnis19w1bkr5s1a8kx";
|
||||
url = "mirror://luarocks/fzf-lua-0.0.2459-1.rockspec";
|
||||
sha256 = "0qz1r8vm7szd7z6gicxiblc40y8pw9w91g5qnvax4qmzhyyw4zcq";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/ibhagwan/fzf-lua/archive/abe5ecafebb4e24feb162384d5f492431036e791.zip";
|
||||
sha256 = "1qjxbj44ryvxxz10i07d70y8m6cqg85v336mjbdiarwmscg1ns12";
|
||||
url = "https://github.com/ibhagwan/fzf-lua/archive/36d60dd59cd9bc0442352119fc0e45e1c9011e03.zip";
|
||||
sha256 = "0lr4rk0fqdw12vhnmrjy197ai2d5ld16rwpcwxw4ay1dnaaq2f3x";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
@@ -906,15 +906,15 @@ final: prev: {
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "grug-far.nvim";
|
||||
version = "1.6.58-1";
|
||||
version = "1.6.60-1";
|
||||
knownRockspec =
|
||||
(fetchurl {
|
||||
url = "mirror://luarocks/grug-far.nvim-1.6.58-1.rockspec";
|
||||
sha256 = "16sbs1kxinqvflfzxxfcvaqdccyk0yanp88d4fc0ysmi6l1sk57c";
|
||||
url = "mirror://luarocks/grug-far.nvim-1.6.60-1.rockspec";
|
||||
sha256 = "1p58vc0kaacrxgpcfsb2xbqgj4ndh1k2fjiv2c79pxb7kmyajj9g";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/MagicDuck/grug-far.nvim/archive/794f03c97afc7f4b03fb6ec5111be507df1850cf.zip";
|
||||
sha256 = "17d11bhy2z9jghx1hifyqwdpmr8aikc9qj2zlgd6xa9iqkf2vyz5";
|
||||
url = "https://github.com/MagicDuck/grug-far.nvim/archive/14babc9b4520184d9696ef282eb7ac20687d4373.zip";
|
||||
sha256 = "0qki472ri9h9y2n4q62kr4f2bpjdbmh67ljyxvps95y2czy3a4my";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
@@ -937,15 +937,15 @@ final: prev: {
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "haskell-tools.nvim";
|
||||
version = "6.2.1-1";
|
||||
version = "7.0.0-1";
|
||||
knownRockspec =
|
||||
(fetchurl {
|
||||
url = "mirror://luarocks/haskell-tools.nvim-6.2.1-1.rockspec";
|
||||
sha256 = "17jhjgbm5b2j5w6i523k8cvasrrqsah29pkxsn6azjhvhbssff3w";
|
||||
url = "mirror://luarocks/haskell-tools.nvim-7.0.0-1.rockspec";
|
||||
sha256 = "03zrib07g6fxzf9gj52f8v5bvllqv7zsvn7z473grwsq6w26dpdy";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/v6.2.1.zip";
|
||||
sha256 = "1243l09llb60lilxh9fpvkl2vn0cdp15ll3vx475z3giba87ss6i";
|
||||
url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/v7.0.0.zip";
|
||||
sha256 = "1jxbdqh4sgh00lx7abrb7rww62x1dafzxncsr0pjlmly53vwrw5r";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
@@ -1586,15 +1586,15 @@ final: prev: {
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "lsp-progress.nvim";
|
||||
version = "1.0.15-1";
|
||||
version = "2.0.0-1";
|
||||
knownRockspec =
|
||||
(fetchurl {
|
||||
url = "mirror://luarocks/lsp-progress.nvim-1.0.15-1.rockspec";
|
||||
sha256 = "160l97hsq9574f1riq4kjwa66y39z2fgnjmnc7li1pf00dkh3fvq";
|
||||
url = "mirror://luarocks/lsp-progress.nvim-2.0.0-1.rockspec";
|
||||
sha256 = "0ik0nambf3q76icmlcap3py30g84g1lpyysdd0f250g3gsyb993z";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/linrongbin16/lsp-progress.nvim/archive/ae52979ad412371ea6dc39ff70c8dfc681fb42b8.zip";
|
||||
sha256 = "0c7s82fl5wamxykdlz63r0xclwdy9s658hp6zm5hmpgl3qyjdrir";
|
||||
url = "https://github.com/linrongbin16/lsp-progress.nvim/archive/f6d5af10563b895ff846346f57cbd4451439f4c1.zip";
|
||||
sha256 = "0jrxlk1q6r687dnq958r7s5x4djl6qcm139s8za998m8sgda397a";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
@@ -3560,15 +3560,15 @@ final: prev: {
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "lze";
|
||||
version = "0.12.0-1";
|
||||
version = "0.13.0-1";
|
||||
knownRockspec =
|
||||
(fetchurl {
|
||||
url = "mirror://luarocks/lze-0.12.0-1.rockspec";
|
||||
sha256 = "104z5r3wqbjinsh89pv8rm32383b3ia8n3r89g8dkbmj118xb93j";
|
||||
url = "mirror://luarocks/lze-0.13.0-1.rockspec";
|
||||
sha256 = "03l1855f97xm7hwjqrwwy85zyfjk9rgpmbm9v2lx7npbi118xmgp";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/BirdeeHub/lze/archive/v0.12.0.zip";
|
||||
sha256 = "0yak34g547yygxrwav021c2bya98zhbc5mkwrsx5zm2vwa4h55pa";
|
||||
url = "https://github.com/BirdeeHub/lze/archive/v0.13.0.zip";
|
||||
sha256 = "012ay0kcbwz3wyh9nqhnb2rnadnz7bxkbi47zbzvfnshz6m7z3z6";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
@@ -3591,15 +3591,15 @@ final: prev: {
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "lzextras";
|
||||
version = "0.4.2-1";
|
||||
version = "0.7.3-1";
|
||||
knownRockspec =
|
||||
(fetchurl {
|
||||
url = "mirror://luarocks/lzextras-0.4.2-1.rockspec";
|
||||
sha256 = "1awxr7bmf5hfgvn5vjra1rdn57dcsmv9v33b5pgp13q6yjhr750s";
|
||||
url = "mirror://luarocks/lzextras-0.7.3-1.rockspec";
|
||||
sha256 = "03zz29rbbdrk518hflmmjb7sz7nczy11h3fs88v1cng08w4qfgd4";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/BirdeeHub/lzextras/archive/v0.4.2.zip";
|
||||
sha256 = "1apgv3g9blwh25hqjhz1b7la3m2c3pfzalg42kg7y0x66ga78qf0";
|
||||
url = "https://github.com/BirdeeHub/lzextras/archive/v0.7.3.zip";
|
||||
sha256 = "0rkspxm6gdxvr7agk8yyfdp8qhj4s3c9k3qaqyy2p9c31gzhsql5";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
@@ -4078,8 +4078,8 @@ final: prev: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrsh7th";
|
||||
repo = "nvim-cmp";
|
||||
rev = "85bbfad83f804f11688d1ab9486b459e699292d6";
|
||||
hash = "sha256-gwuiUgz3UEFpaKs79BSWS4qkwOi+XMHIDFdYRatWt0g=";
|
||||
rev = "da88697d7f45d16852c6b2769dc52387d1ddc45f";
|
||||
hash = "sha256-/jk8pM7VmZ6mr7BspZjslMHNmCGZ8K/csmALo/Cj1hQ=";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1" || luaAtLeast "5.4";
|
||||
@@ -4461,22 +4461,22 @@ final: prev: {
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "rocks-config.nvim";
|
||||
version = "3.1.2-1";
|
||||
version = "3.2.0-1";
|
||||
knownRockspec =
|
||||
(fetchurl {
|
||||
url = "mirror://luarocks/rocks-config.nvim-3.1.2-1.rockspec";
|
||||
sha256 = "0v8zq40dwjp11qrfnpxbr148qm5bvlyq8pggvw1lwzmz9wmb0x9r";
|
||||
url = "mirror://luarocks/rocks-config.nvim-3.2.0-1.rockspec";
|
||||
sha256 = "07sznkw2qkbgibqg4sjpmrirvig17adhww7wmgb2h3kny7vaipxq";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/nvim-neorocks/rocks-config.nvim/archive/v3.1.2.zip";
|
||||
sha256 = "1y6xy6qraxdq1q4r2pdvw1dhaklfzgvnvrr5wkw033xrl8lj1rgs";
|
||||
url = "https://github.com/lumen-oss/rocks-config.nvim/archive/v3.2.0.zip";
|
||||
sha256 = "1w688m50g2q742yq9dp7w6g7rcp71pq6mybz2hw8g9af9q95js81";
|
||||
};
|
||||
|
||||
disabled = lua.luaversion != "5.1";
|
||||
propagatedBuildInputs = [ rocks-nvim ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/nvim-neorocks/rocks-config.nvim";
|
||||
homepage = "https://github.com/lumen-oss/rocks-config.nvim";
|
||||
description = "Allow rocks.nvim to help configure your plugins.";
|
||||
maintainers = with lib.maintainers; [ mrcjkb ];
|
||||
license.fullName = "GPL-3.0";
|
||||
@@ -4534,15 +4534,15 @@ final: prev: {
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "rocks-git.nvim";
|
||||
version = "2.5.7-1";
|
||||
version = "2.5.10-1";
|
||||
knownRockspec =
|
||||
(fetchurl {
|
||||
url = "mirror://luarocks/rocks-git.nvim-2.5.7-1.rockspec";
|
||||
sha256 = "1zynjjzj263c8mmxqzmbmim8smcsn3jki3s8ijdwbi8rb6labq71";
|
||||
url = "mirror://luarocks/rocks-git.nvim-2.5.10-1.rockspec";
|
||||
sha256 = "0a01xh847gnpy844hdlmn8l6iwqhxj604mirqkhsqhr1l4rv715a";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/lumen-oss/rocks-git.nvim/archive/v2.5.7.zip";
|
||||
sha256 = "08bjp6nrvw5gj3plih3si436m17wz8sabf6z34hb4hza7i4y26l3";
|
||||
url = "https://github.com/lumen-oss/rocks-git.nvim/archive/v2.5.10.zip";
|
||||
sha256 = "1hh0zrpdp4nc19wli6pm8bgjf6qzzjz4ydhshm4m2d22dmnh6ngz";
|
||||
};
|
||||
|
||||
disabled = lua.luaversion != "5.1";
|
||||
@@ -4575,15 +4575,15 @@ final: prev: {
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "rocks.nvim";
|
||||
version = "2.47.2-1";
|
||||
version = "2.47.4-1";
|
||||
knownRockspec =
|
||||
(fetchurl {
|
||||
url = "mirror://luarocks/rocks.nvim-2.47.2-1.rockspec";
|
||||
sha256 = "01h368ckrpdq8yrczb0lx6bmj3vv1hlj22y784p6isypxma5iyrf";
|
||||
url = "mirror://luarocks/rocks.nvim-2.47.4-1.rockspec";
|
||||
sha256 = "0wc3ddd926qq186yvsh5ylyxygr1wg5a72p1ch4d8hrgnddpb3ii";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/lumen-oss/rocks.nvim/archive/v2.47.2.zip";
|
||||
sha256 = "1kzhn02zhydb0shha6lhb2ddqhbvldjhpk3h4fmr0kcfv7sf0r99";
|
||||
url = "https://github.com/lumen-oss/rocks.nvim/archive/v2.47.4.zip";
|
||||
sha256 = "1gzy55m1d86wg5skf6pczd9d6wxrmh9bly32asw6rbs6k4fz0lpb";
|
||||
};
|
||||
|
||||
disabled = lua.luaversion != "5.1";
|
||||
@@ -4645,21 +4645,21 @@ final: prev: {
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "rustaceanvim";
|
||||
version = "7.1.1-2";
|
||||
version = "7.1.9-2";
|
||||
knownRockspec =
|
||||
(fetchurl {
|
||||
url = "mirror://luarocks/rustaceanvim-7.1.1-2.rockspec";
|
||||
sha256 = "1fzcf262v25315r777g76a18dhfhjm3xrrlx5v4s6z4z40xfxrq5";
|
||||
url = "mirror://luarocks/rustaceanvim-7.1.9-2.rockspec";
|
||||
sha256 = "1j4n6xf1w542fsyp3jm4h72kv4lrh4g85zal03snjzzl35zslqbq";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/mrcjkb/rustaceanvim/archive/refs/tags/v7.1.1.zip";
|
||||
sha256 = "0pnnzgqg9i89px6ikqqmqpskl4v5ri7f95cd23q99k2mlhzhz0ml";
|
||||
url = "https://github.com/mrcjkb/rustaceanvim/archive/refs/tags/v7.1.9.zip";
|
||||
sha256 = "1s2b44wfk3imbp0vcvldfxq3zx9875jyl7l5bnxhgihdksaxdy7p";
|
||||
};
|
||||
|
||||
disabled = lua.luaversion != "5.1";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/mrcjkb/rustaceanvim/archive/refs/tags/v7.1.1.zip";
|
||||
homepage = "https://github.com/mrcjkb/rustaceanvim/archive/refs/tags/v7.1.9.zip";
|
||||
description = "🦀 Supercharge your Rust experience in Neovim! A heavily modified fork of rust-tools.nvim";
|
||||
maintainers = with lib.maintainers; [ mrcjkb ];
|
||||
license.fullName = "GPL-2.0-only";
|
||||
@@ -5001,8 +5001,8 @@ final: prev: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-telescope";
|
||||
repo = "telescope.nvim";
|
||||
rev = "a8c2223ea6b185701090ccb1ebc7f4e41c4c9784";
|
||||
hash = "sha256-4cfY2Nk3cXph44BI/W+PDhtCC84jxJ6+ONgH9lR/264=";
|
||||
rev = "ad7d9580338354ccc136e5b8f0aa4f880434dcdc";
|
||||
hash = "sha256-Z5wmLGMd+GODObFOYU7CrucwDnBpT5rJjfE5vHwjRxE=";
|
||||
};
|
||||
|
||||
disabled = lua.luaversion != "5.1";
|
||||
|
||||
@@ -933,7 +933,8 @@ in
|
||||
rocks-dev-nvim = prev.rocks-dev-nvim.overrideAttrs {
|
||||
|
||||
# E5113: Error while calling lua chunk [...] pl.path requires LuaFileSystem
|
||||
doCheck = luaOlder "5.2";
|
||||
# TODO: figure out darwin failure
|
||||
doCheck = luaOlder "5.2" && stdenv.hostPlatform.isLinux;
|
||||
nativeCheckInputs = [
|
||||
final.nlua
|
||||
final.bustedCheckHook
|
||||
@@ -949,7 +950,8 @@ in
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
doCheck = lua.luaversion == "5.1";
|
||||
# TODO: figure out darwin failure
|
||||
doCheck = lua.luaversion == "5.1" && stdenv.hostPlatform.isLinux;
|
||||
|
||||
nvimSkipModules = [
|
||||
"bootstrap" # tries to install luarocks from network
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
lem,
|
||||
linksem,
|
||||
yojson,
|
||||
version ? "0.20",
|
||||
version ? "0.20.1",
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
@@ -25,7 +25,7 @@ buildDunePackage {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/rems-project/sail/releases/download/${version}/sail-${version}.tbz";
|
||||
hash = "sha256-WTmYltCrNkt/OeST79Z1xMC2YDgN2HxLJ3PrE7k+R9M=";
|
||||
hash = "sha256-uoG416pXBeBAZAE6sgwAa4DG20T5UiWsT79gQil+UOs=";
|
||||
};
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
@@ -17,14 +17,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiohomematic";
|
||||
version = "2026.1.54";
|
||||
version = "2026.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SukramJ";
|
||||
repo = "aiohomematic";
|
||||
tag = version;
|
||||
hash = "sha256-EAdadToeqT3H65kSWboCrzUogK38whDEzbuA3C6wmoo=";
|
||||
hash = "sha256-HMKrXFhs3s0wV+39/xMIQT77gkLPg9m21iTKlypfZLA=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -3,26 +3,28 @@
|
||||
aiohttp,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
orjson,
|
||||
setuptools,
|
||||
yarl,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiotractive";
|
||||
version = "0.7.0";
|
||||
version = "1.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zhulik";
|
||||
repo = "aiotractive";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-tdeRl3fY+OPlLnh/KixdKSy6WLIH/qQR3icoUkKGeGo=";
|
||||
hash = "sha256-pU6Ugd4l9+oUWJAd1hT3oBPfXK5NEjOg+k3YN52C3B8=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
aiohttp
|
||||
orjson
|
||||
yarl
|
||||
];
|
||||
|
||||
|
||||
@@ -25,24 +25,27 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bleak";
|
||||
version = "2.0.0";
|
||||
version = "2.1.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hbldh";
|
||||
repo = "bleak";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-UrKJoEyLa75HMCOgxmOqJi1z+32buMra+dwVe5qbBds=";
|
||||
hash = "sha256-zplCwm0LxDTbNvjWK6VYEFe0Azd2ginkoPZpV7Tpv20=";
|
||||
};
|
||||
|
||||
postPatch =
|
||||
# bleak checks BlueZ's version with a call to `bluetoothctl --version`
|
||||
lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
substituteInPlace bleak/backends/bluezdbus/version.py \
|
||||
--replace-fail \
|
||||
'"bluetoothctl"' \
|
||||
'"${lib.getExe' bluez "bluetoothctl"}"'
|
||||
'';
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "ignore:Couldn't import C tracer:coverage.exceptions.CoverageWarning" ""
|
||||
''
|
||||
# bleak checks BlueZ's version with a call to `bluetoothctl --version`
|
||||
+ lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
substituteInPlace bleak/backends/bluezdbus/version.py \
|
||||
--replace-fail \
|
||||
'"bluetoothctl"' \
|
||||
'"${lib.getExe' bluez "bluetoothctl"}"'
|
||||
'';
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "compit-inext-api";
|
||||
version = "0.5.0";
|
||||
version = "0.8.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Przemko92";
|
||||
repo = "compit-inext-api";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-DlNkDfV3fp/7DetiIDx3yi8SfJHV4sFIMHEam5rcYrg=";
|
||||
hash = "sha256-7FGB2Vh0BhRzZSv/K5jISSFAN4VmFm9Je4uB9hdXS7k=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -10,12 +10,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cpyparsing";
|
||||
version = "2.4.7.2.4.1";
|
||||
version = "2.4.7.2.4.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-2RfwGnSz/GFPk565n8MooIybHeWAlWYMDylZd0S/HTA=";
|
||||
hash = "sha256-bmoHri14gWvTekgoScA1v0qVhre+08aRwx0V6AvfPdQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -13,7 +13,6 @@
|
||||
grpcio,
|
||||
icmplib,
|
||||
josepy,
|
||||
litellm,
|
||||
pycognito,
|
||||
pyjwt,
|
||||
pytest-aiohttp,
|
||||
@@ -33,7 +32,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hass-nabucasa";
|
||||
version = "1.11.0";
|
||||
version = "1.12.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.13";
|
||||
@@ -42,7 +41,7 @@ buildPythonPackage rec {
|
||||
owner = "nabucasa";
|
||||
repo = "hass-nabucasa";
|
||||
tag = version;
|
||||
hash = "sha256-qTOfZy74bF/e8Tw0FMjS53y7prCqIDlBXTDkVG3DUsQ=";
|
||||
hash = "sha256-hBfO/dHsoMwUKcJf+6wGmS2+GWXauMu5FC527X3Ygow=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -63,7 +62,6 @@ buildPythonPackage rec {
|
||||
grpcio
|
||||
icmplib
|
||||
josepy
|
||||
litellm
|
||||
pycognito
|
||||
pyjwt
|
||||
sentence-stream
|
||||
|
||||
@@ -16,14 +16,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "influxdb-client";
|
||||
version = "1.49.0";
|
||||
version = "1.50.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "influxdata";
|
||||
repo = "influxdb-client-python";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-lu3we/KXwP3oC9bfv6gzbwacOVLGSuPBf9giwmsHXgI=";
|
||||
hash = "sha256-39ioVlTgvICHArTNhfXZQ+WrUda2B5LxLtMwXWp6krU=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -32,7 +32,6 @@ buildPythonPackage rec {
|
||||
certifi
|
||||
python-dateutil
|
||||
reactivex
|
||||
setuptools
|
||||
urllib3
|
||||
];
|
||||
|
||||
|
||||
@@ -26,19 +26,19 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "jupyter-book";
|
||||
version = "2.1.1";
|
||||
version = "2.1.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jupyter-book";
|
||||
repo = "jupyter-book";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-TpscnIywWNBd3eGMe8QDV1bqbTs1z2FbGJqAh/BCOg8=";
|
||||
hash = "sha256-eICmprxo/7E3GHVX4yK+L86pYHfQCBlx9WskbnBFCnY=";
|
||||
};
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-y2vZG64+ZtjANZgResUTVIoibK8GQIgKildpvTJypq4=";
|
||||
hash = "sha256-uPmB6zrP1ESX7J3f5ppr7Yk9BupH8KI7a5OnYc/nN5M=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -3,10 +3,10 @@
|
||||
aresponses,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
hatchling,
|
||||
lib,
|
||||
mashumaro,
|
||||
orjson,
|
||||
hatchling,
|
||||
pytest-cov-stub,
|
||||
pytestCheckHook,
|
||||
syrupy,
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyfirefly";
|
||||
version = "0.1.12";
|
||||
version = "0.1.13";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "erwindouna";
|
||||
repo = "pyfirefly";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-SCB05cKEZ4uejl81TUjz4qN0lzYuIKR1CgMbCsA+G4E=";
|
||||
hash = "sha256-h3p1uP8K/M2DNLapnBlaYmRcYDNzhqdx8507nm7ugqY=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{
|
||||
aiodns,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
@@ -22,10 +21,6 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
aiodns
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "jvcprojector" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@@ -6,13 +6,14 @@
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pynina";
|
||||
version = "1.0.2";
|
||||
version = "1.0.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-ypbfvhXKu4pKr/DrWFnAhwMoqShJzWLqlA7/YQzJ9r4=";
|
||||
};
|
||||
|
||||
@@ -30,8 +31,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Python API wrapper to retrieve warnings from the german NINA app";
|
||||
homepage = "https://gitlab.com/DeerMaximum/pynina";
|
||||
changelog = "https://gitlab.com/DeerMaximum/pynina/-/releases/v${version}";
|
||||
changelog = "https://gitlab.com/DeerMaximum/pynina/-/releases/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [ defusedxml ];
|
||||
dependencies = [ defusedxml ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "python-otbr-api";
|
||||
version = "2.7.1";
|
||||
version = "2.8.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "home-assistant-libs";
|
||||
repo = "python-otbr-api";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-hFWFi64mRJL5487N6Xm6EQVVaYEzsdg9P2QZYEn758k=";
|
||||
hash = "sha256-+Y07rSLIjBQiPuiXKDV5aQhA5mX9c9v7AGktL8rS4sc=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -21,16 +21,16 @@
|
||||
syrupy,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "python-roborock";
|
||||
version = "4.7.2";
|
||||
version = "4.8.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Python-roborock";
|
||||
repo = "python-roborock";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-bZCeMn6t7HN3LlL1qoZHxHv0NWmqNlKgEOcO5k57Kn0=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-eOvadiJ0zLwCJDK22qb/ZPsNi+d6lI5+lzn05EHWB7I=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "pycryptodome" ];
|
||||
@@ -65,9 +65,9 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Python library & console tool for controlling Roborock vacuum";
|
||||
homepage = "https://github.com/Python-roborock/python-roborock";
|
||||
changelog = "https://github.com/Python-roborock/python-roborock/blob/${src.tag}/CHANGELOG.md";
|
||||
changelog = "https://github.com/Python-roborock/python-roborock/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
mainProgram = "roborock";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -17,14 +17,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-xbox";
|
||||
version = "0.1.2";
|
||||
version = "0.1.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tr4nt0r";
|
||||
repo = "python-xbox";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-YP8iK7uGycwKlWwAUmfk3qXI+c6cddg9nQ4NMQF7wDQ=";
|
||||
hash = "sha256-qSVUAjstTPIxpqF0eE4HhwvUf/Q9rD+pqw9CQUkF6ug=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
fetchFromGitHub,
|
||||
mashumaro,
|
||||
pytestCheckHook,
|
||||
python-dateutil,
|
||||
pyyaml,
|
||||
requests,
|
||||
setuptools,
|
||||
@@ -27,6 +28,7 @@ buildPythonPackage rec {
|
||||
dependencies = [
|
||||
aiohttp
|
||||
mashumaro
|
||||
python-dateutil
|
||||
]
|
||||
++ mashumaro.optional-dependencies.orjson;
|
||||
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
poetry-core,
|
||||
pytest-asyncio,
|
||||
pytestCheckHook,
|
||||
pythonAtLeast,
|
||||
typing-extensions,
|
||||
}:
|
||||
|
||||
@@ -13,6 +14,9 @@ buildPythonPackage rec {
|
||||
version = "4.1.0";
|
||||
pyproject = true;
|
||||
|
||||
# https://github.com/ReactiveX/RxPY/issues/737
|
||||
disabled = pythonAtLeast "3.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ReactiveX";
|
||||
repo = "RxPY";
|
||||
|
||||
@@ -21,14 +21,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "timetagger";
|
||||
version = "26.1.1";
|
||||
version = "26.1.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "almarklein";
|
||||
repo = "timetagger";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-BGu+L3bUBGYj18D4qUemUMEs2tk0wLu8DvO9h/7FiJo=";
|
||||
hash = "sha256-X82Ai6E844deRGs6KcJATEid3X6IlDq4+LCEU4lc4hM=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -14,16 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "todoist-api-python";
|
||||
version = "3.2.0";
|
||||
version = "3.2.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Doist";
|
||||
repo = "todoist-api-python";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-rdXYAPCs3PSIFfpBKMfNNRUOJJK5Y/IzY5bmhxTm4zw=";
|
||||
hash = "sha256-udYFWTrWW2G6JBKQUkiqKpyBz1D4dwq7Pix6bzuWnDY=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
@@ -46,7 +44,7 @@ buildPythonPackage rec {
|
||||
description = "Library for the Todoist REST API";
|
||||
homepage = "https://github.com/Doist/todoist-api-python";
|
||||
changelog = "https://github.com/Doist/todoist-api-python/blob/${src.tag}/CHANGELOG.md";
|
||||
license = with lib.licenses; [ mit ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -16,14 +16,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "velbus-aio";
|
||||
version = "2026.1.3";
|
||||
version = "2026.1.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Cereal2nd";
|
||||
repo = "velbus-aio";
|
||||
tag = version;
|
||||
hash = "sha256-TyKRziQf897FVqA0IT/zPLf3NkSeYq03rzdzRgE73T4=";
|
||||
hash = "sha256-xDZg1AeKcmvb1uf8sWR9II4U/Xm5aeXeEeUfKfey0ts=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "weheat";
|
||||
version = "2025.12.24";
|
||||
version = "2026.1.25";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wefabricate";
|
||||
repo = "wh-python";
|
||||
tag = version;
|
||||
hash = "sha256-aO4mU+7lfb4eQwK8ijtJwDBIhzxg+V5veWNwNsnxKu4=";
|
||||
hash = "sha256-8gpRK7vQojOskF0n8iY/UzfCfNPQZ5eVhw2H7vZvgps=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zha-quirks";
|
||||
version = "0.0.152";
|
||||
version = "0.0.156";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.12";
|
||||
@@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "zigpy";
|
||||
repo = "zha-device-handlers";
|
||||
tag = version;
|
||||
hash = "sha256-b0px65f/M1Lm7FUh6NLnF90tK5FKytMEPHdMenrpsso=";
|
||||
hash = "sha256-vVA8FmNLzatfClRTvb9pZm5SQxgSQh+iAllOl+OIo6Q=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zha";
|
||||
version = "0.0.84";
|
||||
version = "0.0.89";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.12";
|
||||
@@ -32,7 +32,7 @@ buildPythonPackage rec {
|
||||
owner = "zigpy";
|
||||
repo = "zha";
|
||||
tag = version;
|
||||
hash = "sha256-CoV2EOlbLVmcr7dfHi63oFLMzCMf2P3vc+CoaOAu1FQ=";
|
||||
hash = "sha256-mtlf8Uh2C9s5ie6aWWbRuNvmS0QbzqpCMeSf/WTW0Zw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -19,14 +19,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zigpy-znp";
|
||||
version = "0.14.2";
|
||||
version = "0.14.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zigpy";
|
||||
repo = "zigpy-znp";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-B4AyCLuhKUdQ0nzwFy5xWXpzR31R50lcC5EJMIJfDKE=";
|
||||
hash = "sha256-XH/nStEGI7jmhwT5JhII4Mc+uO7B9Ur3s5MLvUOFl9c=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -26,14 +26,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zigpy";
|
||||
version = "0.90.0";
|
||||
version = "0.91.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zigpy";
|
||||
repo = "zigpy";
|
||||
tag = version;
|
||||
hash = "sha256-HTQ9azIXnNkNM+s7w0oerDf9+RcCO8DF9+kL9Uzevyk=";
|
||||
hash = "sha256-nBinPaZfW04AFqtuHZ0FnIT3GS0Y5MgqSL09u1o1iCo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -16,7 +16,7 @@ mkKdeDerivation rec {
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit pname version cargoRoot;
|
||||
src = sources.${pname};
|
||||
hash = "sha256-hdm4LfQcs4TTfBLzlZYJ0uzqfLxMXuYQExLGJg81W2U=";
|
||||
hash = "sha256-F9m2+WSrxjQgFDJ+//GCnMvzUD6734IGqnw7sRYIwTU=";
|
||||
};
|
||||
|
||||
extraNativeBuildInputs = [
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -8,11 +8,13 @@
|
||||
flex,
|
||||
p7zip,
|
||||
rsync,
|
||||
nix-update-script,
|
||||
fetchpatch2,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ply";
|
||||
version = "2.1.1-${lib.substring 0 7 src.rev}";
|
||||
version = "2.4.0";
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
@@ -25,10 +27,18 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "iovisor";
|
||||
repo = "ply";
|
||||
rev = "e25c9134b856cc7ffe9f562ff95caf9487d16b59";
|
||||
sha256 = "1178z7vvnjwnlxc98g2962v16878dy7bd0b2njsgn4vqgrnia7i5";
|
||||
tag = finalAttrs.version;
|
||||
sha256 = "sha256-PJaCEiM1BRUEtInd93bK+xZNJzO9EZy+JXkp9cdPrgs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix union member initialization for GCC 15.
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/iovisor/ply/commit/5e78db85a625cff64e5714afcf3163c882a0435a.patch?full_index=1";
|
||||
hash = "sha256-mKPHPIZy0KztyVgHuM/kzyLytKghv8c8XvKt3pYUYDU=";
|
||||
})
|
||||
];
|
||||
|
||||
preAutoreconf = ''
|
||||
# If kernel sources are a folder (i.e. fetched from git), we just copy them in
|
||||
# Since they are owned by uid 0 and read-only, we need to fix permissions
|
||||
@@ -46,6 +56,8 @@ stdenv.mkDerivation rec {
|
||||
./autogen.sh --prefix=$out
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Dynamic tracing in Linux";
|
||||
mainProgram = "ply";
|
||||
@@ -54,7 +66,8 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with lib.maintainers; [
|
||||
mic92
|
||||
mbbx6spp
|
||||
snu
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2026.1.3";
|
||||
version = "2026.2.0";
|
||||
components = {
|
||||
"3_day_blinds" =
|
||||
ps: with ps; [
|
||||
@@ -469,6 +469,7 @@
|
||||
hassil
|
||||
home-assistant-intents
|
||||
mutagen
|
||||
openai
|
||||
pymicro-vad
|
||||
pyspeex-noise
|
||||
python-matter-server
|
||||
@@ -885,6 +886,7 @@
|
||||
home-assistant-intents
|
||||
ifaddr
|
||||
mutagen
|
||||
openai
|
||||
plexapi
|
||||
plexauth
|
||||
plexwebsocket
|
||||
@@ -952,6 +954,7 @@
|
||||
hassil
|
||||
home-assistant-intents
|
||||
mutagen
|
||||
openai
|
||||
pymicro-vad
|
||||
pyspeex-noise
|
||||
python-matter-server
|
||||
@@ -962,6 +965,10 @@
|
||||
ps: with ps; [
|
||||
pycfdns
|
||||
];
|
||||
"cloudflare_r2" =
|
||||
ps: with ps; [
|
||||
aiobotocore
|
||||
];
|
||||
"cmus" =
|
||||
ps: with ps; [
|
||||
pycmus
|
||||
@@ -1151,6 +1158,7 @@
|
||||
ifaddr
|
||||
mutagen
|
||||
numpy
|
||||
openai
|
||||
pillow
|
||||
psutil-home-assistant
|
||||
pymicro-vad
|
||||
@@ -2242,6 +2250,9 @@
|
||||
greeclimate
|
||||
ifaddr
|
||||
];
|
||||
"green_planet_energy" =
|
||||
ps: with ps; [
|
||||
]; # missing inputs: greenplanet-energy-api
|
||||
"greeneye_monitor" =
|
||||
ps: with ps; [
|
||||
greeneye-monitor
|
||||
@@ -2305,6 +2316,10 @@
|
||||
"hddtemp" =
|
||||
ps: with ps; [
|
||||
];
|
||||
"hdfury" =
|
||||
ps: with ps; [
|
||||
hdfury
|
||||
];
|
||||
"hdmi_cec" =
|
||||
ps: with ps; [
|
||||
pycec
|
||||
@@ -3481,6 +3496,7 @@
|
||||
home-assistant-intents
|
||||
loqedapi
|
||||
mutagen
|
||||
openai
|
||||
pymicro-vad
|
||||
pyspeex-noise
|
||||
python-matter-server
|
||||
@@ -3809,6 +3825,7 @@
|
||||
hassil
|
||||
home-assistant-intents
|
||||
mutagen
|
||||
openai
|
||||
pillow
|
||||
pymicro-vad
|
||||
pynacl
|
||||
@@ -4010,7 +4027,6 @@
|
||||
];
|
||||
"namecheapdns" =
|
||||
ps: with ps; [
|
||||
defusedxml
|
||||
];
|
||||
"nanoleaf" =
|
||||
ps: with ps; [
|
||||
@@ -4055,6 +4071,7 @@
|
||||
hassil
|
||||
home-assistant-intents
|
||||
mutagen
|
||||
openai
|
||||
pyatmo
|
||||
pymicro-vad
|
||||
pyspeex-noise
|
||||
@@ -4183,6 +4200,10 @@
|
||||
ps: with ps; [
|
||||
aionotion
|
||||
];
|
||||
"nrgkick" =
|
||||
ps: with ps; [
|
||||
nrgkick-api
|
||||
];
|
||||
"nsw_fuel_station" =
|
||||
ps: with ps; [
|
||||
nsw-fuel-api-client
|
||||
@@ -4301,6 +4322,7 @@
|
||||
home-assistant-intents
|
||||
mutagen
|
||||
onedrive-personal-sdk
|
||||
openai
|
||||
pymicro-vad
|
||||
pyspeex-noise
|
||||
python-matter-server
|
||||
@@ -4356,8 +4378,9 @@
|
||||
];
|
||||
"openevse" =
|
||||
ps: with ps; [
|
||||
openevsewifi
|
||||
];
|
||||
ifaddr
|
||||
zeroconf
|
||||
]; # missing inputs: python-openevse-http
|
||||
"openexchangerates" =
|
||||
ps: with ps; [
|
||||
aioopenexchangerates
|
||||
@@ -4494,6 +4517,7 @@
|
||||
hassil
|
||||
home-assistant-intents
|
||||
mutagen
|
||||
openai
|
||||
pymicro-vad
|
||||
pyspeex-noise
|
||||
python-matter-server
|
||||
@@ -4514,6 +4538,7 @@
|
||||
hassil
|
||||
home-assistant-intents
|
||||
mutagen
|
||||
openai
|
||||
paho-mqtt
|
||||
pymicro-vad
|
||||
pynacl
|
||||
@@ -4639,6 +4664,7 @@
|
||||
hassil
|
||||
home-assistant-intents
|
||||
mutagen
|
||||
openai
|
||||
pymicro-vad
|
||||
pyplaato
|
||||
pyspeex-noise
|
||||
@@ -4701,6 +4727,9 @@
|
||||
ps: with ps; [
|
||||
tesla-powerwall
|
||||
];
|
||||
"prana" =
|
||||
ps: with ps; [
|
||||
]; # missing inputs: prana-api-client
|
||||
"private_ble_device" =
|
||||
ps: with ps; [
|
||||
aioesphomeapi
|
||||
@@ -4938,6 +4967,7 @@
|
||||
hassil
|
||||
home-assistant-intents
|
||||
mutagen
|
||||
openai
|
||||
pymicro-vad
|
||||
pyspeex-noise
|
||||
python-matter-server
|
||||
@@ -5047,6 +5077,7 @@
|
||||
home-assistant-frontend
|
||||
home-assistant-intents
|
||||
mutagen
|
||||
openai
|
||||
pymicro-vad
|
||||
pyspeex-noise
|
||||
python-matter-server
|
||||
@@ -6302,6 +6333,7 @@
|
||||
hassil
|
||||
home-assistant-intents
|
||||
mutagen
|
||||
openai
|
||||
pymicro-vad
|
||||
pyspeex-noise
|
||||
python-matter-server
|
||||
@@ -6452,6 +6484,9 @@
|
||||
ps: with ps; [
|
||||
openwrt-ubus-rpc
|
||||
];
|
||||
"uhoo" =
|
||||
ps: with ps; [
|
||||
]; # missing inputs: uhooapi
|
||||
"uk_transport" =
|
||||
ps: with ps; [
|
||||
];
|
||||
@@ -6604,7 +6639,7 @@
|
||||
];
|
||||
"viaggiatreno" =
|
||||
ps: with ps; [
|
||||
];
|
||||
]; # missing inputs: viaggiatreno_ha
|
||||
"vicare" =
|
||||
ps: with ps; [
|
||||
pyvicare
|
||||
@@ -6731,6 +6766,7 @@
|
||||
hassil
|
||||
home-assistant-intents
|
||||
mutagen
|
||||
openai
|
||||
pymicro-vad
|
||||
pyspeex-noise
|
||||
python-matter-server
|
||||
@@ -6822,6 +6858,7 @@
|
||||
hassil
|
||||
home-assistant-intents
|
||||
mutagen
|
||||
openai
|
||||
pymicro-vad
|
||||
pyspeex-noise
|
||||
python-matter-server
|
||||
@@ -6950,6 +6987,7 @@
|
||||
hassil
|
||||
home-assistant-intents
|
||||
mutagen
|
||||
openai
|
||||
pymicro-vad
|
||||
pyspeex-noise
|
||||
python-matter-server
|
||||
@@ -7245,6 +7283,7 @@
|
||||
"climate"
|
||||
"cloud"
|
||||
"cloudflare"
|
||||
"cloudflare_r2"
|
||||
"co2signal"
|
||||
"coinbase"
|
||||
"color_extractor"
|
||||
@@ -7451,6 +7490,7 @@
|
||||
"harmony"
|
||||
"hassio"
|
||||
"hddtemp"
|
||||
"hdfury"
|
||||
"hdmi_cec"
|
||||
"heos"
|
||||
"here_travel_time"
|
||||
@@ -7711,6 +7751,7 @@
|
||||
"notify"
|
||||
"notify_events"
|
||||
"notion"
|
||||
"nrgkick"
|
||||
"nsw_fuel_station"
|
||||
"nsw_rural_fire_service_feed"
|
||||
"ntfy"
|
||||
@@ -7798,6 +7839,7 @@
|
||||
"prosegur"
|
||||
"prowl"
|
||||
"proximity"
|
||||
"proxmoxve"
|
||||
"prusalink"
|
||||
"ps4"
|
||||
"pterodactyl"
|
||||
@@ -8087,6 +8129,7 @@
|
||||
"wallbox"
|
||||
"waqi"
|
||||
"water_heater"
|
||||
"waterfurnace"
|
||||
"watergate"
|
||||
"watttime"
|
||||
"waze_travel_time"
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
buildHomeAssistantComponent rec {
|
||||
owner = "mampfes";
|
||||
domain = "epex_spot";
|
||||
version = "4.0.0";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mampfes";
|
||||
repo = "ha_epex_spot";
|
||||
tag = version;
|
||||
hash = "sha256-kpyWBeKZ0WUoWI/KwKUo/U3RVz2Kdn4xe5WHWr2pV+U=";
|
||||
hash = "sha256-FLXvnKuo74nAGIo+6dbn1/wzJCXWo+IltoXrxd4aEio=";
|
||||
};
|
||||
|
||||
dependencies = [
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user