Merge master into staging-next
This commit is contained in:
+1
-1
@@ -432,7 +432,7 @@ in
|
||||
*/
|
||||
oldestSupportedRelease =
|
||||
# Update on master only. Do not backport.
|
||||
2505;
|
||||
2511;
|
||||
|
||||
/**
|
||||
Whether a feature is supported in all supported releases (at the time of
|
||||
|
||||
@@ -20,7 +20,7 @@ let
|
||||
};
|
||||
|
||||
plugins."io.containerd.grpc.v1.cri" = {
|
||||
sandbox_image = "pause:latest";
|
||||
sandbox_image = "docker.io/library/pause:latest";
|
||||
|
||||
cni = {
|
||||
bin_dir = "/opt/cni/bin";
|
||||
|
||||
@@ -371,7 +371,6 @@ in
|
||||
--hostname-override=${cfg.hostname} \
|
||||
--kubeconfig=${kubeconfig} \
|
||||
${optionalString (cfg.nodeIp != null) "--node-ip=${cfg.nodeIp}"} \
|
||||
--pod-infra-container-image=pause \
|
||||
${optionalString (cfg.manifests != { }) "--pod-manifest-path=/etc/${manifestPath}"} \
|
||||
${optionalString (taints != "") "--register-with-taints=${taints}"} \
|
||||
--root-dir=${top.dataDir} \
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "mame2003-plus";
|
||||
version = "0-unstable-2025-12-30";
|
||||
version = "0-unstable-2026-01-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "mame2003-plus-libretro";
|
||||
rev = "f6c6d9d3e436e355430f70cd4c85349259abcddb";
|
||||
hash = "sha256-skAK95mdoQc4mr5E4KXmQdhr1NMppch20Aa1yZuJGis=";
|
||||
rev = "9e119625ae7aab771c6f12e6e5ffccfd24b3bd4d";
|
||||
hash = "sha256-Zso1EmJ+JH+eynV87tBUWGq9sPqhMwSHmc4gbF94btE=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -1,17 +1,13 @@
|
||||
diff --color -urpN obs-vertical-canvas.bak/file-updater.c obs-vertical-canvas/file-updater.c
|
||||
--- obs-vertical-canvas.bak/file-updater.c 2025-07-18 18:32:13.239718611 -0400
|
||||
+++ obs-vertical-canvas/file-updater.c 2025-07-18 18:32:30.732020377 -0400
|
||||
@@ -67,10 +67,10 @@ static bool do_http_request(struct updat
|
||||
curl_easy_setopt(info->curl, CURLOPT_ERRORBUFFER, info->error);
|
||||
curl_easy_setopt(info->curl, CURLOPT_WRITEFUNCTION, http_write);
|
||||
curl_easy_setopt(info->curl, CURLOPT_WRITEDATA, info);
|
||||
- curl_easy_setopt(info->curl, CURLOPT_FAILONERROR, true);
|
||||
- curl_easy_setopt(info->curl, CURLOPT_NOSIGNAL, 1);
|
||||
+ curl_easy_setopt(info->curl, CURLOPT_FAILONERROR, 1L);
|
||||
+ curl_easy_setopt(info->curl, CURLOPT_NOSIGNAL, 1L);
|
||||
curl_easy_setopt(info->curl, CURLOPT_ACCEPT_ENCODING, "");
|
||||
- curl_easy_setopt(info->curl, CURLOPT_SSL_OPTIONS, CURLSSLOPT_REVOKE_BEST_EFFORT);
|
||||
+ curl_easy_setopt(info->curl, CURLOPT_SSL_OPTIONS, (long)CURLSSLOPT_REVOKE_BEST_EFFORT);
|
||||
|
||||
code = curl_easy_perform(info->curl);
|
||||
if (code != CURLE_OK) {
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 10ef443..5db6d37 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -28,7 +28,7 @@ endif()
|
||||
find_package(Qt6 COMPONENTS Widgets Core)
|
||||
if(BUILD_OUT_OF_TREE)
|
||||
if(OS_LINUX OR OS_FREEBSD OR OS_OPENBSD)
|
||||
- find_package(Qt6 REQUIRED Gui)
|
||||
+ find_package(Qt6 REQUIRED GuiPrivate)
|
||||
endif()
|
||||
endif()
|
||||
target_link_libraries(${PROJECT_NAME} PRIVATE Qt::Core Qt::Widgets)
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "obs-vertical-canvas";
|
||||
version = "1.4.10";
|
||||
version = "1.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Aitum";
|
||||
repo = "obs-vertical-canvas";
|
||||
rev = version;
|
||||
sha256 = "sha256-0XfJ8q8n2ANO0oDtLZhZjRunZ5S1EouQ6Ak/pxEQYOQ=";
|
||||
sha256 = "sha256-tvoNdv0HkGch8FZCiK7S4BR7iWOqLvTj0blFxyyUjQE=";
|
||||
};
|
||||
|
||||
# Remove after https://github.com/Aitum/obs-vertical-canvas/pull/25 is released :)
|
||||
# Remove after https://github.com/Aitum/obs-vertical-canvas/pull/26 is released :)
|
||||
patches = [ ./obs-vertical-canvas.diff ];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
@@ -45,7 +45,10 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
description = "Plugin for OBS Studio to add vertical canvas";
|
||||
homepage = "https://github.com/Aitum/obs-vertical-canvas";
|
||||
maintainers = with lib.maintainers; [ flexiondotorg ];
|
||||
maintainers = with lib.maintainers; [
|
||||
flexiondotorg
|
||||
jonhermansen
|
||||
];
|
||||
license = lib.licenses.gpl2Plus;
|
||||
inherit (obs-studio.meta) platforms;
|
||||
};
|
||||
|
||||
@@ -15,6 +15,7 @@ let
|
||||
fetchLFS = false;
|
||||
forceFetchGit = false;
|
||||
leaveDotGit = null;
|
||||
postCheckout = "";
|
||||
rootDir = "";
|
||||
sparseCheckout = null;
|
||||
};
|
||||
|
||||
@@ -8,6 +8,25 @@
|
||||
hash = "sha256-7DszvbCNTjpzGRmpIVAWXk20P0/XTrWZ79KSOGLrUWY=";
|
||||
};
|
||||
|
||||
simple-tag = testers.invalidateFetcherByDrvHash fetchFromGitHub {
|
||||
name = "simple-tag-nix-source";
|
||||
owner = "NixOS";
|
||||
repo = "nix";
|
||||
rev = "2.3.15";
|
||||
hash = "sha256-7DszvbCNTjpzGRmpIVAWXk20P0/XTrWZ79KSOGLrUWY=";
|
||||
};
|
||||
|
||||
describe-tag = testers.invalidateFetcherByDrvHash fetchFromGitHub {
|
||||
name = "describe-tag-nix-source";
|
||||
owner = "NixOS";
|
||||
repo = "nix";
|
||||
rev = "2.3.15";
|
||||
hash = "sha256-y7l+46lVP2pzJwGON5qEV0EoxWofRoWAym5q9VXvpc8=";
|
||||
postCheckout = ''
|
||||
{ git -C "$out" describe || echo "git describe failed"; } | tee "$out"/describe-output.txt
|
||||
'';
|
||||
};
|
||||
|
||||
sparseCheckout = testers.invalidateFetcherByDrvHash fetchFromGitHub {
|
||||
name = "sparse-checkout-nix-source";
|
||||
owner = "NixOS";
|
||||
|
||||
@@ -9,26 +9,26 @@ let
|
||||
inherit (stdenv) hostPlatform;
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://downloads.cursor.com/lab/2025.12.17-996666f/linux/x64/agent-cli-package.tar.gz";
|
||||
hash = "sha256-dJ45VoAsSrfTCt3GdS/t9gfT5yie+TjJdNGd2ZrQEAI=";
|
||||
url = "https://downloads.cursor.com/lab/2026.01.02-80e4d9b/linux/x64/agent-cli-package.tar.gz";
|
||||
hash = "sha256-xQml5yMZ2cjBvG2J8mH5Ai65ZArt3kOkstwS245RP1k=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://downloads.cursor.com/lab/2025.12.17-996666f/linux/arm64/agent-cli-package.tar.gz";
|
||||
hash = "sha256-orJS8JmQ0nOhhgU8Slz5hAJ381l9VmMVsmH2Lp3oTec=";
|
||||
url = "https://downloads.cursor.com/lab/2026.01.02-80e4d9b/linux/arm64/agent-cli-package.tar.gz";
|
||||
hash = "sha256-PpI3CgFi5hWZyKKRybolm8UZnPf3qAEH7+MqPkwsFUo=";
|
||||
};
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://downloads.cursor.com/lab/2025.12.17-996666f/darwin/x64/agent-cli-package.tar.gz";
|
||||
hash = "sha256-3f42EdqyjBMVxOqNhdHtmTwRqhW2/GUnmA6PBurXPNg=";
|
||||
url = "https://downloads.cursor.com/lab/2026.01.02-80e4d9b/darwin/x64/agent-cli-package.tar.gz";
|
||||
hash = "sha256-F5DwlZYK79ZNSZS9BhTMD6ryUbbkLHqaDnwhQtmtLKc=";
|
||||
};
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "https://downloads.cursor.com/lab/2025.12.17-996666f/darwin/arm64/agent-cli-package.tar.gz";
|
||||
hash = "sha256-+loTRjtY7x5UYDKK98+RGRFn3cfp5FmHlGFep8p7ijs=";
|
||||
url = "https://downloads.cursor.com/lab/2026.01.02-80e4d9b/darwin/arm64/agent-cli-package.tar.gz";
|
||||
hash = "sha256-By3afWNXURIcmaZjFk9f0Aw0Z54S3zrgeYwzX0lTBD0=";
|
||||
};
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "cursor-cli";
|
||||
version = "0-unstable-2025-12-17";
|
||||
version = "0-unstable-2026-01-02";
|
||||
|
||||
src = sources.${hostPlatform.system};
|
||||
|
||||
|
||||
@@ -8,18 +8,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "filebeat";
|
||||
version = "8.19.7";
|
||||
version = "8.19.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elastic";
|
||||
repo = "beats";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-HvucctY+bXy9wyQxmeR724Hu4UAUXUj0KGjN4dyuCaU=";
|
||||
hash = "sha256-ysxy4kMUvIYDoWjDF9gwXByAwdCh0Taw3JFCxh9j/Gk=";
|
||||
};
|
||||
|
||||
proxyVendor = true; # darwin/linux hash mismatch
|
||||
|
||||
vendorHash = "sha256-EWdZHVYEMp7SE8vYXc9YYYDlK+rrIM+B6nDNEwFAK4o=";
|
||||
vendorHash = "sha256-WvJwFmnT7m4757yMKhuj3RS/NuzkoH9zlda94OpoYNg=";
|
||||
|
||||
subPackages = [ "filebeat" ];
|
||||
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fna3d";
|
||||
version = "25.12";
|
||||
version = "26.01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FNA-XNA";
|
||||
repo = "FNA3D";
|
||||
tag = version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-nrCBW3UypXUYAt7Ccr3w64QikmN/Vg5TSlQ19/g+anM=";
|
||||
hash = "sha256-MlSaB7PNw3lBIgbLlU1o2lk4LGIJDLRzxddZYSju5jY=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}-universal-mac.zip";
|
||||
hash = "sha256-bHpKJw/eIJt9l/wJ1qwZ3CS6TPw0RraM/YpukbOuuqo=";
|
||||
hash = "sha256-U4dRxWZ/0EJWeFhTJkocSFhlks11gSPn3z68k2/1FB0=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@@ -13,7 +13,7 @@ let
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}.AppImage";
|
||||
hash = "sha256-ihFq+P200Jqi7PRIRXs/3TMiQ0rvwld+TE7fxeLjDGI=";
|
||||
hash = "sha256-C3KTa+fs8Mnpz/UELKX+nb6yp6kvdM9+uX5d6Ht2q1w=";
|
||||
}
|
||||
else
|
||||
throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}";
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
callPackage,
|
||||
}:
|
||||
let
|
||||
version = "5.6.250";
|
||||
version = "5.6.251";
|
||||
pname = "gdevelop";
|
||||
meta = {
|
||||
description = "Graphical Game Development Studio";
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
gcc15Stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprlang";
|
||||
version = "0.6.7";
|
||||
version = "0.6.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "hyprlang";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-54ltTSbI6W+qYGMchAgCR6QnC1kOdKXN6X6pJhOWxFg=";
|
||||
hash = "sha256-ZGzcH3gKD9nj8oDLV1+o6ice6kMHZRXkNx24cfyPkRs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,10 +7,10 @@
|
||||
let
|
||||
pname = "lmstudio";
|
||||
|
||||
version_aarch64-darwin = "0.3.35-1";
|
||||
hash_aarch64-darwin = "sha256-iyWioENma74zWkSa+TX/P7vDByz/F8FzY+D9TC2wU6M=";
|
||||
version_x86_64-linux = "0.3.35-1";
|
||||
hash_x86_64-linux = "sha256-rZv5jpH/E7XuodJvFFfI18S+0ku7QZVR1cv/SEA4CVM=";
|
||||
version_aarch64-darwin = "0.3.36-1";
|
||||
hash_aarch64-darwin = "sha256-hLxuQIRUqXHtI+d2Vg/2pbaazjrDVTa0q16hnc9fshk=";
|
||||
version_x86_64-linux = "0.3.36-1";
|
||||
hash_x86_64-linux = "sha256-Yw1BAQ9oKvKxhQI4WwShRn+uIpcHJUhCzH6pY141EaU=";
|
||||
|
||||
meta = {
|
||||
description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "lrcsnc";
|
||||
version = "0.1.1";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Endg4meZer0";
|
||||
repo = "lrcsnc";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-fXsXRv6h7HfEUhszxSIxv2mnkrm7DLm4Zpw7/beNn2I=";
|
||||
hash = "sha256-U1wq3x9GkwJYoR7jA3EtRcFd6UkMf5UGWuBeG+6DYLY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ww+SXy29woGlb120sj1oGb4MIQJzpBCKGpUKYsYxTMk=";
|
||||
|
||||
@@ -72,7 +72,7 @@ python3Packages.buildPythonApplication rec {
|
||||
pytestFlags = [ "tests/cli/test_clipboard.py" ];
|
||||
|
||||
disabledTests = [
|
||||
# AssertionError: assert '/nix/store/rlq03x4cwf8zn73hxaxnx0zn5q9kifls-bash-5.3p3/bin/sh:
|
||||
# AssertionError: assert '/nix/store/00000000000000000000000000000000-bash-5.3p3/bin/sh:
|
||||
# warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8): No such file or directory\n' == ''
|
||||
"test_decodes_non_utf8_bytes"
|
||||
"test_runs_echo_successfully"
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nixbit";
|
||||
version = "0.6.2";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pbek";
|
||||
repo = "nixbit";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Vbv6+d0jUNxI7TP06vIey3a7fCzX/jgnNJZ18ntBN2k=";
|
||||
hash = "sha256-wh7pXUinqjlNA2gGbxY/48f4yScqWqQTWF9SIPOz3/w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "optinix";
|
||||
version = "0.1.4";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "hmajid2301";
|
||||
repo = "optinix";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-OuzLTygfJj1ILT0lAcBC28vU5YLuq0ErZHsLHoQNWBA=";
|
||||
hash = "sha256-cFzu88EFo27c6r7pqYDzMj9z1jPx4RxcylKYa4yxZXo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-gnxG4VqdZbGQyXc1dl3pU7yr3BbZPH17OLAB3dffcrk=";
|
||||
vendorHash = "sha256-b834KT/5P49hW6SqG6fPSiOanzQ1oAfpZ8wNkJP6pNs=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
diff --git a/cmake/Pcsx2Utils.cmake b/cmake/Pcsx2Utils.cmake
|
||||
index 87f012c..052f1be 100644
|
||||
--- a/cmake/Pcsx2Utils.cmake
|
||||
+++ b/cmake/Pcsx2Utils.cmake
|
||||
@@ -44,7 +44,6 @@ function(detect_compiler)
|
||||
endfunction()
|
||||
|
||||
function(get_git_version_info)
|
||||
- set(PCSX2_GIT_REV "")
|
||||
set(PCSX2_GIT_TAG "")
|
||||
set(PCSX2_GIT_HASH "")
|
||||
if (GIT_FOUND AND EXISTS ${PROJECT_SOURCE_DIR}/.git)
|
||||
@@ -1,25 +0,0 @@
|
||||
diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
|
||||
index 504b7a3..100a024 100644
|
||||
--- a/cmake/SearchForStuff.cmake
|
||||
+++ b/cmake/SearchForStuff.cmake
|
||||
@@ -107,7 +107,7 @@ disable_compiler_warnings_for_target(cubeb)
|
||||
disable_compiler_warnings_for_target(speex)
|
||||
|
||||
# Find the Qt components that we need.
|
||||
-find_package(Qt6 6.7.3 COMPONENTS CoreTools Core GuiTools Gui WidgetsTools Widgets LinguistTools REQUIRED)
|
||||
+find_package(Qt6 6.7.3 COMPONENTS CoreTools Core CorePrivate GuiTools Gui GuiPrivate WidgetsTools Widgets WidgetsPrivate LinguistTools REQUIRED)
|
||||
|
||||
if(WIN32)
|
||||
add_subdirectory(3rdparty/rainterface EXCLUDE_FROM_ALL)
|
||||
diff --git a/pcsx2-qt/CMakeLists.txt b/pcsx2-qt/CMakeLists.txt
|
||||
index a62df95..4883c64 100644
|
||||
--- a/pcsx2-qt/CMakeLists.txt
|
||||
+++ b/pcsx2-qt/CMakeLists.txt
|
||||
@@ -266,6 +266,7 @@ target_link_libraries(pcsx2-qt PRIVATE
|
||||
Qt6::Core
|
||||
Qt6::Gui
|
||||
Qt6::Widgets
|
||||
+ Qt6::GuiPrivate
|
||||
KDAB::kddockwidgets
|
||||
)
|
||||
|
||||
@@ -35,8 +35,8 @@ let
|
||||
pcsx2_patches = fetchFromGitHub {
|
||||
owner = "PCSX2";
|
||||
repo = "pcsx2_patches";
|
||||
rev = "9b193aa0a61f5e93d3bd4124b111e8f296ef9fa8";
|
||||
hash = "sha256-1hhdjFxJCNfeO/FIAnjRHESfiyzkErYddZqpRxzG7VQ=";
|
||||
rev = "37b2b6b85dd8a02f3adf5282a7d1aaa3ab493836";
|
||||
hash = "sha256-UkILUj59Mo/pGqe6wfrkJp0h15afyFx0mbZiGcoGkBA=";
|
||||
};
|
||||
|
||||
inherit (qt6)
|
||||
@@ -49,30 +49,28 @@ let
|
||||
in
|
||||
llvmPackages.stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pcsx2";
|
||||
version = "2.4.0";
|
||||
version = "2.6.0";
|
||||
src = fetchFromGitHub {
|
||||
pname = "pcsx2-source";
|
||||
owner = "PCSX2";
|
||||
repo = "pcsx2";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-R+BdywkZKxR/+Z+o1512O3A1mg9A6s7i+JZjFyUbJVs=";
|
||||
hash = "sha256-v1kSQbJSp7kJNL9KKyLXAsMDjPGIhMraq6ywa7TMq6Y=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Remove PCSX2_GIT_REV
|
||||
./0000-define-rev.patch
|
||||
|
||||
./remove-cubeb-vendor.patch
|
||||
|
||||
# Based on https://github.com/PCSX2/pcsx2/commit/8dffc857079e942ca77b091486c20c3c6530e4ed which doesn't apply cleanly
|
||||
./fix-qt-6.10.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace cmake/Pcsx2Utils.cmake \
|
||||
--replace-fail 'set(PCSX2_GIT_TAG "")' 'set(PCSX2_GIT_TAG "${finalAttrs.src.tag}")'
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "PACKAGE_MODE" true)
|
||||
(lib.cmakeBool "DISABLE_ADVANCE_SIMD" true)
|
||||
(lib.cmakeBool "USE_LINKED_FFMPEG" true)
|
||||
(lib.cmakeFeature "PCSX2_GIT_REV" finalAttrs.src.tag)
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -14,20 +14,3 @@ index ff66f9c..e177c90 100644
|
||||
|
||||
# Find the Qt components that we need.
|
||||
find_package(Qt6 6.7.2 COMPONENTS CoreTools Core GuiTools Gui WidgetsTools Widgets LinguistTools REQUIRED)
|
||||
diff --git a/pcsx2/Host/CubebAudioStream.cpp b/pcsx2/Host/CubebAudioStream.cpp
|
||||
index 4cd9993..74c2f5a 100644
|
||||
--- a/pcsx2/Host/CubebAudioStream.cpp
|
||||
+++ b/pcsx2/Host/CubebAudioStream.cpp
|
||||
@@ -288,9 +288,9 @@ std::vector<std::pair<std::string, std::string>> AudioStream::GetCubebDriverName
|
||||
std::vector<std::pair<std::string, std::string>> names;
|
||||
names.emplace_back(std::string(), TRANSLATE_STR("AudioStream", "Default"));
|
||||
|
||||
- const char** cubeb_names = cubeb_get_backend_names();
|
||||
- for (u32 i = 0; cubeb_names[i] != nullptr; i++)
|
||||
- names.emplace_back(cubeb_names[i], cubeb_names[i]);
|
||||
+ cubeb_backend_names backends = cubeb_get_backend_names();
|
||||
+ for (u32 i = 0; i < backends.count; i++)
|
||||
+ names.emplace_back(backends.names[i], backends.names[i]);
|
||||
|
||||
return names;
|
||||
}
|
||||
|
||||
@@ -10,7 +10,4 @@ update-source-version pcsx2 \
|
||||
--rev=$latestPatchesRev \
|
||||
--source-key=pcsx2_patches
|
||||
|
||||
latestVersion="`curl "https://api.github.com/repos/PCSX2/pcsx2/releases/latest" \
|
||||
| jq -r ".tag_name[1:]"`"
|
||||
|
||||
nix-update pcsx2 --version=$latestVersion
|
||||
nix-update pcsx2 --use-github-releases
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
{
|
||||
lib,
|
||||
python3,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "raccoon-scanner";
|
||||
version = "0.8.5-unstable-2025-06-10";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evyatarmeged";
|
||||
repo = "Raccoon";
|
||||
rev = "44024abaa6ca420b6b2c6f06285df306f360eb22";
|
||||
hash = "sha256-jcZKjQR92brWcB1+WSKkpoE0V5TLkfDCRu8TQY/hkoc=";
|
||||
};
|
||||
|
||||
build-system = with python3.pkgs; [ setuptools ];
|
||||
|
||||
dependencies = with python3.pkgs; [
|
||||
beautifulsoup4
|
||||
click
|
||||
dnspython
|
||||
fake-useragent
|
||||
lxml
|
||||
pysocks
|
||||
requests
|
||||
setuptools
|
||||
xmltodict
|
||||
];
|
||||
|
||||
# Project has no test
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "Tool for reconnaissance and vulnerability scanning";
|
||||
homepage = "https://github.com/evyatarmeged/Raccoon";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
mainProgram = "raccoon";
|
||||
};
|
||||
})
|
||||
@@ -22,16 +22,16 @@ let
|
||||
in
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "shogihome";
|
||||
version = "1.26.0";
|
||||
version = "1.26.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sunfish-shogi";
|
||||
repo = "shogihome";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Mq5fmxecPqb0YH4vgzAKiZ+5f77acQRoodJaqJqjjQI=";
|
||||
hash = "sha256-7kDk85tN4uP0WJnof8yyn0M85Qairls5ZqhKwwhRQxc=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-iFAIwvM0SjZiLfY0Ejdk1TlKEJDh/bx3fdzkzNBOkkE=";
|
||||
npmDepsHash = "sha256-Sft5fEf86o1uUJ+yszx9XgQBGNRc+9aKRyR5rOelgQw=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace package.json \
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "spacectl";
|
||||
version = "1.17.0";
|
||||
version = "1.17.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spacelift-io";
|
||||
repo = "spacectl";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-j9c8RZfm5RWcXAy8LUtIZrztfVhXiAWmCJ/Rwq5IiKo=";
|
||||
hash = "sha256-hn1BCDwDhIOPxl5FkJ96gPIvjvVFwa9jscyfCkVc9/0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-g5Y6NuG8z2Pnh3Ng690FcwOrEU2EOhftZbM8oUFj4B4=";
|
||||
vendorHash = "sha256-f/09XZiaYNUZzKM0jITFdUmKt8UQy90K4PGhC6ZupCk=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
buildGoModule {
|
||||
pname = "starlark";
|
||||
version = "0-unstable-2025-12-22";
|
||||
version = "0-unstable-2026-01-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "starlark-go";
|
||||
rev = "15019ee33dea8b618e081116e29a613c9aa050ea";
|
||||
hash = "sha256-BIWOmJwtTxjXTc48Mamm6uqPTNd7DMeURfQ2rYX4Ecs=";
|
||||
rev = "3fee463870c9e2f24e391952f5cf5e95463357b4";
|
||||
hash = "sha256-5tqa2W7OxBJJzO187LSwDluwjGIbFtMvOjhHpgaNGZk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-8drlCBy+KROyqXzm/c+HBe/bMVOyvwRoLHxOApJhMfo=";
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xmake";
|
||||
version = "3.0.5";
|
||||
version = "3.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xmake-io";
|
||||
repo = "xmake";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-rmChbjWRFL2vchifupLBraalMHYze035xjLNLCYzwm8=";
|
||||
hash = "sha256-uQeq9VMwvU4PnY+w+6Z/qivTIKPgSxuQu6bZgKn/AQM=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -162,7 +162,15 @@ buildPythonPackage rec {
|
||||
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
|
||||
# RuntimeError: torch_shm_manager: execl failed: Permission denied
|
||||
"CheckpointTest"
|
||||
];
|
||||
]
|
||||
++
|
||||
lib.optionals
|
||||
(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 && (pythonAtLeast "3.14"))
|
||||
[
|
||||
# https://github.com/huggingface/accelerate/issues/3899
|
||||
"test_accelerate_test"
|
||||
"test_cpu"
|
||||
];
|
||||
|
||||
disabledTestPaths = lib.optionals (!(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64)) [
|
||||
# numerous instances of torch.multiprocessing.spawn.ProcessRaisedException:
|
||||
|
||||
@@ -58,9 +58,10 @@
|
||||
pytest-xdist,
|
||||
hypothesis,
|
||||
writableTmpDirAsHomeHook,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "atopile";
|
||||
version = "0.12.4";
|
||||
pyproject = true;
|
||||
@@ -70,7 +71,7 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "atopile";
|
||||
repo = "atopile";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-SB6D1738t3kQJI+V9ClVsByHm6BsLl078N/wDAHJE6E=";
|
||||
};
|
||||
|
||||
@@ -143,7 +144,9 @@ buildPythonPackage rec {
|
||||
pytest-datafiles
|
||||
pytest-timeout
|
||||
hypothesis
|
||||
versionCheckHook
|
||||
];
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
preCheck = ''
|
||||
# do not report worker logs to filee
|
||||
@@ -185,6 +188,7 @@ buildPythonPackage rec {
|
||||
disabledTests = [
|
||||
# timeout
|
||||
"test_build_error_logging"
|
||||
"test_can_evaluate_literals"
|
||||
"test_examples_build"
|
||||
"test_net_names_deterministic"
|
||||
"test_performance_mifs_bus_params"
|
||||
@@ -224,9 +228,9 @@ buildPythonPackage rec {
|
||||
description = "Design circuit boards with code";
|
||||
homepage = "https://atopile.io";
|
||||
downloadPage = "https://github.com/atopile/atopile";
|
||||
changelog = "https://github.com/atopile/atopile/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/atopile/atopile/releases/tag/${finalAttrs.src.tag}";
|
||||
license = with lib.licenses; [ mit ];
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
mainProgram = "ato";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
pytestCheckHook,
|
||||
pythonAtLeast,
|
||||
writableTmpDirAsHomeHook,
|
||||
pkgs,
|
||||
}:
|
||||
@@ -15,19 +16,27 @@ in
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "icdiff";
|
||||
version = "2.0.7";
|
||||
version = "2.0.8-unstable-2025-11-11";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jeffkaufman";
|
||||
repo = "icdiff";
|
||||
tag = "release-${version}";
|
||||
hash = "sha256-XOw/xhPGlzi1hAgzQ1EtioUM476A+lQWLlvvaxd9j08=";
|
||||
rev = "ee4643ae3976ca023dab534eb59b911f16f762ac";
|
||||
hash = "sha256-XV88WjZDc2NSQ5CEahr8KXLXrBACvIWOavMUPeoPGOw=";
|
||||
leaveDotGit = true;
|
||||
};
|
||||
|
||||
patches = [ ./0001-Don-t-test-black-or-flake8.patch ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace test.sh \
|
||||
--replace-fail "check_gold 1 gold-exclude.txt" "# check_gold 1 gold-exclude.txt" \
|
||||
--replace-fail "check_gold 1 gold-strip-cr-off.txt" "# check_gold 1 gold-strip-cr-off.txt" \
|
||||
--replace-fail "check_gold 1 gold-strip-cr-on.txt" "# check_gold 1 gold-strip-cr-on.txt" \
|
||||
--replace-fail "check_gold 1 gold-no-cr-indent" "# check_gold 1 gold-no-cr-indent"
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonImportsCheck = [ "icdiff" ];
|
||||
|
||||
@@ -22,14 +22,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llm-ollama";
|
||||
version = "0.14.0";
|
||||
version = "0.15.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "taketwo";
|
||||
repo = "llm-ollama";
|
||||
tag = version;
|
||||
hash = "sha256-8ELjUpHaIC8BOcmyQNeyQDPxQ5vO4Pj6FFnHFhvP+r0=";
|
||||
hash = "sha256-iSLLFC+kYcKq6VOYspkgUyTobU6qUs7FxoAXBmm8H44=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
pytestCheckHook,
|
||||
pythonAtLeast,
|
||||
pythonOlder,
|
||||
replaceVars,
|
||||
setuptools,
|
||||
@@ -249,6 +250,13 @@ let
|
||||
# TypeError: CliRunner.__init__() got an unexpected keyword argument 'mix_stderr
|
||||
# https://github.com/simonw/llm/issues/1293
|
||||
"test_embed_multi_files_encoding"
|
||||
]
|
||||
++ lib.optionals (pythonAtLeast "3.14") [
|
||||
# Index out of range
|
||||
# https://github.com/simonw/llm/issues/1335
|
||||
"test_logs_fragments"
|
||||
"test_expand_fragment_json"
|
||||
"test_expand_fragment_markdown"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "llm" ];
|
||||
|
||||
@@ -5,23 +5,26 @@
|
||||
flit-core,
|
||||
pytestCheckHook,
|
||||
nodejs,
|
||||
pythonOlder,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pscript";
|
||||
version = "0.8.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flexxui";
|
||||
repo = "pscript";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-pqjig3dFJ4zfpor6TT6fiBMS7lAtJE/bAYbzl46W/YY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# https://github.com/flexxui/pscript/pull/77
|
||||
substituteInPlace pscript/commonast.py \
|
||||
--replace-fail "ast.Ellipsis" "ast.Constant"
|
||||
'';
|
||||
|
||||
build-system = [ flit-core ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
@@ -44,8 +47,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Python to JavaScript compiler";
|
||||
homepage = "https://pscript.readthedocs.io";
|
||||
changelog = "https://github.com/flexxui/pscript/blob/${src.tag}/docs/releasenotes.rst";
|
||||
changelog = "https://github.com/flexxui/pscript/blob/${finalAttrs.src.tag}/docs/releasenotes.rst";
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = with lib.maintainers; [ matthiasbeyer ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -10,25 +10,25 @@
|
||||
pytest-xdist,
|
||||
pytestCheckHook,
|
||||
pythonAtLeast,
|
||||
pythonOlder,
|
||||
trio,
|
||||
untangle,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydevd";
|
||||
version = "3.3.0";
|
||||
version = "3.4.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fabioz";
|
||||
repo = "PyDev.Debugger";
|
||||
rev = "pydev_debugger_${lib.replaceStrings [ "." ] [ "_" ] version}";
|
||||
hash = "sha256-V5pM0xnMFnpR1oK0purHFCV3wu+4fOmd72kmy7pVeyk=";
|
||||
tag = "pydev_debugger_${lib.replaceStrings [ "." ] [ "_" ] version}";
|
||||
hash = "sha256-srcYeN4IsnX/B0AWLynr62UC5o+DcjnUrGjcTpvHTCM=";
|
||||
};
|
||||
|
||||
# https://github.com/fabioz/PyDev.Debugger/issues/316
|
||||
disabled = pythonAtLeast "3.14";
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/addopts/d' pytest.ini
|
||||
'';
|
||||
@@ -49,6 +49,10 @@ buildPythonPackage rec {
|
||||
untangle
|
||||
];
|
||||
|
||||
enabledTestPaths = [
|
||||
"tests/"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Require network connection
|
||||
"test_completion_sockets_and_messages"
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pythonAtLeast,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
@@ -128,6 +129,17 @@ buildPythonPackage rec {
|
||||
# NameError: name 'ParallelismConfig' is not defined
|
||||
"test_hf_argument_parser"
|
||||
"test_hf_argument_parser_incorrect_string_arguments"
|
||||
|
||||
]
|
||||
++ lib.optionals (pythonAtLeast "3.14") [
|
||||
# TypeError: Pickler._batch_setitems() takes 2 positional arguments but 3 were given
|
||||
# https://github.com/huggingface/sentence-transformers/issues/3606
|
||||
"test_group_by_label_batch_sampler_label_a"
|
||||
"test_group_by_label_batch_sampler_label_b"
|
||||
"test_group_by_label_batch_sampler_uneven_dataset"
|
||||
"test_proportional_no_duplicates"
|
||||
"test_round_robin_batch_sampler"
|
||||
"test_round_robin_batch_sampler_vallue_error"
|
||||
]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin) [
|
||||
# These sparse tests also time out, on x86_64-darwin.
|
||||
|
||||
@@ -12,22 +12,23 @@
|
||||
pscript,
|
||||
pyjwt,
|
||||
pytestCheckHook,
|
||||
pythonAtLeast,
|
||||
requests,
|
||||
setuptools,
|
||||
uvicorn,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "timetagger";
|
||||
version = "25.12.1";
|
||||
version = "26.1.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "almarklein";
|
||||
repo = "timetagger";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-XuYxle5U5Ui8ITsCgiJjwaRdfHwEa9cF0lAMoXwJamw=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-BGu+L3bUBGYj18D4qUemUMEs2tk0wLu8DvO9h/7FiJo=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -53,12 +54,17 @@ buildPythonPackage rec {
|
||||
|
||||
pythonImportsCheck = [ "timetagger" ];
|
||||
|
||||
disabledTestPaths = lib.optionals (pythonAtLeast "3.14") [
|
||||
# RuntimeError: There is no current event loop in thread 'MainThread'
|
||||
"tests/test_server_apiserver.py"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Library to interact with TimeTagger";
|
||||
homepage = "https://github.com/almarklein/timetagger";
|
||||
changelog = "https://github.com/almarklein/timetagger/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/almarklein/timetagger/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ matthiasbeyer ];
|
||||
mainProgram = "timetagger";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -15,9 +15,9 @@
|
||||
let
|
||||
versionMap = {
|
||||
"4_1" = {
|
||||
kafkaVersion = "4.1.0";
|
||||
kafkaVersion = "4.1.1";
|
||||
scalaVersion = "2.13";
|
||||
sha256 = "sha256-hbRThHDR3LmNAnMoa/q4cXBlUi5Zfs//zU24OjAhdY4=";
|
||||
sha256 = "sha256-eR6O5plpgtgFWCk2eoA5H5TBvKcymy+7ZYv8IRp3Ry4=";
|
||||
jre = jdk17_headless;
|
||||
nixosTest = nixosTests.kafka.base.kafka_4_1;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user