Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2026-09-08 20:33:36 +00:00
committed by GitHub
68 changed files with 361 additions and 219 deletions

View File

@@ -32198,12 +32198,6 @@
githubId = 65394961;
name = "Yves Straten";
};
yvnth = {
email = "yashupress@gmail.com";
github = "yvnth";
githubId = 201552597;
name = "Yashwanth Prasannakumar";
};
yzx9 = {
email = "yuan.zx@outlook.com";
github = "yzx9";

View File

@@ -204,5 +204,5 @@ in
]
);
meta.maintainers = with lib.maintainers; [ yvnth ];
meta.maintainers = [ ];
}

View File

@@ -362,7 +362,6 @@ in
{
description = "Syncoid ZFS synchronization from ${c.source} to ${c.target}";
after = [ "zfs.target" ];
startAt = cfg.interval;
# syncoid may need zpool to get feature@extensible_dataset
path = [ "/run/booted-system/sw/bin/" ];
serviceConfig = {
@@ -473,6 +472,23 @@ in
]
)
) cfg.commands;
systemd.timers = lib.concatMapAttrs (
name: c:
lib.optionalAttrs
(config.systemd.services."syncoid-${escapeUnitName name}".enable && cfg.interval != [ ])
{
"syncoid-${escapeUnitName name}" = {
wantedBy = [ "timers.target" ];
timerConfig = {
OnCalendar = cfg.interval;
# Backup timers should catch up on missed windows (e.g. the
# machine was powered off), like restic and btrbk do.
Persistent = true;
};
};
}
) cfg.commands;
};
meta.maintainers = with lib.maintainers; [

View File

@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "bibiman";
version = "0.15.0";
version = "0.19.5";
src = fetchFromCodeberg {
owner = "lukeflo";
repo = "bibiman";
tag = "v${finalAttrs.version}";
hash = "sha256-GAPlfHeo/g2QaRW3v9LatqYajJ2gE1ssK77yJPhOKuo=";
hash = "sha256-mBd5egAcoj6+UTazSzVVma9oct5hns5BsCkhgcpPANs=";
};
cargoHash = "sha256-aQ9h+L232dxZRPOQ+6b+vI3v/QdBR4//3HV8K9vwWV8=";
cargoHash = "sha256-AvbJmo9S0rKZPDzbTsUxEpB7eQPTpl/ShYEu/ANA94I=";
nativeInstallCheckInputs = [
versionCheckHook

View File

@@ -1,13 +1,13 @@
--- old/linux/CMakeLists.txt
+++ new/linux/CMakeLists.txt
@@ -41,35 +41,6 @@
@@ -44,34 +44,6 @@
target_link_libraries(${PLUGIN_NAME} PRIVATE flutter)
target_link_libraries(${PLUGIN_NAME} PRIVATE PkgConfig::GTK)
-# ----------------------------------------------------------------------
-# Download and add objectbox-c prebuilt library.
-
-set(OBJECTBOX_VERSION 4.3.0)
-set(OBJECTBOX_VERSION 5.3.1)
-
-set(OBJECTBOX_ARCH ${CMAKE_SYSTEM_PROCESSOR})
-if (${OBJECTBOX_ARCH} MATCHES "x86_64")
@@ -32,15 +32,14 @@
-endif()
-
-# ----------------------------------------------------------------------
-
# List of absolute paths to libraries that should be bundled with the plugin.
# This list could contain prebuilt libraries, or libraries created by an
# external build triggered from this build file.
@@ -77,6 +48,6 @@
@@ -80,6 +52,6 @@
# Note: do not link the ObjectBox C library; the Dart library looks for it in a lib subfolder
# where flutter build puts it when added below.
set(objectbox_flutter_libs_bundled_libraries
- "${objectbox-download_SOURCE_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}objectbox${CMAKE_SHARED_LIBRARY_SUFFIX}"
+ "@OBJECTBOX_SHARED_LIBRARY@"
PARENT_SCOPE
- "${objectbox-download_SOURCE_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}objectbox${CMAKE_SHARED_LIBRARY_SUFFIX}"
+ "@OBJECTBOX_SHARED_LIBRARY@"
PARENT_SCOPE
)

View File

@@ -19,11 +19,11 @@ let
};
objectbox-c = fetchzip {
name = "objectbox-linux-4.3.0";
url = "https://github.com/objectbox/objectbox-c/releases/download/v4.3.0/objectbox-linux-${arch}.tar.gz";
name = "objectbox-linux-5.3.1";
url = "https://github.com/objectbox/objectbox-c/releases/download/v5.3.1/objectbox-linux-${arch}.tar.gz";
hash = selectSystem {
x86_64-linux = "sha256-VaDUQcTk0ArmeKFpdKN35WEGL8QX89k8KPHTRP9xadI=";
aarch64-linux = "sha256-vnsxkNiYoZIBfw6IcYg4cFgsdRyHGDbyA0y8J4NuYE0=";
x86_64-linux = "sha256-Avd5y6Y6NCCQokzxwfBpkipt+JxF/M46MCLcDpqv8Kk=";
aarch64-linux = "sha256-S6/QbqRhIm3f51e3AcEfuq56cde3aQb0ITN6qPuWCps=";
};
stripRoot = false;
meta.license = lib.licenses.unfree; # the release tarball has a proprietary shared library
@@ -48,5 +48,5 @@ stdenv.mkDerivation {
runHook postInstall
'';
meta.sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
meta.sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
}

View File

@@ -1,25 +1,40 @@
{
lib,
stdenv,
callPackage,
flutter329,
flutter344,
fetchFromGitHub,
fetchzip,
autoPatchelfHook,
webkitgtk_4_1,
libnotify,
libayatana-appindicator,
jdk,
mpv,
}:
flutter329.buildFlutterApplication rec {
let
# the plugin downloads this bundle at configure time. Keep in sync with
# FFMPEGKIT_VERSION and FFMPEGKIT_PACKAGE in its linux/CMakeLists.txt
ffmpeg-kit = fetchzip {
name = "ffmpeg-kit-linux-x86_64-min-8.1.2";
url = "https://github.com/sk3llo/ffmpeg_kit_flutter/releases/download/8.1.2-min/ffmpeg-kit-linux-x86_64-min-8.1.2.tar.gz";
hash = "sha256-5N6CCntUT0UwMt5+Hsdm+R/DhHG7FysRhGoHqrnVnfU=";
stripRoot = false;
meta = {
license = lib.licenses.lgpl3Only;
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
};
};
in
flutter344.buildFlutterApplication rec {
pname = "bluebubbles";
version = "1.15.7";
version = "2.1.1";
src = fetchFromGitHub {
owner = "BlueBubblesApp";
repo = "bluebubbles-app";
tag = "v${version}+76-desktop";
hash = "sha256-KmIoJHQAF4DQQ78SJ5Vra7ubfvqTjmK4lf8tGJDJNTs=";
tag = "v${version}+91";
hash = "sha256-NYX30yt7cFlhTQKLKzYKEjaA4ZKLNWg5HuKSgQiZIDM=";
};
pubspecLock = lib.importJSON ./pubspec.lock.json;
@@ -27,21 +42,26 @@ flutter329.buildFlutterApplication rec {
customSourceBuilders.objectbox_flutter_libs = callPackage ./objectbox_flutter_libs.nix { };
gitHashes = {
desktop_drop = "sha256-ZvSTnZMCrA0WF+bERalxukeTnaeQiVU4g8geNeZoy3Y=";
desktop_webview_auth = "sha256-G6xrC6Jz3kYAysHI6w/8ahzXTvX7k6QW3GB3b8Uh+RQ=";
disable_battery_optimization = "sha256-IsfclmbdLvju+0VWElFz9brdVntRESFB+PF8UPJBL2E=";
ffmpeg_kit_flutter_new_min = "sha256-nqBI4MDTeebvRlY1GbIqWeRyDTdRB+iqkjH3szaqODk=";
firebase_dart = "sha256-jq4Y5ApGPrXcLN3gwC9NuGN/EQkl5u64iMzL8KG02Sc=";
gesture_x_detector = "sha256-H3OJxDhESWwnpRky9jS9RIBiZ7gSqWQ/j0x/1VvRb5M=";
local_notifier = "sha256-OvJKZXa2qmEgKV0Z3Ptdg0e/abWFAmH0z/DZFgW2TIQ=";
permission_handler_windows = "sha256-9h0wEOgY6gtqaSyH9x2fbvH8Y0EfoVs/qNqwwI5d18k=";
video_thumbnail = "sha256-7IbKg6bBA5D8ODwMNwJqIohTCbAox56TMgoI07CbrPw=";
flutter_map = "sha256-JsVh7wwyehhAkE+TIvThQ8iYx7icY76qm2Pwf/k0Z7M=";
flat_buffers = "sha256-RRKL1im0JcSHAe/TH0PBTpcklkTRN47MJsUkrp4jZjg=";
flutter_local_notifications_windows = "sha256-d3CKlz/WGsDje31eXkdoG6k8kgqrqhIiSyJBK9abBtA=";
flutter_map = "sha256-dNpTagcCh6R4+3NzR5/THNH/5q0H4IOcPZqm/GgNlv8=";
gesture_x_detector = "sha256-X3TiMeWV4VbDkZLVBsqXA4swVQNrZemgShUeC75dB8c=";
permission_handler_windows = "sha256-kUF8WfnIoeoq8k0HV6k5/VoQca0e/tNuIO3pO5Ue3Ss=";
};
nativeBuildInputs = [ autoPatchelfHook ];
env = lib.optionalAttrs stdenv.hostPlatform.isx86_64 {
FFMPEGKIT_LOCAL_DIR = "${ffmpeg-kit}/ffmpeg-kit";
};
buildInputs = [
webkitgtk_4_1
libnotify
libayatana-appindicator
jdk
mpv
@@ -49,7 +69,7 @@ flutter329.buildFlutterApplication rec {
# distributed in release tarballs under `data/flutter_assets/.env`, necessary for build and runtime
preBuild = ''
echo 'TENOR_API_KEY=AIzaSyAQwUlgo8sF5FBuIiampkfzaGgVPMglcGk' > .env
echo 'KLIPY_API_KEY=xTqaU4zgnNDVEgU4HkcID8ur4wPKQ5uHAcW5So5hAkXEgETvu9DSEewOG0hMuqAK' > .env
'';
postInstall = ''
@@ -67,8 +87,19 @@ flutter329.buildFlutterApplication rec {
description = "Cross-platform iMessage client";
homepage = "https://github.com/BlueBubblesApp/bluebubbles-app";
mainProgram = "bluebubbles";
license = lib.licenses.asl20;
platforms = lib.platforms.linux;
license = with lib.licenses; [
asl20 # the app
lgpl3Only # bundled ffmpeg-kit
unfree # bundled objectbox core library
];
sourceProvenance = with lib.sourceTypes; [
fromSource
binaryNativeCode
];
platforms = [
"x86_64-linux"
"aarch64-linux"
];
maintainers = with lib.maintainers; [
zacharyweiss
];

File diff suppressed because one or more lines are too long

View File

@@ -10,7 +10,6 @@
appstream-glib,
desktop-file-utils,
fvs2,
librsvg,
gtk4,
gtksourceview5,
libadwaita,
@@ -27,9 +26,10 @@
vkbasalt-cli,
vulkan-tools,
vmtouch,
libportal,
libportal-gtk4,
obs-studio-plugins,
libxml2,
umu-launcher,
nix-update-script,
removeWarningPopup ? false,
withObsVkCapture ? false,
@@ -37,13 +37,13 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "bottles-unwrapped";
version = "65.4";
version = "67.4";
src = fetchFromGitHub {
owner = "bottlesdevs";
repo = "bottles";
tag = finalAttrs.version;
hash = "sha256-59Duh4E1kMShhk/iH/SBhpmFfUjYzRClNuWqoDSbTeM=";
hash = "sha256-Ohzsg/CTmk6ix+hATCncusmN5DqWHcw8jDP0dg67r4o=";
};
patches = [
@@ -70,14 +70,13 @@ python3Packages.buildPythonApplication (finalAttrs: {
gtk4 # gtk4-update-icon-cache
appstream-glib
desktop-file-utils
libxml2
];
buildInputs = [
librsvg
gtk4
gtksourceview5
libadwaita
libportal
libportal-gtk4
];
@@ -101,6 +100,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
certifi
pefile
yara-python
pysocks
]
++ [
cabextract
@@ -115,6 +115,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
mangohud
vmtouch
fvs2
umu-launcher
# Undocumented (subprocess.Popen())
lsb-release

View File

@@ -52,43 +52,43 @@ index f897953c..393572ed 100644
show_chooser()
diff --git a/bottles/frontend/views/bottle_preferences.py b/bottles/frontend/views/bottle_preferences.py
index 2bc2235e..34db4dbd 100644
index 0254eb92..96c73283 100644
--- a/bottles/frontend/views/bottle_preferences.py
+++ b/bottles/frontend/views/bottle_preferences.py
@@ -173,9 +173,6 @@ class PreferencesView(Adw.PreferencesPage):
@@ -185,9 +185,6 @@ class PreferencesView(Adw.PreferencesPage):
)
)
- if not Xdp.Portal.running_under_sandbox():
- if not is_cpak() and not Xdp.Portal.running_under_sandbox():
- return
-
_not_available = _("This feature is unavailable on your system.")
_flatpak_not_available = _("{} To add this feature, please run").format(
_not_available
_not_available = _("This feature is unavailable on your system.")
diff --git a/bottles/frontend/views/list.py b/bottles/frontend/views/list.py
index 6bd8fc81..0f96ab70 100644
index 689d023f..7e7d9b89 100644
--- a/bottles/frontend/views/list.py
+++ b/bottles/frontend/views/list.py
@@ -82,8 +82,6 @@ class BottlesBottleRow(Adw.ActionRow):
@@ -130,8 +130,6 @@ class BottlesBottleRow(Adw.ActionRow):
def run_executable(self, *_args):
"""Display file dialog for executable"""
- if not Xdp.Portal.running_under_sandbox():
- if not is_cpak() and not Xdp.Portal.running_under_sandbox():
- return
def set_path(_dialog, response):
if response != Gtk.ResponseType.ACCEPT:
diff --git a/bottles/frontend/views/new_bottle_dialog.py b/bottles/frontend/views/new_bottle_dialog.py
index 9c386862..3ed98f7c 100644
index 02adeb2f..d755d50d 100644
--- a/bottles/frontend/views/new_bottle_dialog.py
+++ b/bottles/frontend/views/new_bottle_dialog.py
@@ -86,7 +86,7 @@ class BottlesNewBottleDialog(Adw.Dialog):
super().__init__(**kwargs)
@@ -93,9 +93,7 @@ class BottlesNewBottleDialog(Adw.Dialog):
)
# common variables and references
self.window = GtkUtils.get_parent_window()
- if not self.window or not Xdp.Portal.running_under_sandbox():
- if not self.window or (
- not is_cpak() and not Xdp.Portal.running_under_sandbox()
- ):
+ if not self.window:
return

View File

@@ -13,16 +13,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cargo-release";
version = "1.1.3";
version = "1.1.5";
src = fetchFromGitHub {
owner = "crate-ci";
repo = "cargo-release";
tag = "v${finalAttrs.version}";
hash = "sha256-5fe+iIPZAKi8aQW2PfanO7U2d70Oc3KvL/RZTV9/ZU8=";
hash = "sha256-ukzR9VAbrvI+r01D7vCXeBouQeamCtEnKmBg8kKGRpg=";
};
cargoHash = "sha256-abTQuKpVcjorr6RQ1t9sAzqvS39XT6lg4fALAqO68YI=";
cargoHash = "sha256-E+ZhFMfASA6rP4E/+hbZihe0Rzf7RRe3I+W+wj389bo=";
nativeBuildInputs = [
pkg-config
@@ -40,6 +40,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
git
];
checkFlags = [
# Skip tests that require internet connection
"--skip=publish::unpublished_git_dependency"
"--skip=publish::unpublished_workspace_dependency"
];
# disable vendored-libgit2 and vendored-openssl
buildNoDefaultFeatures = true;

View File

@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
homepage = "https://github.com/tareqimbasher/cargo-seek";
changelog = "https://github.com/tareqimbasher/cargo-seek/releases/tag/v${finalAttrs.version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ yvnth ];
maintainers = [ ];
mainProgram = "cargo-seek";
};
})

View File

@@ -7,17 +7,17 @@
php.buildComposerProject2 (finalAttrs: {
pname = "davis";
version = "5.4.3";
version = "5.4.4";
src = fetchFromGitHub {
owner = "tchapi";
repo = "davis";
tag = "v${finalAttrs.version}";
hash = "sha256-QCXjw01uJAt22/Vybm/bgE7GeGj4utwdTbXJ2oIVWRo=";
hash = "sha256-XGnBXJhAX1hsLOO/dujdf/EUBmaPmW7Kt5e23pabVdU=";
};
composerNoPlugins = false;
vendorHash = "sha256-YSpDBkg/Xlq4cPeil5CaSVXgfKcrUFFRdR4kvFtwzhU=";
vendorHash = "sha256-hGLGnF0670jDtZ5m5TH+4ewXMByvt8eL+WoCeATIvDU=";
postInstall = ''
chmod -R u+w $out/share

View File

@@ -51,5 +51,6 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://github.com/askac/dumpifs";
platforms = lib.platforms.unix;
mainProgram = "dumpifs";
license = lib.licenses.unfree;
};
})

View File

@@ -1,4 +1,5 @@
{
lib,
writeShellApplication,
bc,
diffutils,
@@ -10,7 +11,10 @@
}:
writeShellApplication {
name = "edido";
meta.description = "Tool to apply display configuration from `boot.kernelParams`";
meta = {
description = "Tool to apply display configuration from `boot.kernelParams`";
license = lib.licenses.mit;
};
runtimeInputs = [
diffutils
findutils

View File

@@ -11,13 +11,13 @@
buildGoModule (finalAttrs: {
pname = "entire";
version = "0.10.5";
version = "0.10.6";
src = fetchFromGitHub {
owner = "entireio";
repo = "cli";
tag = "v${finalAttrs.version}";
hash = "sha256-/6mErGjBBtvsfLfzw2ttOJZGr3fMliepBfpp2LtMdQQ=";
hash = "sha256-l2elFxZi01SO6zrRGxKNoU50ELtrX8G4YTMnxbpdBqE=";
};
vendorHash = "sha256-3LWRfnyT3OgHsu4SA2cGtCJizjDRolZQs75yjBA4tXc=";

View File

@@ -8,22 +8,22 @@ let
core = fetchFromGitHub {
owner = "fvs-lab";
repo = "core";
tag = "v0.1.1";
hash = "sha256-vEQhV9wInqxgJlSyhgp0BV5VaYBJVtqcPrdN2NP33i4=";
tag = "v0.1.3";
hash = "sha256-9AjUaTRBrcNr1yYakzXfLBuRCKqDIrVwrEKlQgb4m0o=";
};
in
buildGoModule (finalAttrs: {
pname = "fvs2";
version = "0.9.0";
version = "0.11.0";
src = fetchFromGitHub {
owner = "fvs-lab";
repo = "fvs2";
tag = "v${finalAttrs.version}";
hash = "sha256-lJZd9QbvjArYMSXG6qHcaxaAe5UOPpko/TXD2L8yxDA=";
hash = "sha256-j/jUz/WGOy7qtGDfARtVf1Tv1thk434eRVbq3ePC7RQ=";
};
vendorHash = "sha256-FUst0ccxpZS3NjvthQQE7CVlULWPhXj8KA2cOoksLGI=";
vendorHash = "sha256-gzI8mKGJWRJqUkscOU3wXTscZO+9i6MLKCoyMLkymUY=";
# Needed for build time tests
nativeBuildInputs = [ git ];

View File

@@ -99,5 +99,6 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://github.com/jdalrymple/gitbeaker";
maintainers = [ ];
mainProgram = "gitbeaker";
license = lib.licenses.mit;
};
})

View File

@@ -1,6 +1,5 @@
{
lib,
stdenv,
rustPlatform,
fetchFromGitHub,
cmake,
@@ -13,20 +12,23 @@
libxcb,
wayland,
xorgproto,
libxi,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "venbind";
pname = "goofbind";
version = "0.1.7";
src = fetchFromGitHub {
owner = "tuxinal";
repo = "venbind";
tag = "v${finalAttrs.version}";
hash = "sha256-6gPyQ6JjqvM2AUuIxCfO0nOLJfyQTX5bbsbKDzlNSqo=";
owner = "Milkshiift";
repo = "goofbind";
# Fetch commit from repo, until the tag version is released
rev = "703237071f61d1ceede8076b0015488773a7c4ae";
hash = "sha256-XAt0ThqDRPun5nrp1sFWEeX3vEIGOpXpwQsx1I4bfqA=";
fetchSubmodules = true;
};
cargoHash = "sha256-FZTXj8f+ezRhElovKhF3khWc5SqC+22tDHlFe9IHuwo=";
cargoHash = "sha256-GAtNCaMFAbgHktLU+/rQGfbjVEY4iFCmfuQw0y5wFcY=";
nativeBuildInputs = [
rustPlatform.bindgenHook
@@ -42,6 +44,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
libxkbcommon
libxcb
wayland
libxi
xorgproto
];

View File

@@ -50,8 +50,8 @@ stdenv.mkDerivation {
outputHash =
{
x86_64-linux = "sha256-2PH4qa4M/y4AzVT9dW4BK1jE3RWSr+NWY1AhU3cfUTE=";
aarch64-linux = "sha256-RGJGUdp3i6Q/tCuQ42NfF4eFGrrgoyhx1l14fPwlCN8=";
x86_64-linux = "sha256-J26DRSUa/C7lvI8JFPQ92yj4zUVnD+SPkKwRQA9ITB8=";
aarch64-linux = "sha256-WIjcl//+OGB5J6Dp4Q2x24MA/cWqdtHYNwBBOgCD/tU=";
}
.${stdenv.hostPlatform.system} or (throw "Unsupported system ${stdenv.hostPlatform.system}");
outputHashAlgo = "sha256";

View File

@@ -17,17 +17,17 @@
}:
let
patchcordAddon = callPackage ./patchcord-addon.nix { };
venbindAddon = callPackage ./venbind-addon.nix { };
goofbindAddon = callPackage ./goofbind-addon.nix { };
in
stdenv.mkDerivation (finalAttrs: {
pname = "goofcord";
version = "2.2.1";
version = "2.3.0";
src = fetchFromGitHub {
owner = "Milkshiift";
repo = "GoofCord";
tag = "v${finalAttrs.version}";
hash = "sha256-qcgEUkPh671q9aJtge+PSbBTrg7vY+iz+H+SKXPFqFI=";
hash = "sha256-cg9NVL/dPIQ9xyMrUmWd42HxEsTSnhUGiqB7qaU2LuQ=";
};
nativeBuildInputs = [
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
env = {
ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
GOOFCORD_PATCHCORD_PATH = "${patchcordAddon}/bin/patchcord";
GOOFCORD_VENBIND_PATH = "${venbindAddon}/lib/libvenbind.so";
GOOFCORD_VENBIND_PATH = "${goofbindAddon}/lib/libvenbind.so";
};
configurePhase = ''

View File

@@ -10,8 +10,8 @@ rustPlatform.buildRustPackage {
src = fetchFromGitHub {
owner = "Milkshiift";
repo = "patchcord";
rev = "f2611630f143a53b46514d4916af0971d7aab2b5";
hash = "sha256-VTHS5psVqg4RjSrAs9vPkixsVwwIYE2E4o0vXVN58tE=";
rev = "cb0d3d48f0c217e9621c48c576ec340fdfd9b9b7";
hash = "sha256-MYcLrDVnyhNZ0Wb/X6dNEtc4S1K6k9/XBUyaNCeTli4=";
};
cargoHash = "sha256-/IbHvs9SEuulNcWkihwFwaFcqMM0rdFBVjCWgUu7dys=";

View File

@@ -12,7 +12,7 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "herdr";
version = "0.8.2";
version = "0.9.0";
__structuredAttrs = true;
@@ -20,10 +20,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
owner = "herdrdev";
repo = "herdr";
tag = "v${finalAttrs.version}";
hash = "sha256-sEGIN3dLZasaHob3EHscWBCIQHflMQVchYmzgsETDk4=";
hash = "sha256-SUYF4bbaYwNgoe498VoCUzuLPcjBLQXR0o0DWjjoSnI=";
};
cargoHash = "sha256-4VThqPwYYEsGvaOKjBeL6XAC5bnNWB6oUMWP/uXc/UQ=";
cargoHash = "sha256-CW/SF/cAPDv47gS5B7XbVZEE6LC9F1a2I1TLTJ4AWdw=";
zigDeps = zig_0_15.fetchDeps {
inherit (finalAttrs) pname version;

View File

@@ -7,13 +7,16 @@
stdenv.mkDerivation {
pname = "hidrd";
version = "unstable-2019-06-03";
version = "0.2.0-unstable-2019-06-03";
strictDeps = true;
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "DIGImend";
repo = "hidrd";
rev = "6c0ed39708a5777ac620f902f39c8a0e03eefe4e";
sha256 = "1rnhq6b0nrmphdig1qrpzpbpqlg3943gzpw0v7p5rwcdynb6bb94";
hash = "sha256-JK1llvWN8Vzu2YDf/wZJ41F81/034/Big7dmC5bB0OY=";
};
patches = [

View File

@@ -70,5 +70,6 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://ipbus.web.cern.ch/";
maintainers = [ lib.maintainers.bashsu ];
mainProgram = "ipbus-uhal";
license = lib.licenses.gpl3Plus;
};
})

View File

@@ -39,5 +39,6 @@ stdenv.mkDerivation (finalAttrs: {
maintainers = with lib.maintainers; [ tbutter ];
platforms = lib.platforms.unix;
homepage = "https://www.ircd-hybrid.org/";
license = lib.licenses.gpl2Plus;
};
})

View File

@@ -63,7 +63,6 @@ stdenv.mkDerivation (finalAttrs: {
maintainers = with lib.maintainers; [
matt-snider
wenjinnn
yvnth
];
platforms = lib.platforms.all;
mainProgram = "jdtls";

View File

@@ -117,7 +117,6 @@ rustPlatform.buildRustPackage {
jk
ryan4yin
xrelkd
yvnth
];
mainProgram = "just";
};

View File

@@ -4,7 +4,7 @@
fetchFromGitHub,
fetchpatch,
qt6,
ffmpeg_4,
ffmpeg_7-headless,
pkg-config,
}:
@@ -19,6 +19,9 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-eW5sO1gjuwIighnlylJQd9QC+07s1MZX/oPyaHIi/Qs=";
};
strictDeps = true;
__structuredAttrs = true;
patches = [
# fix build with Qt 6.10, remove after next release
# https://github.com/gyunaev/karlyriceditor/pull/38
@@ -35,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
];
buildInputs = [
ffmpeg_4
ffmpeg_7-headless
qt6.qtmultimedia
];

View File

@@ -23,7 +23,7 @@ buildNpmPackage (finalAttrs: {
npmDeps = fetchNpmDeps {
inherit (finalAttrs) version src sourceRoot;
hash = "sha256-1xsvOHTIO1dxNlb+lISr0Qtt7/QScLS1AUXzpZWTIuc=";
hash = "sha256-Roc12TRm+Qpm5fO9StlQoKCLZFSPmhRW8tFMfhP8+nA=";
};
npmBuildScript = "build";

View File

@@ -17,7 +17,7 @@ buildNpmPackage (finalAttrs: {
src
sourceRoot
;
hash = "sha256-wmAyH35rNgju0GyhvQJHS6vDkFKOoIgiN4ctnu4clN0=";
hash = "sha256-3IhXkNjb9ObPxcIwExHKeFGRhbWG9exsVZtzUNvGOxs=";
};
npmBuildScript = "build";

View File

@@ -22,7 +22,7 @@ buildNpmPackage (finalAttrs: {
pname = "${finalAttrs.pname}-npm-deps";
inherit version src;
inherit (finalAttrs) sourceRoot;
hash = "sha256-kArjyi8Jp5gfC/VW5Idzobxgt+NwGHSVP/UxQf7ds4Y=";
hash = "sha256-9vZUKElS0cGkF/j0eh7WPZhhD9wRifw000nMve9W7IA=";
};
npmBuildScript = "build";

View File

@@ -6,13 +6,13 @@
python3,
}:
let
version = "1.29.0";
version = "1.31.0";
src = fetchFromGitHub {
owner = "suitenumerique";
repo = "meet";
tag = "v${version}";
hash = "sha256-SqWKhb4oLKzFkcl96IX4OxzUHVAJn3zh2ZVEDnFVz4E=";
hash = "sha256-yxOld2AfGjw282sx/e1G/iM2D8LUMwAeFyNUUvEmFjc=";
};
meta = {

View File

@@ -42,10 +42,7 @@ buildGoModule (finalAttrs: {
description = "Simple terminal UI for both docker and docker-compose";
homepage = "https://github.com/jesseduffield/lazydocker";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
das-g
yvnth
];
maintainers = with lib.maintainers; [ das-g ];
mainProgram = "lazydocker";
};
})

View File

@@ -9,13 +9,13 @@
}:
mkLibretroCore {
core = "citra";
version = "0-unstable-2026-07-21";
version = "0-unstable-2026-09-04";
src = fetchFromGitHub {
owner = "libretro";
repo = "citra";
rev = "e3e057f166f498ebd9997985ab9179a2cde4fc01";
hash = "sha256-9Fxftxbph1RynBa29MSgyqh+kom6cZLaXQ3lta0WReQ=";
rev = "e4cbe379bfa8990af706977d699e16a618523778";
hash = "sha256-rROcJpctx73DI4AGU7QBaFkPAmsCDNQnj8WRynTC9Fk=";
fetchSubmodules = true;
};

View File

@@ -7,13 +7,13 @@
}:
mkLibretroCore rec {
core = "fbalpha2012";
version = "0-unstable-2026-04-20";
version = "0-unstable-2026-07-28";
src = fetchFromGitHub {
owner = "libretro";
repo = "fbalpha2012";
rev = "95fa35582b1ca7ce68de3313615794c8c9d8d7c0";
hash = "sha256-9F970HETDJsttoQOlqg2dFMzff/drR7G8MxXaSlWTHI=";
rev = "0ce31536bef3162fe7e69ff5f555334ec4913cef";
hash = "sha256-b5pCf5gn/mHoh8+/mIQPxVq1kl5UlDURp4SB5nNsGBI=";
};
sourceRoot = "${src.name}/svn-current/trunk";

View File

@@ -6,13 +6,13 @@
}:
mkLibretroCore {
core = "mame2010";
version = "0-unstable-2026-07-03";
version = "0-unstable-2026-09-02";
src = fetchFromGitHub {
owner = "libretro";
repo = "mame2010-libretro";
rev = "484456818393505dd4367e6e4c116c573c04a1ec";
hash = "sha256-CstMUeTxOsL419R2kzSK6hDd1okxsbtwMvqjwzSf3bI=";
rev = "dff8aadd1c3f38215af3955746d6e19abe0ddcea";
hash = "sha256-UfppTEDAnUkV8RzAlbsZIRjYy6Jj2GMWOp3T3lsix68=";
};
makefile = "Makefile";

View File

@@ -14,13 +14,13 @@
}:
mkLibretroCore {
core = "play";
version = "0-unstable-2026-08-11";
version = "0-unstable-2026-09-03";
src = fetchFromGitHub {
owner = "jpd002";
repo = "Play-";
rev = "04bde0df87ee7c0e2f0151b51bb2cc22c88541da";
hash = "sha256-D9GDf3/y6Et93IRUL4V7o7jBhiSHKGCJDpDbIicDHy4=";
rev = "83700b2c31e593bc94e845b4b31b797be84dda59";
hash = "sha256-2N8s1ltgey4UNJ2cVntcCF0GJp7KIoovw5oRPAyl9q8=";
fetchSubmodules = true;
};

View File

@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "stella2014";
version = "0-unstable-2026-07-06";
version = "0-unstable-2026-09-04";
src = fetchFromGitHub {
owner = "libretro";
repo = "stella2014-libretro";
rev = "4a7da82595d27b8df7af1ecb467a64b642a41bc9";
hash = "sha256-uwtYNo6hUR6u2OicFYcbfgCGNlpDfIOF7Q5bNuJ/uMM=";
rev = "7d1361e407e63f29e52892655069e5fb4096e691";
hash = "sha256-jIDuexx2SgQbqXsSl1EDH2ji65JKXFDX6AevEf3QwJQ=";
};
makefile = "Makefile";

View File

@@ -79,5 +79,6 @@ stdenv.mkDerivation (finalAttrs: {
mainProgram = "louvre-views";
maintainers = [ ];
platforms = lib.platforms.linux;
license = lib.licenses.lgpl21Only;
};
})

View File

@@ -156,10 +156,7 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://github.com/luals/lua-language-server";
changelog = "https://github.com/LuaLS/lua-language-server/blob/${finalAttrs.version}/changelog.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
gepbird
yvnth
];
maintainers = with lib.maintainers; [ gepbird ];
mainProgram = "lua-language-server";
platforms = lib.platforms.linux ++ lib.platforms.darwin;
};

View File

@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://codeberg.org/Vaishnav-Sabari-Girish/miru";
changelog = "https://codeberg.org/Vaishnav-Sabari-Girish/miru/releases/tag/v${finalAttrs.version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ yvnth ];
maintainers = [ ];
platforms = lib.platforms.linux;
mainProgram = "miru-daemon";
};

View File

@@ -14,13 +14,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mongoc";
version = "1.30.3";
version = "1.30.9";
src = fetchFromGitHub {
owner = "mongodb";
repo = "mongo-c-driver";
tag = finalAttrs.version;
hash = "sha256-3mzqsrbXfrtAAC5igIna5dAgU8FH23lkMS2IacVlCmI=";
hash = "sha256-5msXPEt4a/Q/LDSowf2Eu2HD7ktrTrB9Adi/PtPIs5o=";
};
nativeBuildInputs = [

View File

@@ -5,30 +5,30 @@
nodejs,
fetchPnpmDeps,
pnpmConfigHook,
pnpm_10,
pnpm_11,
npmHooks,
versionCheckHook,
nix-update-script,
}:
let
pnpm = pnpm_10;
pnpm = pnpm_11;
in
stdenv.mkDerivation (finalAttrs: {
pname = "ni";
version = "30.3.0";
version = "30.5.0";
src = fetchFromGitHub {
owner = "antfu-collective";
repo = "ni";
tag = "v${finalAttrs.version}";
hash = "sha256-bcljQAlwE4VrVp+lJEf/MdHBesudgHDlXVzZygeLyqg=";
hash = "sha256-FYBq3UpwAEsLZ1mvDiI4jWkXFPIRerinmq05t/AaFkU=";
};
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
inherit pnpm;
fetcherVersion = 3;
hash = "sha256-QzILjHzJKOoE7FP4tWaktVRq3b62Suu/kTP0jKQOoU8=";
fetcherVersion = 4;
hash = "sha256-CSMH9Dv1rJaQfVLRMpwc/Go4M8ybShstEiWDz7gQ37c=";
};
nativeBuildInputs = [

View File

@@ -7,11 +7,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "omniwm";
version = "0.6.7";
version = "0.6.8";
src = fetchurl {
url = "https://github.com/BarutSRB/OmniWM/releases/download/v${finalAttrs.version}/OmniWM-v${finalAttrs.version}.zip";
hash = "sha256-sg5vshasrk4uv5P2YkSIt1VTlE6rHV4vdv+hirT26Gg=";
hash = "sha256-CCOWPIpcO96FT3/dA82MJcRCGkC9b3SETyyPfBaiZ2U=";
};
sourceRoot = "OmniWM.app";

View File

@@ -54,6 +54,6 @@ buildGo127Module (finalAttrs: {
license = lib.licenses.gpl3Only;
mainProgram = "pokego";
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ yvnth ];
maintainers = [ ];
};
})

View File

@@ -58,7 +58,6 @@ let
Crafter
evanjs
johnrichardrinehart
yvnth
];
platforms = [
"aarch64-darwin"

View File

@@ -10,18 +10,17 @@
openssl,
stdenv,
}:
let
# udev rules are in another unversioned repo
udevRules = fetchurl {
url = "https://raw.githubusercontent.com/probe-rs/webpage/054a0b16831593091a8a5624d0e2305573e860ee/public/files/69-probe-rs.rules";
hash = "sha256-yjxld5ebm2jpfyzkw+vngBfHu5Nfh2ioLUKQQDY4KYo=";
};
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "probe-rs-tools";
version = "0.32.0";
# udev rules are in another unversioned repo
udevRules = fetchurl {
# Last updated 2026-08-10
url = "https://raw.githubusercontent.com/probe-rs/webpage/9cc4b7d0727cc1ad0b87d5999aa9cdbfd8021632/public/files/69-probe-rs.rules";
hash = "sha256-JvH56IOapIIaT1gD9XCd/mdgrha3VVNSjneVDdebnoI=";
};
src = fetchFromGitHub {
owner = "probe-rs";
repo = "probe-rs";
@@ -47,7 +46,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
];
postInstall = ''
install -D -m 444 ${udevRules} $out/etc/udev/rules.d/69-probe-rs.rules
install -D -m 444 $udevRules $out/etc/udev/rules.d/69-probe-rs.rules
''
+ lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd probe-rs \

View File

@@ -1,6 +1,6 @@
{
lib,
buildGo126Module,
buildGo127Module,
fetchFromGitHub,
stdenvNoCC,
nixosTests,
@@ -11,14 +11,14 @@
pnpmConfigHook,
versionCheckHook,
}:
buildGo126Module (finalAttrs: {
buildGo127Module (finalAttrs: {
pname = "qui";
version = "1.26.0";
version = "1.28.0";
src = fetchFromGitHub {
owner = "autobrr";
repo = "qui";
tag = "v${finalAttrs.version}";
hash = "sha256-sBtuOlNx0/qYqXTIdszrdVhhNoH/fWmt2QCRDGExHb0=";
hash = "sha256-LPjJyOEABojCbXqwzlSI1K0S6AqSAKH7a2c64yMMIYM=";
};
qui-web = stdenvNoCC.mkDerivation (finalAttrs': {
@@ -42,7 +42,7 @@ buildGo126Module (finalAttrs: {
;
pnpm = pnpm_11;
fetcherVersion = 4;
hash = "sha256-bizOVrot/FrZ+NDefXJkll9YxjxbRut5tdPqGd3u5kE=";
hash = "sha256-qEcCIRbHSS/nha0pDGa/ZCm8D3z9tMKsZ2ccuosBUu4=";
};
postBuild = ''
@@ -54,7 +54,7 @@ buildGo126Module (finalAttrs: {
'';
});
vendorHash = "sha256-Zam5xkJUsGbzvX5q9NKNiN0n7UxhCUk9e43GMzE4M18=";
vendorHash = "sha256-KDAYA17arRtQsPz9cg/punKNy6kKYYHYOPw6fSpVzrA=";
preBuild = ''
cp -r ${finalAttrs.qui-web}/* web/dist

View File

@@ -0,0 +1,64 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
tree-sitter,
versionCheckHook,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "ripwire";
version = "0.5.0";
__structuredAttrs = true;
strictDeps = true;
src = fetchFromGitHub {
owner = "redhat-et";
repo = "ripwire";
tag = "v${finalAttrs.version}";
hash = "sha256-JB2xwEfDhljHo9tpxmpDkIFvjBdLwkhe7w2KnNrcN+Q=";
};
# Unvendor tree-sitter
postPatch = ''
rm -r third_party/deps/tree_sitter
mkdir -p third_party/deps/tree_sitter
ln -s ${tree-sitter.src}/lib third_party/deps/tree_sitter/lib
'';
nativeBuildInputs = [
cmake
];
preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''
prependToVar cmakeFlags "-DCMAKE_C_COMPILER_AR=$(command -v $AR)"
prependToVar cmakeFlags "-DCMAKE_C_COMPILER_RANLIB=$(command -v $RANLIB)"
'';
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
];
buildInputs = [
tree-sitter
];
hardeningDisable = [ "format" ]; # -Werror=format-security
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
passthru.updateScript = nix-update-script { };
meta = {
description = "The ripgrep of AI context: a zero-dependency C++23 CLI + MCP server giving coding agents a ranked, deterministic map of any repo, blast radius, tests-to-run and quality deltas. Signatures at 80% fewer bytes than bodies; ~5% of a grep-and-read pass's tokens";
homepage = "https://github.com/redhat-et/ripwire";
changelog = "https://github.com/redhat-et/ripwire/blob/${finalAttrs.src.tag}/CHANGELOG.md";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ drupol ];
mainProgram = "ripwire";
platforms = lib.platforms.all;
};
})

View File

@@ -68,10 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
homepage = finalAttrs.src.meta.homepage;
license = lib.licenses.mit;
mainProgram = "scenefx";
maintainers = with lib.maintainers; [
swarsel
yvnth
];
maintainers = with lib.maintainers; [ swarsel ];
pkgConfigModules = [ "scenefx-${lib.versions.majorMinor finalAttrs.version}" ];
platforms = lib.platforms.all;
};

View File

@@ -22,13 +22,13 @@
stdenv.mkDerivation {
pname = "slade";
version = "3.2.12-unstable-2026-06-08";
version = "3.2.12-unstable-2026-09-06";
src = fetchFromGitHub {
owner = "sirjuddington";
repo = "SLADE";
rev = "46fc51ac57f4fe54caf036b3d1e9b028a120be27";
hash = "sha256-mSddQstwZYkTzeA9fHswfuIUaoQlqXT+zTXWp20jgDc=";
rev = "351fd983fa986423c1825c87128691c27e0817aa";
hash = "sha256-WfDUlF2+tL/EVSLR2U0Pgh8180OClDT1tLlavpFVydw=";
};
nativeBuildInputs = [

View File

@@ -40,6 +40,10 @@ stdenv.mkDerivation (finalAttrs: {
lib.optionalString (conf != null) "cp ${finalAttrs.configFile} config.def.h"
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace config.mk --replace "-lrt" ""
''
+ ''
substituteInPlace config.mk \
--replace-fail "-lX11 -lutil -lXft" '-lutil `$(PKG_CONFIG) --libs x11 xft`'
'';
strictDeps = true;

View File

@@ -139,10 +139,7 @@ stdenv.mkDerivation (finalAttrs: {
changelog = "https://github.com/swaywm/sway/releases/tag/${finalAttrs.version}";
license = lib.licenses.mit;
platforms = lib.platforms.linux ++ lib.platforms.freebsd;
maintainers = with lib.maintainers; [
c6rg0
yvnth
];
maintainers = with lib.maintainers; [ c6rg0 ];
mainProgram = "sway";
};
})

View File

@@ -60,10 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
license = lib.licenses.mit;
mainProgram = "swayidle";
maintainers = with lib.maintainers; [
wineee
yvnth
];
maintainers = with lib.maintainers; [ wineee ];
platforms = lib.platforms.linux;
};
})

View File

@@ -67,9 +67,6 @@ stdenv.mkDerivation (finalAttrs: {
mainProgram = "swaylock";
license = lib.licenses.mit;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [
wineee
yvnth
];
maintainers = with lib.maintainers; [ wineee ];
};
})

View File

@@ -55,7 +55,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
maintainers = with lib.maintainers; [
faukah
psibi
yvnth
];
mainProgram = "tombi";
};

View File

@@ -77,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
strictDeps = true;
__structuredAttrs = true;
doCheck = true;
patches = [
./0001-Skip-bundle-fixup.patch
@@ -99,6 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
(cmakeBool "ENABLE_GTK" enableGTK)
(cmakeBool "ENABLE_MAC" enableMac)
(cmakeBool "ENABLE_QT" enableQt)
(cmakeBool "ENABLE_TESTS" finalAttrs.doCheck)
(cmakeBool "INSTALL_LIB" installLib)
(cmakeBool "RUN_CLANG_TIDY" false)
]

View File

@@ -2,6 +2,7 @@
lib,
stdenvNoCC,
fetchzip,
installFonts,
}:
stdenvNoCC.mkDerivation rec {
@@ -14,14 +15,7 @@ stdenvNoCC.mkDerivation rec {
hash = "sha256-54U8tZzvivTSOgmGesj9QbIgkSTm9w4quMhsuEc0Xy4=";
};
installPhase = ''
runHook preInstall
mkdir -p $out/share/fonts/truetype
cp */*.ttf $out/share/fonts/truetype
runHook postInstall
'';
nativeBuildInputs = [ installFonts ];
meta = {
description = "Ultimate Oldschool PC Font Pack (TTF Fonts)";

View File

@@ -169,9 +169,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
homepage = "https://wezterm.org";
license = lib.licenses.mit;
mainProgram = "wezterm";
maintainers = with lib.maintainers; [
SuperSandro2000
yvnth
];
maintainers = with lib.maintainers; [ SuperSandro2000 ];
};
})

View File

@@ -8,11 +8,11 @@
stdenv.mkDerivation {
pname = "python314-docs-texinfo";
version = "3.14.6";
version = "3.14.7";
src = fetchurl {
url = "https://www.python.org/ftp/python/doc/3.14.6/python-3.14.6-docs-texinfo.tar.bz2";
sha256 = "0nwdvgnxs6sik0d1kkl6fnnhxrvmj356i92abp84i33d4dy6i9hw";
url = "https://www.python.org/ftp/python/doc/3.14.7/python-3.14.7-docs-texinfo.tar.bz2";
sha256 = "sha256-FezukFw4rQTPbc8CUB1Afn3VgEDCvgaZAUGp+wv7AmI=";
};
installPhase = ''
mkdir -p $out/share/info

View File

@@ -8,11 +8,11 @@
stdenv.mkDerivation {
pname = "python314-docs-text";
version = "3.14.6";
version = "3.14.7";
src = fetchurl {
url = "https://www.python.org/ftp/python/doc/3.14.6/python-3.14.6-docs-text.tar.bz2";
sha256 = "0flqq4k9fq948gb3zim04znyxr21pfv8i4mrhh3qwna13fh897zg";
url = "https://www.python.org/ftp/python/doc/3.14.7/python-3.14.7-docs-text.tar.bz2";
sha256 = "sha256-CTat/lWLaXZ/50nMy/mddBxMG8CS13g6pGW2V0jRMoo=";
};
installPhase = ''
mkdir -p $out/share/doc/python314

View File

@@ -50,6 +50,7 @@ EOF
echo "Generating ${outfile}"
url=$(echo -n $URL |sed -e "s,VERSION,${version},g" -e "s,TYPE,${type},")
sha=$(nix-prefetch-url ${url} ${hash})
sha=$(nix hash convert --from nix32 --to sri --hash-algo sha256 "$sha")
sed -e "s,VERSION,${version}," \

View File

@@ -14,12 +14,12 @@
buildPythonPackage rec {
pname = "cloudflare";
version = "5.6.0";
version = "5.7.0";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-uMgVhq7NDOSPDaqoWczlVPe5dbAdMStg0aka0OpLZ/8=";
hash = "sha256-DKL7YBfoB3vXmCEdJQWqLK0Yai2sFKIKrle4/+Q/s4s=";
};
postPatch = ''

View File

@@ -1,12 +1,14 @@
{
lib,
stdenv,
_experimental-update-script-combinators,
alsa-lib,
alsa-plugins,
autoPatchelfHook,
fetchFromGitHub,
freetype,
installShellFiles,
libGL,
libGLU,
libpulseaudio,
libx11,
@@ -18,24 +20,27 @@
libxrandr,
libxrender,
makeWrapper,
nix-update-script,
openssl,
pkg-config,
scons,
testers,
udev,
writeScriptBin,
yasm,
zlib,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "godot3";
version = "3.6.2";
version = "3.6.3";
godotBuildDescription = "X11 tools";
src = fetchFromGitHub {
owner = "godotengine";
repo = "godot";
rev = "${finalAttrs.version}-stable";
hash = "sha256-loNjE+NmHniZ827Eb9MHSNo27F2LrURhWURjUq4d8xw=";
hash = "sha256-5MerJVY+SAri85mo2dbqxjDftpJJXzjsMAvlwidGEs4=";
};
# Fix PIE hardening: https://github.com/godotengine/godot/pull/50737
@@ -170,6 +175,39 @@ stdenv.mkDerivation (finalAttrs: {
]
);
passthru = {
tests.version = testers.testVersion {
package = finalAttrs.finalPackage;
};
updateScript = _experimental-update-script-combinators.sequence [
(nix-update-script {
extraArgs = [
"--version-regex"
"(3\\..*)-stable"
];
})
./mono/update-glue-version.sh
];
patch-godot-bin =
let
libPath = lib.makeLibraryPath [
libxcursor
libxinerama
libxext
libxrandr
libxrender
libx11
libxi
libGL
];
in
writeScriptBin "patch-godot-bin" ''
patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" --set-rpath "${libPath}" "$1"
'';
};
meta = {
homepage = "https://godotengine.org";
description =

View File

@@ -44,17 +44,15 @@
# official glue version by building from the official source.
#
# To address this, we are patching the python script with a hard-coded glue version number. This
# patch file needs to be updated for every new version of godot, so to enforce this, the godot
# version is baked in to the file name, causing the build to fail until the patch is updated.
# patch file needs to be updated for every new version of godot.
#
# The correct glue version number for a given godot version is obtained by running the official
# build of that version of godot with the --generate-mono-glue flag. This generates the mono
# glue files. One of those files, mono_glue.gen.cpp, has a function called get_cs_glue_version()
# which contains a hard-coded number. This is the glue version to put in the patch file.
#
# For convenience, the accompanying update-glue-version.sh script automates this work. Run it by
# passing the godot version as an argument, e.g. "3.5.2".
"/gen_cs_glue_version.py/hardcodeGlueVersion_${self.version}.patch"
# For convenience, the accompanying update-glue-version.sh script automates this work.
"/gen_cs_glue_version.py/hardcodeGlueVersion.patch"
];
outputs = [ "out" ];

View File

@@ -16,7 +16,7 @@ index 98bbb4d9be..5189f2551b 100644
- latest_mtime = mtime if mtime > latest_mtime else latest_mtime
-
- glue_version = int(latest_mtime) # The latest modified time will do for now
+ glue_version = 1761170065
+ glue_version = 1787344265
with open(version_header_dst, "w") as version_header:
version_header.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n")

View File

@@ -1,39 +1,41 @@
#! /usr/bin/env nix-shell
#! nix-shell -i bash -p steam-run unzip wget
#! nix-shell -i bash -p unzip wget godot3.patch-godot-bin -I nixpkgs=.
# shellcheck shell=bash
# This script updates the hard-coded glue_version in:
#
# patches/gen_cs_glue_version.py/hardcodeGlueVersionFor{version}.patch
# patches/gen_cs_glue_version.py/hardcodeGlueVersionFor.patch
#
# It does so by pulling it from the official build.
set -e
[ -z "$1" ] && echo "Godot version not specified. Exiting." && exit 1
gdversion=$1
if [[ -z "$1" ]]; then
gdversion=$(nix-instantiate --eval --raw -A ${UPDATE_NIX_ATTR_PATH:-godot3}.version)
else
gdversion=$1
fi
# Download and extract the official stable 64-bit X11 mono build of Godot.
gddir="$(mktemp -d)"
trap 'rm -rf -- "$gddir"' EXIT
tmpdir="$(mktemp -d)"
trap 'rm -rf -- "$tmpdir"' EXIT
gddir="$tmpdir"/gd
gluedir="$tmpdir"/glue
mkdir -p "$gddir" "$gluedir"
wget -O "$gddir"/Godot_v$gdversion-stable_mono_x11_64.zip "https://downloads.godotengine.org/?version=$gdversion&flavor=stable&slug=mono_x11_64.zip&platform=linux.64"
unzip "$gddir"/Godot_v$gdversion-stable_mono_x11_64.zip -d "$gddir"
# Generate the mono glue from the official build.
gluedir="$(mktemp -d)"
trap 'rm -rf -- "$gluedir"' EXIT
steam-run "$gddir"/Godot_v$gdversion-stable_mono_x11_64/Godot_v$gdversion-stable_mono_x11.64 --generate-mono-glue "$gluedir"
patch-godot-bin "$gddir"/Godot_v$gdversion-stable_mono_x11_64/Godot_v$gdversion-stable_mono_x11.64
"$gddir"/Godot_v$gdversion-stable_mono_x11_64/Godot_v$gdversion-stable_mono_x11.64 --generate-mono-glue "$gluedir"
# Extract the glue version.
glueversion=$(grep -Po '(?<=get_cs_glue_version\(\) \{ return )[0-9]+(?=; \})' "$gluedir"/mono_glue.gen.cpp)
patchdir=./patches/gen_cs_glue_version.py/
patchprefix=hardcodeGlueVersion_
newpatchname=$patchprefix$gdversion.patch
patch="$(dirname "${BASH_SOURCE[0]}")"/patches/gen_cs_glue_version.py/hardcodeGlueVersion.patch
# Update the patch with the obtained glue version.
sed -i "s/^+ glue_version = [0-9]\+$/+ glue_version = $glueversion/" $patchdir/$patchprefix*.patch
sed -i "s/^+ glue_version = [0-9]\+$/+ glue_version = $glueversion/" "$patch"
mv $patchdir/$patchprefix*.patch $patchdir/$patchprefix$gdversion.patch
echo "Updated $patchdir/$patchprefix$gdversion.patch with glue_version: $glueversion"
echo "Updated $patch with glue_version: $glueversion"