Merge master into staging-next
This commit is contained in:
@@ -12,19 +12,19 @@
|
||||
pkgs,
|
||||
}:
|
||||
let
|
||||
version = "0.0.25-unstable-2025-07-02";
|
||||
version = "0.0.25-unstable-2025-07-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "yetone";
|
||||
repo = "avante.nvim";
|
||||
rev = "6bbf3d2004133252cd0e2d057add5c1431dc8511";
|
||||
hash = "sha256-xHYogeovrd2n7oZB935ma2qwqhfu0eEDieQv5j5d9dQ=";
|
||||
rev = "c4ce24e3c047c3283652aeb9a16114603d6f705c";
|
||||
hash = "sha256-ILOISh3+bfN1dEz1BN4+iZ2WJzmt0++QVZUjp24ZjNI=";
|
||||
};
|
||||
avante-nvim-lib = rustPlatform.buildRustPackage {
|
||||
pname = "avante-nvim-lib";
|
||||
inherit version src;
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-pmnMoNdaIR0i+4kwW3cf01vDQo39QakTCEG9AXA86ck=";
|
||||
cargoHash = "sha256-8mBpzndz34RrmhJYezd4hLrJyhVL4S4IHK3plaue1k8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -1115,7 +1115,7 @@ let
|
||||
publisher = "Continue";
|
||||
version = "1.1.49";
|
||||
}
|
||||
// sources.${stdenv.system};
|
||||
// sources.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
|
||||
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
|
||||
buildInputs = [ (lib.getLib stdenv.cc.cc) ];
|
||||
meta = {
|
||||
@@ -1387,7 +1387,7 @@ let
|
||||
publisher = "devsense";
|
||||
version = "1.41.14332";
|
||||
}
|
||||
// sources.${stdenv.system};
|
||||
// sources.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
|
||||
@@ -3334,7 +3334,7 @@ let
|
||||
publisher = "ms-dotnettools";
|
||||
version = "2.2.3";
|
||||
}
|
||||
// sources.${stdenv.system};
|
||||
// sources.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
|
||||
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
|
||||
buildInputs = [
|
||||
(lib.getLib stdenv.cc.cc)
|
||||
|
||||
@@ -10,17 +10,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "avbroot";
|
||||
version = "3.17.1";
|
||||
version = "3.17.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chenxiaolong";
|
||||
repo = "avbroot";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-W+ElIKi1WrjxBEEGWcR4MkjlJwdQFBiI09gvks4Pfr8=";
|
||||
hash = "sha256-7/EW547UCyuKxp8JYWxg9qIr3p4CfA0RKxJuEify6DU=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-t9cOFl3gtQ6cn+6xlMf4IOA3S6md/9D83w9L9dPgBMU=";
|
||||
cargoHash = "sha256-eId/2+U34WxfniJe+oVv49zvMkjoo3ZM8Sna7bKnjKA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -47,7 +47,9 @@ rustPlatform.buildRustPackage rec {
|
||||
doCheck = false;
|
||||
|
||||
# provide the list of solc versions to the `svm-rs-builds` dependency
|
||||
SVM_RELEASES_LIST_JSON = solc-versions.${stdenv.hostPlatform.system};
|
||||
SVM_RELEASES_LIST_JSON =
|
||||
solc-versions.${stdenv.hostPlatform.system}
|
||||
or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
meta = {
|
||||
description = "Solidity test generator based on the Branching Tree Technique";
|
||||
|
||||
@@ -39,13 +39,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cpu-x";
|
||||
version = "5.3.0";
|
||||
version = "5.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "X0rg";
|
||||
owner = "TheTumultuousUnicornOfDarkness";
|
||||
repo = "CPU-X";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-UOOqPkOXsyZthreg0Fv/KMJcm0Syd7/Uni9G3H6UJ2E=";
|
||||
hash = "sha256-yrDTvOdMeUw2fxLtNjCZggs9M9P1YKeMxm/dI5MRyYQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -30,7 +30,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
};
|
||||
};
|
||||
in
|
||||
fetchurl urls."${stdenvNoCC.hostPlatform.system}";
|
||||
fetchurl (
|
||||
urls."${stdenvNoCC.hostPlatform.system}"
|
||||
or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}")
|
||||
);
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
|
||||
Generated
-1875
File diff suppressed because it is too large
Load Diff
@@ -1,45 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
pkg-config,
|
||||
openssl,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "degit-rs";
|
||||
version = "0.1.2-unstable-2021-09-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "psnszsn";
|
||||
repo = "degit-rs";
|
||||
rev = "c7dbeb75131510a79400838e081b90665c654c80";
|
||||
hash = "sha256-swyfKnYQ+I4elnDnJ0yPDUryiFXEVnrGt9xHWiEe6wo=";
|
||||
};
|
||||
|
||||
# The source repo doesn't provide a Cargo.lock file, so we need to create one
|
||||
postPatch = ''
|
||||
ln -s ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
|
||||
cargoLock.lockFile = ./Cargo.lock;
|
||||
|
||||
cargoHash = "sha256-bUoZsXU7iWK7MZ/hXk1JNUX1hN88lrU1mc1rrYuiCYs=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
# The test suite is not working for it requires a network connection,
|
||||
# so we disable it
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "Rust rewrite of degit";
|
||||
homepage = "https://github.com/psnszsn/degit-rs";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "degit";
|
||||
maintainers = with lib.maintainers; [ chillcicada ];
|
||||
};
|
||||
}
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "files-cli";
|
||||
version = "2.15.38";
|
||||
version = "2.15.44";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "files-cli";
|
||||
owner = "files-com";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bf87pCosw41yqnPeQ38t++jedRYKEn22wwuTSrmPvCo=";
|
||||
hash = "sha256-+5fGCHRjBbPgX2CdNyBS+cOXJYLK/HPwca0Gg+ZVEx0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-p5Fcs7xVsDBfJQLNbEqsJY2jwgoKrBRCi6Qadwr1azY=";
|
||||
vendorHash = "sha256-ofI/aaikK2O02XswK5WgDTCgnwDyfq0eR17WWJsOqH8=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
version = "3.5.1";
|
||||
version = "3.5.2";
|
||||
pname = "grafana-loki";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "loki";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-aDUQe4OJtrmZ9RXvNkS4lDne5fKzrzNm003ElA+IF5U=";
|
||||
hash = "sha256-sgAcrW5TpiCjnouvpYwo26eJ1Cfe7XPWNeWG8/59wSQ=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
-80
@@ -1,80 +0,0 @@
|
||||
From cc70ed70b19a712babd834806d6fc700b20c020a Mon Sep 17 00:00:00 2001
|
||||
From: Emily <hello@emily.moe>
|
||||
Date: Wed, 22 Jan 2025 23:25:51 +0000
|
||||
Subject: [PATCH 1/2] =?UTF-8?q?structs:=20Omit=20=E2=80=98free=E2=80=99=20?=
|
||||
=?UTF-8?q?field=20from=20=E2=80=98%config-entry=E2=80=99=20on=20libgit2?=
|
||||
=?UTF-8?q?=201.9+.?=
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
* configure.ac: Check for the ‘free’ field of ‘git_config_entry’.
|
||||
* git/configuration.scm.in (%have-config-entry-free?): New variable.
|
||||
* git/structs.scm (%config-entry): Omit ‘free’ field conditionally.
|
||||
---
|
||||
configure.ac | 10 ++++++++++
|
||||
git/configuration.scm.in | 4 ++++
|
||||
git/structs.scm | 4 +++-
|
||||
3 files changed, 17 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index b04ca6b..7f8f0b9 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -87,6 +87,16 @@ else
|
||||
fi
|
||||
AC_SUBST([HAVE_CONFIG_ENTRY_BACKEND_TYPE])
|
||||
|
||||
+dnl Does 'git_config_entry' have 'free'? Removed in 1.9.
|
||||
+AC_CHECK_MEMBER([git_config_entry.free], [], [],
|
||||
+ [[#include <git2.h>]])
|
||||
+if test "x$ac_cv_member_git_config_entry_free" = "xyes"; then
|
||||
+ HAVE_CONFIG_ENTRY_FREE="#true"
|
||||
+else
|
||||
+ HAVE_CONFIG_ENTRY_FREE="#false"
|
||||
+fi
|
||||
+AC_SUBST([HAVE_CONFIG_ENTRY_FREE])
|
||||
+
|
||||
dnl Does 'git_diff_options' have 'oid_type'? It's new in 1.7.
|
||||
AC_CHECK_MEMBER([git_diff_options.oid_type], [], [],
|
||||
[[#include <git2.h>]])
|
||||
diff --git a/git/configuration.scm.in b/git/configuration.scm.in
|
||||
index e10b195..864b9ff 100644
|
||||
--- a/git/configuration.scm.in
|
||||
+++ b/git/configuration.scm.in
|
||||
@@ -24,6 +24,7 @@
|
||||
%have-fetch-options-depth?
|
||||
%have-diff-options-oid-type?
|
||||
%have-config-entry-backend-type?
|
||||
+ %have-config-entry-free?
|
||||
%have-GIT_OPT_SET_SERVER_CONNECT_TIMEOUT?
|
||||
%have-GIT_OPT_SET_HOMEDIR?
|
||||
%have-GIT_OPT_SET_USER_AGENT_PRODUCT?))
|
||||
@@ -48,6 +49,9 @@
|
||||
(define %have-config-entry-backend-type?
|
||||
@HAVE_CONFIG_ENTRY_BACKEND_TYPE@)
|
||||
|
||||
+(define %have-config-entry-free?
|
||||
+ @HAVE_CONFIG_ENTRY_FREE@)
|
||||
+
|
||||
(define %have-GIT_OPT_SET_SERVER_CONNECT_TIMEOUT?
|
||||
@HAVE_GIT_OPT_SET_SERVER_CONNECT_TIMEOUT@)
|
||||
|
||||
diff --git a/git/structs.scm b/git/structs.scm
|
||||
index beebd11..b35ae6d 100644
|
||||
--- a/git/structs.scm
|
||||
+++ b/git/structs.scm
|
||||
@@ -505,7 +505,9 @@
|
||||
'())
|
||||
(include-depth ,unsigned-int)
|
||||
(level ,int) ;git_config_level_t
|
||||
- (free ,(bs:pointer int))
|
||||
+ ,@(if %have-config-entry-free?
|
||||
+ `(free ,(bs:pointer int))
|
||||
+ '())
|
||||
,@(if %have-config-entry-backend-type?
|
||||
'()
|
||||
`((payload ,(bs:pointer int))))))) ;removed in 1.8
|
||||
--
|
||||
2.47.0
|
||||
|
||||
-84
@@ -1,84 +0,0 @@
|
||||
From 595b850c85f55592b94d2218a12084fd7050b508 Mon Sep 17 00:00:00 2001
|
||||
From: Emily <hello@emily.moe>
|
||||
Date: Wed, 22 Jan 2025 23:55:45 +0000
|
||||
Subject: [PATCH 2/2] =?UTF-8?q?structs:=20Add=20=E2=80=98update-refs?=
|
||||
=?UTF-8?q?=E2=80=99=20field=20to=20=E2=80=98%remote-callbacks=E2=80=99=20?=
|
||||
=?UTF-8?q?on=20libgit2=201.9+.?=
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
* configure.ac: Check for the ‘update_refs’ field of
|
||||
‘git_remote_callbacks’.
|
||||
* git/configuration.scm.in (%have-remote-callbacks-update-refs?): New
|
||||
variable.
|
||||
* git/structs.scm (%remote-callbacks): Add ‘update-refs’ field
|
||||
conditionally.
|
||||
---
|
||||
configure.ac | 10 ++++++++++
|
||||
git/configuration.scm.in | 4 ++++
|
||||
git/structs.scm | 5 ++++-
|
||||
3 files changed, 18 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 7f8f0b9..a2575f4 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -107,6 +107,16 @@ else
|
||||
fi
|
||||
AC_SUBST([HAVE_DIFF_OPTIONS_OID_TYPE])
|
||||
|
||||
+dnl Does 'git_remote_callbacks' have 'update_refs'? New in 1.9.
|
||||
+AC_CHECK_MEMBER([git_remote_callbacks.update_refs], [], [],
|
||||
+ [[#include <git2.h>]])
|
||||
+if test "x$ac_cv_member_git_remote_callbacks_update_refs" = "xyes"; then
|
||||
+ HAVE_REMOTE_CALLBACKS_UPDATE_REFS="#true"
|
||||
+else
|
||||
+ HAVE_REMOTE_CALLBACKS_UPDATE_REFS="#false"
|
||||
+fi
|
||||
+AC_SUBST([HAVE_REMOTE_CALLBACKS_UPDATE_REFS])
|
||||
+
|
||||
dnl 'GIT_OPT_SET_SERVER_CONNECT_TIMEOUT' & co. are new in 1.7.
|
||||
GUILE_GIT_CHECK_DECLARATION([GIT_OPT_SET_SERVER_CONNECT_TIMEOUT])
|
||||
|
||||
diff --git a/git/configuration.scm.in b/git/configuration.scm.in
|
||||
index 864b9ff..1e82c24 100644
|
||||
--- a/git/configuration.scm.in
|
||||
+++ b/git/configuration.scm.in
|
||||
@@ -25,6 +25,7 @@
|
||||
%have-diff-options-oid-type?
|
||||
%have-config-entry-backend-type?
|
||||
%have-config-entry-free?
|
||||
+ %have-remote-callbacks-update-refs?
|
||||
%have-GIT_OPT_SET_SERVER_CONNECT_TIMEOUT?
|
||||
%have-GIT_OPT_SET_HOMEDIR?
|
||||
%have-GIT_OPT_SET_USER_AGENT_PRODUCT?))
|
||||
@@ -52,6 +53,9 @@
|
||||
(define %have-config-entry-free?
|
||||
@HAVE_CONFIG_ENTRY_FREE@)
|
||||
|
||||
+(define %have-remote-callbacks-update-refs?
|
||||
+ @HAVE_REMOTE_CALLBACKS_UPDATE_REFS@)
|
||||
+
|
||||
(define %have-GIT_OPT_SET_SERVER_CONNECT_TIMEOUT?
|
||||
@HAVE_GIT_OPT_SET_SERVER_CONNECT_TIMEOUT@)
|
||||
|
||||
diff --git a/git/structs.scm b/git/structs.scm
|
||||
index b35ae6d..664a7c1 100644
|
||||
--- a/git/structs.scm
|
||||
+++ b/git/structs.scm
|
||||
@@ -670,7 +670,10 @@ type to 'specified for this to take effect."
|
||||
(transport ,(bs:pointer uint8))
|
||||
(remote-ready ,(bs:pointer void))
|
||||
(payload ,(bs:pointer uint8))
|
||||
- (resolve-url ,(bs:pointer uint8)))))
|
||||
+ (resolve-url ,(bs:pointer uint8))
|
||||
+ ,@(if %have-remote-callbacks-update-refs?
|
||||
+ `((update-refs ,(bs:pointer uint8)))
|
||||
+ '()))))
|
||||
|
||||
(define-record-type <remote-callbacks>
|
||||
(%make-remote-callbacks bytestructure)
|
||||
--
|
||||
2.47.0
|
||||
|
||||
@@ -10,22 +10,17 @@
|
||||
texinfo,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "guile-git";
|
||||
version = "0.9.0";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "guile-git";
|
||||
repo = "guile-git";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lFBoA1VBJRHcZkP3h2gnlXQrMjDFWS4jl9RlF8VVf/Q=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ihKpEnng6Uemrguecbd25vElEhIu2Efb86aM8679TAc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./0001-structs-Omit-free-field-from-config-entry-on-libgit2.patch
|
||||
./0002-structs-Add-update-refs-field-to-remote-callbacks-on.patch
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
@@ -52,11 +47,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Bindings to Libgit2 for GNU Guile";
|
||||
homepage = "https://gitlab.com/guile-git/guile-git";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ ethancedwards8 ];
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ ethancedwards8 ];
|
||||
platforms = guile.meta.platforms;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -8,29 +8,29 @@
|
||||
|
||||
let
|
||||
pname = "hamrs-pro";
|
||||
version = "2.40.0";
|
||||
version = "2.41.1";
|
||||
|
||||
throwSystem = throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}";
|
||||
|
||||
srcs = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://hamrs-dist.s3.amazonaws.com/hamrs-pro-${version}-linux-x86_64.AppImage";
|
||||
hash = "sha256-DUqaF8DQu+iSpC6nnHT7l7kurN/L9yAhKOF47khkoDw=";
|
||||
hash = "sha256-HJXuxqIZU1dHf+ABb4rXnQkbQ1x7khpYiYq+0/HKZTs=";
|
||||
};
|
||||
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://hamrs-dist.s3.amazonaws.com/hamrs-pro-${version}-linux-arm64.AppImage";
|
||||
hash = "sha256-YloMNPvtprJzQ5/w0I9n7DtQLqyuzgVnQ60Yf6ueOjk=";
|
||||
hash = "sha256-pgMXAlOKxxzxJHMfM1fSfwmdKq2K1o7UVBQdeAwEIKE=";
|
||||
};
|
||||
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://hamrs-dist.s3.amazonaws.com/hamrs-pro-${version}-mac-x64.dmg";
|
||||
hash = "sha256-wgCXf6vTWZtlRjZCJYb5xYuWk7bpqiCDxVCTWR2ASxc=";
|
||||
hash = "sha256-kIvw18jvZCBJqdIL9fikSpKmZw+NDqFhCNvEO9gkvMA=";
|
||||
};
|
||||
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "https://hamrs-dist.s3.amazonaws.com/hamrs-pro-${version}-mac-arm64.dmg";
|
||||
hash = "sha256-WOWIjeQtOGwpa/vR8n/irzU491C5sb0VUKn1vBckpvs=";
|
||||
hash = "sha256-+zMXF8p/KcJrMbeFF2uHLBpqEmUtzN9rNVBD8+h1PG0=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "luau-lsp";
|
||||
version = "1.49.1";
|
||||
version = "1.52.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JohnnyMorganz";
|
||||
repo = "luau-lsp";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-CRfDJXAgofDV9yeF0C91rTLVVa+cqBvqbzlR90AYfVU=";
|
||||
hash = "sha256-ndHzpENa2VldaLLs9F8mgw+Ra7TQmEki12fTwpiqsEU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -5,7 +5,9 @@
|
||||
unzip,
|
||||
}:
|
||||
let
|
||||
info = (lib.importJSON ./info.json)."${stdenvNoCC.hostPlatform.parsed.cpu.name}-darwin";
|
||||
info =
|
||||
(lib.importJSON ./info.json)."${stdenvNoCC.hostPlatform.parsed.cpu.name}-darwin"
|
||||
or (throw "Unsupported CPU architecture: ${stdenvNoCC.hostPlatform.parsed.cpu.name}");
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "notion-app";
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "qir-runner";
|
||||
version = "0.8.2";
|
||||
version = "0.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qir-alliance";
|
||||
repo = "qir-runner";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-KskBPvRlTw4ITuoAXyY+CyFfgTW0RtbLWDa97ftFOTA=";
|
||||
hash = "sha256-k93I/DE8Jx0DbloBVNhKKay/L26H5TPX5yvkHKe/yBg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ llvmPackages_19.llvm ];
|
||||
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
|
||||
];
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-3Ww5PEvk1CqiJTqEUdinmcAfcHLQjctrlM4F3BPBWQw=";
|
||||
cargoHash = "sha256-U/9oDOPhlSL1ViW1n5C4MWRvUvU4c/cuATLNIx7FkiM=";
|
||||
|
||||
meta = {
|
||||
description = "QIR bytecode runner to assist with QIR development and validation";
|
||||
|
||||
@@ -8,17 +8,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "typstyle";
|
||||
version = "0.13.13";
|
||||
version = "0.13.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "typstyle-rs";
|
||||
repo = "typstyle";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-IAKCwKekeFekHBjfdC4pi74SXJzCDFoby3n1Z0Pu5q4=";
|
||||
hash = "sha256-rIbLYV4f+XaEkyIFkJL1Biwg+TnjHi7e9kvIlroiNNA=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-7TkL/bYcTFAPvr4gu5XPxcJdIuwpTyZ6aOEj/YB9F4I=";
|
||||
cargoHash = "sha256-YRsCuGvfSAUz0qsETIUcTKIchdkvleP3xJy0Hz+2BM0=";
|
||||
|
||||
# Disabling tests requiring network access
|
||||
checkFlags = [
|
||||
|
||||
@@ -144,7 +144,7 @@ let
|
||||
++ google-api-core.optional-dependencies.grpc
|
||||
++ unstructured.optional-dependencies.all-docs
|
||||
);
|
||||
version = "0.0.87";
|
||||
version = "0.0.89";
|
||||
unstructured_api_nltk_data = python3.pkgs.nltk.dataDir (d: [
|
||||
d.punkt
|
||||
d.averaged-perceptron-tagger
|
||||
@@ -158,7 +158,7 @@ stdenvNoCC.mkDerivation {
|
||||
owner = "Unstructured-IO";
|
||||
repo = "unstructured-api";
|
||||
rev = version;
|
||||
hash = "sha256-yb5m62OJWAGTwQBzCRGfeRc6/BCqGiYKYgdG/cslzgs=";
|
||||
hash = "sha256-FxWOR13wZwowZny2t4Frwl+cLMv+6nkHxQm9Xc4Y9Kw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "uxplay";
|
||||
version = "1.72.1";
|
||||
version = "1.72.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FDH2";
|
||||
repo = "UxPlay";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-qb4wsVPdT4rRQxHjLnft0C1D41IhA7M0ZqiLL65r3Ns=";
|
||||
hash = "sha256-xXYaaLYOlFoPObYOnBnj1LghTRaCSsOvQ7d019gyx9c=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -124,5 +124,7 @@ stdenv.mkDerivation (
|
||||
};
|
||||
}
|
||||
// lib.optionalAttrs (stdenv.hostPlatform.isDarwin) darwinAttrs
|
||||
// lib.optionalAttrs (stdenv.hostPlatform.isLinux) linuxAttrs.${stdenv.system}
|
||||
//
|
||||
lib.optionalAttrs (stdenv.hostPlatform.isLinux)
|
||||
linuxAttrs.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}")
|
||||
)
|
||||
|
||||
@@ -47,13 +47,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wxwidgets";
|
||||
version = "3.2.7.1";
|
||||
version = "3.2.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wxWidgets";
|
||||
repo = "wxWidgets";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-CKU0Aa78YrtGKLE9/MF9VNc2fmzPZ1j4lviX1aAv9cQ=";
|
||||
hash = "sha256-aXI59oN5qqds6u2/6MI7BYLbFPy3Yrfn2FGTfxlPG7o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@@ -24,7 +24,9 @@ let
|
||||
go-turbo = stdenv.mkDerivation {
|
||||
pname = "go-turbo";
|
||||
version = go-turbo-version;
|
||||
src = go-turbo-srcs.${stdenv.hostPlatform.system};
|
||||
src =
|
||||
go-turbo-srcs.${stdenv.hostPlatform.system}
|
||||
or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
dontBuild = true;
|
||||
installPhase = ''
|
||||
|
||||
@@ -484,6 +484,7 @@ stdenv.mkDerivation {
|
||||
"aarch64" = "AArch64";
|
||||
}
|
||||
.${targetPlatform.parsed.cpu.name}
|
||||
or (throw "Unsupported CPU architecture: ${targetPlatform.parsed.cpu.name}")
|
||||
}
|
||||
"
|
||||
buildProject llvm llvm-project/llvm
|
||||
|
||||
@@ -10,22 +10,18 @@
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage {
|
||||
pname = "chart-studio";
|
||||
version = "1.1.0-unstable-2024-07-23";
|
||||
version = "1.1.0-unstable-2025-01-30";
|
||||
pyproject = true;
|
||||
|
||||
# chart-studio was split from plotly
|
||||
src = fetchFromGitHub {
|
||||
owner = "plotly";
|
||||
repo = "plotly.py";
|
||||
# We use plotly's upstream version as it's the same repo, but chart studio has its own version number.
|
||||
rev = "v5.23.0";
|
||||
hash = "sha256-K1hEs00AGBCe2fgytyPNWqE5M0jU5ESTzynP55kc05Y=";
|
||||
repo = "chart-studio";
|
||||
rev = "44c7c43be0fe7e031ec281c86ee7dae0efa0619e";
|
||||
hash = "sha256-RekcZzUcunIqXOSriW+RvpLdvATQWTeRAiR8LFodfQg=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/packages/python/chart-studio";
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
@@ -36,6 +32,7 @@ buildPythonPackage rec {
|
||||
|
||||
nativeCheckInputs = [
|
||||
mock
|
||||
plotly
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
@@ -46,13 +43,12 @@ buildPythonPackage rec {
|
||||
# most tests talk to a network service, so only run ones that don't do that.
|
||||
enabledTestPaths = [
|
||||
"chart_studio/tests/test_core"
|
||||
"chart_studio/tests/test_plot_ly/test_api"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Utilities for interfacing with Plotly's Chart Studio service";
|
||||
homepage = "https://github.com/plotly/plotly.py/tree/master/packages/python/chart-studio";
|
||||
homepage = "https://github.com/plotly/chart-studio";
|
||||
license = with lib.licenses; [ mit ];
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ sarahec ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -55,6 +55,8 @@ buildPythonPackage rec {
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
pythonRelaxDeps = [ "setuptools" ];
|
||||
|
||||
pythonRemoveDeps = [ "patchelf" ];
|
||||
|
||||
dependencies =
|
||||
|
||||
@@ -40,14 +40,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "huggingface-hub";
|
||||
version = "0.33.2";
|
||||
version = "0.33.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "huggingface";
|
||||
repo = "huggingface_hub";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Com5lLcQqIPRvsXyqD5S3SW/1KmKEc85Rjxyc9iG5SY=";
|
||||
hash = "sha256-AYTK/PO4fcG0g3I03Vf8FAbeqegijNMeFDCHCcXASac=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -39,14 +39,14 @@ let
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-cpp-python";
|
||||
version = "0.3.9";
|
||||
version = "0.3.12";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "abetlen";
|
||||
repo = "llama-cpp-python";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-iw9teWZ612gUNM2Zm5WGdFTq7aNo8QRRIGeHoFpXdfQ=";
|
||||
hash = "sha256-TTGweGfav1uI2+87iUYc1Esmuor9sEZdZqSU2YVPCdQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
# src = /home/gaetan/llama-cpp-python;
|
||||
@@ -118,7 +118,10 @@ buildPythonPackage rec {
|
||||
pythonImportsCheck = [ "llama_cpp" ];
|
||||
|
||||
passthru = {
|
||||
updateScript = gitUpdater { rev-prefix = "v"; };
|
||||
updateScript = gitUpdater {
|
||||
rev-prefix = "v";
|
||||
allowedVersions = "^[.0-9]+$";
|
||||
};
|
||||
tests = lib.optionalAttrs stdenvTarget.hostPlatform.isLinux {
|
||||
withCuda = llama-cpp-python.override {
|
||||
cudaSupport = true;
|
||||
|
||||
@@ -38,14 +38,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "plotly";
|
||||
version = "6.1.2";
|
||||
version = "6.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "plotly";
|
||||
repo = "plotly.py";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-+vIq//pDLaaTmRGW+oytho3TfMmLCtuIoHeFenLVcek=";
|
||||
hash = "sha256-Vfj5jG0AkBjivExOx7oMoocTopWl0yMc1INpEbtlgTc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -105,27 +105,34 @@ buildPythonPackage rec {
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# fails to launch kaleido subprocess
|
||||
"tests/test_optional/test_kaleido"
|
||||
# numpy2 related error, RecursionError
|
||||
# See: https://github.com/plotly/plotly.py/issues/4852
|
||||
"tests/test_plotly_utils/validators/test_angle_validator.py"
|
||||
"tests/test_plotly_utils/validators/test_any_validator.py"
|
||||
"tests/test_plotly_utils/validators/test_color_validator.py"
|
||||
"tests/test_plotly_utils/validators/test_colorlist_validator.py"
|
||||
"tests/test_plotly_utils/validators/test_colorscale_validator.py"
|
||||
"tests/test_plotly_utils/validators/test_dataarray_validator.py"
|
||||
"tests/test_plotly_utils/validators/test_enumerated_validator.py"
|
||||
"tests/test_plotly_utils/validators/test_fig_deepcopy.py"
|
||||
"tests/test_plotly_utils/validators/test_flaglist_validator.py"
|
||||
"tests/test_plotly_utils/validators/test_infoarray_validator.py"
|
||||
"tests/test_plotly_utils/validators/test_integer_validator.py"
|
||||
"tests/test_plotly_utils/validators/test_number_validator.py"
|
||||
"tests/test_plotly_utils/validators/test_pandas_series_input.py"
|
||||
"tests/test_plotly_utils/validators/test_string_validator.py"
|
||||
"tests/test_plotly_utils/validators/test_xarray_input.py"
|
||||
];
|
||||
disabledTestPaths =
|
||||
[
|
||||
# Broken imports
|
||||
"plotly/matplotlylib/mplexporter/tests"
|
||||
# Fails to catch error when serializing document
|
||||
"tests/test_optional/test_kaleido/test_kaleido.py::test_defaults"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# fails to launch kaleido subprocess
|
||||
"tests/test_optional/test_kaleido"
|
||||
# numpy2 related error, RecursionError
|
||||
# See: https://github.com/plotly/plotly.py/issues/4852
|
||||
"tests/test_plotly_utils/validators/test_angle_validator.py"
|
||||
"tests/test_plotly_utils/validators/test_any_validator.py"
|
||||
"tests/test_plotly_utils/validators/test_color_validator.py"
|
||||
"tests/test_plotly_utils/validators/test_colorlist_validator.py"
|
||||
"tests/test_plotly_utils/validators/test_colorscale_validator.py"
|
||||
"tests/test_plotly_utils/validators/test_dataarray_validator.py"
|
||||
"tests/test_plotly_utils/validators/test_enumerated_validator.py"
|
||||
"tests/test_plotly_utils/validators/test_fig_deepcopy.py"
|
||||
"tests/test_plotly_utils/validators/test_flaglist_validator.py"
|
||||
"tests/test_plotly_utils/validators/test_infoarray_validator.py"
|
||||
"tests/test_plotly_utils/validators/test_integer_validator.py"
|
||||
"tests/test_plotly_utils/validators/test_number_validator.py"
|
||||
"tests/test_plotly_utils/validators/test_pandas_series_input.py"
|
||||
"tests/test_plotly_utils/validators/test_string_validator.py"
|
||||
"tests/test_plotly_utils/validators/test_xarray_input.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "plotly" ];
|
||||
|
||||
@@ -135,6 +142,9 @@ buildPythonPackage rec {
|
||||
downloadPage = "https://github.com/plotly/plotly.py";
|
||||
changelog = "https://github.com/plotly/plotly.py/blob/master/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ pandapip1 ];
|
||||
maintainers = with lib.maintainers; [
|
||||
pandapip1
|
||||
sarahec
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -23,14 +23,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymilvus";
|
||||
version = "2.5.11";
|
||||
version = "2.5.12";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "milvus-io";
|
||||
repo = "pymilvus";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-O8037LYuR6PX57s78OawPFyPrIi0ZFRX2vV3lC+wT0I=";
|
||||
hash = "sha256-IazZ/Cuy37k/gqLvM/2zqpx2IoL9uoWmiGtMWaTINg4=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -59,14 +59,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "transformers";
|
||||
version = "4.53.1";
|
||||
version = "4.53.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "huggingface";
|
||||
repo = "transformers";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-u9/wxvAJcLl4n7Netf1MZqRS3fajRWZAgciFSsXpZ9s=";
|
||||
hash = "sha256-uipCL3xY8+thCA9+zVop5+MZr4pY4UVB7uEHa4hzLYo=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -35,8 +35,11 @@ buildPythonPackage rec {
|
||||
inherit pname version format;
|
||||
python = "py3";
|
||||
dist = "py3";
|
||||
platform = platforms.${stdenv.hostPlatform.system} or { };
|
||||
sha256 = hashes.${stdenv.hostPlatform.system} or { };
|
||||
platform =
|
||||
platforms.${stdenv.hostPlatform.system}
|
||||
or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
sha256 =
|
||||
hashes.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -10,7 +10,9 @@ let
|
||||
fetchurl {
|
||||
name = "librusty_v8-${args.version}";
|
||||
url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a.gz";
|
||||
sha256 = args.shas.${stdenv.hostPlatform.system};
|
||||
sha256 =
|
||||
args.shas.${stdenv.hostPlatform.system}
|
||||
or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
meta = {
|
||||
inherit (args) version;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
|
||||
@@ -279,19 +279,24 @@ buildPythonPackage rec {
|
||||
"--timeout=1024"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Require docker access
|
||||
"tests/system_tests"
|
||||
disabledTestPaths =
|
||||
[
|
||||
# Require docker access
|
||||
"tests/system_tests"
|
||||
|
||||
# broke somewhere between sentry-sdk 2.15.0 and 2.22.0
|
||||
"tests/unit_tests/test_analytics/test_sentry.py"
|
||||
# broke somewhere between sentry-sdk 2.15.0 and 2.22.0
|
||||
"tests/unit_tests/test_analytics/test_sentry.py"
|
||||
|
||||
# Server connection times out under load
|
||||
"tests/unit_tests/test_wandb_login.py"
|
||||
# Server connection times out under load
|
||||
"tests/unit_tests/test_wandb_login.py"
|
||||
|
||||
# PermissionError: unable to write to .cache/wandb/artifacts
|
||||
"tests/unit_tests/test_artifacts/test_wandb_artifacts.py"
|
||||
];
|
||||
# PermissionError: unable to write to .cache/wandb/artifacts
|
||||
"tests/unit_tests/test_artifacts/test_wandb_artifacts.py"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# Breaks in sandbox: "Timed out waiting for wandb service to start"
|
||||
"tests/unit_tests/test_job_builder.py"
|
||||
];
|
||||
|
||||
disabledTests =
|
||||
[
|
||||
@@ -391,6 +396,15 @@ buildPythonPackage rec {
|
||||
|
||||
# RuntimeError: *** -[__NSPlaceholderArray initWithObjects:count:]: attempt to insert nil object from objects[1]
|
||||
"test_wandb_image_with_matplotlib_figure"
|
||||
|
||||
# AssertionError: assert 'did you mean https://api.wandb.ai' in '1'
|
||||
"test_login_bad_host"
|
||||
|
||||
# Asserttion error: 1 != 0 (testing system exit code)
|
||||
"test_login_host_trailing_slash_fix_invalid"
|
||||
|
||||
# Breaks in sandbox: "Timed out waiting for wandb service to start"
|
||||
"test_setup_offline"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "wandb" ];
|
||||
|
||||
@@ -170,6 +170,7 @@ let
|
||||
"aarch64" = "AArch64";
|
||||
}
|
||||
.${llvmStdenv.targetPlatform.parsed.cpu.name}
|
||||
or (throw "Unsupported CPU architecture: ${llvmStdenv.targetPlatform.parsed.cpu.name}")
|
||||
}";
|
||||
# -ffat-lto-objects = emit LTO object files that are compatible with non-LTO-supporting builds too
|
||||
# FatLTO objects are a special type of fat object file that contain LTO compatible IR in addition to generated object code,
|
||||
|
||||
@@ -532,6 +532,7 @@ mapAliases {
|
||||
deadpixi-sam = deadpixi-sam-unstable;
|
||||
|
||||
debugedit-unstable = throw "'debugedit-unstable' has been renamed to/replaced by 'debugedit'"; # Converted to throw 2024-10-17
|
||||
degit-rs = throw "'degit-rs' has been removed because it is unmaintained upstream and has vulnerable dependencies."; # Added 2025-07-11
|
||||
deltachat-cursed = arcanechat-tui; # added 2025-02-25
|
||||
deltachat-electron = throw "'deltachat-electron' has been renamed to/replaced by 'deltachat-desktop'"; # Converted to throw 2024-10-17
|
||||
|
||||
|
||||
@@ -1387,6 +1387,8 @@ with pkgs;
|
||||
pkgsCross.gnu32.callPackage ../applications/emulators/box86 args
|
||||
else if stdenv.hostPlatform.isAarch64 then
|
||||
pkgsCross.armv7l-hf-multiplatform.callPackage ../applications/emulators/box86 args
|
||||
else if stdenv.hostPlatform.isRiscV64 then
|
||||
pkgsCross.riscv32.callPackage ../applications/emulators/box86 args
|
||||
else
|
||||
throw "Don't know 32-bit platform for cross from: ${stdenv.hostPlatform.stdenv}";
|
||||
|
||||
|
||||
@@ -10657,12 +10657,12 @@ self: super: with self; {
|
||||
|
||||
openai = callPackage ../development/python-modules/openai { };
|
||||
|
||||
openai-agents = callPackage ../development/python-modules/openai-agents { };
|
||||
|
||||
openai-whisper = callPackage ../development/python-modules/openai-whisper { };
|
||||
|
||||
openaiauth = callPackage ../development/python-modules/openaiauth { };
|
||||
|
||||
openai-agents = callPackage ../development/python-modules/openai-agents { };
|
||||
|
||||
openant = callPackage ../development/python-modules/openant { };
|
||||
|
||||
openapi-core = callPackage ../development/python-modules/openapi-core { };
|
||||
|
||||
Reference in New Issue
Block a user