Compare commits

..

1 Commits

Author SHA1 Message Date
nixpkgs-ci[bot]
31073b23b0 maintainers/github-teams.json: Automated sync 2026-06-15 20:40:55 +00:00
153 changed files with 3024 additions and 18355 deletions

View File

@@ -128,7 +128,6 @@
"Pandapip1": 45835846,
"a-kenji": 65275785,
"drakon64": 6444703,
"michaelBelsanti": 62124625,
"thefossguy": 44400303
},
"name": "COSMIC"
@@ -847,6 +846,18 @@
},
"name": "Radicle"
},
"redis": {
"description": "Maintain Redis, related packages, module, and tests.",
"id": 17932473,
"maintainers": {
"Hythera": 87016780,
"MiniHarinn": 52773156,
"debtquity": 225436867,
"kybe236": 118068228
},
"members": {},
"name": "Redis"
},
"reproducible": {
"description": "Team that is interested in reproducible builds",
"id": 7625643,

View File

@@ -10455,11 +10455,6 @@
githubId = 14929991;
keys = [ { fingerprint = "F7D3 7890 228A 9074 40E1 FD48 46B9 228E 814A 2AAC"; } ];
};
haansn08 = {
name = "Stefan Haan";
github = "haansn08";
githubId = 6215916;
};
hacker1024 = {
name = "hacker1024";
email = "hacker1024@users.sourceforge.net";
@@ -18355,13 +18350,6 @@
github = "mkleczek";
githubId = 11559480;
};
mkoppmann = {
email = "dev@mkoppmann.at";
github = "mkoppmann";
githubId = 21209717;
matrix = "@shibayashi:ncrypt.at";
name = "Michael Koppmann";
};
mksafavi = {
name = "MK Safavi";
email = "mksafavi@gmail.com";
@@ -20648,6 +20636,12 @@
matrix = "@olduser101:matrix.org";
name = "Nathan Gill";
};
olebedev = {
email = "ole6edev@gmail.com";
github = "olebedev";
githubId = 848535;
name = "Oleg Lebedev";
};
oleina = {
email = "antholeinik@gmail.com";
github = "antholeole";

View File

@@ -70,6 +70,7 @@ with lib.maintainers;
members = [
mboes
cbley
olebedev
groodt
aherrmann
ylecornec

View File

@@ -17,7 +17,9 @@ in
Note that only users in the "uinput" group will be able to use the package
'';
};
package = lib.mkPackageOption pkgs "mouse-actions" { };
package = lib.mkPackageOption pkgs "mouse-actions" {
example = "mouse-actions-gui";
};
autorun = lib.mkOption {
type = lib.types.bool;
default = false;

View File

@@ -13,18 +13,18 @@
writableTmpDirAsHomeHook,
}:
let
version = "0.9.4";
version = "0.9.3";
src = fetchFromGitHub {
owner = "dmtrKovalenko";
repo = "fff.nvim";
tag = "v${version}";
hash = "sha256-q/RfjfVZMM8RyfOP1o2NjUP6NrOh7D2ribgq5Dvwxkc=";
hash = "sha256-9k1XWnHzBjy7dABCzZ0yxCHqgX1bsWkkxksLVLDqdmc=";
};
fff-nvim-lib = rustPlatform.buildRustPackage {
pname = "fff-nvim-lib";
inherit version src;
cargoHash = "sha256-NmQDTsevfJq6UGfoxaHwEX4+eJZLXebndpFAsbUNvl8=";
cargoHash = "sha256-R/w3Km9LTqWQ2NFbwYbTCld72av26BdXtxC/K0sqdlQ=";
cargoBuildFlags = [
"-p"

View File

@@ -481,8 +481,8 @@ let
mktplcRef = {
publisher = "ban";
name = "spellright";
version = "3.0.154";
hash = "sha256-vGzmzY78FOS8ZsrT1YpTNOUJprW4rZHVuM83cZz6V+Q=";
version = "3.0.148";
hash = "sha256-h1xKEpKg4j7mGw3EQQDPZBDBDY/xjk2lsGk0ktd2ems=";
};
meta = {
description = "Visual Studio Code extension for Spellchecker";
@@ -2346,8 +2346,8 @@ let
mktplcRef = {
name = "vscode-vibrancy-continued";
publisher = "illixion";
version = "1.1.79";
hash = "sha256-Yja0W+wIizOOyF9um8t1V7g0DMdv9fVlR4uJCE/pbjk=";
version = "1.1.78";
hash = "sha256-w0i0Gmqj2atCtEYW+0XvZech37qQaTjkt8MJRdHamxs=";
};
meta = {
downloadPage = "https://marketplace.visualstudio.com/items?itemName=illixion.vscode-vibrancy-continued";
@@ -4164,8 +4164,8 @@ let
mktplcRef = {
name = "metals";
publisher = "scalameta";
version = "1.67.0";
hash = "sha256-THrd3Yix0gohTo/cshy9ZYZysA+xCGLx4KJHFk4zmCM=";
version = "1.66.0";
hash = "sha256-hC2YR67hRfk9QuKVbmK1IzHIGyQ3XTBNvaCP66eC/no=";
};
meta = {
license = lib.licenses.asl20;

View File

@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "helm-diff";
version = "3.15.9";
version = "3.15.8";
src = fetchFromGitHub {
owner = "databus23";
repo = "helm-diff";
rev = "v${version}";
hash = "sha256-dZ2bXouzjX0rw9NoUJjtF4KzTuZVdHm2ik6puiOg2Tc=";
hash = "sha256-rH5EgSrL6yBmLd8m5QhEe3VTv8NVmyO5AC++7QQw/wI=";
};
vendorHash = "sha256-GanQBm/g+PcMHaXA5gAaqacpOuv6kES6ng/CmH8/0j4=";
vendorHash = "sha256-wBGHhjVNqA7SAueg9xowqxcCda8HzggepmOprsKPnjo=";
ldflags = [
"-s"

View File

@@ -46,7 +46,7 @@
libredirect,
libseccomp,
libsecret,
# libsoup_2_4,
libsoup_2_4,
libvorbis,
libxml2_13,
libxslt,
@@ -210,7 +210,7 @@ stdenv.mkDerivation rec {
libpulseaudio
libseccomp
libsecret
# libsoup_2_4
libsoup_2_4
libvorbis
libxml2_13
libxslt
@@ -443,11 +443,9 @@ stdenv.mkDerivation rec {
'';
meta = {
# citrix_workspace has a hard dependency on libsoup 2.4 (autoPatchelf
# fails if it is not present), which was removed for being insecure.
#
# Versions older than 25.08 also required webkitgtk_4_0, which was removed.
broken = true;
# Older versions need webkitgtk_4_0 which was removed.
# 25.08 bundles the same.
broken = lib.versionOlder version "25.08";
license = lib.licenses.unfree;
description = "Citrix Workspace";
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];

View File

@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "adrs";
version = "0.7.6";
version = "0.7.4";
src = fetchFromGitHub {
owner = "joshrotenberg";
repo = "adrs";
tag = "v${finalAttrs.version}";
hash = "sha256-PB/BuZP2pvYJCjaazEPs9d2ik8Fs7nuTnHdLREsu+wQ=";
hash = "sha256-JtYj30XGs+SbbbSy1aHbyZFlwQ/rkZ3JPrvRm4hicxg=";
};
cargoHash = "sha256-RzX3moZog5BIppvWtQcU4Yauk4hZQfc8ZuFkvRs5jXA=";
cargoHash = "sha256-uvgadUtRmHoa3piEiTaLhVKEeGA/YIl6AMRPHNubYhQ=";
meta = {
description = "Command-line tool for managing Architectural Decision Records";

View File

@@ -0,0 +1,76 @@
{
rustPlatform,
lib,
fetchFromGitHub,
pkg-config,
# webkitgtk_4_0,
openssl,
nodejs,
npmHooks,
fetchNpmDeps,
gtk3,
wrapGAppsHook3,
cargo-tauri_1,
librsvg,
libappindicator-gtk3,
}:
rustPlatform.buildRustPackage rec {
pname = "alexandria";
version = "0.13.1";
src = fetchFromGitHub {
owner = "btpf";
repo = "Alexandria";
tag = "v${version}";
hash = "sha256-18i3/HLTfhBSa9/c55dCOfFal+V40wcHcLoYt1dU+d0=";
fetchSubmodules = true;
};
npmDeps = fetchNpmDeps {
inherit src;
hash = "sha256-6r9bEY7e1Eef/0/CJ26ITpFJcCVUEKLrFx+TNEomLPE=";
};
cargoRoot = "src-tauri";
buildAndTestSubdir = "src-tauri";
cargoHash = "sha256-VX/G4dF9DhlGfifp4xf9xkXli7BHFtKY2+HaMHqqPiA=";
env = {
OPENSSL_NO_VENDOR = 1;
};
nativeBuildInputs = [
cargo-tauri_1.hook
nodejs
npmHooks.npmConfigHook
pkg-config
rustPlatform.bindgenHook
wrapGAppsHook3
];
buildInputs = [
openssl
# webkitgtk_4_0
gtk3
librsvg
libappindicator-gtk3
];
meta = {
# webkitgtk_4_0 was removed
broken = true;
homepage = "https://github.com/btpf/Alexandria";
changelog = "https://github.com/btpf/Alexandria/releases/tag/v${version}";
description = "Minimalistic cross-platform eBook reader";
maintainers = with lib.maintainers; [ bot-wxt1221 ];
mainProgram = "alexandria";
platforms = [
"x86_64-linux"
"aarch64-darwin"
"x86_64-darwin"
];
license = lib.licenses.gpl3Plus;
};
}

View File

@@ -30,15 +30,23 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ayatana-indicator-display";
version = "26.6.0";
version = "24.5.2";
src = fetchFromGitHub {
owner = "AyatanaIndicators";
repo = "ayatana-indicator-display";
tag = finalAttrs.version;
hash = "sha256-A4v2cdsFgR50b8BGAMpR9DrHxlVlahaM8Fii+eQ3UcA=";
hash = "sha256-rsZjEfAiz1HC5XMjPume1Y6miNAv1kmPFP4J/+NKlsA=";
};
patches = [
# This should be dropped once the issue is fixed upstream.
# https://github.com/AyatanaIndicators/ayatana-indicator-display/pull/108
./patches/0001-service.cpp-Mark-create_phone_menu-as-static.patch
./patches/0002-cppcheck-Workaround-undefined-function-like-macro-fo.patch
./patches/0003-Fix-cppcheck-warning-has-no-initializer.patch
];
postPatch = ''
# Replace systemd prefix in pkg-config query, use GNUInstallDirs location for /etc
substituteInPlace data/CMakeLists.txt \

View File

@@ -0,0 +1,26 @@
From 5a1ce0ea5fd630efc7d85d681dacb562c356c3a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jeremy=20B=C3=ADcha?= <jbicha@ubuntu.com>
Date: Sun, 29 Mar 2026 21:49:07 -0700
Subject: [PATCH 1/3] service.cpp: Mark create_phone_menu as static
to satisfy cppcheck
---
src/service.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/service.cpp b/src/service.cpp
index d6b4ed7..ced370c 100644
--- a/src/service.cpp
+++ b/src/service.cpp
@@ -1058,7 +1058,7 @@ private:
static_cast<Impl*>(gself)->update_phone_header();
}
- GMenuModel* create_phone_menu()
+ static GMenuModel* create_phone_menu()
{
GMenu* menu;
GMenu* section;
--
2.43.0

View File

@@ -0,0 +1,49 @@
From 3f30df763c2b0ac84b1c754faaedc69107539508 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jeremy=20B=C3=ADcha?= <jbicha@ubuntu.com>
Date: Sun, 29 Mar 2026 17:02:56 -0700
Subject: [PATCH 2/3] cppcheck: Workaround undefined function-like macro for
GLIB_CHECK_VERSION
Copy a snippet from gtk.cfg.
I didn't include gtk.cfg directly because its config triggers
additional failures, so only copy the one line that we need
https://github.com/danmar/cppcheck/commit/8c762adcdd9e
https://bugs.debian.org/1125642
Closes: #106
---
tests/CMakeLists.txt | 2 +-
tests/ayatana.cfg | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
create mode 100644 tests/ayatana.cfg
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index bdc074f..97d6be0 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -28,7 +28,7 @@ endif()
add_compile_options(${CXX_WARNING_ARGS})
-add_test(cppcheck cppcheck --enable=all -USCHEMA_DIR --check-level=exhaustive --error-exitcode=2 --inline-suppr --library=qt -I${CMAKE_SOURCE_DIR} -i${CMAKE_SOURCE_DIR}/tests/utils/qmain.cpp -i${CMAKE_SOURCE_DIR}/tests/gmock ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests --suppress=missingIncludeSystem --suppress=uninitDerivedMemberVar --suppress=unmatchedSuppression --suppress=constParameter --suppress=constParameterCallback --suppress=unusedFunction --suppress=uselessOverride)
+add_test(cppcheck cppcheck --enable=all -USCHEMA_DIR --check-level=exhaustive --error-exitcode=2 --inline-suppr --library=qt --library=${CMAKE_SOURCE_DIR}/tests/ayatana.cfg -I${CMAKE_SOURCE_DIR} -i${CMAKE_SOURCE_DIR}/tests/utils/qmain.cpp -i${CMAKE_SOURCE_DIR}/tests/gmock ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests --suppress=missingIncludeSystem --suppress=uninitDerivedMemberVar --suppress=unmatchedSuppression --suppress=constParameter --suppress=constParameterCallback --suppress=unusedFunction --suppress=uselessOverride)
add_subdirectory (unit)
diff --git a/tests/ayatana.cfg b/tests/ayatana.cfg
new file mode 100644
index 0000000..035020a
--- /dev/null
+++ b/tests/ayatana.cfg
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<def format="2">
+ <!-- cppcheck override copied from gtk.cfg -->
+ <define name="GLIB_CHECK_VERSION(major, minor, micro)" value="1"/>
+</def>
--
2.43.0

View File

@@ -0,0 +1,30 @@
From 172bf8a7d8e232d31a85ef61d21ee54b6c2eab7c Mon Sep 17 00:00:00 2001
From: fliiiix <hi@l33t.name>
Date: Tue, 9 Jun 2026 15:33:29 +0200
Subject: [PATCH 3/3] Fix cppcheck warning has no initializer
cppcheck 2.21.0
---
src/service.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/service.cpp b/src/service.cpp
index ced370c..251df5b 100644
--- a/src/service.cpp
+++ b/src/service.cpp
@@ -50,9 +50,9 @@ extern "C"
typedef struct
{
- guint nTempLow;
- guint nTempHigh;
- const gchar *sName;
+ guint nTempLow{};
+ guint nTempHigh{};
+ const gchar *sName = nullptr;
} TempProfile;
TempProfile m_lTempProfiles[] =
--
2.43.0

View File

@@ -44,6 +44,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
homepage = "https://github.com/joscha/bkyml";
description = "CLI tool to generate a pipeline.yaml file for Buildkite on the fly";
license = lib.licenses.mit;
maintainers = [ ];
maintainers = with lib.maintainers; [ olebedev ];
};
})

View File

@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cargo-deny";
version = "0.19.9";
version = "0.19.8";
src = fetchFromGitHub {
owner = "EmbarkStudios";
repo = "cargo-deny";
tag = finalAttrs.version;
hash = "sha256-b3p4UxMDUNMKusgGDji3A0myfAfYU+o4DFnhM4mrWao=";
hash = "sha256-pcF/SYtlydu09ZXQ5/1Wm2gwttFBulEt27SCEY1+kNU=";
};
cargoHash = "sha256-+FWEA2T8CASg3MmTb7WpN4MO8lwiLZtsVDuWMddkUgA=";
cargoHash = "sha256-I2BHVcpULObHtsqBxzTvEPevZa/CkhlC/gj0ldofDwA=";
nativeBuildInputs = [
pkg-config

View File

@@ -0,0 +1,68 @@
{
lib,
stdenv,
bzip2,
pkg-config,
rustPlatform,
xz,
zstd,
cargo-tauri,
}:
cargo-tauri.overrideAttrs (
finalAttrs: oldAttrs: {
version = "1.6.6";
src = oldAttrs.src.override {
hash = "sha256-UE/mJ0WdbVT4E1YuUCtu80UB+1WR+KRWs+4Emy3Nclc=";
};
patches = [ ];
postPatch = "";
# Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at
# https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202
sourceRoot = "${finalAttrs.src.name}/tooling/cli";
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs)
pname
version
src
sourceRoot
;
hash = "sha256-kAaq6Kam3e5n8569Y4zdFEiClI8q97XFX1hBD7NkUqw=";
};
nativeBuildInputs = oldAttrs.nativeBuildInputs or [ ] ++ [ pkg-config ];
buildInputs = [
# Required by `zip` in `tauri-bundler`
bzip2
zstd
]
# Required by `rpm` in `tauri-bundler`
++ lib.optionals stdenv.hostPlatform.isLinux [ xz ];
env = {
ZSTD_SYS_USE_PKG_CONFIG = true;
};
passthru = {
inherit (oldAttrs.passthru) hook gst-plugin;
tests = { inherit (oldAttrs.passthru.tests) version; };
};
meta = {
inherit (oldAttrs.meta)
description
homepage
changelog
license
maintainers
mainProgram
;
};
}
)

View File

@@ -9,16 +9,16 @@
buildGoModule (finalAttrs: {
pname = "clickhouse-backup";
version = "2.7.2";
version = "2.7.1";
src = fetchFromGitHub {
owner = "Altinity";
repo = "clickhouse-backup";
tag = "v${finalAttrs.version}";
hash = "sha256-rzCVuyG04IHl5oUyw9XuyN56tM/AzAmveZ9NsB7Co68=";
hash = "sha256-hS3Hhy8NYIP/xpXZNSdzO4U0jWcl7nw+H8I1rnpvBmQ=";
};
vendorHash = "sha256-MZfAEXoONdx/2Zb4NeDrdM1WT4jnqhwdNkMm6QzasGY=";
vendorHash = "sha256-8vWqfoAJiZyb7ABk5bC3kuTu1s8dPgB+oHAI5eENDWY=";
ldflags = [
"-X main.version=${finalAttrs.version}"

View File

@@ -1,47 +0,0 @@
From a471982c82d1917637cce81a084fcd4b02d6e33b Mon Sep 17 00:00:00 2001
From: David Roman <droman@ifae.es>
Date: Mon, 25 Nov 2024 14:10:16 +0100
Subject: [PATCH] fix build with btrfs-progs >= 6.10.1
https://github.com/kilobyte/compsize/pull/54
---
compsize.c | 2 ++
radix-tree.h | 4 ----
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/compsize.c b/compsize.c
index 42ec304..0f533e5 100644
--- a/compsize.c
+++ b/compsize.c
@@ -5,12 +5,14 @@
#include <unistd.h>
#include <fcntl.h>
#include <dirent.h>
+#include "kerncompat.h"
#include <btrfs/ioctl.h>
#include <btrfs/ctree.h>
#include <stdarg.h>
#include <stdlib.h>
#include <sys/ioctl.h>
#include <inttypes.h>
+#include <errno.h>
#include <linux/limits.h>
#include <getopt.h>
#include <signal.h>
diff --git a/radix-tree.h b/radix-tree.h
index bf96d83..d99ea7e 100644
--- a/radix-tree.h
+++ b/radix-tree.h
@@ -37,11 +37,7 @@
#ifndef _LINUX_RADIX_TREE_H
#define _LINUX_RADIX_TREE_H
-#if BTRFS_FLAT_INCLUDES
#include "kerncompat.h"
-#else
-#include <btrfs/kerncompat.h>
-#endif /* BTRFS_FLAT_INCLUDES */
#define RADIX_TREE_MAX_TAGS 2

View File

@@ -2,45 +2,49 @@
lib,
stdenv,
fetchFromGitHub,
fetchurl,
btrfs-progs,
}:
stdenv.mkDerivation {
let
# https://github.com/kilobyte/compsize/issues/52
btrfs-progs' = btrfs-progs.overrideAttrs (old: rec {
pname = "btrfs-progs";
version = "6.10";
src = fetchurl {
url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
hash = "sha256-M4KoTj/P4f/eoHphqz9OhmZdOPo18fNFSNXfhnQj4N8=";
};
});
in
stdenv.mkDerivation rec {
pname = "compsize";
version = "1.5-unstable-2023-12-24";
version = "1.5";
src = fetchFromGitHub {
owner = "kilobyte";
repo = "compsize";
rev = "d79eacf77abe3b799387bb8a4e07a18f1f1031e8";
sha256 = "sha256-pwHFllwTznhgZAGtGsULoLLBZlCllGt1eBmUKoJ/2wk=";
rev = "v${version}";
sha256 = "sha256-OX41ChtHX36lVRL7O2gH21Dfw6GPPEClD+yafR/PFm8=";
};
patches = [
./btrfs-progs-6-10-1.patch
];
__structuredAttrs = true;
strictDeps = true;
enableParallelBuilding = true;
outputs = [
"out"
"man"
];
buildInputs = [ btrfs-progs ];
buildInputs = [ btrfs-progs' ];
installFlags = [
"PREFIX=${placeholder "out"}"
];
preInstall = ''
mkdir -p $out/share/man/man8
'';
meta = {
description = "Find compression type/ratio on a file or set of files in the Btrfs filesystem";
mainProgram = "compsize";
homepage = "https://github.com/kilobyte/compsize";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ sandarukasa ];
maintainers = [ ];
platforms = lib.platforms.linux;
};
}

View File

@@ -6,16 +6,16 @@
buildNpmPackage rec {
pname = "cz-cli";
version = "4.3.2";
version = "4.3.0";
src = fetchFromGitHub {
owner = "commitizen";
repo = "cz-cli";
tag = "v${version}";
hash = "sha256-+MBFO3sisxV/4iddZTsfJW8QARZ+JlWK5ao3KNJ3zSA=";
hash = "sha256-4kyGxidE8dzkHL0oPv/XxDxQ3qlEE6TKSgj+1g9uvJM=";
};
npmDepsHash = "sha256-6UpTaMqd7T17gx4yJowcWJMgKmFeq2r2yckrx1OpTCc=";
npmDepsHash = "sha256-zQ0T/1khnn+CXm/3yc9nANL0ROEEE03U5fV57btEmPg=";
meta = {
description = "Commitizen command line utility";

View File

@@ -0,0 +1,85 @@
{
lib,
rustPlatform,
buildNpmPackage,
fetchFromGitHub,
copyDesktopItems,
makeDesktopItem,
pkg-config,
gtk3,
libsoup_2_4,
}:
rustPlatform.buildRustPackage rec {
pname = "desktop-postflop";
version = "0.2.7";
src = fetchFromGitHub {
owner = "b-inary";
repo = "desktop-postflop";
rev = "v${version}";
hash = "sha256-pOPxNHM4mseIuyyWNoU0l+dGvfURH0+9+rmzRIF0I5s=";
};
npmDist = buildNpmPackage {
name = "${pname}-${version}-dist";
inherit src;
npmDepsHash = "sha256-HWZLicyKL2FHDjZQj9/CRwVi+uc/jHmVNxtlDuclf7s=";
installPhase = ''
mkdir -p $out
cp -r dist/* $out
'';
};
sourceRoot = "${src.name}/src-tauri";
cargoHash = "sha256-pMvh2Rr+rMe0nMB9yRDrGatrS36+VM7os0eeBR31oCM=";
postPatch = ''
substituteInPlace tauri.conf.json \
--replace "../dist" "${npmDist}"
'';
# postflop-solver requires unstable rust features
env.RUSTC_BOOTSTRAP = 1;
nativeBuildInputs = [
copyDesktopItems
pkg-config
];
buildInputs = [
gtk3
libsoup_2_4
# webkitgtk_4_0
];
postInstall = ''
install -Dm644 ${src}/public/favicon.png $out/share/icons/hicolor/128x128/apps/desktop-postflop.png
'';
desktopItems = [
(makeDesktopItem {
name = "desktop-postflop";
exec = "desktop-postflop";
icon = "desktop-postflop";
desktopName = "Desktop Postflop";
comment = meta.description;
categories = [ "Utility" ];
terminal = false;
})
];
meta = {
# webkitgtk_4_0 was removed
broken = true;
changelog = "https://github.com/b-inary/desktop-postflop/releases/tag/${src.rev}";
description = "Free, open-source GTO solver for Texas hold'em poker";
homepage = "https://github.com/b-inary/desktop-postflop";
license = lib.licenses.agpl3Plus;
mainProgram = "desktop-postflop";
maintainers = with lib.maintainers; [ tomasajt ];
};
}

View File

@@ -7,29 +7,29 @@
}:
let
version = "2026.5.26-8";
version = "2026.5.26-6";
throwSystem = throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}";
srcs = {
x86_64-linux = fetchurl {
url = "https://static.devin.ai/cli/${version}/devin-${version}-x86_64-unknown-linux.tar.gz";
hash = "sha256-TqSABBxigiYTafi0vxFYnssLjHbiXYaNxI8prkkp8CE=";
hash = "sha256-8jEq0X2owEnOdSWzEhDOYahAdq/3G/JIUZShHbYrR2c=";
};
aarch64-linux = fetchurl {
url = "https://static.devin.ai/cli/${version}/devin-${version}-aarch64-unknown-linux.tar.gz";
hash = "sha256-1hoTd6JR43nR+heLqU7igP+debI1bhWcIlG6BGyaj3I=";
hash = "sha256-i8m05WrmO/KQCt/4jVFkRxz9nIXZEDi8idVhXkXxDig=";
};
aarch64-darwin = fetchurl {
url = "https://static.devin.ai/cli/${version}/devin-${version}-aarch64-apple-darwin.tar.gz";
hash = "sha256-/8vd26V0z1qyt8EOJ2Z/JdWNGjb+iN+YkgaJQRoBHUk=";
hash = "sha256-WPL1kPMSmqh9/n2m9CvNnUcyLfjHz3PC9tAjGrjaZfw=";
};
x86_64-darwin = fetchurl {
url = "https://static.devin.ai/cli/${version}/devin-${version}-x86_64-apple-darwin.tar.gz";
hash = "sha256-uF6ORbWwC0hgIURFoXFQh/5oPvfS4cgRBaCui4S0E0E=";
hash = "sha256-HtB5iCT3d3AprPM+1uNkPkX0v4wSerTJlEu5F4P6pp0=";
};
};
in

View File

@@ -3,8 +3,8 @@
set -euo pipefail
currentVersion=$(nix-instantiate --eval --raw -E "with import ./. {}; devin-cli.version or (lib.getVersion devin-cli)")
latestVersion=$(curl https://static.devin.ai/cli/current/manifest.json | jq -r '.version')
currentVersion=$(nix-instantiate --eval -E "with import ./. {}; devin-cli.version or (lib.getVersion devin-cli)" | tr -d '"')
latestVersion=$(curl https://static.devin.ai/cli/current/manifest.json | jq '.version' | tr -d '"')
if [[ "$currentVersion" == "$latestVersion" ]]; then
echo "package is up-to-date: $currentVersion"
@@ -18,7 +18,6 @@ for system in \
aarch64-linux \
x86_64-darwin \
aarch64-darwin; do
hash=$(nix store prefetch-file --json --hash-type sha256 \
$(nix-instantiate --eval --raw -E "with import ./. {}; devin-cli.src.url" --system "$system") | jq -r '.hash')
hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix-instantiate --eval -E "with import ./. {}; devin-cli.src.url" --system "$system" | tr -d '"')))
update-source-version devin-cli $latestVersion $hash --system=$system --ignore-same-version
done

View File

@@ -22,13 +22,13 @@ let
in
stdenv.mkDerivation rec {
pname = "ed-odyssey-materials-helper";
version = "3.7.0";
version = "3.6.6";
src = fetchFromGitHub {
owner = "jixxed";
repo = "ed-odyssey-materials-helper";
tag = version;
hash = "sha256-vQn45gHcMRLH5ta5+h3QXLODUlmDWeG1PSRRl/hgfiE=";
hash = "sha256-ljCN2tW7iH+kTiSXwUt+OsAhjYKlAy0W5x/JDmQeR6M=";
};
nativeBuildInputs = [
@@ -147,7 +147,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/jixxed/ed-odyssey-materials-helper";
downloadPage = "https://github.com/jixxed/ed-odyssey-materials-helper/releases/tag/${version}";
changelog = "https://github.com/jixxed/ed-odyssey-materials-helper/releases/tag/${version}";
license = lib.licenses.mit;
license = lib.licenses.gpl3Only;
sourceProvenance = with lib.sourceTypes; [
fromSource
binaryBytecode # mitm cache

View File

@@ -17,16 +17,16 @@
}:
let
version = "0.309.1";
version = "0.309.0";
src = fetchFromGitHub {
owner = "evcc-io";
repo = "evcc";
tag = version;
hash = "sha256-fMWLr8UrwejLlPiPdcs5lLd//81iqvuE5Ia9Ne0d3l4=";
hash = "sha256-Uyb83sBFNJLRU78Q60Mj3Q6j9Uvrv3unj0kkAdTXePc=";
};
vendorHash = "sha256-lCXIgJuUg5NG8E/iYobGxtvxfTk77Y8ZzVi0GsjbbHw=";
vendorHash = "sha256-95yI/ObkLByzO+BBbACylaNcCrple8MpxY8dKLGqFDE=";
commonMeta = {
license = lib.licenses.mit;

View File

@@ -1,78 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
rustPlatform,
cargo-tauri,
nodejs,
npmHooks,
fetchNpmDeps,
pkg-config,
webkitgtk_4_1,
libayatana-appindicator,
libxscrnsaver,
cacert,
wrapGAppsHook3,
autoPatchelfHook,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "fluux-messenger";
version = "0.16.0";
__structuredAttrs = true;
strictDeps = true;
src = fetchFromGitHub {
owner = "processone";
repo = "fluux-messenger";
rev = "v${finalAttrs.version}";
hash = "sha256-P4bRyge5EGdlZBdX+gIWh48itkCLQ+EjKLHt4xv6qnY=";
};
cargoRoot = "apps/fluux/src-tauri";
cargoHash = "sha256-YIX/F9LMuHFGJ89NIsFLUjjrR7XBoJF78OsyXiSjEqU=";
npmDeps = fetchNpmDeps {
name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
inherit (finalAttrs) src;
hash = "sha256-rzkFrvLb/0c+pg2SIUnhyTHK2MGL2ugRI9XuHtdm8XE=";
};
nativeBuildInputs = [
cargo-tauri.hook
nodejs
npmHooks.npmConfigHook
pkg-config
]
++ lib.optionals stdenv.hostPlatform.isLinux [
(wrapGAppsHook3.override { isGraphical = true; })
autoPatchelfHook
];
buildInputs = [
webkitgtk_4_1
libayatana-appindicator
libxscrnsaver
cacert
];
# libayatana-appindicator is not in the RUNPATH by default
runtimeDependencies = [ libayatana-appindicator ];
tauriBuildFlags = [ "--no-sign" ];
# setting buildAndTestSubdir from the beginning interferes with buildPhase
preCheck = "export buildAndTestSubdir=${finalAttrs.cargoRoot}";
# tauriInstallHook only works when we are in cargoRoot
preInstall = "pushd $buildAndTestSubdir";
postInstall = "popd";
meta = {
description = "XMPP client for communities and organizations";
homepage = "https://github.com/processone/fluux-messenger";
license = lib.licenses.agpl3Plus;
mainProgram = "fluux";
maintainers = [ lib.maintainers.haansn08 ];
platforms = lib.platforms.all;
};
})

View File

@@ -0,0 +1,72 @@
{
lib,
stdenv,
fetchFromGitHub,
nix-update-script,
pantheon,
vala,
pkg-config,
meson,
ninja,
python3,
glib,
gsettings-desktop-schemas,
gtk3,
libgee,
libhandy,
libsoup_2_4,
json-glib,
glib-networking,
desktop-file-utils,
wrapGAppsHook3,
}:
stdenv.mkDerivation rec {
pname = "fondo";
version = "1.6.1";
src = fetchFromGitHub {
owner = "calo001";
repo = "fondo";
rev = version;
sha256 = "sha256-JiDbkVs+EZRWRohSiuh8xFFgEhbnMYZfnZtz5Z4Wdb0=";
};
nativeBuildInputs = [
desktop-file-utils
meson
ninja
pkg-config
python3
vala
wrapGAppsHook3
];
buildInputs = [
glib
glib-networking
gsettings-desktop-schemas
gtk3
json-glib
libgee
libhandy
libsoup_2_4
pantheon.granite
];
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
'';
passthru.updateScript = nix-update-script { };
meta = {
homepage = "https://github.com/calo001/fondo";
description = "Find the most beautiful wallpapers for your desktop";
license = lib.licenses.agpl3Plus;
teams = [ lib.teams.pantheon ];
platforms = lib.platforms.linux;
mainProgram = "com.github.calo001.fondo";
};
}

View File

@@ -0,0 +1,70 @@
{
stdenv,
lib,
fetchFromGitHub,
meson,
ninja,
vala,
pkg-config,
desktop-file-utils,
glib,
gtk3,
glib-networking,
libgee,
libsoup_2_4,
json-glib,
sqlite,
# webkitgtk_4_0,
libmanette,
libxtst,
wrapGAppsHook3,
}:
stdenv.mkDerivation rec {
pname = "GameHub";
version = "0.16.3-2";
src = fetchFromGitHub {
owner = "tkashkin";
repo = "GameHub";
rev = "${version}-master";
hash = "sha256-dBGzXwDO9BvnEIcdfqlGnMzUdBqaVA96Ds0fY6eukes=";
};
nativeBuildInputs = [
desktop-file-utils
meson
ninja
pkg-config
vala
wrapGAppsHook3
];
buildInputs = [
glib
glib-networking
gtk3
json-glib
libgee
libmanette
libsoup_2_4
libxtst
sqlite
# webkitgtk_4_0
];
meta = {
# webkitgtk_4_0 was removed
broken = true;
homepage = "https://tkashkin.github.io/projects/gamehub";
description = "Unified library for all your games";
longDescription = ''
GameHub is a unified library for all your games. It allows you to store
your games from different platforms into one program to make it easier
for you to manage your games.
'';
maintainers = with lib.maintainers; [ pasqui23 ];
license = with lib.licenses; [ gpl3Only ];
platforms = lib.platforms.linux;
};
}

View File

@@ -7,16 +7,16 @@
buildGoModule (finalAttrs: {
pname = "gatus";
version = "5.36.0";
version = "5.35.0";
src = fetchFromGitHub {
owner = "TwiN";
repo = "gatus";
rev = "v${finalAttrs.version}";
hash = "sha256-YduXhHra6w7zo1f+brCjiusH7xCSdAzo5uF6aN5uv/A=";
hash = "sha256-I1HjeJ4/yLLgcoIEOQCv3WQDNrpIAFhzDvVpz24T7gU=";
};
vendorHash = "sha256-RbFNtojZthf7bKMhGStH/jOkeIR6EHpw2vvAMLEFtKI=";
vendorHash = "sha256-PBy/0My0TdlolpagDSdt7r2dPPLJOVHEsU1xaV8RFjg=";
subPackages = [ "." ];

View File

@@ -15,18 +15,18 @@
buildNpmPackage (finalAttrs: {
pname = "gemini-cli";
version = "0.44.1";
version = "0.43.0";
src = fetchFromGitHub {
owner = "google-gemini";
repo = "gemini-cli";
tag = "v${finalAttrs.version}";
hash = "sha256-FizxmHWOomlnWZoCK2lOLc94RjNTQM33vN16nLXsJI0=";
hash = "sha256-UFz+CQLGbzFlpa5Mhf/frnQJWttF35URvua1QTfoaZ0=";
};
nodejs = nodejs_22;
npmDepsHash = "sha256-yn17dwHIpL3T2Z9nSOyBMehggrj4y6so7WMhnk2VwoA=";
npmDepsHash = "sha256-7Pl020NKKzRpQftzEYRpQ0v1mkPnO3kVZITvFSLYztI=";
dontPatchElf = stdenv.hostPlatform.isDarwin;
@@ -54,13 +54,9 @@ buildNpmPackage (finalAttrs: {
# Remove node-pty dependency from packages/core/package.json
${jq}/bin/jq 'del(.optionalDependencies."node-pty")' packages/core/package.json > packages/core/package.json.tmp && mv packages/core/package.json.tmp packages/core/package.json
# Prefer the Nix ripgrep binary by prepending it to candidate paths
# Fix ripgrep path for SearchText; ensureRgPath() on its own may return the path to a dynamically-linked ripgrep binary without required libraries
substituteInPlace packages/core/src/tools/ripGrep.ts \
--replace-fail "const candidatePaths = [" "const candidatePaths = [\"${lib.getExe ripgrep}\", "
# Trust the Nix store path by adding it to standard system prefixes
substituteInPlace packages/core/src/utils/paths.ts \
--replace-fail "const trustedPrefixes = [" "const trustedPrefixes = [\"/nix/store\", "
--replace-fail "await ensureRgPath();" "'${lib.getExe ripgrep}';"
# Disable auto-update by changing default values in settings schema
sed -i '/enableAutoUpdate:/,/default: true/ s/default: true/default: false/' packages/cli/src/config/settingsSchema.ts

View File

@@ -0,0 +1,161 @@
{
lib,
stdenv,
fetchurl,
pkg-config,
autoconf,
automake,
libtool,
mm-common,
intltool,
itstool,
doxygen,
graphviz,
makeFontsConf,
freefont_ttf,
boost,
libxmlxx3,
libxslt,
libgdamm,
libarchive,
libepc,
python311,
python3,
ncurses,
glibmm,
gtk3,
openssl,
gtkmm3,
goocanvasmm2,
evince,
isocodes,
gtksourceview,
gtksourceviewmm,
postgresql,
gobject-introspection,
yelp-tools,
wrapGAppsHook3,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "glom";
version = "1.32.0";
outputs = [
"out"
"lib"
"dev"
"doc"
"devdoc"
];
src = fetchurl {
url = "mirror://gnome/sources/glom/${lib.versions.majorMinor finalAttrs.version}/glom-${finalAttrs.version}.tar.xz";
hash = "sha256-U78gfryoLFY7nme86XdFmhfn/ZTjXCfBlphnNtokjfE=";
};
gda = libgdamm.override {
mysqlSupport = true;
postgresSupport = true;
};
python = python311.withPackages (
pkgs: with pkgs; [
pygobject3
distutils
]
);
python_boost = python311.withPackages (pkgs: with pkgs; [ pygobject3 ]);
sphinx-build = python311.pkgs.sphinx.overrideAttrs (super: {
postFixup = super.postFixup or "" + ''
# Do not propagate Python
rm $out/nix-support/propagated-build-inputs
'';
});
boost_python = boost.override {
enablePython = true;
python = finalAttrs.python_boost;
};
nativeBuildInputs = [
pkg-config
autoconf
automake
libtool
mm-common
intltool
(yelp-tools.override {
python3 = python311;
})
itstool
doxygen
graphviz
finalAttrs.sphinx-build
wrapGAppsHook3
gobject-introspection # for setup hook
];
buildInputs = [
finalAttrs.boost_python
glibmm
gtk3
openssl
libxmlxx3
libxslt
python311.pkgs.pygobject3
finalAttrs.gda
libarchive
libepc
finalAttrs.python
ncurses # for python
gtkmm3
goocanvasmm2
evince
isocodes
gtksourceview
gtksourceviewmm
postgresql # for postgresql utils
];
enableParallelBuilding = true;
preConfigure = "NOCONFIGURE=1 ./autogen.sh";
configureFlags = [
"--with-boost-python=boost_python${lib.versions.major python311.version}${lib.versions.minor python311.version}"
"--with-postgres-utils=${lib.getBin postgresql}/bin"
];
makeFlags = [
"libdocdir=${placeholder "doc"}/share/doc/$(book_name)"
"devhelpdir=${placeholder "devdoc"}/share/devhelp/books/$(book_name)"
];
# Fontconfig error: Cannot load default config file
env.FONTCONFIG_FILE = makeFontsConf {
fontDirectories = [ freefont_ttf ];
};
preFixup = ''
gappsWrapperArgs+=(
--prefix PYTHONPATH : "${placeholder "out"}/${python311.sitePackages}"
--set PYTHONHOME "${finalAttrs.python}"
)
'';
meta = {
description = "Easy-to-use database designer and user interface";
license = with lib.licenses; [
lgpl2
gpl2
];
homepage = "https://gitlab.gnome.org/Archive/glom";
maintainers = with lib.maintainers; [
bot-wxt1221
];
platforms = lib.platforms.linux;
};
})

View File

@@ -7,18 +7,18 @@
buildGoModule (finalAttrs: {
pname = "google-alloydb-auth-proxy";
version = "1.15.1";
version = "1.15.0";
src = fetchFromGitHub {
owner = "GoogleCloudPlatform";
repo = "alloydb-auth-proxy";
tag = "v${finalAttrs.version}";
hash = "sha256-1Rb8iyunMZtbomIwS20zBW5PXc5jTLftaocppA+61wc=";
hash = "sha256-TNb5rXKpVfqi4aPdB1qlQFVnxmcblrgmODeZtmS4XgA=";
};
subPackages = [ "." ];
vendorHash = "sha256-ZJ6cUhYwk00QA7mn4/DakyKuTIVbtx41awVQ6T7Exic=";
vendorHash = "sha256-j+jMwkW2yNEEd7TA5gUNRgKOOrm4w4U3ZfP7yErd13M=";
checkFlags = [
"-short"

View File

@@ -0,0 +1,109 @@
{
stdenv,
lib,
fetchpatch2,
fetchurl,
meson,
ninja,
pkg-config,
gobject-introspection,
vala,
gi-docgen,
python3,
libsoup_2_4,
glib,
gnome,
gssdp-tools,
buildPackages,
withIntrospection ?
lib.meta.availableOn stdenv.hostPlatform gobject-introspection
&& stdenv.hostPlatform.emulatorAvailable buildPackages,
}:
stdenv.mkDerivation rec {
pname = "gssdp";
version = "1.4.1";
outputs = [
"out"
"dev"
]
++ lib.optionals withIntrospection [ "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gssdp/${lib.versions.majorMinor version}/gssdp-${version}.tar.xz";
sha256 = "VySWVDV9PVGxQDFRaaJMBnHeeqUsb3XIxcmr1Ao1JSk=";
};
patches = [
(fetchpatch2 {
# https://gitlab.gnome.org/GNOME/gssdp/-/merge_requests/11
url = "https://gitlab.gnome.org/GNOME/gssdp/-/commit/db9d02c22005be7e5e81b43a3ab777250bd7b27b.diff";
hash = "sha256-DJQrg6MhzpX8R0QaNnqdwA1+v8xncDU8jcX+I3scW1M=";
})
];
strictDeps = true;
depsBuildBuild = [
pkg-config
];
nativeBuildInputs = [
meson
ninja
pkg-config
glib
python3
]
++ lib.optionals withIntrospection [
gobject-introspection
vala
gi-docgen
];
buildInputs = [
libsoup_2_4
];
propagatedBuildInputs = [
glib
];
mesonFlags = [
"-Dsniffer=false"
(lib.mesonBool "gtk_doc" withIntrospection)
(lib.mesonBool "introspection" withIntrospection)
(lib.mesonBool "vapi" withIntrospection)
];
# Bail out! GLib-GIO-FATAL-CRITICAL: g_inet_address_to_string: assertion 'G_IS_INET_ADDRESS (address)' failed
doCheck = !stdenv.hostPlatform.isDarwin;
postFixup = lib.optionalString withIntrospection ''
# Move developer documentation to devdoc output.
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
find -L "$out/share/doc" -type f -regex '.*\.devhelp2?' -print0 \
| while IFS= read -r -d ''' file; do
moveToOutput "$(dirname "''${file/"$out/"/}")" "$devdoc"
done
'';
passthru = {
updateScript = gnome.updateScript {
packageName = "gssdp";
freeze = true;
};
tests = {
inherit gssdp-tools;
};
};
meta = {
description = "GObject-based API for handling resource discovery and announcement over SSDP";
homepage = "http://www.gupnp.org/";
license = lib.licenses.lgpl2Plus;
platforms = lib.platforms.all;
};
}

View File

@@ -0,0 +1,55 @@
From a3461f69222ef23b2edd411c5fc8daefea556a2c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 20 Oct 2021 20:55:29 +0200
Subject: [PATCH] pkg-config: Declare header dependencies as public
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The headers include libsoup and libxml2 headers but those libraries are only
listed in Requires.private. This does not matter for upstream pkg-config
because it uses Cflags from libraries in Requires.private as well but as our
pkg-config is patched to only use Requires.private for static linking.
Lets add libsoup-2.4 and libxml-2.0 to Requires rather than Requires.private
to make the reverse dependencies correctly find their headers.
---
libgupnp/meson.build | 2 +-
meson.build | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/libgupnp/meson.build b/libgupnp/meson.build
index cb8a102..5fda9d8 100644
--- a/libgupnp/meson.build
+++ b/libgupnp/meson.build
@@ -129,7 +129,7 @@ pkg.generate(
libgupnp,
subdirs: 'gupnp-1.2',
name : 'gupnp-1.2',
- requires : ['glib-2.0', 'gio-2.0', 'gssdp-1.2'],
+ requires : ['glib-2.0', 'gio-2.0', 'gssdp-1.2', 'libsoup-2.4 >= ' + libsoup_version, 'libxml-2.0'],
description : 'GObject-based UPnP library',
version : meson.project_version(),
filebase : 'gupnp-1.2'
diff --git a/meson.build b/meson.build
index 3790bcf..c96a983 100644
--- a/meson.build
+++ b/meson.build
@@ -25,12 +25,13 @@ gssdp_dep = dependency('gssdp-1.2', version : '>= 1.3.0', default_options: ['sni
gio_unix = dependency('gio-unix-2.0', version: '>= 2.44', required: host_machine.system() != 'windows')
+libsoup_version = '2.48.0'
dependencies = [
dependency('glib-2.0', version : '>= ' + glib_version),
dependency('gio-2.0', version : '>= ' + glib_version),
dependency('gmodule-2.0', version : '>= ' + glib_version),
dependency('gobject-2.0', version : '>= ' + glib_version),
- dependency('libsoup-2.4', version : '>= 2.48.0'),
+ dependency('libsoup-2.4', version : '>= ' + libsoup_version),
gssdp_dep,
dependency('libxml-2.0'),
]
--
2.33.0

View File

@@ -0,0 +1,107 @@
{
stdenv,
lib,
fetchurl,
fetchpatch2,
meson,
ninja,
pkg-config,
gobject-introspection,
vala,
gtk-doc,
docbook_xsl,
docbook_xml_dtd_412,
docbook_xml_dtd_45,
glib,
gssdp,
libsoup_2_4,
libxml2,
libuuid,
gnome,
}:
stdenv.mkDerivation rec {
pname = "gupnp";
version = "1.4.4";
outputs = [
"out"
"dev"
]
++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "sha256-N2GxXLBjYh+Efz7/t9djfwMXUA/Ka9oeGQT3OSF1Ch8=";
};
patches = [
# Bring .pc file in line with our patched pkg-config.
./0001-pkg-config-Declare-header-dependencies-as-public.patch
# Unbreak build with Meson 1.2.0
# https://gitlab.gnome.org/GNOME/gupnp/-/merge_requests/33
(fetchpatch2 {
name = "meson-1.2-fix.patch";
url = "https://gitlab.gnome.org/GNOME/gupnp/-/commit/85c0244cfbf933d3e90d50ab68394c68d86f9ed5.patch";
hash = "sha256-poDhkEgDTpgGnTbbZLPwx8Alf0h81vmzJyx3izWmDGw=";
})
# Fix build against libxml2 2.11
# https://gitlab.gnome.org/GNOME/gupnp/-/merge_requests/34
(fetchpatch2 {
name = "libxml2-2.11-fix.patch";
url = "https://gitlab.gnome.org/GNOME/gupnp/-/commit/bc56f02b0f89e96f2bd74af811903d9931965f58.patch";
hash = "sha256-KCHlq7Es+WLIWKgIgGVTaHarVQIiZPEi5r6nMAhXTgY=";
})
];
depsBuildBuild = [
pkg-config
];
nativeBuildInputs = [
meson
ninja
pkg-config
gobject-introspection
vala
gtk-doc
docbook_xsl
docbook_xml_dtd_412
docbook_xml_dtd_45
];
buildInputs = [
libuuid
];
propagatedBuildInputs = [
glib
gssdp
libsoup_2_4
libxml2
];
mesonFlags = [
"-Dgtk_doc=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}"
];
# Bail out! ERROR:../tests/test-bugs.c:168:test_on_timeout: code should not be reached
doCheck = !stdenv.hostPlatform.isDarwin;
passthru = {
updateScript = gnome.updateScript {
packageName = "gupnp";
freeze = true;
};
};
meta = {
homepage = "http://www.gupnp.org/";
description = "Implementation of the UPnP specification";
mainProgram = "gupnp-binding-tool-1.2";
license = lib.licenses.lgpl2Plus;
platforms = lib.platforms.unix;
};
}

View File

@@ -26,13 +26,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gvm-libs";
version = "23.3.0";
version = "23.2.2";
src = fetchFromGitHub {
owner = "greenbone";
repo = "gvm-libs";
tag = "v${finalAttrs.version}";
hash = "sha256-aS+3XMz37TJTI56y0EecRCbrdkO1JIYm5KamC54tFyI=";
hash = "sha256-lXvivYyo4o9Ng7AG9/VdRAgfzGo5ow/n5dIL+RPYTMU=";
};
postPatch = ''

View File

@@ -8,15 +8,15 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "hayagriva";
version = "0.10.1";
version = "0.10.0";
src = fetchCrate {
inherit (finalAttrs) version;
pname = "hayagriva";
hash = "sha256-bWCBKWuTyDoCQwzbqaHOD/1AZ/aNrwet1+E5iL6JcbA=";
hash = "sha256-bVyorGygr8T58qarpXiRtAwSFSf0nPttS5QNY2Y7tLs=";
};
cargoHash = "sha256-Dz7XmnIW3F2KV54jE1ZqqZLvUDJ88MfHn3tWoASeTkM=";
cargoHash = "sha256-gqDxSj6paQOlH9ZoiWa5RRelsvr7QOZXWYJSNK2uHj0=";
buildFeatures = [ "cli" ];

View File

@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "hck";
version = "0.11.6";
version = "0.11.5";
src = fetchFromGitHub {
owner = "sstadick";
repo = "hck";
rev = "v${finalAttrs.version}";
hash = "sha256-W5y9NQjRkbb+ifOFMbqDECsm58rk6pozDprMnzC0euk=";
hash = "sha256-cycM40fm0bc6SCgGsMTKFVPUtjcXGpoMo3KhDDo74ZQ=";
};
cargoHash = "sha256-coaRVmI++074P8PhZ/Zmok0lwtEz+/38nkF2h0JraAo=";
cargoHash = "sha256-1Kaob5OZiM9WZ6lwuRvuDMtHVolRPjApQtQ52TQhs8A=";
nativeBuildInputs = [ cmake ];

View File

@@ -8,8 +8,8 @@
fetchurl,
flac,
gcc14,
# gssdp,
# gupnp,
gssdp,
gupnp,
gupnp-av,
lame,
libgmpris,
@@ -49,8 +49,8 @@ stdenv.mkDerivation rec {
flac
gcc14.cc.lib
rygel-hqplayerd
# gssdp
# gupnp
gssdp
gupnp
gupnp-av
lame
libgmpris
@@ -111,11 +111,6 @@ stdenv.mkDerivation rec {
};
meta = {
# libsoup 2.4 and its dependents (specifically gupnp and gssdp) were
# removed due to being insecure and having many known vulnerabilities. this
# thus no longer builds. this may be unbroken by updating to hqplayer 6.0,
# as it ostensibly removes the need for rygel and gupnp at all.
broken = true;
homepage = "https://www.signalyst.com/custom.html";
description = "High-end upsampling multichannel software embedded HD-audio player";
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];

View File

@@ -12,13 +12,13 @@
wrapGAppsHook3,
python3,
glib,
# gssdp,
# gupnp,
gssdp,
gupnp,
gupnp-av,
gupnp-dlna,
gst_all_1,
libgee,
# libsoup_2_4,
libsoup_2_4,
gtk3,
libmediaart,
sqlite,
@@ -61,12 +61,12 @@ stdenv.mkDerivation rec {
buildInputs = [
glib
# gssdp
# gupnp
gssdp
gupnp
gupnp-av
gupnp-dlna
libgee
# libsoup_2_4
libsoup_2_4
gtk3
libmediaart
sqlite
@@ -105,11 +105,6 @@ stdenv.mkDerivation rec {
};
meta = {
# libsoup 2.4 and its dependents (specifically gupnp and gssdp) were
# removed due to being insecure and having many known vulnerabilities. this
# thus no longer builds. this derivation might be obsoleted by updating to
# hqplayer 6.0, as it ostensibly removes the need for rygel.
broken = true;
description = "Home media solution (UPnP AV MediaServer) that allows you to easily share audio, video and pictures to other devices";
homepage = "https://gitlab.gnome.org/GNOME/rygel";
license = lib.licenses.lgpl21Plus;

View File

@@ -7,19 +7,13 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "i3altlayout";
version = "0.3";
pyproject = true;
__structuredAttrs = true;
format = "setuptools";
src = fetchPypi {
inherit (finalAttrs) pname version;
hash = "sha256-DhOYeSCxKthr2fEMGMBXjUYeCJjj6AV4d05So4eDF8A=";
};
build-system = with python3Packages; [
setuptools
];
pythonRemoveDeps = [ "enum-compat" ];
pythonPath = with python3Packages; [

View File

@@ -1,17 +0,0 @@
{
lib,
makeSetupHook,
}:
makeSetupHook {
name = "install-fonts-hook";
meta = {
description = "Copies standard font extension into their respective installation path";
maintainers = with lib.maintainers; [
pancaek
sigmanificient
jopejoe1
];
license = lib.licenses.mit;
};
} ./install-fonts.sh

View File

@@ -11,13 +11,13 @@
gtk3-x11,
luajit,
sdcv,
sdl3,
SDL2,
openssl,
writeScript,
}:
let
version = "2026.03";
version = "2025.10";
# LuaJIT with table.pack/unpack support for KOReader
# https://github.com/koreader/koreader-base/tree/master/thirdparty/luajit
@@ -35,16 +35,13 @@ let
owner = "koreader";
tag = "v${version}";
fetchSubmodules = true;
hash = "sha256-KWpWlFoBEAhVDuRTiF7yj1wlKLzYmvcngI9iWqsDuQY=";
hash = "sha256-uYKN5fgIdCVH+pXU2lmsGu7HxZbDld5EJVO9o7Tk8BA=";
};
in
stdenv.mkDerivation {
pname = "koreader";
inherit version;
__structuredAttrs = true;
strictDeps = true;
src =
let
selectSystem =
@@ -57,11 +54,11 @@ stdenv.mkDerivation {
};
in
fetchurl {
url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader_${version}-1_${arch}.deb";
url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-${arch}.deb";
hash = selectSystem {
aarch64-linux = "sha256-4ulpMXYcICQ5/9Q0GGn9lkbW0ntzIfUHQ5woTAhyXLU=";
armv7l-linux = "sha256-diMWFhL0D5bWPQFc9vvZZRPMfNxlxchGyT8Lz/TLHPs=";
x86_64-linux = "sha256-OhBu3oj9IqNmK5ngCkXvucVQq5aJohObgENtjdDcQcE=";
aarch64-linux = "sha256-z92sguFe5qcPmHk+Orm8vHJycVeZY3cYGByU6xIcrkA=";
armv7l-linux = "sha256-kVO+eUwGMULJZwbxZwbeooqRDF8oZPiuo47a7lNsl3I=";
x86_64-linux = "sha256-OYzMOUFzUzkYvcjjMX0FZBkZs//9ie3025lhhFOrt9M=";
};
};
@@ -76,7 +73,7 @@ stdenv.mkDerivation {
gtk3-x11
luajit_koreader
sdcv
sdl3
SDL2
openssl
];
@@ -93,9 +90,8 @@ stdenv.mkDerivation {
''
# Link SSL/network libraries
+ ''
ln -sf ${lib.getLib openssl}/lib/libcrypto.so.3 $out/lib/koreader/libs/libcrypto.so.1.1
ln -sf ${lib.getLib openssl}/lib/libssl.so.3 $out/lib/koreader/libs/libssl.so.1.1
ln -sf ${lib.getLib sdl3}/lib/libSDL3.so.0 $out/lib/koreader/libs/libSDL3.so.0
ln -sf ${openssl.out}/lib/libcrypto.so.3 $out/lib/koreader/libs/libcrypto.so.1.1
ln -sf ${openssl.out}/lib/libssl.so.3 $out/lib/koreader/libs/libssl.so.1.1
''
# Copy fonts
+ ''
@@ -109,7 +105,7 @@ stdenv.mkDerivation {
wrapProgram $out/bin/koreader --prefix LD_LIBRARY_PATH : $out/lib/koreader/libs:${
lib.makeLibraryPath [
gtk3-x11
sdl3
SDL2
glib
stdenv.cc.cc
openssl.out

View File

@@ -20,13 +20,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libdeltachat";
version = "2.53.0";
version = "2.52.0";
src = fetchFromGitHub {
owner = "chatmail";
repo = "core";
tag = "v${finalAttrs.version}";
hash = "sha256-W2Yh5+6MaJ47GqJioGKge2J3RetGGTcl+0YxPPlSdDo=";
hash = "sha256-AQo27qnHPCK6q/3+Umk6ueqkOIVBA8n4q9S5iEZ7TkM=";
};
patches = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
cargoDeps = rustPlatform.fetchCargoVendor {
pname = "chatmail-core";
inherit (finalAttrs) version src;
hash = "sha256-aoPc5XvjwwuA9aOTvIOpTm15wozC9glJGqn3vPqsJF4=";
hash = "sha256-ni8iaVPHXWhxfiBvtVzGRyPcxkbV0HiqcQCHGmAqk7s=";
};
nativeBuildInputs = [

View File

@@ -0,0 +1,36 @@
diff --git a/Makefile.am b/Makefile.am
index acf0d25..13022d1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,8 +32,6 @@ noinst_PROGRAMS = \
examples/lookup-resource \
examples/service-browser \
examples/simple-publisher \
- examples/consumer-ui \
- examples/publisher-ui \
examples/server-credentials \
$(TESTS)
TESTS = \
@@ -155,10 +153,6 @@ examples_service_browser_LDADD = $(example_epc_libs)
examples_simple_publisher_CFLAGS = $(example_epc_cflags)
examples_simple_publisher_LDADD = $(example_epc_libs)
-examples_consumer_ui_CFLAGS = $(example_epc_ui_cflags) $(AVAHI_UI_CFLAGS)
-examples_consumer_ui_LDADD = $(example_epc_ui_libs) $(AVAHI_UI_LIBS)
-examples_publisher_ui_CFLAGS = $(example_epc_ui_cflags) $(AVAHI_UI_CFLAGS) -rdynamic
-examples_publisher_ui_LDADD = $(example_epc_ui_libs) $(AVAHI_UI_LIBS)
examples_server_credentials_CFLAGS = $(example_epc_ui_cflags)
examples_server_credentials_LDADD = $(example_epc_ui_libs)
diff --git a/configure.ac b/configure.ac
index d68bf94..89bd471 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,7 +53,6 @@ PKG_CHECK_EXISTS([$GIO_REQUIREMENT],
GIO=$GIO_REQUIREMENT],
[AC_MSG_RESULT([no])])
-PKG_CHECK_MODULES(AVAHI_UI, [avahi-ui-gtk3 >= 0.6])
PKG_CHECK_MODULES(LIBEPC, [avahi-client >= 0.6
avahi-glib >= 0.6
glib-2.0 >= 2.36

View File

@@ -0,0 +1,75 @@
{
stdenv,
lib,
fetchurl,
autoreconfHook,
gnome-common,
pkg-config,
intltool,
gtk-doc,
glib,
avahi,
gnutls,
libuuid,
libsoup_2_4,
gtk3,
gnome,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "libepc";
version = "0.4.6";
outputs = [
"out"
"dev"
"devdoc"
];
src = fetchurl {
url = "mirror://gnome/sources/libepc/${lib.versions.majorMinor finalAttrs.version}/libepc-${finalAttrs.version}.tar.xz";
sha256 = "1s3svb2slqjsrqfv50c2ymnqcijcxb5gnx6bfibwh9l5ga290n91";
};
patches = [
# Remove dependency that is only needed by uninstalled examples.
./no-avahi-ui.patch
];
nativeBuildInputs = [
autoreconfHook
gnome-common
pkg-config
intltool
gtk-doc
];
buildInputs = [
glib
libuuid
gtk3
];
propagatedBuildInputs = [
avahi
gnutls
libsoup_2_4
];
enableParallelBuilding = true;
passthru = {
updateScript = gnome.updateScript {
packageName = "libepc";
versionPolicy = "odd-unstable";
};
};
meta = {
description = "Easy Publish and Consume Library";
homepage = "https://gitlab.gnome.org/Archive/libepc";
license = lib.licenses.lgpl21Plus;
maintainers = [ lib.maintainers.bot-wxt1221 ];
platforms = lib.platforms.linux;
};
})

View File

@@ -20,13 +20,13 @@
withGpu ? true,
}:
let
version = "1.19.0";
version = "1.18.0";
src = fetchFromGitHub {
owner = "containers";
repo = "libkrun";
tag = "v${version}";
hash = "sha256-g4u34sGdgv6mRRry9b5TAXSx+pmVwCNSD3YNtr6qRxo=";
hash = "sha256-R7q52ZwiL9JsGofLPhXVTk/eH6bEob3DoZe21PHSBrU=";
};
virglrenderer = stdenv.mkDerivation (finalAttrs: {
@@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
hash = "sha256-rxdaqEKDDMxFwRuX6kLhqGyFXJTz+Bx4mJJhYL5nPgU=";
hash = "sha256-3IAEWF+XGeKnb61SUpuVHMPiX6q0FgQFN4/eOBCH80c=";
};
nativeBuildInputs = [

View File

@@ -12,11 +12,11 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "libmspub";
version = "0.1.5";
version = "0.1.4";
src = fetchzip {
url = "https://dev-www.libreoffice.org/src/libmspub/libmspub-${finalAttrs.version}.tar.xz";
hash = "sha256-1At2aFAdPeoDKcsrv1hpZ1Eig0//tc3jaRpg1qn14xI=";
hash = "sha256-/6e9IGcTIZTlnsakOaSjTn3DsO9ZNQigdCCbMbrBTQE=";
};
nativeBuildInputs = [ pkg-config ];
@@ -43,7 +43,6 @@ stdenv.mkDerivation (finalAttrs: {
];
meta = {
changelog = "https://git.libreoffice.org/libmspub/+/refs/tags/libmspub-${finalAttrs.version}/NEWS";
description = "Microsoft Publisher import library";
homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libmspub";
license = lib.licenses.mpl20;

View File

@@ -26,11 +26,11 @@
stdenv.mkDerivation rec {
pname = "liferea";
version = "1.16.11";
version = "1.16.10";
src = fetchurl {
url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
hash = "sha256-2WlCm4dc4TmZAtAzx3D5ApYdp3ia6IWb/kd9L6Kua3E=";
hash = "sha256-4cprlrp/vCaoUN4HwZFa+H1DW1S5q/byQcd+g/g427g=";
};
nativeBuildInputs = [

View File

@@ -23,16 +23,16 @@
buildGoModule (finalAttrs: {
pname = "lnd";
version = "0.21.0-beta";
version = "0.20.1-beta";
src = fetchFromGitHub {
owner = "lightningnetwork";
repo = "lnd";
rev = "v${finalAttrs.version}";
hash = "sha256-Sbg80Bn5PqrNQ23OEeSN5+s71NeJl/ENFtH+OGYZS1c=";
hash = "sha256-EHyyUleCKLEAnYNH7+PYwE/uTz445EQmtfosFxf10wU=";
};
vendorHash = "sha256-dTKonSAFc/iRhBtlUqhznX+ljRfJ0gqv8m7d1Ue6Mi4=";
vendorHash = "sha256-jF/yQE0xH0MFKI7CCGHy/HFzp6tgTM5T/MP2uB62vKk=";
subPackages = [
"cmd/lncli"

View File

@@ -18,18 +18,18 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "lux-cli";
version = "0.32.0";
version = "0.31.1";
src = fetchFromGitHub {
owner = "lumen-oss";
repo = "lux";
tag = "v${finalAttrs.version}";
hash = "sha256-4S0kjWQ3Ckrgvh8biSkEU7jA2hwG+t3oHN6h1937xgY=";
hash = "sha256-3gS3QO0i1ApVYG/hL/EyZhH1LykeJ5Ttt59vSDLUPMY=";
};
buildAndTestSubdir = "lux-cli";
cargoHash = "sha256-eE5LKDRjSZ6IfPY/veTyZ7Lnlvl4WtULo6knRGFPRa4=";
cargoHash = "sha256-Ventw1LRk5795+X38yzyFGHFbvW1tEq6PE1zjhZSDDM=";
nativeInstallCheckInputs = [
versionCheckHook

View File

@@ -16,7 +16,7 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "lychee";
version = "0.24.2";
version = "0.24.1";
src = fetchFromGitHub {
owner = "lycheeverse";
@@ -31,10 +31,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
'("cargo:rustc-env=GIT_DATE={}", "'$GIT_DATE'")'
rm -rf $out/.git
'';
hash = "sha256-fXuLeLwrE/CINQKqk87o0Dp+8nGOqCyUkS5gTr9YOXY=";
hash = "sha256-lknj0uTIWYwDm3PA/Q8paVxRn+B9qvfllYUjnp7I4jI=";
};
cargoHash = "sha256-21J6eH2xSLK2VWnsrMk9WaKjPJiNP2UQGJuYkZUqsnM=";
cargoHash = "sha256-ivLx48qbagjw5zGkYC+ygK83p8q110iEn2YEfUjTFHs=";
nativeBuildInputs = [
installShellFiles

View File

@@ -6,13 +6,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lzbench";
version = "2.3";
version = "2.2";
src = fetchFromGitHub {
owner = "inikep";
repo = "lzbench";
rev = "v${finalAttrs.version}";
sha256 = "sha256-/rRLD7lK8YGyx6dHxw5BPydf2YigZn/dF5NF2Q2Misg=";
sha256 = "sha256-CmT+mjFKf8/HE00re1QzU2pwdUYR8Js1kN4y6c2ZiNY=";
};
enableParallelBuilding = true;

View File

@@ -6,13 +6,13 @@
buildGoModule (finalAttrs: {
pname = "mieru";
version = "3.34.0";
version = "3.33.0";
src = fetchFromGitHub {
owner = "enfein";
repo = "mieru";
rev = "v${finalAttrs.version}";
hash = "sha256-9VjzQ53/oifjXqT/aLaDDy200xyWEU3BBjxP+LM/EKE=";
hash = "sha256-26BT/OsA4T6S9xqlux/segQXtqWGR+IgCRG/PwuxquU=";
};
vendorHash = "sha256-pKcdvP38fZ2KFYNDx6I4TfmnnvWKzFDvz80xMkUojqM=";

View File

@@ -22,16 +22,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "mise";
version = "2026.6.5";
version = "2026.6.0";
src = fetchFromGitHub {
owner = "jdx";
repo = "mise";
tag = "v${finalAttrs.version}";
hash = "sha256-z3+rGBwqTD0r22cv2Yk9EWyPj+mXJSMV6flrjG2LygA=";
hash = "sha256-UE+Mo6AtNiVgKOfLS7khAoVNJGyomL5Vb/pfcCke5fI=";
};
cargoHash = "sha256-Qd57u6dTEUccTic9f5H/Kn5vQT4iZeKKnQtGUzrnP4A=";
cargoHash = "sha256-N1/lLQZbkqeQavNGhYBx4PDl0cid+DACzy9gpj5g1rs=";
nativeBuildInputs = [
installShellFiles

View File

@@ -0,0 +1,2 @@
KERNEL=="uinput", SUBSYSTEM=="misc", TAG+="uaccess", OPTIONS+="static_node=uinput"
KERNEL=="/dev/input/event*", SUBSYSTEM=="misc", TAG+="uaccess", OPTIONS+="static_node=uinput"

View File

@@ -0,0 +1,81 @@
{
lib,
fetchFromGitHub,
npmHooks,
fetchNpmDeps,
nodejs,
rustPlatform,
cargo-tauri_1,
pkg-config,
wrapGAppsHook3,
libxtst,
libevdev,
udevCheckHook,
gtk3,
libsoup_2_4,
}:
rustPlatform.buildRustPackage rec {
pname = "mouse-actions-gui";
version = "0.4.5";
src = fetchFromGitHub {
owner = "jersou";
repo = "mouse-actions";
tag = "v${version}";
hash = "sha256-44F4CdsDHuN2FuijnpfmoFy4a/eAbYOoBYijl9mOctg=";
};
sourceRoot = "${src.name}/config-editor";
nativeBuildInputs = [
npmHooks.npmConfigHook
nodejs
cargo-tauri_1.hook
pkg-config
wrapGAppsHook3
udevCheckHook
];
buildInputs = [
# Base deps
libxtst
libevdev
# Tauri deps
gtk3
libsoup_2_4
# webkitgtk_4_0
];
npmDeps = fetchNpmDeps {
inherit src sourceRoot;
hash = "sha256-amDTYAvEoDHb7+dg39+lUne0dv0M9vVe1vHoXk2agZA=";
};
cargoRoot = "src-tauri";
buildAndTestSubdir = cargoRoot;
cargoHash = "sha256-G5PQWPcPOVhq11BQIplbB3mLAGFCVm+vQ4eM4/5MFwI=";
doInstallCheck = true;
postInstall = ''
install -Dm644 ${./80-mouse-actions.rules} $out/etc/udev/rules.d/80-mouse-actions.rules
'';
meta = {
# webkitgtk_4_0 was removed
broken = true;
changelog = "https://github.com/jersou/mouse-actions/blob/${src.rev}/CHANGELOG.md";
description = "Mouse event based command executor, a mix between Easystroke and Comiz edge commands";
homepage = "https://github.com/jersou/mouse-actions";
license = lib.licenses.mit;
mainProgram = "mouse-actions-gui";
maintainers = with lib.maintainers; [ tomasajt ];
platforms = lib.platforms.linux;
};
}

View File

@@ -6,13 +6,13 @@
}:
buildGoModule (finalAttrs: {
pname = "n8n-task-runner-launcher";
version = "1.4.7";
version = "1.4.6";
src = fetchFromGitHub {
owner = "n8n-io";
repo = "task-runner-launcher";
tag = finalAttrs.version;
hash = "sha256-URIFMc/VSMuuI4Hi7jB9eFlP4/GjEvDRhoTAjEhT988=";
hash = "sha256-9XbeAssVQBcAfuiCgLEAX0CkI9u1410PE2HOcrI2Uxs=";
};
vendorHash = "sha256-5dcIELsNFGB5qTmfpY/YRWeN2z9GdanysGw4Lqpfsi0=";

View File

@@ -101,7 +101,6 @@ buildGoModule (finalAttrs: {
"-X github.com/nezhahq/nezha/service/singleton.Version=${finalAttrs.version}"
];
__darwinAllowLocalNetworking = true; # TestOptionalAuth_PATWithoutScopeIsDenied
checkFlags = "-skip=^TestSplitDomainSOA$";
postInstall = ''

File diff suppressed because it is too large Load Diff

View File

@@ -8,16 +8,16 @@
buildNpmPackage rec {
pname = "node-gyp";
version = "13.0.0";
version = "12.3.0";
src = fetchFromGitHub {
owner = "nodejs";
repo = "node-gyp";
tag = "v${version}";
hash = "sha256-QURUUit1HWRQ6O3nMM1aId51B2POPO4eyPwBdbkFJKw=";
hash = "sha256-+QPQxWrO2n5QsyAmM5UfL/posEyQQGHmDG7EL0jBNeE=";
};
npmDepsHash = "sha256-swJ8Amv/CtZAW1Weo2S5GQWHPgnF3/6cw0ZTdEyyAxA=";
npmDepsHash = "sha256-43YHmebfSYNb7glSjycQqjnLY13Bp9syXRAWNDjBIXY=";
postPatch = ''
ln -s ${./package-lock.json} package-lock.json

View File

@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "nsc";
version = "2.15.0";
version = "2.12.2";
src = fetchFromGitHub {
owner = "nats-io";
repo = "nsc";
rev = "v${version}";
hash = "sha256-eGu0vuJAvTWTjalq1YRA8QP9TjArQuCcEdsHzFqAM2c=";
hash = "sha256-jgGyCMS1jCCEj1zNEXpXhOc2t0lP1iXs7R3uDTKhhuk=";
};
ldflags = [
@@ -24,7 +24,7 @@ buildGoModule rec {
"-X main.builtBy=nixpkgs"
];
vendorHash = "sha256-zjEFz3FdAWhLRQogKCuzmr8yBINQdglKeCIoXTzhpV0=";
vendorHash = "sha256-fjMQMHwkAzUecyM7iqcMFwD93Trkfa0cQhCOPczXlXk=";
nativeBuildInputs = [ installShellFiles ];
@@ -47,7 +47,7 @@ buildGoModule rec {
# the test strips table formatting from the command output in a naive way
# that removes all the table characters, including '-'.
# The nix build directory looks something like:
# /private/tmp/nix-build-nsc-2.15.0.drv-0/nsc_test2000598938/keys
# /private/tmp/nix-build-nsc-2.12.2.drv-0/nsc_test2000598938/keys
# Then the `-` are removed from the path unintentionally and the test fails.
# This should be fixed upstream to avoid mangling the path when
# removing the table decorations from the command output.

View File

@@ -16,7 +16,7 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "opencode";
version = "1.17.7";
version = "1.17.4";
__structuredAttrs = true;
strictDeps = true;
@@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
owner = "anomalyco";
repo = "opencode";
tag = "v${finalAttrs.version}";
hash = "sha256-rTeJuwqc11r6Xiksfg5IoTezK2ZtG3GlenQCxTW04P4=";
hash = "sha256-ppWpyi1iGmL5UF6FuERf7tnN9kRkphaiyN3IoHcFY6A=";
};
node_modules = stdenvNoCC.mkDerivation {
@@ -78,7 +78,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
# NOTE: Required else we get errors that our fixed-output derivation references store paths
dontFixup = true;
outputHash = "sha256-DntnRo2N32nhjv8YxedIbRMtEkSsXAOrpFmK6six/g4=";
outputHash = "sha256-V9LtFMyZj/rYXZ2R+ALbAL5yCZF58DZdCRg2KqdGVqs=";
outputHashAlgo = "sha256";
outputHashMode = "recursive";
};

View File

@@ -26,13 +26,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "openimageio";
version = "3.1.14.1";
version = "3.1.14.0";
src = fetchFromGitHub {
owner = "AcademySoftwareFoundation";
repo = "OpenImageIO";
tag = "v${finalAttrs.version}";
hash = "sha256-gAW9pUK0oPGoeNRBCS7i444PQ3b6f9Pa0UJwhSJV9ss=";
hash = "sha256-sA4NzGdT+K9uQM+h8Ew1EvjO8TGMGyyLS5KYYMJAToE=";
};
outputs = [

View File

@@ -4,7 +4,6 @@
fetchFromGitHub,
stdenv,
nix-update-script,
enableSystemd ? stdenv.hostPlatform.isLinux,
}:
rustPlatform.buildRustPackage (finalAttrs: {
@@ -20,25 +19,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
cargoHash = "sha256-pxzPcieUXE3VOyGNDaeDHUQPayRDZXpW57VWMejlZ4k=";
buildFeatures = lib.optionals enableSystemd [
buildFeatures = lib.optionals stdenv.hostPlatform.isLinux [
"systemd"
];
preConfigure = ''
substituteInPlace lib/systemd/user/pizauth.service \
--replace-fail /usr/bin/ ''${!outputBin}/bin/
# Upstream's Makefile uses target/release/pizauth as a Makefile target that
# the `install` target depends upon. Nixpkgs' cargoBuildHook defaults to
# using the explicit `--target @rustcTargetSpec@` flag, so that the
# executable always ends up in
# `target/${stdenv.hostPlatform.rust.rustcTargetSpec}/release`. To make the
# Makefile not run cargo build again, we use this substitution.
substituteInPlace Makefile \
--replace-fail target/release target/${stdenv.hostPlatform.rust.rustcTargetSpec}/release
'';
postInstall = ''
make PREFIX=$out install ${lib.optionalString enableSystemd "install-systemd"}
make PREFIX=$out install ${lib.optionalString stdenv.hostPlatform.isLinux "install-systemd"}
'';
passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=pizauth-(.*)" ]; };

View File

@@ -1,35 +0,0 @@
diff --git a/lib/theme/mono_theme.dart b/lib/theme/mono_theme.dart
index b423b4c6..04834360 100644
--- a/lib/theme/mono_theme.dart
+++ b/lib/theme/mono_theme.dart
@@ -42,7 +42,7 @@ ThemeData monoTheme({required bool dark, bool oled = false}) {
);
final base = ThemeData(
- useMaterial3: true,
+ useMaterial3: true, fontFamily: 'NotoSans',
brightness: isDark ? Brightness.dark : Brightness.light,
colorScheme: ColorScheme(
brightness: isDark ? Brightness.dark : Brightness.light,
@@ -85,7 +85,7 @@ ThemeData monoTheme({required bool dark, bool oled = false}) {
titleTextStyle: TextStyle(color: c.text, fontSize: 18, fontWeight: FontWeight.w700, letterSpacing: -0.2),
),
textTheme: Typography.englishLike2021
- .apply(bodyColor: c.text, displayColor: c.text)
+ .apply(fontFamily: 'NotoSans', bodyColor: c.text, displayColor: c.text)
.copyWith(
displayLarge: const TextStyle(fontWeight: FontWeight.w700, letterSpacing: -0.5),
titleMedium: const TextStyle(fontWeight: FontWeight.w600),
diff --git a/pubspec.yaml b/pubspec.yaml
index 8de9f2e3..5b6f1f14 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -142,3 +142,8 @@ flutter:
- assets/shaders/anime4k/
- assets/player_icons/
- assets/rating_icons/
+
+ fonts:
+ - family: NotoSans
+ fonts:
+ - asset: assets/fonts/NotoSans.ttc

View File

@@ -21,8 +21,6 @@
_7zz,
makeBinaryWrapper,
runCommand,
noto-fonts-cjk-sans ? null,
use16kPagesizeWorkaround ? false,
}:
let
@@ -75,12 +73,7 @@ let
# Upstream uses a sentry-dart fork that fetches sentry-native as a zip instead of via
# git clone. The PR was merged and reverted upstream (getsentry/sentry-dart#3630), so
# we use upstream since theres no actual meaningful difference
patches = [
./replace-sentry-fork.patch
]
++ lib.optionals use16kPagesizeWorkaround [
./16k-font-workaround.patch
];
patches = [ ./replace-sentry-fork.patch ];
nativeBuildInputs = [
pkg-config
@@ -109,12 +102,6 @@ let
substituteInPlace linux/CMakeLists.txt \
--replace-fail "URL https://github.com/simdutf/simdutf/releases/download/v6.4.2/singleheader.zip" \
"URL file://${simdutf}"
''
+ lib.optionalString use16kPagesizeWorkaround ''
# Opt-in workaround for invisible text on aarch64-linux systems with 16K page size kernels
# (e.g. Asahi Linux). Text was invisible; bundling the font as a Dart asset fixed it,
# likely related to libflutter_linux_gtk.so being compiled with 4K page alignment only.
install -Dm644 ${noto-fonts-cjk-sans}/share/fonts/opentype/noto-cjk/NotoSansCJK-VF.otf.ttc assets/fonts/NotoSans.ttc
'';
desktopItems = [

View File

@@ -15,14 +15,14 @@
python3Packages.buildPythonApplication rec {
pname = "pmbootstrap";
version = "3.10.3";
version = "3.10.2";
pyproject = true;
src = fetchFromGitLab {
owner = "postmarketOS";
repo = "pmbootstrap";
tag = version;
hash = "sha256-Zl7Ti0HwMQSjMeW4GjdEKIRoCNjV15Qiv8bzhktNoyQ=";
hash = "sha256-Dimr0Ye/u3Rbryu9cm0Qwhm1w7kgzgM5Jkcu+ffeRXU=";
domain = "gitlab.postmarketos.org";
};

View File

@@ -28,6 +28,8 @@
withKeybinder ? false,
libnotify,
withLibnotify ? false,
libsoup_2_4,
withLibsoup ? false,
libgudev,
withGudev ? false, # experimental
libmtp,
@@ -93,6 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optional withLibnotify libnotify
++ lib.optional withLastfm liblastfm-vambrose
++ lib.optional withGlyr glyr
++ lib.optional withLibsoup libsoup_2_4
++ lib.optional withMtp libmtp
++ lib.optional withXfce4ui libxfce4ui
++ lib.optional withTotemPlParser totem-pl-parser

View File

@@ -1,13 +1,13 @@
[
{
"pname": "Azure.Core",
"version": "1.50.0",
"hash": "sha256-8Pjz0/2wTLK5uY7G5qrxQr4CsmrjiR8gL4g6zJymj5s="
"version": "1.47.1",
"hash": "sha256-YJR1bDI9H9lr6p/9QcOWEhnpMD8ePyxxO39S32VAOak="
},
{
"pname": "Azure.Identity",
"version": "1.17.1",
"hash": "sha256-pjNnhL/sCFy+BWNMAgj+l6aGoOp4ngrFO/61RIgzBEU="
"version": "1.14.2",
"hash": "sha256-PpGcGQrzcEzDtTm65gLmjWrt8yavst4VOKDlr+NuLQo="
},
{
"pname": "BouncyCastle.Cryptography",
@@ -26,8 +26,8 @@
},
{
"pname": "Dapper",
"version": "2.1.79",
"hash": "sha256-QIGZ+vlnwhSl+nnVZ//s3uwFh/vKJ5kDpgGkmpMjhmw="
"version": "2.1.66",
"hash": "sha256-e5n/wnAFGPDSe30oQQ0fanXrvFZYYa+qCDSTHtfQmPw="
},
{
"pname": "Diacritical.Net",
@@ -111,13 +111,13 @@
},
{
"pname": "IPAddressRange",
"version": "6.3.0",
"hash": "sha256-RM3Bm07HzaKAMY64JiuJ2xCT399Bhj/Asyv1+o3kdNo="
"version": "6.2.0",
"hash": "sha256-g3brzbKKPZS23cbttpr5CCYoZHm+dvH43/gXLuZYmFg="
},
{
"pname": "MailKit",
"version": "4.16.0",
"hash": "sha256-4yyFxq8pJVTIgAJkyAYcuV2+/ZirENgUSk1OSD/gKIo="
"version": "4.15.1",
"hash": "sha256-ZI2ASxX1dY53YxWRii0Dow4aojR8VCEWzCWZLrH7wPw="
},
{
"pname": "Microsoft.ApplicationInsights",
@@ -126,19 +126,24 @@
},
{
"pname": "Microsoft.AspNetCore.Cryptography.Internal",
"version": "8.0.27",
"hash": "sha256-3GmpnUmBfk45cWCfkoeN+9ANom7LrJsakZvIT8kIagk="
"version": "8.0.17",
"hash": "sha256-CS/I8fajxwimZC2WNpN5ai/hEVU6Pk4El8hKNr/QgfU="
},
{
"pname": "Microsoft.AspNetCore.Cryptography.KeyDerivation",
"version": "8.0.27",
"hash": "sha256-FGqqp3fruL4r1ImEMcDRqvgl+uxkQqngkRRfXhc7EWI="
"version": "8.0.17",
"hash": "sha256-fXjTm7dua1WoGVSkGX6swTFvsNwdhAJvI3Y6onrR3p4="
},
{
"pname": "Microsoft.Bcl.AsyncInterfaces",
"version": "8.0.0",
"hash": "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw="
},
{
"pname": "Microsoft.Bcl.Cryptography",
"version": "8.0.0",
"hash": "sha256-p9aO+aVi4Vl8bRsYRFGJyc9Mqd2wkQ12RwWDwBhdt4I="
},
{
"pname": "Microsoft.CodeCoverage",
"version": "17.10.0",
@@ -151,8 +156,8 @@
},
{
"pname": "Microsoft.Data.SqlClient",
"version": "6.1.5",
"hash": "sha256-XpGL/oKQWn+FmYNmKB6CMmWbPEuCDX/xdOMqljS0vvs="
"version": "6.1.1",
"hash": "sha256-IBVkAipJyF7KO9uid+5QyfVzWEeY/BbQUofKc6zQoW0="
},
{
"pname": "Microsoft.Data.SqlClient.SNI.runtime",
@@ -341,24 +346,24 @@
},
{
"pname": "Microsoft.Identity.Client",
"version": "4.80.0",
"hash": "sha256-vtuXCu0ykTYJjvlSSWMjC9EGJQXZ1dqgpaMeD4FmlGQ="
"version": "4.73.1",
"hash": "sha256-cd5ArtDvQK4gdX8M0GHQEsCFWlqpdm6lxvaM2yMHkhc="
},
{
"pname": "Microsoft.Identity.Client.Extensions.Msal",
"version": "4.78.0",
"hash": "sha256-0s9wa8HkFhnzmAz+TGxtA3qTX3dZiIoPcTWGLgY8mAg="
"version": "4.73.1",
"hash": "sha256-wc4oHBGKCJhAqNIyD4LlugCFvmyiW5iVzGYP88bnWqs="
},
{
"pname": "Microsoft.IdentityModel.Abstractions",
"version": "6.35.0",
"hash": "sha256-bxyYu6/QgaA4TQYBr5d+bzICL+ktlkdy/tb/1fBu00Q="
},
{
"pname": "Microsoft.IdentityModel.Abstractions",
"version": "7.7.1",
"hash": "sha256-v83O6Gb8s4wGhbRPvOA95t0LSX+MAhF6WpA6qZeK2XM="
},
{
"pname": "Microsoft.IdentityModel.Abstractions",
"version": "8.14.0",
"hash": "sha256-bkCuz1Wj56N+LHWLvHKLcCtIRqBK+3k5vD2qfB7xXKk="
},
{
"pname": "Microsoft.IdentityModel.JsonWebTokens",
"version": "7.7.1",
@@ -471,8 +476,8 @@
},
{
"pname": "MimeKit",
"version": "4.16.0",
"hash": "sha256-yWGXVm+EHvBSsZlVHdWdD+rVwdf/5hHxsUfJMSd2Afo="
"version": "4.15.1",
"hash": "sha256-MI4Wr+JWoxR9wsYhKmW8j1EdJ59W/O4jv5D9Zb8mEUw="
},
{
"pname": "Mono.Nat",
@@ -517,23 +522,23 @@
},
{
"pname": "Newtonsoft.Json",
"version": "13.0.4",
"hash": "sha256-8JCB1FdAW681qXP6DFDWvycu1oPyVoxaYgpJ2pUvZSk="
"version": "13.0.3",
"hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="
},
{
"pname": "NLog",
"version": "5.5.1",
"hash": "sha256-cLAAj2QWWhbfh4vgnE/fLq5Rpr3uTe4ufnVWTig0nEo="
"version": "5.4.0",
"hash": "sha256-l2R0UHHCL02KPMC96e62AL2ONFD0PAty619y9UnD25A="
},
{
"pname": "NLog.Extensions.Logging",
"version": "5.5.0",
"hash": "sha256-gdhJP9V5lDHgRS8gpFDgW6CkkLKo+tACCqPvERLaZ68="
"version": "5.4.0",
"hash": "sha256-9pVBguAKnjmbtKM3wBVBEzovXkoEXgqvB4IhiayAkVo="
},
{
"pname": "NLog.Layouts.ClefJsonLayout",
"version": "1.0.5",
"hash": "sha256-mBHH0OlpW0dCa34jI2xBTg1J7EDfmNJqjdRJOA3khWQ="
"version": "1.0.3",
"hash": "sha256-Rgf3s3Q9TXdzZHwb+VCBupazvmrgAPZcrKGBhV9Jh6Q="
},
{
"pname": "NLog.Targets.Syslog",
@@ -547,8 +552,8 @@
},
{
"pname": "Npgsql",
"version": "9.0.5",
"hash": "sha256-5AF0qiVQwfKUqCXSFb+oJhe3Q1wwK9F9+Q9/A4RTIdo="
"version": "9.0.3",
"hash": "sha256-X3F05GNj3vNVl++VOV5TMYE5dvEe6cx0k+5yWo2Q/+o="
},
{
"pname": "NUnit",
@@ -567,8 +572,8 @@
},
{
"pname": "Polly",
"version": "8.6.6",
"hash": "sha256-0BrOttCw+HQYB24Y2uMy2vo0P5/txUlhELC8FlyLKps="
"version": "8.6.0",
"hash": "sha256-wlvYcfcOExa3LopwRFO4axW682jkUZvioHe+kznspHk="
},
{
"pname": "Polly.Contrib.WaitAndRetry",
@@ -577,8 +582,8 @@
},
{
"pname": "Polly.Core",
"version": "8.6.6",
"hash": "sha256-y6/a4OWrUlRfe0J8qdhBRmYRDi6K2y+kwhEVCIUOjvU="
"version": "8.6.0",
"hash": "sha256-NEGMMQ+3+i4ytsGekKfP1trUe0mRZP7MV0eBiSFXHW8="
},
{
"pname": "RestSharp",
@@ -824,8 +829,8 @@
},
{
"pname": "SourceGear.sqlite3",
"version": "3.50.4.5",
"hash": "sha256-yPOyLiK4QoTfE3IED0hFl1JJYjmt8RBB3fp1a1CwvqE="
"version": "3.50.4.2",
"hash": "sha256-NsahZ3lW1JYXMq4NOH5nM/EhdjV05sbrhjsGNIinb+M="
},
{
"pname": "Swashbuckle.AspNetCore.Annotations",
@@ -854,8 +859,8 @@
},
{
"pname": "System.ClientModel",
"version": "1.8.0",
"hash": "sha256-ZWVhuw3IRk9rZXkXERhesEET2KMMzHjUH/HDI288WK8="
"version": "1.5.1",
"hash": "sha256-n4PHKtjmFXo37s5yhfUQ9UbfnWplqHpC+wsvlHxctow="
},
{
"pname": "System.Collections",
@@ -894,8 +899,8 @@
},
{
"pname": "System.Data.SQLite",
"version": "2.0.3",
"hash": "sha256-2TzEFt0nJjK1g8Gi5RMII7TOpG4vi9UzvJI3JxuPnKA="
"version": "2.0.2",
"hash": "sha256-s++mcixhc+QaQKzdXZ6quK8kH5WWWmU0mESZNNuP/ck="
},
{
"pname": "System.Diagnostics.Debug",
@@ -914,8 +919,8 @@
},
{
"pname": "System.Diagnostics.DiagnosticSource",
"version": "8.0.1",
"hash": "sha256-zmwHjcJgKcbkkwepH038QhcnsWMJcHys+PEbFGC0Jgo="
"version": "6.0.1",
"hash": "sha256-Xi8wrUjVlioz//TPQjFHqcV/QGhTqnTfUcltsNlcCJ4="
},
{
"pname": "System.Diagnostics.EventLog",
@@ -939,8 +944,8 @@
},
{
"pname": "System.Drawing.Common",
"version": "8.0.27",
"hash": "sha256-lxN0ZYNBAHdT0x45JuNSJ2L2uBdruqsDCAT4KVrmejs="
"version": "8.0.20",
"hash": "sha256-+NEKutfbGO9q1Yig45K1X8n/+gEZOQYNGlXRhbexvzA="
},
{
"pname": "System.Formats.Asn1",
@@ -1102,6 +1107,11 @@
"version": "4.3.0",
"hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="
},
{
"pname": "System.Runtime.CompilerServices.Unsafe",
"version": "6.0.0",
"hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="
},
{
"pname": "System.Runtime.Extensions",
"version": "4.3.0",
@@ -1234,8 +1244,8 @@
},
{
"pname": "System.Text.Json",
"version": "8.0.6",
"hash": "sha256-qD3WF3jQO9+TLuBWwJhz3iKDArJqcRiy7EdrCQhrtes="
"version": "8.0.5",
"hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68="
},
{
"pname": "System.Text.RegularExpressions",
@@ -1274,8 +1284,8 @@
},
{
"pname": "System.ValueTuple",
"version": "4.6.2",
"hash": "sha256-dv0ONmorkGVf0V1Vewt5UEGXdINYy1eP4xk/bZe92ao="
"version": "4.6.1",
"hash": "sha256-Hb87MPcNdHQRlREDzFEKU8ZqtKN26bjyAiimJmm6LWI="
},
{
"pname": "System.Xml.ReaderWriter",

View File

@@ -21,7 +21,7 @@
applyPatches,
}:
let
version = "6.2.1.10461";
version = "6.1.1.10360";
# The dotnet8 compatibility patches also change `yarn.lock`, so we must pass
# the already patched lockfile to `fetchYarnDeps`.
src = applyPatches {
@@ -29,7 +29,7 @@ let
owner = "Radarr";
repo = "Radarr";
tag = "v${version}";
hash = "sha256-gDEMahF0uhwlOisD0gWzY3M17mXftKBm9gN5Uaatqsk=";
hash = "sha256-AtvuZFAF+KJmEp46KWrA9qHv3+IejSXxUyol2W8BWdk=";
};
postPatch = ''
mv src/NuGet.config NuGet.Config
@@ -67,7 +67,7 @@ buildDotnetModule {
yarnOfflineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock";
hash = "sha256-FrYvTYSxUDP68a4n0isEaHxRNFL25N3LNQJVFBOLdyE=";
hash = "sha256-Ng7ZsUfGBKtNktJeuI4Q6+tMN2ZPj+pVSQ+0Ssy5gRc=";
};
ffprobe = lib.optionalDrvAttr withFFmpeg (lib.getExe' servarr-ffmpeg "ffprobe");

View File

@@ -7,7 +7,6 @@
accountsservice,
dbus,
glib,
gst_all_1,
gtk4,
pango,
librsvg,
@@ -38,9 +37,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
dbus
glib
gtk4
gst_all_1.gstreamer # Used for animated wallpapers or video playback
gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-base
pango
librsvg
];

View File

@@ -17,7 +17,7 @@
buildNpmPackage (finalAttrs: {
pname = "sandbox-runtime";
version = "0.0.55";
version = "0.0.54";
__structuredAttrs = true;
@@ -25,7 +25,7 @@ buildNpmPackage (finalAttrs: {
owner = "anthropic-experimental";
repo = "sandbox-runtime";
tag = "v${finalAttrs.version}";
hash = "sha256-ODcAtuflJGXziAmRTLvf+qTYrZpShn2D6k3TIOihngY=";
hash = "sha256-mk+dd/vMuQPklbFhse35n+m/0Y90WxrLPqjXCFBLE78=";
};
postPatch =
@@ -37,7 +37,7 @@ buildNpmPackage (finalAttrs: {
strictDeps = true;
npmDepsHash = "sha256-QI86b0aZXAys5LksnB9aH1I0CYptpnGNZKGx6uel9UI=";
npmDepsHash = "sha256-H4azrpaCxKZNQZPEC/xaKxpPzwK19/ZhQlzYKsrDHWY=";
postFixup =
let

View File

@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "screenly-cli";
version = "1.2.0";
version = "1.1.1";
src = fetchFromGitHub {
owner = "screenly";
repo = "cli";
tag = "v${finalAttrs.version}";
hash = "sha256-1Trq1LFmKtzCCuqOT3DeL5KAPtHWi/glmhLBTR2vdVg=";
hash = "sha256-g8qVlZVsHA0FiAK58AWH/LDyCopBBFPO4ocbz4rCivk=";
};
cargoHash = "sha256-VPl9/5GkMI2oZQ9ZUwpMcW9+3SCbCpLCVrBiXneCakQ=";
cargoHash = "sha256-yM7ueeYvJANBOaV/j7tlp+vVke/C2FepZ5Sd1IIqYX8=";
nativeBuildInputs = [
pkg-config

View File

@@ -1,43 +0,0 @@
{
lib,
buildGoModule,
fetchFromGitHub,
nix-update-script,
versionCheckHook,
}:
buildGoModule (finalAttrs: {
pname = "sharefinder";
version = "1.4.0";
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "vflame6";
repo = "sharefinder";
tag = "v${finalAttrs.version}";
hash = "sha256-82hQPz05Xzvq5ggUht3GFaJ+3yEjES94mfZjQd5a+rA=";
};
vendorHash = "sha256-ABPq6WKYIjyCX5K8iU++6dszUW7s9Ld1Queb2hGdGzs=";
ldflags = [
"-s"
"-X=github.com/vflame6/sharefinder/cmd.VERSION=${finalAttrs.version}"
];
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;
passthru.updateScript = nix-update-script { };
meta = {
description = "Active network shares enumeration tool";
homepage = "https://github.com/vflame6/sharefinder";
changelog = "https://github.com/vflame6/sharefinder/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fab ];
mainProgram = "sharefinder";
};
})

View File

@@ -52,8 +52,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
versionCheckProgramArg = "version";
doInstallCheck = true;
__darwinAllowLocalNetworking = true;
passthru.updateScript = nix-update-script { };
meta = {

View File

@@ -0,0 +1,112 @@
{
lib,
stdenv,
rustPlatform,
fetchFromGitHub,
fetchNpmDeps,
cargo-tauri_1,
makeBinaryWrapper,
nodejs,
npmHooks,
pkg-config,
wrapGAppsHook3,
dbus,
freetype,
gtk3,
libsoup_2_4,
openssl,
parallel-disk-usage,
}:
rustPlatform.buildRustPackage rec {
pname = "squirreldisk";
version = "0.3.4";
src = fetchFromGitHub {
owner = "adileo";
repo = "squirreldisk";
rev = "v${version}";
hash = "sha256-As2nvc68knjeLPuX0QLBoybj8vuvkpS5Vr+7U7E5CjA=";
};
cargoRoot = "src-tauri";
buildAndTestSubdir = "src-tauri";
cargoHash = "sha256-PfpbzawgwkqykG4u2G05rgZwksuxWJUcv6asnJvZJvU=";
npmDeps = fetchNpmDeps {
name = "squirreldisk-${version}-npm-deps";
inherit src;
hash = "sha256-Japcn0KYP7aYIDK8+Ns+mrnbbAb0fLWXHIV2+yltI6I=";
};
patches = [
# Update field names to work with pdu versions >=0.10.0
# https://github.com/adileo/squirreldisk/pull/47
./update-pdu-json-format.patch
];
cargoPatches = [
# Remove dependency on parallel-disk-usage crate. The version is outdated and
# does not compile anymore with Rust 1.87.0.
# https://github.com/adileo/squirreldisk/pull/49
./remove-pdu-crate.patch
];
postPatch = ''
# Use pdu binary from nixpkgs instead of the vendored prebuilt binary
rm src-tauri/bin/pdu-*
cp ${parallel-disk-usage}/bin/pdu src-tauri/bin/pdu-${stdenv.hostPlatform.rust.rustcTarget}
'';
nativeBuildInputs = [
cargo-tauri_1.hook
npmHooks.npmConfigHook
nodejs
]
++ lib.optionals stdenv.hostPlatform.isLinux [
pkg-config
wrapGAppsHook3
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
makeBinaryWrapper
];
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
dbus
freetype
gtk3
libsoup_2_4
openssl
# webkitgtk_4_0
];
# Disable checkPhase, since the project doesn't contain tests
doCheck = false;
# We'll wrap the main binary manually
dontWrapGApps = true;
# WEBKIT_DISABLE_COMPOSITING_MODE essential in NVIDIA + compositor https://github.com/NixOS/nixpkgs/issues/212064#issuecomment-1400202079
postFixup =
lib.optionalString stdenv.hostPlatform.isLinux ''
wrapGApp "$out/bin/squirrel-disk" \
--set WEBKIT_DISABLE_COMPOSITING_MODE 1
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
makeWrapper "$out/Applications/SquirrelDisk.app/Contents/MacOS/SquirrelDisk" "$out/bin/squirrel-disk"
'';
meta = {
# webkitgtk_4_0 was removed
broken = true;
description = "Cross-platform disk usage analysis tool";
homepage = "https://www.squirreldisk.com/";
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ peret ];
mainProgram = "squirrel-disk";
};
}

View File

@@ -0,0 +1,487 @@
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 667c8b7..440d72a 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -38,12 +38,6 @@ version = "1.0.68"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61"
-[[package]]
-name = "assert-cmp"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "737bf4aa6df38f69a17efc233b4d0343cc5aa0d2c3b53e7007bd4c9866038ffd"
-
[[package]]
name = "atk"
version = "0.15.1"
@@ -252,64 +246,6 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-[[package]]
-name = "clap"
-version = "4.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76"
-dependencies = [
- "bitflags",
- "clap_derive",
- "clap_lex",
- "is-terminal",
- "once_cell",
- "strsim",
- "termcolor",
-]
-
-[[package]]
-name = "clap-utilities"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15bcff807ef65113605e59223ac0ce77adc2cc0976e3ece014e0f2c17e4a7798"
-dependencies = [
- "clap",
- "clap_complete",
- "pipe-trait",
- "thiserror",
-]
-
-[[package]]
-name = "clap_complete"
-version = "4.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6540eedc41f8a5a76cf3d8d458057dcdf817be4158a55b5f861f7a5483de75"
-dependencies = [
- "clap",
-]
-
-[[package]]
-name = "clap_derive"
-version = "4.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8"
-dependencies = [
- "heck 0.4.0",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade"
-dependencies = [
- "os_str_bytes",
-]
-
[[package]]
name = "cocoa"
version = "0.24.1"
@@ -518,38 +454,14 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"
-[[package]]
-name = "darling"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f2c43f534ea4b0b049015d00269734195e6d3f0f6635cb692251aca6f9f8b3c"
-dependencies = [
- "darling_core 0.12.4",
- "darling_macro 0.12.4",
-]
-
[[package]]
name = "darling"
version = "0.13.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c"
dependencies = [
- "darling_core 0.13.4",
- "darling_macro 0.13.4",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e91455b86830a1c21799d94524df0845183fa55bafd9aa137b01c7d1065fa36"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim",
- "syn",
+ "darling_core",
+ "darling_macro",
]
[[package]]
@@ -566,24 +478,13 @@ dependencies = [
"syn",
]
-[[package]]
-name = "darling_macro"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29b5acf0dea37a7f66f7b25d2c5e93fd46f8f6968b1a5d7a3e02e97768afc95a"
-dependencies = [
- "darling_core 0.12.4",
- "quote",
- "syn",
-]
-
[[package]]
name = "darling_macro"
version = "0.13.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
dependencies = [
- "darling_core 0.13.4",
+ "darling_core",
"quote",
"syn",
]
@@ -599,37 +500,6 @@ dependencies = [
"winapi",
]
-[[package]]
-name = "derive_builder"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d13202debe11181040ae9063d739fa32cfcaaebe2275fe387703460ae2365b30"
-dependencies = [
- "derive_builder_macro",
-]
-
-[[package]]
-name = "derive_builder_core"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66e616858f6187ed828df7c64a6d71720d83767a7f19740b2d1b6fe6327b36e5"
-dependencies = [
- "darling 0.12.4",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "derive_builder_macro"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58a94ace95092c5acb1e97a7e846b310cfbd499652f72297da7493f618a98d73"
-dependencies = [
- "derive_builder_core",
- "syn",
-]
-
[[package]]
name = "derive_more"
version = "0.99.17"
@@ -722,27 +592,6 @@ dependencies = [
"cfg-if",
]
-[[package]]
-name = "errno"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
-dependencies = [
- "errno-dragonfly",
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
-dependencies = [
- "cc",
- "libc",
-]
-
[[package]]
name = "fastrand"
version = "1.8.0"
@@ -784,16 +633,6 @@ dependencies = [
"miniz_oxide",
]
-[[package]]
-name = "fmt-iter"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0b9289d76691c7084d8830f1d0a29ddefbad768f8b5f276e012840bb0fca610"
-dependencies = [
- "derive_more",
- "itertools",
-]
-
[[package]]
name = "fnv"
version = "1.0.7"
@@ -1329,37 +1168,6 @@ dependencies = [
"cfg-if",
]
-[[package]]
-name = "io-lifetimes"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e"
-dependencies = [
- "libc",
- "windows-sys 0.42.0",
-]
-
-[[package]]
-name = "is-terminal"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189"
-dependencies = [
- "hermit-abi",
- "io-lifetimes",
- "rustix",
- "windows-sys 0.42.0",
-]
-
-[[package]]
-name = "itertools"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
-dependencies = [
- "either",
-]
-
[[package]]
name = "itoa"
version = "0.4.8"
@@ -1477,12 +1285,6 @@ dependencies = [
"safemem",
]
-[[package]]
-name = "linux-raw-sys"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
-
[[package]]
name = "lock_api"
version = "0.4.9"
@@ -1892,12 +1694,6 @@ dependencies = [
"windows-sys 0.42.0",
]
-[[package]]
-name = "os_str_bytes"
-version = "6.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
-
[[package]]
name = "overload"
version = "0.1.1"
@@ -1929,31 +1725,6 @@ dependencies = [
"system-deps 6.0.3",
]
-[[package]]
-name = "parallel-disk-usage"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e42b33f85d6d5a345c243fff616265c2b8263a44641e88e4afd80f32dbd7279b"
-dependencies = [
- "assert-cmp",
- "clap",
- "clap-utilities",
- "clap_complete",
- "derive_more",
- "fmt-iter",
- "itertools",
- "pipe-trait",
- "rayon",
- "rounded-div",
- "serde",
- "serde_json",
- "smart-default",
- "terminal_size",
- "text-block-macros",
- "thiserror",
- "zero-copy-pads",
-]
-
[[package]]
name = "parking_lot"
version = "0.12.1"
@@ -2115,12 +1886,6 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-[[package]]
-name = "pipe-trait"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1be1ec9e59f0360aefe84efa6f699198b685ab0d5718081e9f72aa2344289e2"
-
[[package]]
name = "pkg-config"
version = "0.3.26"
@@ -2432,12 +2197,6 @@ dependencies = [
"windows 0.37.0",
]
-[[package]]
-name = "rounded-div"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "464c8fb0a126d6a0326baf6abf1aa62c2da0d5780aa781a81451d64f543f5e2f"
-
[[package]]
name = "rustc_version"
version = "0.3.3"
@@ -2456,20 +2215,6 @@ dependencies = [
"semver 1.0.16",
]
-[[package]]
-name = "rustix"
-version = "0.36.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03"
-dependencies = [
- "bitflags",
- "errno",
- "io-lifetimes",
- "libc",
- "linux-raw-sys",
- "windows-sys 0.42.0",
-]
-
[[package]]
name = "rustversion"
version = "1.0.11"
@@ -2658,7 +2403,7 @@ version = "1.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082"
dependencies = [
- "darling 0.13.4",
+ "darling",
"proc-macro2",
"quote",
"syn",
@@ -2747,17 +2492,6 @@ version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
-[[package]]
-name = "smart-default"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "133659a15339456eeeb07572eb02a91c91e9815e9cbc89566944d2c8d3efdbf6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
[[package]]
name = "soup2"
version = "0.2.1"
@@ -2792,7 +2526,6 @@ version = "0.0.0"
dependencies = [
"cocoa",
"objc",
- "parallel-disk-usage",
"raw-window-handle",
"regex",
"serde",
@@ -3200,31 +2933,6 @@ dependencies = [
"utf-8",
]
-[[package]]
-name = "termcolor"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "terminal_size"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb20089a8ba2b69debd491f8d2d023761cbf196e999218c591fa1e7e15a21907"
-dependencies = [
- "rustix",
- "windows-sys 0.42.0",
-]
-
-[[package]]
-name = "text-block-macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f8b59b4da1c1717deaf1de80f0179a9d8b4ac91c986d5fd9f4a8ff177b84049"
-
[[package]]
name = "thin-slice"
version = "0.1.1"
@@ -3452,12 +3160,6 @@ version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a"
-[[package]]
-name = "unicode-width"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
-
[[package]]
name = "url"
version = "2.3.1"
@@ -4036,18 +3738,6 @@ dependencies = [
"libc",
]
-[[package]]
-name = "zero-copy-pads"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5649a5dce1370c707880332f781f6566883736a41861a5749890f4671d5746b6"
-dependencies = [
- "derive_builder",
- "derive_more",
- "fmt-iter",
- "unicode-width",
-]
-
[[package]]
name = "zip"
version = "0.6.3"
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index c930949..3ae2c83 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -22,7 +22,6 @@ window-vibrancy = "0.3.2"
window-shadows = { git = "https://github.com/adileo/window-shadows" }
raw-window-handle = "0.5.0"
walkdir = "2"
-parallel-disk-usage = "0.8.3"
regex = "1"
[target."cfg(target_os = \"windows\")".dependencies]

View File

@@ -0,0 +1,77 @@
diff --git a/src/components/FileLine.tsx b/src/components/FileLine.tsx
index e55f3bd..bd722d7 100644
--- a/src/components/FileLine.tsx
+++ b/src/components/FileLine.tsx
@@ -65,7 +65,7 @@ export const FileLine = ({
{/* {JSON.stringify(item.data)} */}
{item &&
item.data &&
- (item.data.data / mul / mul / mul).toFixed(2)}{" "}
+ (item.data.size / mul / mul / mul).toFixed(2)}{" "}
GB
</div>
</div>
diff --git a/src/d3chart.ts b/src/d3chart.ts
index 855886b..d85c682 100644
--- a/src/d3chart.ts
+++ b/src/d3chart.ts
@@ -191,7 +191,7 @@ const updateData = (
isDirectory: false,
name: "Smaller Items",
value: item.value || 0,
- data: item.value || 0,
+ size: item.value || 0,
children: [],
};
accumulator = d3.hierarchy(v) as D3HierarchyDiskItem;
@@ -248,7 +248,7 @@ const updateData = (
.ancestors()
.map((d) => d.data.name)
.reverse()
- .join("/")}\n${((d.data.data || 0) / mul / mul / mul).toFixed(
+ .join("/")}\n${((d.data.size || 0) / mul / mul / mul).toFixed(
2
)} GB`
);
diff --git a/src/index.d.ts b/src/index.d.ts
index daa7233..81b5243 100644
--- a/src/index.d.ts
+++ b/src/index.d.ts
@@ -5,7 +5,7 @@ interface DiskItem {
id: string;
name: string;
value: number;
- data: number;
+ size: number;
isDirectory: boolean;
children: Array<DiskItem>;
}
diff --git a/src/pruneData.ts b/src/pruneData.ts
index 37e70d8..040e227 100644
--- a/src/pruneData.ts
+++ b/src/pruneData.ts
@@ -18,7 +18,7 @@ export const itemMap = (obj: any, parent: any = null) => {
//recursive call to scan property
if (obj["children"].length > 0) {
obj.isDirectory = true;
- obj.value = obj.data;
+ obj.value = obj.size;
obj["children"].forEach((element: any) => {
itemMap(element, obj);
});
@@ -31,13 +31,13 @@ const partition = (data: DiskItem) => {
const hierarchy = d3
.hierarchy(data)
.sum(function (d) {
- return !d.children || d.children.length === 0 ? d.data : 0;
+ return !d.children || d.children.length === 0 ? d.size : 0;
})
// .sum(d => d.value)
// .sum((d: DiskItem) => (d.children ? d.data : d.data))
// .sum(d => d.data ? 0 : d.value)
- .sort((a: any, b: any) => (b.data || 0) - (a.data || 0));
+ .sort((a: any, b: any) => (b.size || 0) - (a.size || 0));
// debugger;
const partition = d3
.partition<DiskItem>()

View File

@@ -44,7 +44,6 @@ buildGoModule rec {
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [
keegancsmith
burmudar
];
mainProgram = "src";
};

View File

@@ -1,47 +1,35 @@
{
lib,
cacert,
fetchFromGitHub,
rustPlatform,
versionCheckHook,
stalwart,
}:
rustPlatform.buildRustPackage (finalAttrs: {
rustPlatform.buildRustPackage {
inherit (stalwart) src version cargoDeps;
pname = "stalwart-cli";
version = "1.0.8";
src = fetchFromGitHub {
owner = "stalwartlabs";
repo = "cli";
tag = "v${finalAttrs.version}";
hash = "sha256-teQB+6ZPEH3RXxG8WX4L67ckLCTYfMF4xaiz3S074b0=";
};
cargoHash = "sha256-yMfWFTXV1gXPqo2OOAN/Fkym9UiHjXDX0tAJOCF2p4U=";
__structuredAttrs = true;
# `Result::unwrap()` on an `Err` value: Network(reqwest::Error { kind: Builder, source: General("No CA certificates were loaded from the system") })
nativeCheckInputs = [ cacert ];
cargoBuildFlags = [
"--package"
"stalwart-cli"
];
cargoTestFlags = [
"--package"
"stalwart-cli"
];
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
meta = {
description = "Stalwart Command Line Interface";
longDescription = ''
A schema-driven command line tool for administering Stalwart Mail and Collaboration Server over its JMAP API.
The tool fetches the server's schema on first use and derives every command, validation rule, and rendered view from it. The same binary works against any compatible Stalwart deployment without recompilation.
'';
homepage = "https://github.com/stalwartlabs/cli";
changelog = "https://github.com/stalwartlabs/cli/blob/${finalAttrs.src.tag}/CHANGELOG.md";
license = lib.licenses.OR [
lib.licenses.agpl3Only
{
fullName = "Stalwart Enterprise License 2.0 (SELv2) Agreement";
url = "https://github.com/stalwartlabs/cli/blob/main/LICENSES/LicenseRef-SEL.txt";
free = false;
redistributable = false;
}
];
# Prerelease reports incorrect version
dontVersionCheck = true;
meta = {
inherit (stalwart.meta) license homepage changelog;
description = "Stalwart Mail Server CLI";
mainProgram = "stalwart-cli";
maintainers = with lib.maintainers; [
giomf
debtquity
];
};
})
}

View File

@@ -7,14 +7,14 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "vandelay";
version = "1.0.3";
version = "1.0.2";
src = fetchFromGitHub {
owner = "stalwartlabs";
repo = "vandelay";
tag = "v${finalAttrs.version}";
hash = "sha256-khEK+uB/CrNBv4syDO9smDx9CbQ2BeDLZQn3wBuuA1g=";
hash = "sha256-RwcSwgzAqagm4JpNXptnXbHhtl7KoyPoiuSf2kBwzt8=";
};
cargoHash = "sha256-i0MtrOIguU4bXeTqvyJjwvJwherib2vCnW7hTFB0aNk=";
cargoHash = "sha256-hxnnBy7YpwYhxw1jtGckNt0zU/6sdsXC8geFuwIJjWE=";
__structuredAttrs = true;
__darwinAllowLocalNetworking = true;
# called `Result::unwrap()` on an `Err` value: Tls("rustls platform verifier: unexpected error: No CA certificates were loaded from the system")

View File

@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "stylance-cli";
version = "0.8.4";
version = "0.8.3";
src = fetchFromGitHub {
owner = "basro";
repo = "stylance-rs";
tag = "v${finalAttrs.version}";
hash = "sha256-raimzhK0o3ZMMfHpBIOVkDly5MSIpfgpSDDdW2aWbUI=";
hash = "sha256-UVRUPjDxfwnajkY3KUa/615pIo/uAyGu1ngQBSAnEBE=";
};
cargoHash = "sha256-wqNQUCD7/q41GKIxjLFEGrlNru3SIN9mbUh+nApm1i8=";
cargoHash = "sha256-bNOOp/6myQX7z/O0gmW/2s9eEog5ZMlL5hD0GFgj7OY=";
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;

View File

@@ -5,16 +5,17 @@
makeWrapper,
bash,
subversion,
zenity,
}:
stdenv.mkDerivation {
pname = "thcrap-proton";
version = "0-unstable-2026-02-11";
version = "0-unstable-2024-04-03";
src = fetchFromGitHub {
owner = "nerusuki";
owner = "tactikauan";
repo = "thcrap-steam-proton-wrapper";
rev = "a5edfe44ead2df2e6bca54bd738ae0dc3284e679";
hash = "sha256-4RTVfcwlYW+KPyPIon0X1d4SPsF6cFkRSXBfe4yzAyQ=";
rev = "2b636c3f5f1ce1b9b41f731aa9397aa68d2ce66b";
hash = "sha256-J2O8F75NMdsxSaNVr8zLf+vLEJE6CHqWQIIscuuJZ3o=";
};
buildInputs = [ subversion ];
@@ -36,13 +37,14 @@ stdenv.mkDerivation {
lib.makeBinPath [
bash
subversion
zenity
]
}
'';
meta = {
description = "Wrapper script for launching the official Touhou games on Steam with patches through Proton on GNU/Linux";
homepage = "https://github.com/nerusuki/thcrap-steam-proton-wrapper";
homepage = "https://github.com/tactikauan/thcrap-steam-proton-wrapper";
license = lib.licenses.unlicense;
maintainers = with lib.maintainers; [ ashuramaruzxc ];
platforms = [

View File

@@ -6,7 +6,7 @@
nix-update-script,
}:
let
version = "0.33.0";
version = "0.32.2";
in
rustPlatform.buildRustPackage {
pname = "tinty";
@@ -16,10 +16,10 @@ rustPlatform.buildRustPackage {
owner = "tinted-theming";
repo = "tinty";
tag = "v${version}";
hash = "sha256-pQ7Aw95evZc8buPLkluUhxs113El2SFFNTltpunPbow=";
hash = "sha256-+13iS99bwvIZDy96x1fgOtDyvbu59ieY4nUZk91mK4s=";
};
cargoHash = "sha256-pJH8ROgwfHZfJQWQI7u+mzqVX6I369/cF3QUM2+D7Y4=";
cargoHash = "sha256-gShC4+uzdJVi3KuLc6ImJRvEWvIY4vgKcYT8Aykm0Xc=";
# Pretty much all tests require internet access
doCheck = false;

View File

@@ -9,7 +9,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "tombi";
version = "1.1.3";
version = "1.1.2";
__structuredAttrs = true;
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
owner = "tombi-toml";
repo = "tombi";
tag = "v${finalAttrs.version}";
hash = "sha256-zkvg82Fl8bFr5U0015z+5mQpZGw8hOQxO/7llFBpGAA=";
hash = "sha256-qgYyp8PglhRByajXartyuPgLDK8S5Uik7xABJnI26Bw=";
};
# Tests relies on the presence of network

View File

@@ -6,16 +6,16 @@
buildGoModule (finalAttrs: {
pname = "traefik-certs-dumper";
version = "2.11.3";
version = "2.11.2";
src = fetchFromGitHub {
owner = "ldez";
repo = "traefik-certs-dumper";
rev = "v${finalAttrs.version}";
sha256 = "sha256-8x/3g2/6XVoR4EVR83aUDh16LSiG8r3buny+4F0qNH4=";
sha256 = "sha256-4s4IN/aDGP/9mFEf3Sl8/R9GtQlYSSXjxPrSA2CYuWE=";
};
vendorHash = "sha256-DR1Bo4MwoJy7AZyuLsjkqbUHj12fN01mnyDVXcvmjMI=";
vendorHash = "sha256-VKtYOc1PbR0UZ9mJZ5houzVEPN+j+OnTw42eFr1aQgg=";
excludedPackages = "integrationtest";
meta = {

View File

@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "twitch-hls-client";
version = "1.7.0";
version = "1.6.2";
src = fetchFromGitHub {
owner = "2bc4";
repo = "twitch-hls-client";
rev = finalAttrs.version;
hash = "sha256-GtnAx94bQGb5rokXsep815+OeazBCfoDRkvTGQKDC4c=";
hash = "sha256-AoefKtAiM8Xi1DoPDH2E623QSC668qrQLOLpdtFxuAs=";
};
cargoHash = "sha256-2z1ezQjOrji6wh7Rg8RYeRJxAi1uSwTjnQ/xOBiCYoY=";
cargoHash = "sha256-j4y3os2l0PmmE7T3RFJMsnFfulN9uR6nMGaPZCBc7dE=";
meta = {
description = "Minimal CLI client for watching/recording Twitch streams";

View File

@@ -12,14 +12,13 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "typst";
version = "0.15.0";
__structuredAttrs = true;
version = "0.14.2";
src = fetchFromGitHub {
owner = "typst";
repo = "typst";
tag = "v${finalAttrs.version}";
hash = "sha256-R8hgStbn/oWN+FklUkbuKnODTToRvvw3XSE0AxN/EG0=";
hash = "sha256-EXcmL/KNj9vCChCs6RH1J/+aetYcXnEdGEhvVzGNNZA=";
leaveDotGit = true;
postFetch = ''
cd $out
@@ -28,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
'';
};
cargoHash = "sha256-g+w0fkATxnWNcLuNrEMzI52psPKXMrsWqnHgfXNc8tI=";
cargoHash = "sha256-HDu7/kgpBgUe/CrHm17BkNlg3DYlegTevgAeBCXp6so=";
nativeBuildInputs = [
installShellFiles
@@ -52,8 +51,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
substituteInPlace tests/src/args.rs --replace-fail \
'num_threads' \
'test_threads'
export TYPST_COMMIT_SHA="$(cat COMMIT | cut -c1-8)"
substituteInPlace crates/typst-cli/build.rs --replace-fail \
'"cargo:rustc-env=TYPST_COMMIT_SHA={}", typst_commit_sha()' \
"\"cargo:rustc-env=TYPST_COMMIT_SHA={}\", \"$(cat COMMIT | cut -c1-8)\""
'';
postInstall = ''
@@ -76,7 +76,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
};
meta = {
changelog = "https://github.com/typst/typst/releases/tag/${finalAttrs.src.tag}";
changelog = "https://github.com/typst/typst/releases/tag/v${finalAttrs.version}";
description = "New markup-based typesetting system that is powerful and easy to learn";
homepage = "https://github.com/typst/typst";
license = lib.licenses.asl20;
@@ -84,7 +84,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
maintainers = with lib.maintainers; [
kanashimia
RossSmyth
faukah
];
};
})

View File

@@ -4,6 +4,7 @@
fetchFromGitHub,
writeShellScript,
makeWrapper,
umap,
postgresql,
postgresqlTestHook,
playwright-driver,
@@ -15,20 +16,16 @@ let
django = prev.django_5.override { withGdal = true; };
};
};
in
python.pkgs.buildPythonApplication (finalAttrs: {
python.pkgs.buildPythonApplication rec {
pname = "umap";
version = "3.7.3";
pyproject = true;
strictDeps = true;
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "umap-project";
repo = "umap";
tag = finalAttrs.version;
rev = version;
hash = "sha256-rM1o83/udkqiVD0nSiAjNVAzriJr2ztvSXh45wxmYzU=";
};
@@ -72,7 +69,7 @@ python.pkgs.buildPythonApplication (finalAttrs: {
];
passthru = {
pythonPath = "${finalAttrs.finalPackage}/${python.sitePackages}:${python.pkgs.makePythonPath finalAttrs.passthru.dependencies}";
pythonPath = "${umap}/${python.sitePackages}:${python.pkgs.makePythonPath dependencies}";
};
nativeBuildInputs = [
@@ -81,7 +78,6 @@ python.pkgs.buildPythonApplication (finalAttrs: {
postInstall =
let
pythonPath = python.pkgs.makePythonPath finalAttrs.passthru.dependencies;
start_script = writeShellScript "umap-serve" ''
${lib.getExe python3.pkgs.uvicorn} "$@" umap.asgi:application;
'';
@@ -89,7 +85,7 @@ python.pkgs.buildPythonApplication (finalAttrs: {
''
makeWrapper ${start_script} $out/bin/umap-serve \
--prefix PYTHONPATH : "$out/${python.sitePackages}" \
--prefix PYTHONPATH : "${pythonPath}"
--prefix PYTHONPATH : "${python.pkgs.makePythonPath dependencies}";
'';
nativeCheckInputs =
@@ -143,4 +139,4 @@ python.pkgs.buildPythonApplication (finalAttrs: {
];
mainProgram = "umap";
};
})
}

View File

@@ -1,40 +0,0 @@
From 95734ddc06af1e98a0a6165d382c353c423c6e63 Mon Sep 17 00:00:00 2001
From: "tsrk." <tsrk@tsrk.me>
Date: Sun, 24 May 2026 05:14:44 +0200
Subject: [PATCH 4/4] Upgrade Electron 14 to force removal of remote module
Cc: Freya Murphy <freya@freyacat.org>
Signed-off-by: tsrk. <tsrk@tsrk.me>
---
package.json | 2 +-
src/background.js | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/package.json b/package.json
index 54a0ec9..9404be1 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
"acorn": "^8",
"babel-loader": "^8.1.2",
"css-loader": "^3.5",
- "electron": "^9.0.0",
+ "electron": "^14.2.9",
"electron-builder-squirrel-windows": "24.13.3",
"electron-devtools-assembler": "^1.2.0",
"electron-icon-builder": "^1.0.2",
diff --git a/src/background.js b/src/background.js
index 6fa2256..3a4b6d7 100644
--- a/src/background.js
+++ b/src/background.js
@@ -750,7 +750,6 @@ async function createWindow () {
// MOD: disable isolation to get
// collection to work with electron 35
contextIsolation: false,
- enableRemoteModule: true,
plugins: true,
webviewTag: true
}
--
2.51.2

View File

@@ -31,12 +31,11 @@ stdenv.mkDerivation (finalAttrs: {
})
./0002-disable-update-check.patch
./0003-make-compatible-with-native-electron.patch
./0004-Upgrade-Electron-14-to-force-removal-of-remote-module.patch
];
offlineCache = fetchYarnDeps {
yarnLock = ./yarn.lock;
hash = "sha256-CKWFtIZBASGx/1tBR8n7aKPqfj4P9dCAPIzee/DIOP8=";
yarnLock = "${finalAttrs.src}/yarn.lock";
hash = "sha256-mo5Ir/pLoqc6K/0AOJqKC0yup7vx9UrNfQ+casIgBCo=";
};
nativeBuildInputs = [
@@ -50,9 +49,6 @@ stdenv.mkDerivation (finalAttrs: {
configurePhase = ''
runHook preConfigure
# Replace lockfile with our own (sync offline cache)
cp -f ${./yarn.lock} yarn.lock
# setup yarn
fixup-yarn-lock yarn.lock
yarn config --offline set ignore-engines true

File diff suppressed because it is too large Load Diff

View File

@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "vrrtest";
version = "2.1.1";
version = "2.1.0";
src = fetchFromGitHub {
owner = "Nixola";
repo = "VRRTest";
rev = "v${finalAttrs.version}";
hash = "sha256-xosnYd55fUas3p90oWUCT5p5Y37iX2nTxkcgejYWmLE=";
hash = "sha256-esyD+BpdnB8miUrIjV6P8Lho1xztmhLDnKxdQKW8GXc=";
};
nativeBuildInputs = [ makeWrapper ];

View File

@@ -9,7 +9,6 @@
nix-update,
curl,
writeShellApplication,
installShellFiles,
llvmPackages_21,
libffi,
libxml2,
@@ -84,7 +83,6 @@ stdenv.mkDerivation (finalAttrs: {
rustc
rustPlatform.cargoSetupHook
rustPlatform.bindgenHook
installShellFiles
]
++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
@@ -144,19 +142,9 @@ stdenv.mkDerivation (finalAttrs: {
V8_LIB_DIR = "${v8Prebuilt}/lib";
};
postInstall =
lib.optionalString stdenv.hostPlatform.isDarwin ''
install -Dm755 target/release/libwasmer.dylib $out/lib/libwasmer.dylib
''
+ lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
# gen-completions uses argv[0] as the command name, so invoke wasmer with
# `exec -a wasmer` to avoid baking the absolute store path into the output
# (which produces invalid fish function names that fail to load).
installShellCompletion --cmd wasmer \
--bash <(exec -a wasmer $out/bin/wasmer gen-completions bash) \
--fish <(exec -a wasmer $out/bin/wasmer gen-completions fish) \
--zsh <(exec -a wasmer $out/bin/wasmer gen-completions zsh)
'';
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
install -Dm755 target/release/libwasmer.dylib $out/lib/libwasmer.dylib
'';
passthru.updateScript = lib.getExe (writeShellApplication {
name = "update-wasmer";

View File

@@ -13,13 +13,13 @@
stdenv.mkDerivation {
pname = "wdt";
version = "1.27.1612021-unstable-2026-06-09";
version = "1.27.1612021-unstable-2026-02-26";
src = fetchFromGitHub {
owner = "facebook";
repo = "wdt";
rev = "b3e21d71b2223fcecba58436f81a0ba7a56a6d6a";
hash = "sha256-H7/WJV5rvgdjwFAV2FCAbmkdsqO45LsDAfCroFbxTU4=";
rev = "8e72c3f16ef471919f93815e9518ae2c4e81cc15";
hash = "sha256-6xTxcJzvtCbVllU5d/fgF+LYZmkIbXq4+3XP01ooggE=";
};
nativeBuildInputs = [ cmake ];

View File

@@ -111,7 +111,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
];
in
lib.concatMap (
p: if p == null || lib.elem p.pname coreDeps then [ ] else [ p.pname ]
p: if lib.elem p.pname coreDeps then [ ] else [ p.pname ]
) finalAttrs.passthru.dependencies;
dependencies =

View File

@@ -0,0 +1,98 @@
{
lib,
cmake,
dbus,
fetchFromGitHub,
fetchYarnDeps,
freetype,
gtk3,
libsoup_2_4,
stdenvNoCC,
yarnConfigHook,
yarnBuildHook,
nodejs,
openssl,
pkg-config,
rustPlatform,
}:
let
pname = "xplorer";
version = "unstable-2023-03-19";
src = fetchFromGitHub {
owner = "kimlimjustin";
repo = "xplorer";
rev = "8d69a281cbceda277958796cb6b77669fb062ee3";
sha256 = "sha256-VFRdkSfe2mERaYYtZlg9dvH1loGWVBGwiTRj4AoNEAo=";
};
frontend-build = stdenvNoCC.mkDerivation (finalAttrs: {
inherit version src;
pname = "xplorer-ui";
offlineCache = fetchYarnDeps {
yarnLock = src + "/yarn.lock";
sha256 = "sha256-H37vD0GTSsWV5UH7C6UANDWnExTGh8yqajLn3y7P2T8=";
};
nativeBuildInputs = [
yarnConfigHook
yarnBuildHook
nodejs
];
yarnBuildScript = "prebuild";
installPhase = ''
cp -r out $out
'';
});
in
rustPlatform.buildRustPackage {
inherit version src pname;
sourceRoot = "${src.name}/src-tauri";
cargoHash = "sha256-D7qgmxDYQEgOkEYKDSLA875bXeTKDvAntF7kB4esn24=";
# copy the frontend static resources to final build directory
# Also modify tauri.conf.json so that it expects the resources at the new location
postPatch = ''
mkdir -p frontend-build
cp -R ${frontend-build}/src frontend-build
substituteInPlace tauri.conf.json --replace '"distDir": "../out/src",' '"distDir": "frontend-build/src",'
'';
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
dbus
openssl
freetype
libsoup_2_4
gtk3
# webkitgtk_4_0
];
checkFlags = [
# tries to mutate the parent directory
"--skip=test_file_operation"
];
postInstall = ''
mv $out/bin/app $out/bin/xplorer
'';
meta = {
# webkitgtk_4_0 was removed
broken = true;
description = "Customizable, modern file manager";
homepage = "https://xplorer.space";
license = lib.licenses.asl20;
maintainers = [ ];
mainProgram = "xplorer";
};
}

Some files were not shown because too many files have changed in this diff Show More