mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
Merge staging-next into staging
This commit is contained in:
commit
2eaa7a755f
78 changed files with 17018 additions and 2671 deletions
|
|
@ -10455,6 +10455,11 @@
|
|||
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";
|
||||
|
|
|
|||
|
|
@ -17,9 +17,7 @@ in
|
|||
Note that only users in the "uinput" group will be able to use the package
|
||||
'';
|
||||
};
|
||||
package = lib.mkPackageOption pkgs "mouse-actions" {
|
||||
example = "mouse-actions-gui";
|
||||
};
|
||||
package = lib.mkPackageOption pkgs "mouse-actions" { };
|
||||
autorun = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
|
|
|
|||
|
|
@ -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,9 +443,11 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = {
|
||||
# Older versions need webkitgtk_4_0 which was removed.
|
||||
# 25.08 bundles the same.
|
||||
broken = lib.versionOlder version "25.08";
|
||||
# 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;
|
||||
license = lib.licenses.unfree;
|
||||
description = "Citrix Workspace";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
|
|
|
|||
|
|
@ -1,76 +0,0 @@
|
|||
{
|
||||
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;
|
||||
};
|
||||
}
|
||||
|
|
@ -30,23 +30,15 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ayatana-indicator-display";
|
||||
version = "24.5.2";
|
||||
version = "26.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AyatanaIndicators";
|
||||
repo = "ayatana-indicator-display";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-rsZjEfAiz1HC5XMjPume1Y6miNAv1kmPFP4J/+NKlsA=";
|
||||
hash = "sha256-A4v2cdsFgR50b8BGAMpR9DrHxlVlahaM8Fii+eQ3UcA=";
|
||||
};
|
||||
|
||||
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 \
|
||||
|
|
|
|||
|
|
@ -1,26 +0,0 @@
|
|||
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
|
||||
|
||||
|
|
@ -1,49 +0,0 @@
|
|||
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
|
||||
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
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
|
||||
|
||||
|
|
@ -1,68 +0,0 @@
|
|||
{
|
||||
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
|
||||
;
|
||||
};
|
||||
}
|
||||
)
|
||||
|
|
@ -1,85 +0,0 @@
|
|||
{
|
||||
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 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -7,29 +7,29 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "2026.5.26-6";
|
||||
version = "2026.5.26-8";
|
||||
|
||||
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-8jEq0X2owEnOdSWzEhDOYahAdq/3G/JIUZShHbYrR2c=";
|
||||
hash = "sha256-TqSABBxigiYTafi0vxFYnssLjHbiXYaNxI8prkkp8CE=";
|
||||
};
|
||||
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://static.devin.ai/cli/${version}/devin-${version}-aarch64-unknown-linux.tar.gz";
|
||||
hash = "sha256-i8m05WrmO/KQCt/4jVFkRxz9nIXZEDi8idVhXkXxDig=";
|
||||
hash = "sha256-1hoTd6JR43nR+heLqU7igP+debI1bhWcIlG6BGyaj3I=";
|
||||
};
|
||||
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "https://static.devin.ai/cli/${version}/devin-${version}-aarch64-apple-darwin.tar.gz";
|
||||
hash = "sha256-WPL1kPMSmqh9/n2m9CvNnUcyLfjHz3PC9tAjGrjaZfw=";
|
||||
hash = "sha256-/8vd26V0z1qyt8EOJ2Z/JdWNGjb+iN+YkgaJQRoBHUk=";
|
||||
};
|
||||
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://static.devin.ai/cli/${version}/devin-${version}-x86_64-apple-darwin.tar.gz";
|
||||
hash = "sha256-HtB5iCT3d3AprPM+1uNkPkX0v4wSerTJlEu5F4P6pp0=";
|
||||
hash = "sha256-uF6ORbWwC0hgIURFoXFQh/5oPvfS4cgRBaCui4S0E0E=";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
|
||||
set -euo pipefail
|
||||
|
||||
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 '"')
|
||||
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')
|
||||
|
||||
if [[ "$currentVersion" == "$latestVersion" ]]; then
|
||||
echo "package is up-to-date: $currentVersion"
|
||||
|
|
@ -18,6 +18,7 @@ for system in \
|
|||
aarch64-linux \
|
||||
x86_64-darwin \
|
||||
aarch64-darwin; do
|
||||
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 '"')))
|
||||
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')
|
||||
update-source-version devin-cli $latestVersion $hash --system=$system --ignore-same-version
|
||||
done
|
||||
|
|
|
|||
|
|
@ -22,13 +22,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ed-odyssey-materials-helper";
|
||||
version = "3.6.6";
|
||||
version = "3.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jixxed";
|
||||
repo = "ed-odyssey-materials-helper";
|
||||
tag = version;
|
||||
hash = "sha256-ljCN2tW7iH+kTiSXwUt+OsAhjYKlAy0W5x/JDmQeR6M=";
|
||||
hash = "sha256-vQn45gHcMRLH5ta5+h3QXLODUlmDWeG1PSRRl/hgfiE=";
|
||||
};
|
||||
|
||||
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.gpl3Only;
|
||||
license = lib.licenses.mit;
|
||||
sourceProvenance = with lib.sourceTypes; [
|
||||
fromSource
|
||||
binaryBytecode # mitm cache
|
||||
|
|
|
|||
|
|
@ -17,16 +17,16 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "0.309.0";
|
||||
version = "0.309.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evcc-io";
|
||||
repo = "evcc";
|
||||
tag = version;
|
||||
hash = "sha256-Uyb83sBFNJLRU78Q60Mj3Q6j9Uvrv3unj0kkAdTXePc=";
|
||||
hash = "sha256-fMWLr8UrwejLlPiPdcs5lLd//81iqvuE5Ia9Ne0d3l4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-95yI/ObkLByzO+BBbACylaNcCrple8MpxY8dKLGqFDE=";
|
||||
vendorHash = "sha256-lCXIgJuUg5NG8E/iYobGxtvxfTk77Y8ZzVi0GsjbbHw=";
|
||||
|
||||
commonMeta = {
|
||||
license = lib.licenses.mit;
|
||||
|
|
|
|||
78
pkgs/by-name/fl/fluux-messenger/package.nix
Normal file
78
pkgs/by-name/fl/fluux-messenger/package.nix
Normal file
|
|
@ -0,0 +1,78 @@
|
|||
{
|
||||
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;
|
||||
};
|
||||
})
|
||||
|
|
@ -1,72 +0,0 @@
|
|||
{
|
||||
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";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,70 +0,0 @@
|
|||
{
|
||||
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;
|
||||
};
|
||||
}
|
||||
|
|
@ -15,18 +15,18 @@
|
|||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "gemini-cli";
|
||||
version = "0.43.0";
|
||||
version = "0.44.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google-gemini";
|
||||
repo = "gemini-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-UFz+CQLGbzFlpa5Mhf/frnQJWttF35URvua1QTfoaZ0=";
|
||||
hash = "sha256-FizxmHWOomlnWZoCK2lOLc94RjNTQM33vN16nLXsJI0=";
|
||||
};
|
||||
|
||||
nodejs = nodejs_22;
|
||||
|
||||
npmDepsHash = "sha256-7Pl020NKKzRpQftzEYRpQ0v1mkPnO3kVZITvFSLYztI=";
|
||||
npmDepsHash = "sha256-yn17dwHIpL3T2Z9nSOyBMehggrj4y6so7WMhnk2VwoA=";
|
||||
|
||||
dontPatchElf = stdenv.hostPlatform.isDarwin;
|
||||
|
||||
|
|
@ -54,9 +54,13 @@ 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
|
||||
|
||||
# Fix ripgrep path for SearchText; ensureRgPath() on its own may return the path to a dynamically-linked ripgrep binary without required libraries
|
||||
# Prefer the Nix ripgrep binary by prepending it to candidate paths
|
||||
substituteInPlace packages/core/src/tools/ripGrep.ts \
|
||||
--replace-fail "await ensureRgPath();" "'${lib.getExe ripgrep}';"
|
||||
--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\", "
|
||||
|
||||
# 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
|
||||
|
|
|
|||
|
|
@ -1,161 +0,0 @@
|
|||
{
|
||||
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;
|
||||
};
|
||||
})
|
||||
|
|
@ -1,109 +0,0 @@
|
|||
{
|
||||
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;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,55 +0,0 @@
|
|||
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.
|
||||
|
||||
Let’s 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
|
||||
|
||||
|
|
@ -1,107 +0,0 @@
|
|||
{
|
||||
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;
|
||||
};
|
||||
}
|
||||
|
|
@ -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,6 +111,11 @@ 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 ];
|
||||
|
|
|
|||
|
|
@ -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,6 +105,11 @@ 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;
|
||||
|
|
|
|||
17
pkgs/by-name/in/installFonts/package.nix
Normal file
17
pkgs/by-name/in/installFonts/package.nix
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
{
|
||||
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
|
||||
|
|
@ -11,13 +11,13 @@
|
|||
gtk3-x11,
|
||||
luajit,
|
||||
sdcv,
|
||||
SDL2,
|
||||
sdl3,
|
||||
openssl,
|
||||
writeScript,
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2025.10";
|
||||
version = "2026.03";
|
||||
|
||||
# LuaJIT with table.pack/unpack support for KOReader
|
||||
# https://github.com/koreader/koreader-base/tree/master/thirdparty/luajit
|
||||
|
|
@ -35,13 +35,16 @@ let
|
|||
owner = "koreader";
|
||||
tag = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-uYKN5fgIdCVH+pXU2lmsGu7HxZbDld5EJVO9o7Tk8BA=";
|
||||
hash = "sha256-KWpWlFoBEAhVDuRTiF7yj1wlKLzYmvcngI9iWqsDuQY=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "koreader";
|
||||
inherit version;
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
src =
|
||||
let
|
||||
selectSystem =
|
||||
|
|
@ -54,11 +57,11 @@ stdenv.mkDerivation {
|
|||
};
|
||||
in
|
||||
fetchurl {
|
||||
url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-${arch}.deb";
|
||||
url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader_${version}-1_${arch}.deb";
|
||||
hash = selectSystem {
|
||||
aarch64-linux = "sha256-z92sguFe5qcPmHk+Orm8vHJycVeZY3cYGByU6xIcrkA=";
|
||||
armv7l-linux = "sha256-kVO+eUwGMULJZwbxZwbeooqRDF8oZPiuo47a7lNsl3I=";
|
||||
x86_64-linux = "sha256-OYzMOUFzUzkYvcjjMX0FZBkZs//9ie3025lhhFOrt9M=";
|
||||
aarch64-linux = "sha256-4ulpMXYcICQ5/9Q0GGn9lkbW0ntzIfUHQ5woTAhyXLU=";
|
||||
armv7l-linux = "sha256-diMWFhL0D5bWPQFc9vvZZRPMfNxlxchGyT8Lz/TLHPs=";
|
||||
x86_64-linux = "sha256-OhBu3oj9IqNmK5ngCkXvucVQq5aJohObgENtjdDcQcE=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -73,7 +76,7 @@ stdenv.mkDerivation {
|
|||
gtk3-x11
|
||||
luajit_koreader
|
||||
sdcv
|
||||
SDL2
|
||||
sdl3
|
||||
openssl
|
||||
];
|
||||
|
||||
|
|
@ -90,8 +93,9 @@ stdenv.mkDerivation {
|
|||
''
|
||||
# Link SSL/network libraries
|
||||
+ ''
|
||||
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
|
||||
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
|
||||
''
|
||||
# Copy fonts
|
||||
+ ''
|
||||
|
|
@ -105,7 +109,7 @@ stdenv.mkDerivation {
|
|||
wrapProgram $out/bin/koreader --prefix LD_LIBRARY_PATH : $out/lib/koreader/libs:${
|
||||
lib.makeLibraryPath [
|
||||
gtk3-x11
|
||||
SDL2
|
||||
sdl3
|
||||
glib
|
||||
stdenv.cc.cc
|
||||
openssl.out
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libdeltachat";
|
||||
version = "2.52.0";
|
||||
version = "2.53.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chatmail";
|
||||
repo = "core";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-AQo27qnHPCK6q/3+Umk6ueqkOIVBA8n4q9S5iEZ7TkM=";
|
||||
hash = "sha256-W2Yh5+6MaJ47GqJioGKge2J3RetGGTcl+0YxPPlSdDo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
pname = "chatmail-core";
|
||||
inherit (finalAttrs) version src;
|
||||
hash = "sha256-ni8iaVPHXWhxfiBvtVzGRyPcxkbV0HiqcQCHGmAqk7s=";
|
||||
hash = "sha256-aoPc5XvjwwuA9aOTvIOpTm15wozC9glJGqn3vPqsJF4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,36 +0,0 @@
|
|||
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
|
||||
|
|
@ -1,75 +0,0 @@
|
|||
{
|
||||
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;
|
||||
};
|
||||
})
|
||||
|
|
@ -20,13 +20,13 @@
|
|||
withGpu ? true,
|
||||
}:
|
||||
let
|
||||
version = "1.18.0";
|
||||
version = "1.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "libkrun";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-R7q52ZwiL9JsGofLPhXVTk/eH6bEob3DoZe21PHSBrU=";
|
||||
hash = "sha256-g4u34sGdgv6mRRry9b5TAXSx+pmVwCNSD3YNtr6qRxo=";
|
||||
};
|
||||
|
||||
virglrenderer = stdenv.mkDerivation (finalAttrs: {
|
||||
|
|
@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
hash = "sha256-3IAEWF+XGeKnb61SUpuVHMPiX6q0FgQFN4/eOBCH80c=";
|
||||
hash = "sha256-rxdaqEKDDMxFwRuX6kLhqGyFXJTz+Bx4mJJhYL5nPgU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libmspub";
|
||||
version = "0.1.4";
|
||||
version = "0.1.5";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://dev-www.libreoffice.org/src/libmspub/libmspub-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-/6e9IGcTIZTlnsakOaSjTn3DsO9ZNQigdCCbMbrBTQE=";
|
||||
hash = "sha256-1At2aFAdPeoDKcsrv1hpZ1Eig0//tc3jaRpg1qn14xI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
@ -43,6 +43,7 @@ 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;
|
||||
|
|
|
|||
|
|
@ -26,11 +26,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "liferea";
|
||||
version = "1.16.10";
|
||||
version = "1.16.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
|
||||
hash = "sha256-4cprlrp/vCaoUN4HwZFa+H1DW1S5q/byQcd+g/g427g=";
|
||||
hash = "sha256-2WlCm4dc4TmZAtAzx3D5ApYdp3ia6IWb/kd9L6Kua3E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -23,16 +23,16 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "lnd";
|
||||
version = "0.20.1-beta";
|
||||
version = "0.21.0-beta";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lightningnetwork";
|
||||
repo = "lnd";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-EHyyUleCKLEAnYNH7+PYwE/uTz445EQmtfosFxf10wU=";
|
||||
hash = "sha256-Sbg80Bn5PqrNQ23OEeSN5+s71NeJl/ENFtH+OGYZS1c=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-jF/yQE0xH0MFKI7CCGHy/HFzp6tgTM5T/MP2uB62vKk=";
|
||||
vendorHash = "sha256-dTKonSAFc/iRhBtlUqhznX+ljRfJ0gqv8m7d1Ue6Mi4=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/lncli"
|
||||
|
|
|
|||
|
|
@ -18,18 +18,18 @@
|
|||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "lux-cli";
|
||||
|
||||
version = "0.31.1";
|
||||
version = "0.32.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lumen-oss";
|
||||
repo = "lux";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-3gS3QO0i1ApVYG/hL/EyZhH1LykeJ5Ttt59vSDLUPMY=";
|
||||
hash = "sha256-4S0kjWQ3Ckrgvh8biSkEU7jA2hwG+t3oHN6h1937xgY=";
|
||||
};
|
||||
|
||||
buildAndTestSubdir = "lux-cli";
|
||||
|
||||
cargoHash = "sha256-Ventw1LRk5795+X38yzyFGHFbvW1tEq6PE1zjhZSDDM=";
|
||||
cargoHash = "sha256-eE5LKDRjSZ6IfPY/veTyZ7Lnlvl4WtULo6knRGFPRa4=";
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
|
|
|
|||
|
|
@ -1,2 +0,0 @@
|
|||
KERNEL=="uinput", SUBSYSTEM=="misc", TAG+="uaccess", OPTIONS+="static_node=uinput"
|
||||
KERNEL=="/dev/input/event*", SUBSYSTEM=="misc", TAG+="uaccess", OPTIONS+="static_node=uinput"
|
||||
|
|
@ -1,81 +0,0 @@
|
|||
{
|
||||
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;
|
||||
};
|
||||
}
|
||||
1400
pkgs/by-name/no/node-gyp/package-lock.json
generated
1400
pkgs/by-name/no/node-gyp/package-lock.json
generated
File diff suppressed because it is too large
Load diff
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "node-gyp";
|
||||
version = "12.3.0";
|
||||
version = "13.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nodejs";
|
||||
repo = "node-gyp";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-+QPQxWrO2n5QsyAmM5UfL/posEyQQGHmDG7EL0jBNeE=";
|
||||
hash = "sha256-QURUUit1HWRQ6O3nMM1aId51B2POPO4eyPwBdbkFJKw=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-43YHmebfSYNb7glSjycQqjnLY13Bp9syXRAWNDjBIXY=";
|
||||
npmDepsHash = "sha256-swJ8Amv/CtZAW1Weo2S5GQWHPgnF3/6cw0ZTdEyyAxA=";
|
||||
|
||||
postPatch = ''
|
||||
ln -s ${./package-lock.json} package-lock.json
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "nsc";
|
||||
version = "2.12.2";
|
||||
version = "2.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nats-io";
|
||||
repo = "nsc";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jgGyCMS1jCCEj1zNEXpXhOc2t0lP1iXs7R3uDTKhhuk=";
|
||||
hash = "sha256-eGu0vuJAvTWTjalq1YRA8QP9TjArQuCcEdsHzFqAM2c=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
|
@ -24,7 +24,7 @@ buildGoModule rec {
|
|||
"-X main.builtBy=nixpkgs"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-fjMQMHwkAzUecyM7iqcMFwD93Trkfa0cQhCOPczXlXk=";
|
||||
vendorHash = "sha256-zjEFz3FdAWhLRQogKCuzmr8yBINQdglKeCIoXTzhpV0=";
|
||||
|
||||
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.12.2.drv-0/nsc_test2000598938/keys
|
||||
# /private/tmp/nix-build-nsc-2.15.0.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.
|
||||
|
|
|
|||
35
pkgs/by-name/pl/plezy/16k-font-workaround.patch
Normal file
35
pkgs/by-name/pl/plezy/16k-font-workaround.patch
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
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
|
||||
|
|
@ -21,6 +21,8 @@
|
|||
_7zz,
|
||||
makeBinaryWrapper,
|
||||
runCommand,
|
||||
noto-fonts-cjk-sans ? null,
|
||||
use16kPagesizeWorkaround ? false,
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -73,7 +75,12 @@ 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 ];
|
||||
patches = [
|
||||
./replace-sentry-fork.patch
|
||||
]
|
||||
++ lib.optionals use16kPagesizeWorkaround [
|
||||
./16k-font-workaround.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
@ -102,6 +109,12 @@ 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 = [
|
||||
|
|
|
|||
|
|
@ -28,8 +28,6 @@
|
|||
withKeybinder ? false,
|
||||
libnotify,
|
||||
withLibnotify ? false,
|
||||
libsoup_2_4,
|
||||
withLibsoup ? false,
|
||||
libgudev,
|
||||
withGudev ? false, # experimental
|
||||
libmtp,
|
||||
|
|
@ -95,7 +93,6 @@ 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
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "sandbox-runtime";
|
||||
version = "0.0.54";
|
||||
version = "0.0.55";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
|
|
@ -25,7 +25,7 @@ buildNpmPackage (finalAttrs: {
|
|||
owner = "anthropic-experimental";
|
||||
repo = "sandbox-runtime";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-mk+dd/vMuQPklbFhse35n+m/0Y90WxrLPqjXCFBLE78=";
|
||||
hash = "sha256-ODcAtuflJGXziAmRTLvf+qTYrZpShn2D6k3TIOihngY=";
|
||||
};
|
||||
|
||||
postPatch =
|
||||
|
|
@ -37,7 +37,7 @@ buildNpmPackage (finalAttrs: {
|
|||
|
||||
strictDeps = true;
|
||||
|
||||
npmDepsHash = "sha256-H4azrpaCxKZNQZPEC/xaKxpPzwK19/ZhQlzYKsrDHWY=";
|
||||
npmDepsHash = "sha256-QI86b0aZXAys5LksnB9aH1I0CYptpnGNZKGx6uel9UI=";
|
||||
|
||||
postFixup =
|
||||
let
|
||||
|
|
|
|||
|
|
@ -52,6 +52,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
versionCheckProgramArg = "version";
|
||||
doInstallCheck = true;
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,112 +0,0 @@
|
|||
{
|
||||
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";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,487 +0,0 @@
|
|||
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]
|
||||
|
||||
|
|
@ -1,77 +0,0 @@
|
|||
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>()
|
||||
|
|
@ -44,6 +44,7 @@ buildGoModule rec {
|
|||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
keegancsmith
|
||||
burmudar
|
||||
];
|
||||
mainProgram = "src";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,35 +1,47 @@
|
|||
{
|
||||
lib,
|
||||
cacert,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
versionCheckHook,
|
||||
stalwart,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit (stalwart) src version cargoDeps;
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "stalwart-cli";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"--package"
|
||||
"stalwart-cli"
|
||||
];
|
||||
cargoTestFlags = [
|
||||
"--package"
|
||||
"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 ];
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
# Prerelease reports incorrect version
|
||||
dontVersionCheck = true;
|
||||
|
||||
meta = {
|
||||
inherit (stalwart.meta) license homepage changelog;
|
||||
description = "Stalwart Mail Server CLI";
|
||||
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;
|
||||
}
|
||||
];
|
||||
mainProgram = "stalwart-cli";
|
||||
maintainers = with lib.maintainers; [
|
||||
giomf
|
||||
debtquity
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -5,17 +5,16 @@
|
|||
makeWrapper,
|
||||
bash,
|
||||
subversion,
|
||||
zenity,
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
pname = "thcrap-proton";
|
||||
version = "0-unstable-2024-04-03";
|
||||
version = "0-unstable-2026-02-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tactikauan";
|
||||
owner = "nerusuki";
|
||||
repo = "thcrap-steam-proton-wrapper";
|
||||
rev = "2b636c3f5f1ce1b9b41f731aa9397aa68d2ce66b";
|
||||
hash = "sha256-J2O8F75NMdsxSaNVr8zLf+vLEJE6CHqWQIIscuuJZ3o=";
|
||||
rev = "a5edfe44ead2df2e6bca54bd738ae0dc3284e679";
|
||||
hash = "sha256-4RTVfcwlYW+KPyPIon0X1d4SPsF6cFkRSXBfe4yzAyQ=";
|
||||
};
|
||||
|
||||
buildInputs = [ subversion ];
|
||||
|
|
@ -37,14 +36,13 @@ 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/tactikauan/thcrap-steam-proton-wrapper";
|
||||
homepage = "https://github.com/nerusuki/thcrap-steam-proton-wrapper";
|
||||
license = lib.licenses.unlicense;
|
||||
maintainers = with lib.maintainers; [ ashuramaruzxc ];
|
||||
platforms = [
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "twitch-hls-client";
|
||||
version = "1.6.2";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "2bc4";
|
||||
repo = "twitch-hls-client";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-AoefKtAiM8Xi1DoPDH2E623QSC668qrQLOLpdtFxuAs=";
|
||||
hash = "sha256-GtnAx94bQGb5rokXsep815+OeazBCfoDRkvTGQKDC4c=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-j4y3os2l0PmmE7T3RFJMsnFfulN9uR6nMGaPZCBc7dE=";
|
||||
cargoHash = "sha256-2z1ezQjOrji6wh7Rg8RYeRJxAi1uSwTjnQ/xOBiCYoY=";
|
||||
|
||||
meta = {
|
||||
description = "Minimal CLI client for watching/recording Twitch streams";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,40 @@
|
|||
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
|
||||
|
||||
|
|
@ -31,11 +31,12 @@ 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 = "${finalAttrs.src}/yarn.lock";
|
||||
hash = "sha256-mo5Ir/pLoqc6K/0AOJqKC0yup7vx9UrNfQ+casIgBCo=";
|
||||
yarnLock = ./yarn.lock;
|
||||
hash = "sha256-CKWFtIZBASGx/1tBR8n7aKPqfj4P9dCAPIzee/DIOP8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -49,6 +50,9 @@ 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
|
||||
|
|
|
|||
15326
pkgs/by-name/un/unofficial-homestuck-collection/yarn.lock
generated
Normal file
15326
pkgs/by-name/un/unofficial-homestuck-collection/yarn.lock
generated
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -9,6 +9,7 @@
|
|||
nix-update,
|
||||
curl,
|
||||
writeShellApplication,
|
||||
installShellFiles,
|
||||
llvmPackages_21,
|
||||
libffi,
|
||||
libxml2,
|
||||
|
|
@ -83,6 +84,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
rustc
|
||||
rustPlatform.cargoSetupHook
|
||||
rustPlatform.bindgenHook
|
||||
installShellFiles
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
|
||||
|
||||
|
|
@ -142,9 +144,19 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
V8_LIB_DIR = "${v8Prebuilt}/lib";
|
||||
};
|
||||
|
||||
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
install -Dm755 target/release/libwasmer.dylib $out/lib/libwasmer.dylib
|
||||
'';
|
||||
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)
|
||||
'';
|
||||
|
||||
passthru.updateScript = lib.getExe (writeShellApplication {
|
||||
name = "update-wasmer";
|
||||
|
|
|
|||
|
|
@ -1,98 +0,0 @@
|
|||
{
|
||||
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";
|
||||
};
|
||||
}
|
||||
|
|
@ -2198,6 +2198,7 @@ broken-packages:
|
|||
- gi-gtksheet # failure in job https://hydra.nixos.org/build/233211386 at 2023-09-02
|
||||
- gi-ibus # failure in job https://hydra.nixos.org/build/233220272 at 2023-09-02
|
||||
- gi-keybinder # failure in job https://hydra.nixos.org/build/265273447 at 2024-07-14
|
||||
- gi-soup2 # depends on libsoup 2.4, which has been dropped from Nixpkgs
|
||||
- gi-webkit # failure in job https://hydra.nixos.org/build/307610609 at 2025-09-19
|
||||
- gi-webkit2webextension # failure in job https://hydra.nixos.org/build/254424710 at 2024-03-31
|
||||
- gi-webkitwebprocessextension # failure in job https://hydra.nixos.org/build/233227647 at 2023-09-02
|
||||
|
|
@ -5952,6 +5953,7 @@ broken-packages:
|
|||
- speculation # failure in job https://hydra.nixos.org/build/233211559 at 2023-09-02
|
||||
- sphinx-cli # failure in job https://hydra.nixos.org/build/295097187 at 2025-04-22
|
||||
- sphinxesc # failure in job https://hydra.nixos.org/build/233194825 at 2023-09-02
|
||||
- spike # depends on libsoup 2.4, which has been dropped from Nixpkgs
|
||||
- spir-v # failure in job https://hydra.nixos.org/build/233191427 at 2023-09-02
|
||||
- spiros # failure in job https://hydra.nixos.org/build/233249615 at 2023-09-02
|
||||
- splay # failure in job https://hydra.nixos.org/build/233217055 at 2023-09-02
|
||||
|
|
|
|||
|
|
@ -280,7 +280,6 @@ dont-distribute-packages:
|
|||
- Bitly
|
||||
- bitly-cli
|
||||
- bitmaps
|
||||
- bits-extra
|
||||
- bittorrent
|
||||
- bla
|
||||
- blakesum-demo
|
||||
|
|
@ -731,6 +730,7 @@ dont-distribute-packages:
|
|||
- dhscanner-kbgen
|
||||
- dia-functions
|
||||
- diagrams-html5
|
||||
- diagrams-reflex
|
||||
- diagrams-wx
|
||||
- dialog
|
||||
- difference-monoid
|
||||
|
|
@ -1103,6 +1103,7 @@ dont-distribute-packages:
|
|||
- ghc-plugs-out
|
||||
- ghc-session
|
||||
- ghci-pretty
|
||||
- ghcjs-dom-hello
|
||||
- ghcjs-dom-webkit
|
||||
- ghcjs-hplay
|
||||
- ght
|
||||
|
|
@ -1110,6 +1111,7 @@ dont-distribute-packages:
|
|||
- gi-ges
|
||||
- gi-gstpbutils
|
||||
- gi-gtk-declarative-app-simple
|
||||
- gi-webkit2
|
||||
- git-config
|
||||
- git-fmt
|
||||
- git-gpush
|
||||
|
|
@ -1189,6 +1191,7 @@ dont-distribute-packages:
|
|||
- grapefruit-records
|
||||
- grapefruit-ui
|
||||
- grapefruit-ui-gtk
|
||||
- grapesy-etcd
|
||||
- graph-rewriting-cl
|
||||
- graph-rewriting-gl
|
||||
- graph-rewriting-lambdascope
|
||||
|
|
@ -1708,11 +1711,8 @@ dont-distribute-packages:
|
|||
- huzzy
|
||||
- hw-all
|
||||
- hw-balancedparens
|
||||
- hw-bits
|
||||
- hw-eliasfano
|
||||
- hw-excess
|
||||
- hw-int
|
||||
- hw-ip
|
||||
- hw-json
|
||||
- hw-json-demo
|
||||
- hw-json-lens
|
||||
|
|
@ -1721,7 +1721,6 @@ dont-distribute-packages:
|
|||
- hw-kafka-avro
|
||||
- hw-rankselect
|
||||
- hw-simd
|
||||
- hw-streams
|
||||
- hw-succinct
|
||||
- hw-uri
|
||||
- hworker-ses
|
||||
|
|
@ -1763,20 +1762,6 @@ dont-distribute-packages:
|
|||
- ihaskell-inline-r
|
||||
- ihaskell-rlangqq
|
||||
- ihaskell-symtegration
|
||||
- ihp
|
||||
- ihp-datasync
|
||||
- ihp-datasync-typescript
|
||||
- ihp-graphql
|
||||
- ihp-hspec
|
||||
- ihp-ide
|
||||
- ihp-job-dashboard
|
||||
- ihp-mail
|
||||
- ihp-schema-compiler
|
||||
- ihp-sitemap
|
||||
- ihp-ssc
|
||||
- ihp-typed-sql
|
||||
- ihp-welcome
|
||||
- ihp-zip
|
||||
- ihttp
|
||||
- imap
|
||||
- imbib
|
||||
|
|
@ -1882,6 +1867,8 @@ dont-distribute-packages:
|
|||
- jordan-servant-client
|
||||
- jordan-servant-openapi
|
||||
- jordan-servant-server
|
||||
- jsaddle-hello
|
||||
- jsaddle-webkit2gtk
|
||||
- jsaddle-webkitgtk
|
||||
- jsc
|
||||
- JsContracts
|
||||
|
|
@ -2033,6 +2020,7 @@ dont-distribute-packages:
|
|||
- legion-discovery
|
||||
- legion-discovery-client
|
||||
- legion-extra
|
||||
- leksah
|
||||
- leksah-server
|
||||
- lens-utils
|
||||
- lenz
|
||||
|
|
@ -2868,9 +2856,12 @@ dont-distribute-packages:
|
|||
- refh
|
||||
- reflex-animation
|
||||
- reflex-backend-wai
|
||||
- reflex-dom
|
||||
- reflex-dom-colonnade
|
||||
- reflex-gloss-scene
|
||||
- reflex-libtelnet
|
||||
- reflex-localize
|
||||
- reflex-localize-dom
|
||||
- reflex-monad-auth
|
||||
- refractor
|
||||
- refurb
|
||||
|
|
@ -3426,6 +3417,7 @@ dont-distribute-packages:
|
|||
- techlab
|
||||
- telegram-bot
|
||||
- telegram-raw-api
|
||||
- templates
|
||||
- temporal-sdk
|
||||
- ten-lens
|
||||
- ten-unordered-containers
|
||||
|
|
@ -3503,6 +3495,7 @@ dont-distribute-packages:
|
|||
- trasa-client
|
||||
- trasa-extra
|
||||
- trasa-form
|
||||
- trasa-reflex
|
||||
- trasa-server
|
||||
- trasa-th
|
||||
- TreeCounter
|
||||
|
|
|
|||
|
|
@ -110622,7 +110622,6 @@ self: {
|
|||
];
|
||||
description = "Useful bitwise operations";
|
||||
license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}
|
||||
) { };
|
||||
|
||||
|
|
@ -197731,6 +197730,7 @@ self: {
|
|||
];
|
||||
description = "reflex backend for diagrams drawing EDSL";
|
||||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}
|
||||
) { };
|
||||
|
||||
|
|
@ -274677,8 +274677,9 @@ self: {
|
|||
description = "Libsoup 2.4.x bindings";
|
||||
license = lib.licenses.lgpl21Only;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
broken = true;
|
||||
}
|
||||
) { inherit (pkgs) libsoup_2_4; };
|
||||
) { libsoup_2_4 = null; };
|
||||
|
||||
gi-soup3 = callPackage (
|
||||
{
|
||||
|
|
@ -289319,6 +289320,7 @@ self: {
|
|||
];
|
||||
description = "grapesy-etcd - GRPC interface to etcd";
|
||||
license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}
|
||||
) { };
|
||||
|
||||
|
|
@ -376777,7 +376779,6 @@ self: {
|
|||
];
|
||||
description = "Bit manipulation";
|
||||
license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}
|
||||
) { };
|
||||
|
||||
|
|
@ -377536,7 +377537,6 @@ self: {
|
|||
];
|
||||
description = "Additional facilities for Integers";
|
||||
license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}
|
||||
) { };
|
||||
|
||||
|
|
@ -377608,7 +377608,6 @@ self: {
|
|||
doHaddock = false;
|
||||
description = "Library for manipulating IP addresses and CIDR blocks";
|
||||
license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
mainProgram = "hw-ip";
|
||||
}
|
||||
) { };
|
||||
|
|
@ -379301,7 +379300,6 @@ self: {
|
|||
];
|
||||
description = "Primitive functions and data types";
|
||||
license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}
|
||||
) { };
|
||||
|
||||
|
|
@ -386392,7 +386390,6 @@ self: {
|
|||
];
|
||||
description = "Haskell Web Framework";
|
||||
license = lib.meta.getLicenseFromSpdxId "MIT";
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
maintainers = [ lib.maintainers.mpscholten ];
|
||||
}
|
||||
) { };
|
||||
|
|
@ -386561,7 +386558,6 @@ self: {
|
|||
];
|
||||
description = "IHP DataSync Framework";
|
||||
license = lib.meta.getLicenseFromSpdxId "MIT";
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}
|
||||
) { };
|
||||
|
||||
|
|
@ -386603,7 +386599,6 @@ self: {
|
|||
];
|
||||
description = "TypeScript code generation for IHP DataSync";
|
||||
license = lib.meta.getLicenseFromSpdxId "MIT";
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
mainProgram = "generate-datasync-types";
|
||||
}
|
||||
) { };
|
||||
|
|
@ -386658,7 +386653,6 @@ self: {
|
|||
];
|
||||
description = "GraphQL support for IHP";
|
||||
license = lib.meta.getLicenseFromSpdxId "MIT";
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}
|
||||
) { };
|
||||
|
||||
|
|
@ -386696,7 +386690,6 @@ self: {
|
|||
];
|
||||
description = "Test helpers for IHP apps";
|
||||
license = lib.meta.getLicenseFromSpdxId "MIT";
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}
|
||||
) { };
|
||||
|
||||
|
|
@ -387034,7 +387027,6 @@ self: {
|
|||
];
|
||||
description = "Dev tools for IHP";
|
||||
license = lib.meta.getLicenseFromSpdxId "MIT";
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
maintainers = [ lib.maintainers.mpscholten ];
|
||||
}
|
||||
) { };
|
||||
|
|
@ -387106,7 +387098,6 @@ self: {
|
|||
];
|
||||
description = "Dashboard for IHP job runners";
|
||||
license = lib.meta.getLicenseFromSpdxId "MIT";
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}
|
||||
) { };
|
||||
|
||||
|
|
@ -387179,7 +387170,6 @@ self: {
|
|||
];
|
||||
description = "Email support for IHP";
|
||||
license = lib.meta.getLicenseFromSpdxId "MIT";
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}
|
||||
) { };
|
||||
|
||||
|
|
@ -387561,7 +387551,6 @@ self: {
|
|||
];
|
||||
description = "Lightweight schema compiler for IHP";
|
||||
license = lib.meta.getLicenseFromSpdxId "MIT";
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
mainProgram = "build-generated-code";
|
||||
}
|
||||
) { };
|
||||
|
|
@ -387605,7 +387594,6 @@ self: {
|
|||
];
|
||||
description = "SEO";
|
||||
license = lib.meta.getLicenseFromSpdxId "MIT";
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}
|
||||
) { };
|
||||
|
||||
|
|
@ -387651,7 +387639,6 @@ self: {
|
|||
];
|
||||
description = "Server Side Components for IHP";
|
||||
license = lib.meta.getLicenseFromSpdxId "MIT";
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}
|
||||
) { };
|
||||
|
||||
|
|
@ -387720,7 +387707,6 @@ self: {
|
|||
];
|
||||
description = "Compile-time typed SQL quasiquoter for IHP";
|
||||
license = lib.meta.getLicenseFromSpdxId "MIT";
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}
|
||||
) { };
|
||||
|
||||
|
|
@ -387748,7 +387734,6 @@ self: {
|
|||
];
|
||||
description = "IHP Welcome Controller";
|
||||
license = lib.meta.getLicenseFromSpdxId "MIT";
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}
|
||||
) { };
|
||||
|
||||
|
|
@ -387774,7 +387759,6 @@ self: {
|
|||
];
|
||||
description = "Support for making ZIP archives with IHP";
|
||||
license = lib.meta.getLicenseFromSpdxId "MIT";
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}
|
||||
) { };
|
||||
|
||||
|
|
@ -427980,6 +427964,7 @@ self: {
|
|||
];
|
||||
description = "Haskell IDE written in Haskell";
|
||||
license = "GPL";
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
mainProgram = "leksah";
|
||||
}
|
||||
) { inherit (pkgs) gtk3; };
|
||||
|
|
@ -584926,6 +584911,7 @@ self: {
|
|||
];
|
||||
description = "Functional Reactive Web Apps with Reflex";
|
||||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
maintainers = [ lib.maintainers.maralorn ];
|
||||
}
|
||||
) { };
|
||||
|
|
@ -584997,6 +584983,7 @@ self: {
|
|||
];
|
||||
description = "Use colonnade with reflex-dom";
|
||||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}
|
||||
) { };
|
||||
|
||||
|
|
@ -586059,6 +586046,7 @@ self: {
|
|||
description = "Helper widgets for reflex-localize";
|
||||
license = lib.licenses.mit;
|
||||
badPlatforms = [ "aarch64-linux" ] ++ lib.platforms.darwin;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}
|
||||
) { };
|
||||
|
||||
|
|
@ -650813,8 +650801,9 @@ self: {
|
|||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
mainProgram = "spike";
|
||||
broken = true;
|
||||
}
|
||||
) { inherit (pkgs) libsoup_2_4; };
|
||||
) { libsoup_2_4 = null; };
|
||||
|
||||
spine = callPackage (
|
||||
{ mkDerivation, base }:
|
||||
|
|
@ -693017,6 +693006,7 @@ self: {
|
|||
];
|
||||
description = "Out of the box reflex-dom elements";
|
||||
license = lib.licenses.mit;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}
|
||||
) { };
|
||||
|
||||
|
|
@ -714366,6 +714356,7 @@ self: {
|
|||
];
|
||||
description = "Reactive Type Safe Routing";
|
||||
license = lib.licenses.mit;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}
|
||||
) { };
|
||||
|
||||
|
|
|
|||
|
|
@ -1,169 +0,0 @@
|
|||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchurl,
|
||||
fetchpatch,
|
||||
glib,
|
||||
libxml2,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
gnome,
|
||||
libsysprof-capture,
|
||||
gobject-introspection,
|
||||
vala,
|
||||
libpsl,
|
||||
brotli,
|
||||
gnomeSupport ? true,
|
||||
sqlite,
|
||||
buildPackages,
|
||||
withIntrospection ?
|
||||
lib.meta.availableOn stdenv.hostPlatform gobject-introspection
|
||||
&& stdenv.hostPlatform.emulatorAvailable buildPackages,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libsoup";
|
||||
version = "2.74.3";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/libsoup/${lib.versions.majorMinor version}/libsoup-${version}.tar.xz";
|
||||
sha256 = "sha256-5Ld8Qc/EyMWgNfzcMgx7xs+3XvfFoDQVPfFBP6HZLxM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "CVE-2024-52530.patch";
|
||||
url = "https://gitlab.gnome.org/GNOME/libsoup/-/commit/04df03bc092ac20607f3e150936624d4f536e68b.patch";
|
||||
hash = "sha256-WRLiW2B/xxr3hW0nmeRNrXtZL44S0nTptPRdTqBV8Iw=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "CVE-2024-52531_1.patch";
|
||||
url = "https://git.launchpad.net/ubuntu/+source/libsoup2.4/patch/?id=4ce2f2dc8ba0c458edce0f039a087fb3ac57787e";
|
||||
hash = "sha256-wg1qz8xHcnTiinBTF0ECMkrsD8W6M4IbiKGgbJ1gp9o=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "CVE-2024-52531_2.patch";
|
||||
url = "https://git.launchpad.net/ubuntu/+source/libsoup2.4/patch/?id=5866d63aed3500700c5f1d2868ff689bb2ba8b82";
|
||||
hash = "sha256-e/VXtKX+agCw+ESGbgQ83NaVNbB3jLTxL7+VgNGbZ7U=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "CVE-2024-52532_1.patch";
|
||||
url = "https://git.launchpad.net/ubuntu/+source/libsoup2.4/patch/?id=98e096a0d2142e3c63de2cca7d4023f9c52ed2c6";
|
||||
hash = "sha256-h7k+HpcKlsVYlAONxTOiupMhsMkf2v246ouxLejurcY=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "CVE-2024-52532_2.patch";
|
||||
url = "https://git.launchpad.net/ubuntu/+source/libsoup2.4/patch/?id=030e72420e8271299c324273f393d92f6d4bb53e";
|
||||
hash = "sha256-0BEJpEKgjmKACf53lHMglxhmevKsSXR4ejEoTtr4wII=";
|
||||
})
|
||||
];
|
||||
|
||||
depsBuildBuild = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
glib
|
||||
]
|
||||
++ lib.optionals withIntrospection [
|
||||
gobject-introspection
|
||||
vala
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
sqlite
|
||||
libpsl
|
||||
glib.out
|
||||
brotli
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
libsysprof-capture
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
glib
|
||||
libxml2
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dtls_check=false" # glib-networking is a runtime dependency, not a compile-time dependency
|
||||
"-Dgssapi=disabled"
|
||||
"-Dvapi=${if withIntrospection then "enabled" else "disabled"}"
|
||||
"-Dintrospection=${if withIntrospection then "enabled" else "disabled"}"
|
||||
"-Dgnome=${lib.boolToString gnomeSupport}"
|
||||
"-Dntlm=disabled"
|
||||
]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isLinux) [
|
||||
"-Dsysprof=disabled"
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-lpthread";
|
||||
|
||||
doCheck = false; # ERROR:../tests/socket-test.c:37:do_unconnected_socket_test: assertion failed (res == SOUP_STATUS_OK): (2 == 200)
|
||||
separateDebugInfo = true;
|
||||
|
||||
postPatch = ''
|
||||
# fixes finding vapigen when cross-compiling
|
||||
# the commit is in 3.0.6
|
||||
# https://gitlab.gnome.org/GNOME/libsoup/-/commit/5280e936d0a76f94dbc5d8489cfbdc0a06343f65
|
||||
substituteInPlace meson.build \
|
||||
--replace "required: vapi_opt)" "required: vapi_opt, native: false)"
|
||||
|
||||
patchShebangs libsoup/
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
attrPath = "libsoup_2_4";
|
||||
packageName = "libsoup";
|
||||
versionPolicy = "odd-unstable";
|
||||
freeze = true;
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "HTTP client/server library for GNOME";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/libsoup";
|
||||
license = lib.licenses.lgpl2Plus;
|
||||
platforms = lib.platforms.unix ++ lib.platforms.windows;
|
||||
pkgConfigModules = [
|
||||
"libsoup-2.4"
|
||||
"libsoup-gnome-2.4"
|
||||
];
|
||||
knownVulnerabilities = [
|
||||
''
|
||||
libsoup 2 is EOL, with many known unfixed CVEs.
|
||||
The last release happened 2023-10-11,
|
||||
with few security backports since and no stable release.
|
||||
|
||||
Vulnerabilities likely include (incomplete list):
|
||||
- CVE-2025-4948: https://gitlab.gnome.org/GNOME/libsoup/-/issues/449
|
||||
- CVE-2025-46421: https://gitlab.gnome.org/GNOME/libsoup/-/issues/439
|
||||
- CVE-2025-32914: https://gitlab.gnome.org/GNOME/libsoup/-/issues/436
|
||||
- CVE-2025-32913: https://gitlab.gnome.org/GNOME/libsoup/-/issues/435
|
||||
- CVE-2025-32912: https://gitlab.gnome.org/GNOME/libsoup/-/issues/434
|
||||
- CVE-2025-32911: https://gitlab.gnome.org/GNOME/libsoup/-/issues/433
|
||||
- CVE-2025-32910: https://gitlab.gnome.org/GNOME/libsoup/-/issues/432
|
||||
- CVE-2025-32909: https://gitlab.gnome.org/GNOME/libsoup/-/issues/431
|
||||
- CVE-2025-32907: https://gitlab.gnome.org/GNOME/libsoup/-/issues/428
|
||||
- CVE-2025-32053: https://gitlab.gnome.org/GNOME/libsoup/-/issues/426
|
||||
- CVE-2025-32052: https://gitlab.gnome.org/GNOME/libsoup/-/issues/425
|
||||
- CVE-2025-32050: https://gitlab.gnome.org/GNOME/libsoup/-/issues/424
|
||||
- CVE-2024-52531: https://gitlab.gnome.org/GNOME/libsoup/-/issues/423
|
||||
- CVE-2025-2784: https://gitlab.gnome.org/GNOME/libsoup/-/issues/422
|
||||
|
||||
These vulnerabilities were fixed in libsoup 3,
|
||||
with the vulnerable code present in libsoup 2 versions.
|
||||
''
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -17,14 +17,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "i-pi";
|
||||
version = "3.1.12";
|
||||
version = "3.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "i-pi";
|
||||
repo = "i-pi";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-FXDinbsM5sznXNn6lR85dLqy3p0YJESGCgvjkYoPCDc=";
|
||||
hash = "sha256-PGWgeLmYsVftPhjGTMvAzmKMpZo18ssgXYqZ+l48tfs=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
|
|||
|
|
@ -61,14 +61,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "litellm";
|
||||
version = "1.86.0";
|
||||
version = "1.89.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BerriAI";
|
||||
repo = "litellm";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-uInjKBUduDAfXHg5dQj5/qqqMJhlDeTri1kULkz5unM=";
|
||||
hash = "sha256-tPw4cDqCQgyC8EoB5EPfui2gT+frjlSMOv95ntUXTWk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@
|
|||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pysilero-vad";
|
||||
version = "3.3.0";
|
||||
version = "3.3.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rhasspy";
|
||||
repo = "pysilero-vad";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-S0PDtooVmy09i2fE40ZhaPIKfOTqXQS/rs7dwtm0+pQ=";
|
||||
hash = "sha256-gQDZuu8hN0s+yfkp22w39/Aje5/6qdX0W95FPu6obw0=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "sparsediffpy";
|
||||
version = "0.4.0";
|
||||
version = "0.5.1";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
|
|
@ -26,7 +26,7 @@ buildPythonPackage (finalAttrs: {
|
|||
# SparseDiffEngine is built from source and their cmake does not support finding it on the
|
||||
# system. We fallback to using the git submodule approach for now.
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-uT+HyZZpDGWPSfalF2j3qTFdWqYyOqYtHO/J9+5Dvz8=";
|
||||
hash = "sha256-PqtD3FjOpYLuu5ddeTdJ1UcL4Wvcv6RoZFGchpVdBAI=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
|
|||
|
|
@ -7,81 +7,81 @@
|
|||
|
||||
version:
|
||||
builtins.getAttr version {
|
||||
"2.11.0" = {
|
||||
"2.12.0" = {
|
||||
x86_64-linux-310 = {
|
||||
name = "torch-2.11.0+cu128-cp310-cp310-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu128/torch-2.11.0%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl";
|
||||
hash = "sha256-ctU/MXamnMIHEMTsuV99xMa6EMTk7aRbg5buee5A91o=";
|
||||
name = "torch-2.12.0+cu130-cp310-cp310-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu130/torch-2.12.0%2Bcu130-cp310-cp310-manylinux_2_28_x86_64.whl";
|
||||
hash = "sha256-hFoXKaUq7HZh0bbauuiBXrFNurXHxnpf4LrxlKr6Ef4=";
|
||||
};
|
||||
x86_64-linux-311 = {
|
||||
name = "torch-2.11.0+cu128-cp311-cp311-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu128/torch-2.11.0%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl";
|
||||
hash = "sha256-yafKTHT64QpY5hdbSyzqlT+TIrtlYrvzOa1qBfUhkK0=";
|
||||
name = "torch-2.12.0+cu130-cp311-cp311-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu130/torch-2.12.0%2Bcu130-cp311-cp311-manylinux_2_28_x86_64.whl";
|
||||
hash = "sha256-UDjwnuFhM5pSFF0Ab2BfYM6qc1Yn4uNRuTQZy6YGlsM=";
|
||||
};
|
||||
x86_64-linux-312 = {
|
||||
name = "torch-2.11.0+cu128-cp312-cp312-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu128/torch-2.11.0%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl";
|
||||
hash = "sha256-0lLPl1+xjJSoUzYyOtQl9HPfVtqzWkSwA5m9cMejuZc=";
|
||||
name = "torch-2.12.0+cu130-cp312-cp312-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu130/torch-2.12.0%2Bcu130-cp312-cp312-manylinux_2_28_x86_64.whl";
|
||||
hash = "sha256-n1EupRwXCnzBoEh8CPAVS3je+6TrhhnK0BMMhhXthSY=";
|
||||
};
|
||||
x86_64-linux-313 = {
|
||||
name = "torch-2.11.0+cu128-cp313-cp313-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu128/torch-2.11.0%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl";
|
||||
hash = "sha256-25ZLM8VQNacqs+IWIoevjxzCdgOcZdAVdAzIjCbc7fc=";
|
||||
name = "torch-2.12.0+cu130-cp313-cp313-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu130/torch-2.12.0%2Bcu130-cp313-cp313-manylinux_2_28_x86_64.whl";
|
||||
hash = "sha256-/l/vt4SjcNG6SVneboe807NUQQQKmb/+MvXNA7vINMA=";
|
||||
};
|
||||
x86_64-linux-314 = {
|
||||
name = "torch-2.11.0+cu128-cp314-cp314-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu128/torch-2.11.0%2Bcu128-cp314-cp314-manylinux_2_28_x86_64.whl";
|
||||
hash = "sha256-04moUGd/DSTa+uFXNkQDRCjY07nIC1HVW6Yv7X5sh3c=";
|
||||
name = "torch-2.12.0+cu130-cp314-cp314-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu130/torch-2.12.0%2Bcu130-cp314-cp314-manylinux_2_28_x86_64.whl";
|
||||
hash = "sha256-P/c2b2kZIy8JnvcCw+vTUJyRqzfDZ+QIyzeZxr7SFKQ=";
|
||||
};
|
||||
aarch64-darwin-310 = {
|
||||
name = "torch-2.11.0-cp310-none-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.11.0-cp310-cp310-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-kSCcfYokYLduj/Wyi3Yj2kqx0nR0t54d6D6VSHGYWv4=";
|
||||
name = "torch-2.12.0-cp310-none-macosx_14_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.12.0-cp310-cp310-macosx_14_0_arm64.whl";
|
||||
hash = "sha256-GDS9mE+KL08WvfvuzKkUYYSyIKpGJ2v1dWc1tdrhKBI=";
|
||||
};
|
||||
aarch64-darwin-311 = {
|
||||
name = "torch-2.11.0-cp311-none-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.11.0-cp311-cp311-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-116tzZf+DcfNDu3E1yFSSEwZyyz+Rs5VdmyOEpEWQl8=";
|
||||
name = "torch-2.12.0-cp311-none-macosx_14_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.12.0-cp311-cp311-macosx_14_0_arm64.whl";
|
||||
hash = "sha256-EIAv04O7/tZGIS52WnLDfSGFIF1PJusZeiVOisfdyyU=";
|
||||
};
|
||||
aarch64-darwin-312 = {
|
||||
name = "torch-2.11.0-cp312-none-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.11.0-cp312-cp312-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-Q7NRFoAshfuI2Z9KOWuL1Ecr/KHdguaUmeWk+bi04lI=";
|
||||
name = "torch-2.12.0-cp312-none-macosx_14_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.12.0-cp312-cp312-macosx_14_0_arm64.whl";
|
||||
hash = "sha256-tBM535PUkUNeeQ/4vLrhwM53cXWIm/0SgdEZhieT5qI=";
|
||||
};
|
||||
aarch64-darwin-313 = {
|
||||
name = "torch-2.11.0-cp313-none-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.11.0-cp313-cp313-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-RC7J3HhZJWT9rWnPC+qp2i+Cq4EMy08TkDhpqQvz8V0=";
|
||||
name = "torch-2.12.0-cp313-none-macosx_14_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.12.0-cp313-cp313-macosx_14_0_arm64.whl";
|
||||
hash = "sha256-kN1Yel9hv+EwcUi1geIIT8W8SgbiuQog6aNrgQh/8Ws=";
|
||||
};
|
||||
aarch64-darwin-314 = {
|
||||
name = "torch-2.11.0-cp314-cp314-macosx_14_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.11.0-cp314-cp314-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-ByoNbkhl6LDcDb/m6+1o+uI1EkIig17wPlgU1BTYwBI=";
|
||||
name = "torch-2.12.0-cp314-cp314-macosx_14_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.12.0-cp314-cp314-macosx_14_0_arm64.whl";
|
||||
hash = "sha256-99+uSlGRl9+gUOmNjjY3ig+1iZYlqHXCtURFAFouQE4=";
|
||||
};
|
||||
aarch64-linux-310 = {
|
||||
name = "torch-2.11.0+cpu-cp310-cp310-manylinux_2_28_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.11.0%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl";
|
||||
hash = "sha256-x9uuOlzQpKPqt2B0K5vjvXkoIllIjPgxdhl87zHOFhA=";
|
||||
name = "torch-2.12.0+cpu-cp310-cp310-manylinux_2_28_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.12.0%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl";
|
||||
hash = "sha256-x0pEmtf5e4eXNLWk8QkqkbF4DizVJew2nCn9mHfvc8A=";
|
||||
};
|
||||
aarch64-linux-311 = {
|
||||
name = "torch-2.11.0+cpu-cp311-cp311-manylinux_2_28_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.11.0%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl";
|
||||
hash = "sha256-RvuwqiV7t4Hvv61kj1sEXA4jJXO2YfFGFZPbYTQukJY=";
|
||||
name = "torch-2.12.0+cpu-cp311-cp311-manylinux_2_28_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.12.0%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl";
|
||||
hash = "sha256-Ts2OzbnqGv+l810QUBgJ1i3HE/feljXoCY52DdvrhSw=";
|
||||
};
|
||||
aarch64-linux-312 = {
|
||||
name = "torch-2.11.0+cpu-cp312-cp312-manylinux_2_28_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.11.0%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl";
|
||||
hash = "sha256-cOyyZZr2Nzt8UzbmkuZlYFsCAeoh/1Gq6kfh116mtao=";
|
||||
name = "torch-2.12.0+cpu-cp312-cp312-manylinux_2_28_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.12.0%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl";
|
||||
hash = "sha256-zi3biAsIE/zJGnN/CP3Zc6gRWnTGTMs06cCaeWS01Eg=";
|
||||
};
|
||||
aarch64-linux-313 = {
|
||||
name = "torch-2.11.0+cpu-cp313-cp313-manylinux_2_28_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.11.0%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl";
|
||||
hash = "sha256-SLPiGjEURazdCyfxODDiHZOt73DUch4FHp8Fm665uPk=";
|
||||
name = "torch-2.12.0+cpu-cp313-cp313-manylinux_2_28_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.12.0%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl";
|
||||
hash = "sha256-aLfd1NtGA6A+EG50xwmMjYyJQ9M8HlraAJykzYhXWcM=";
|
||||
};
|
||||
aarch64-linux-314 = {
|
||||
name = "torch-2.11.0+cpu-cp314-cp314-manylinux_2_28_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.11.0%2Bcpu-cp314-cp314-manylinux_2_28_aarch64.whl";
|
||||
hash = "sha256-cWdvapqEu9OF4BAZi1H6HCMk+488USoy0sga9l9o9Mk=";
|
||||
name = "torch-2.12.0+cpu-cp314-cp314-manylinux_2_28_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.12.0%2Bcpu-cp314-cp314-manylinux_2_28_aarch64.whl";
|
||||
hash = "sha256-eXwGY2d5LJLrl8r7p/0Mqo10VeYHik7ogGMAdzeNw3I=";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,10 +38,11 @@ let
|
|||
pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
|
||||
srcs = import ./binary-hashes.nix version;
|
||||
unsupported = throw "Unsupported system";
|
||||
version = "2.11.0";
|
||||
version = "2.12.0";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit version;
|
||||
__structuredAttrs = true;
|
||||
|
||||
pname = "torch";
|
||||
# Don't forget to update torch to the same version.
|
||||
|
|
@ -92,10 +93,11 @@ buildPythonPackage {
|
|||
|
||||
pythonRemoveDeps = [
|
||||
"cuda-toolkit"
|
||||
"nvidia-cudnn-cu12"
|
||||
"nvidia-cusparselt-cu12"
|
||||
"nvidia-nccl-cu12"
|
||||
"nvidia-nvshmem-cu12"
|
||||
"nvidia-cublas"
|
||||
"nvidia-cudnn-cu13"
|
||||
"nvidia-cusparselt-cu13"
|
||||
"nvidia-nccl-cu13"
|
||||
"nvidia-nvshmem-cu13"
|
||||
];
|
||||
dependencies = [
|
||||
filelock
|
||||
|
|
@ -178,5 +180,16 @@ buildPythonPackage {
|
|||
GaetanLepage
|
||||
junjihashimoto
|
||||
];
|
||||
# cuda-bindings<14,>=13.0.3 not satisfied by version 12.9.7
|
||||
problems = lib.optionalAttrs (lib.versionOlder cuda-bindings.version "13.0.3") {
|
||||
unsupported-cuda-version = {
|
||||
message = ''
|
||||
cudaPackages is too old (${cudaPackages.cudaMajorMinorVersion}).
|
||||
PyTorch expects cuda-bindings>=13.0.3, current is ${cuda-bindings.version}.
|
||||
Please override cudaPackages with a more recent version.
|
||||
'';
|
||||
kind = "broken";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ set -eou pipefail
|
|||
|
||||
version=$1
|
||||
|
||||
linux_cuda_version="cu128"
|
||||
linux_cuda_version="cu130"
|
||||
linux_cuda_bucket="https://download.pytorch.org/whl/${linux_cuda_version}"
|
||||
linux_cpu_bucket="https://download.pytorch.org/whl/cpu"
|
||||
darwin_bucket="https://download.pytorch.org/whl/cpu"
|
||||
|
|
@ -16,11 +16,11 @@ url_and_key_list=(
|
|||
"x86_64-linux-312 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp312-cp312-manylinux_2_28_x86_64.whl torch-${version}+${linux_cuda_version}-cp312-cp312-linux_x86_64.whl"
|
||||
"x86_64-linux-313 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp313-cp313-manylinux_2_28_x86_64.whl torch-${version}+${linux_cuda_version}-cp313-cp313-linux_x86_64.whl"
|
||||
"x86_64-linux-314 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp314-cp314-manylinux_2_28_x86_64.whl torch-${version}+${linux_cuda_version}-cp314-cp314-linux_x86_64.whl"
|
||||
"aarch64-darwin-310 $darwin_bucket/torch-${version}-cp310-cp310-macosx_11_0_arm64.whl torch-${version}-cp310-none-macosx_11_0_arm64.whl"
|
||||
"aarch64-darwin-311 $darwin_bucket/torch-${version}-cp311-cp311-macosx_11_0_arm64.whl torch-${version}-cp311-none-macosx_11_0_arm64.whl"
|
||||
"aarch64-darwin-312 $darwin_bucket/torch-${version}-cp312-cp312-macosx_11_0_arm64.whl torch-${version}-cp312-none-macosx_11_0_arm64.whl"
|
||||
"aarch64-darwin-313 $darwin_bucket/torch-${version}-cp313-cp313-macosx_11_0_arm64.whl torch-${version}-cp313-none-macosx_11_0_arm64.whl"
|
||||
"aarch64-darwin-314 $darwin_bucket/torch-${version}-cp314-cp314-macosx_11_0_arm64.whl torch-${version}-cp314-cp314-macosx_14_0_arm64.whl"
|
||||
"aarch64-darwin-310 $darwin_bucket/torch-${version}-cp310-cp310-macosx_14_0_arm64.whl torch-${version}-cp310-none-macosx_14_0_arm64.whl"
|
||||
"aarch64-darwin-311 $darwin_bucket/torch-${version}-cp311-cp311-macosx_14_0_arm64.whl torch-${version}-cp311-none-macosx_14_0_arm64.whl"
|
||||
"aarch64-darwin-312 $darwin_bucket/torch-${version}-cp312-cp312-macosx_14_0_arm64.whl torch-${version}-cp312-none-macosx_14_0_arm64.whl"
|
||||
"aarch64-darwin-313 $darwin_bucket/torch-${version}-cp313-cp313-macosx_14_0_arm64.whl torch-${version}-cp313-none-macosx_14_0_arm64.whl"
|
||||
"aarch64-darwin-314 $darwin_bucket/torch-${version}-cp314-cp314-macosx_14_0_arm64.whl torch-${version}-cp314-cp314-macosx_14_0_arm64.whl"
|
||||
"aarch64-linux-310 $linux_cpu_bucket/torch-${version}%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl torch-${version}+cpu-cp310-cp310-manylinux_2_28_aarch64.whl"
|
||||
"aarch64-linux-311 $linux_cpu_bucket/torch-${version}%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl torch-${version}+cpu-cp311-cp311-manylinux_2_28_aarch64.whl"
|
||||
"aarch64-linux-312 $linux_cpu_bucket/torch-${version}%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl torch-${version}+cpu-cp312-cp312-manylinux_2_28_aarch64.whl"
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ let
|
|||
pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
|
||||
srcs = import ./binary-hashes.nix version;
|
||||
unsupported = throw "Unsupported system";
|
||||
version = "0.26.0";
|
||||
version = "0.27.0";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit version;
|
||||
|
|
|
|||
|
|
@ -7,81 +7,81 @@
|
|||
|
||||
version:
|
||||
builtins.getAttr version {
|
||||
"0.26.0" = {
|
||||
"0.27.0" = {
|
||||
x86_64-linux-310 = {
|
||||
name = "torchvision-0.26.0-cp310-cp310-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu128/torchvision-0.26.0%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl";
|
||||
hash = "sha256-9Ev8Ybm+gLz1KnYtNNo2POoxJdEMAfN+JxWDgDx7uXs=";
|
||||
name = "torchvision-0.27.0-cp310-cp310-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu130/torchvision-0.27.0%2Bcu130-cp310-cp310-manylinux_2_28_x86_64.whl";
|
||||
hash = "sha256-Xs5N8/Jq7zmBicaHP5vpW7FUhu8GTElx0WHhpkcMVqI=";
|
||||
};
|
||||
x86_64-linux-311 = {
|
||||
name = "torchvision-0.26.0-cp311-cp311-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu128/torchvision-0.26.0%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl";
|
||||
hash = "sha256-jyYp0FZXDJKbCh1Uc9nLAyC5C9oXZL2jU1U6csxrIGk=";
|
||||
name = "torchvision-0.27.0-cp311-cp311-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu130/torchvision-0.27.0%2Bcu130-cp311-cp311-manylinux_2_28_x86_64.whl";
|
||||
hash = "sha256-+QI3OY77jOcAG4DhhwySGzo3XZHIkrqLRkFfgIWjcR0=";
|
||||
};
|
||||
x86_64-linux-312 = {
|
||||
name = "torchvision-0.26.0-cp312-cp312-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu128/torchvision-0.26.0%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl";
|
||||
hash = "sha256-zPJrS2Wc/ObyIIy4MmBx1RxwIZo0hW399GjR4Zr1LA0=";
|
||||
name = "torchvision-0.27.0-cp312-cp312-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu130/torchvision-0.27.0%2Bcu130-cp312-cp312-manylinux_2_28_x86_64.whl";
|
||||
hash = "sha256-Zk3/RvrJenMMkKl2o3CuLK1SeA32rkD610vnfu6LRSg=";
|
||||
};
|
||||
x86_64-linux-313 = {
|
||||
name = "torchvision-0.26.0-cp313-cp313-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu128/torchvision-0.26.0%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl";
|
||||
hash = "sha256-yx9hhKe6MPukBYDhoBpmBKhsVeef3aGH9AEW7mgEQew=";
|
||||
name = "torchvision-0.27.0-cp313-cp313-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu130/torchvision-0.27.0%2Bcu130-cp313-cp313-manylinux_2_28_x86_64.whl";
|
||||
hash = "sha256-r6QSjzcGa4OvnUJoQaUxR908II7+qJPJPcPrb6KvIoc=";
|
||||
};
|
||||
x86_64-linux-314 = {
|
||||
name = "torchvision-0.26.0-cp314-cp314-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu128/torchvision-0.26.0%2Bcu128-cp314-cp314-manylinux_2_28_x86_64.whl";
|
||||
hash = "sha256-qsZHyRMPHyX1yPW8o9lc/Za9+sk6tUUpaQsIjmTk+mQ=";
|
||||
name = "torchvision-0.27.0-cp314-cp314-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu130/torchvision-0.27.0%2Bcu130-cp314-cp314-manylinux_2_28_x86_64.whl";
|
||||
hash = "sha256-dMLjPv/NrSV4AMF4+H8iz/MR7+cDdWiz/q57Thkc4gk=";
|
||||
};
|
||||
aarch64-darwin-310 = {
|
||||
name = "torchvision-0.26.0-cp310-cp310-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.26.0-cp310-cp310-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-oG1HcqjhPncpBu1zbMU+xmOeXmBVT45fpsoWWqvrxGQ=";
|
||||
name = "torchvision-0.27.0-cp310-cp310-macosx_14_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.27.0-cp310-cp310-macosx_14_0_arm64.whl";
|
||||
hash = "sha256-CCK1jSxdMlzQxxUrdErL0V+JjAdXLiz7cLB1qGWk9vk=";
|
||||
};
|
||||
aarch64-darwin-311 = {
|
||||
name = "torchvision-0.26.0-cp311-cp311-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.26.0-cp311-cp311-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-Vb1q1K53vgG6Z6QQsFtR9TsNDuRfFG62oN+5AH5wqzw=";
|
||||
name = "torchvision-0.27.0-cp311-cp311-macosx_14_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.27.0-cp311-cp311-macosx_14_0_arm64.whl";
|
||||
hash = "sha256-3wwWa2vffEf4joHotDvAhUUdXFDQxdFpG8R0wSJ9b+0=";
|
||||
};
|
||||
aarch64-darwin-312 = {
|
||||
name = "torchvision-0.26.0-cp312-cp312-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.26.0-cp312-cp312-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-xAnhw/3r7Ho4NEZQhtvai/doDv95q/f9LxDGtZUgp6Q=";
|
||||
name = "torchvision-0.27.0-cp312-cp312-macosx_14_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.27.0-cp312-cp312-macosx_14_0_arm64.whl";
|
||||
hash = "sha256-Gm3XQqFQZFEm354LLkSYdMHWNYl8dzsyLC4Gfpg4Lf4=";
|
||||
};
|
||||
aarch64-darwin-313 = {
|
||||
name = "torchvision-0.26.0-cp313-cp313-macosx_12_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.26.0-cp313-cp313-macosx_12_0_arm64.whl";
|
||||
hash = "sha256-XWPdQxYmkSWLGzUpuQQbrH1UyqN+rgkl+ZcQgmjL98Q=";
|
||||
name = "torchvision-0.27.0-cp313-cp313-macosx_14_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.27.0-cp313-cp313-macosx_14_0_arm64.whl";
|
||||
hash = "sha256-Qdba5z4a8J+oLe1ZeuV/KiMUKFrN5UsliQqPjlG5mdc=";
|
||||
};
|
||||
aarch64-darwin-314 = {
|
||||
name = "torchvision-0.26.0-cp314-cp314-macosx_12_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.26.0-cp314-cp314-macosx_12_0_arm64.whl";
|
||||
hash = "sha256-62GATrnb6IxaKmxNqN7B2A0tCm8YyZnFJOMiZssevNM=";
|
||||
name = "torchvision-0.27.0-cp314-cp314-macosx_14_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.27.0-cp314-cp314-macosx_14_0_arm64.whl";
|
||||
hash = "sha256-wfrA/Cp63ylIH8GTig54RcV7oRR6mGeEEJxNmPQ06ow=";
|
||||
};
|
||||
aarch64-linux-310 = {
|
||||
name = "torchvision-0.26.0-cp310-cp310-linux_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.26.0%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl";
|
||||
hash = "sha256-l9+ahZXc4lbS5t0Wu80caN0A7scS431LbseYVFPdwqo=";
|
||||
name = "torchvision-0.27.0-cp310-cp310-linux_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.27.0%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl";
|
||||
hash = "sha256-J5oFamQ29p92dnWx8dgrZ+ysoboYcbEc4K9HRKMkqiI=";
|
||||
};
|
||||
aarch64-linux-311 = {
|
||||
name = "torchvision-0.26.0-cp311-cp311-linux_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.26.0%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl";
|
||||
hash = "sha256-wR5VBB9rhKbE+yiYG5AUdaqBw4aVzOxt38xUw/qfrE8=";
|
||||
name = "torchvision-0.27.0-cp311-cp311-linux_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.27.0%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl";
|
||||
hash = "sha256-mdBdBx/zQwUzTuGFT17ffCdnuWuln+kudthKH6csjgY=";
|
||||
};
|
||||
aarch64-linux-312 = {
|
||||
name = "torchvision-0.26.0-cp312-cp312-linux_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.26.0%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl";
|
||||
hash = "sha256-F/C1QjMfyUIwtCFMbRI/A4r3Mw/YEBlgjA0kAvO8MHk=";
|
||||
name = "torchvision-0.27.0-cp312-cp312-linux_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.27.0%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl";
|
||||
hash = "sha256-Gwb0LUi2IJgRSSPYo/6fqGQYJxXbBlhKUVFV2wqo6zA=";
|
||||
};
|
||||
aarch64-linux-313 = {
|
||||
name = "torchvision-0.26.0-cp313-cp313-linux_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.26.0%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl";
|
||||
hash = "sha256-LpMq8SOjkTeBXf0VLGTMaD+ny9MnyWXoB8lyjHqklxo=";
|
||||
name = "torchvision-0.27.0-cp313-cp313-linux_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.27.0%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl";
|
||||
hash = "sha256-aQk7ZLJ2LEPfF74tsr4WMCmWPZC8PxgBUA/etyPlSDM=";
|
||||
};
|
||||
aarch64-linux-314 = {
|
||||
name = "torchvision-0.26.0-cp314-cp314-linux_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.26.0%2Bcpu-cp314-cp314-manylinux_2_28_aarch64.whl";
|
||||
hash = "sha256-eFdsjVqGZd5sqqbnw6P7fKpdwRIDK6YOEpqeeKRGoDs=";
|
||||
name = "torchvision-0.27.0-cp314-cp314-linux_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.27.0%2Bcpu-cp314-cp314-manylinux_2_28_aarch64.whl";
|
||||
hash = "sha256-x+PFZiJ4q11k0VDMF2lAYOnOWHW4c5CU2t8HpLpFuQ4=";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ set -eou pipefail
|
|||
|
||||
version=$1
|
||||
|
||||
linux_cuda_version="cu128"
|
||||
linux_cuda_version="cu130"
|
||||
linux_bucket="https://download.pytorch.org/whl/${linux_cuda_version}"
|
||||
cpu_bucket="https://download.pytorch.org/whl/cpu"
|
||||
|
||||
|
|
@ -15,11 +15,11 @@ url_and_key_list=(
|
|||
"x86_64-linux-312 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp312-cp312-manylinux_2_28_x86_64.whl torchvision-${version}-cp312-cp312-linux_x86_64.whl"
|
||||
"x86_64-linux-313 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp313-cp313-manylinux_2_28_x86_64.whl torchvision-${version}-cp313-cp313-linux_x86_64.whl"
|
||||
"x86_64-linux-314 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp314-cp314-manylinux_2_28_x86_64.whl torchvision-${version}-cp314-cp314-linux_x86_64.whl"
|
||||
"aarch64-darwin-310 $cpu_bucket/torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl"
|
||||
"aarch64-darwin-311 $cpu_bucket/torchvision-${version}-cp311-cp311-macosx_11_0_arm64.whl torchvision-${version}-cp311-cp311-macosx_11_0_arm64.whl"
|
||||
"aarch64-darwin-312 $cpu_bucket/torchvision-${version}-cp312-cp312-macosx_11_0_arm64.whl torchvision-${version}-cp312-cp312-macosx_11_0_arm64.whl"
|
||||
"aarch64-darwin-313 $cpu_bucket/torchvision-${version}-cp313-cp313-macosx_12_0_arm64.whl torchvision-${version}-cp313-cp313-macosx_12_0_arm64.whl"
|
||||
"aarch64-darwin-314 $cpu_bucket/torchvision-${version}-cp314-cp314-macosx_12_0_arm64.whl torchvision-${version}-cp314-cp314-macosx_12_0_arm64.whl"
|
||||
"aarch64-darwin-310 $cpu_bucket/torchvision-${version}-cp310-cp310-macosx_14_0_arm64.whl torchvision-${version}-cp310-cp310-macosx_14_0_arm64.whl"
|
||||
"aarch64-darwin-311 $cpu_bucket/torchvision-${version}-cp311-cp311-macosx_14_0_arm64.whl torchvision-${version}-cp311-cp311-macosx_14_0_arm64.whl"
|
||||
"aarch64-darwin-312 $cpu_bucket/torchvision-${version}-cp312-cp312-macosx_14_0_arm64.whl torchvision-${version}-cp312-cp312-macosx_14_0_arm64.whl"
|
||||
"aarch64-darwin-313 $cpu_bucket/torchvision-${version}-cp313-cp313-macosx_14_0_arm64.whl torchvision-${version}-cp313-cp313-macosx_14_0_arm64.whl"
|
||||
"aarch64-darwin-314 $cpu_bucket/torchvision-${version}-cp314-cp314-macosx_14_0_arm64.whl torchvision-${version}-cp314-cp314-macosx_14_0_arm64.whl"
|
||||
"aarch64-linux-310 $cpu_bucket/torchvision-${version}%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl torchvision-${version}-cp310-cp310-linux_aarch64.whl"
|
||||
"aarch64-linux-311 $cpu_bucket/torchvision-${version}%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl torchvision-${version}-cp311-cp311-linux_aarch64.whl"
|
||||
"aarch64-linux-312 $cpu_bucket/torchvision-${version}%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl torchvision-${version}-cp312-cp312-linux_aarch64.whl"
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "triton";
|
||||
version = "3.6.0";
|
||||
version = "3.7.0";
|
||||
format = "wheel";
|
||||
__structuredAttrs = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -7,56 +7,56 @@
|
|||
|
||||
version:
|
||||
builtins.getAttr version {
|
||||
"3.6.0" = {
|
||||
"3.7.0" = {
|
||||
x86_64-linux-310 = {
|
||||
name = "triton-3.6.0-cp310-cp310-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/triton-3.6.0-cp310-cp310-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
|
||||
hash = "sha256-ctaz7qoTREyim6ZdVfxXtkETc6K45hn2OuWWLT2eokk=";
|
||||
name = "triton-3.7.0-cp310-cp310-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/triton-3.7.0-cp310-cp310-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
|
||||
hash = "sha256-DWfwgNzCW+9f7WkqkbeI8Drq6pSJq9JTXhgrETBofzA=";
|
||||
};
|
||||
x86_64-linux-311 = {
|
||||
name = "triton-3.6.0-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/triton-3.6.0-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
|
||||
hash = "sha256-4CHofo8mbG+HvzebZpxDwoAKrGJHvfXVGMtVPjxAPAA=";
|
||||
name = "triton-3.7.0-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/triton-3.7.0-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
|
||||
hash = "sha256-PBIlPvbItqSqBDO/PibdYt/eF41OcoDD3PRodajhyN4=";
|
||||
};
|
||||
x86_64-linux-312 = {
|
||||
name = "triton-3.6.0-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/triton-3.6.0-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
|
||||
hash = "sha256-b1ko5tRMNKl7vhZMzt3A7yAHEhyJ68+6VBXPRS3n7p8=";
|
||||
name = "triton-3.7.0-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/triton-3.7.0-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
|
||||
hash = "sha256-H3DCuStFoa2Xj5zASHL+wLosg4v7l1wfY2nUzk2D9U4=";
|
||||
};
|
||||
x86_64-linux-313 = {
|
||||
name = "triton-3.6.0-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/triton-3.6.0-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
|
||||
hash = "sha256-AHUDn/J3ZUgAg7GhCZmb8nEQ81QvH5+tlfD5Blo22nk=";
|
||||
name = "triton-3.7.0-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/triton-3.7.0-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
|
||||
hash = "sha256-0BA4KB83Yz8GFC8dTazEh+pNRRsC6zPt/edY0TZii6I=";
|
||||
};
|
||||
x86_64-linux-314 = {
|
||||
name = "triton-3.6.0-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/triton-3.6.0-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
|
||||
hash = "sha256-ttgAvaZm675+whRuP16yce6H+PrHJAEdx/Jd7pv7X38=";
|
||||
name = "triton-3.7.0-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/triton-3.7.0-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
|
||||
hash = "sha256-lrEJlBySIGSt4Nc4Ni4DqTB57H5IMjL2/bqAO3YCFMw=";
|
||||
};
|
||||
aarch64-linux-310 = {
|
||||
name = "triton-3.6.0-cp310-cp310-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/triton-3.6.0-cp310-cp310-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
|
||||
hash = "sha256-otC3ubTymt4xz3vXwje1DScKJIfPlD0DSzB6mz9z2cc=";
|
||||
name = "triton-3.7.0-cp310-cp310-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/triton-3.7.0-cp310-cp310-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
|
||||
hash = "sha256-2sAV6VWrDzCKoSqaFb4jI0LknH5nvtv0lhLAZQA3gNg=";
|
||||
};
|
||||
aarch64-linux-311 = {
|
||||
name = "triton-3.6.0-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/triton-3.6.0-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
|
||||
hash = "sha256-KQaH9PMQznlKB9akP6lN6pvahmFb8EV4UzN4UDvtcVo=";
|
||||
name = "triton-3.7.0-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/triton-3.7.0-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
|
||||
hash = "sha256-544DgwVnCFaytHMUJpTE48W2idvyxCX7ELya2kRTqAA=";
|
||||
};
|
||||
aarch64-linux-312 = {
|
||||
name = "triton-3.6.0-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/triton-3.6.0-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
|
||||
hash = "sha256-bkLQhIZNErh4Rzb+UaDNBfbMVndbJcgQLJ2AxCH04pg=";
|
||||
name = "triton-3.7.0-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/triton-3.7.0-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
|
||||
hash = "sha256-FDX2q4g0OXa9S3WmGNIFRJIkr0nxnIV0gqi7fN3/hIE=";
|
||||
};
|
||||
aarch64-linux-313 = {
|
||||
name = "triton-3.6.0-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/triton-3.6.0-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
|
||||
hash = "sha256-WNV9Z5awAEB2MVQzUm/p1K9CBE1DCv3uHmzUKna9bQk=";
|
||||
name = "triton-3.7.0-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/triton-3.7.0-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
|
||||
hash = "sha256-m4KV9sctz4QNP0ysJcGy/0gu8enq0jQVtI/C2Dc6Fw0=";
|
||||
};
|
||||
aarch64-linux-314 = {
|
||||
name = "triton-3.6.0-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/triton-3.6.0-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
|
||||
hash = "sha256-IO0vdw9yF7iplMupnnysN+e+c1o5kTRJkLgKtP6pZMQ=";
|
||||
name = "triton-3.7.0-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/triton-3.7.0-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
|
||||
hash = "sha256-Zo7ZiY+ZmzY79dep1ZUWzkH41di/D0p3cNLufdD57HE=";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,19 +4,24 @@
|
|||
async-timeout,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "waqiasync";
|
||||
version = "1.1.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-SOs998BQV4UlLnRB3Yf7zze51u43g2Npwgk6y80S+m8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
aiohttp
|
||||
async-timeout
|
||||
];
|
||||
|
|
@ -31,4 +36,4 @@ buildPythonPackage rec {
|
|||
license = with lib.licenses; [ mit ];
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -283,6 +283,7 @@ mapAliases {
|
|||
akkoma-emoji = throw "'akkoma-emoji' has been renamed to/replaced by 'blobs_gg'"; # Converted to throw 2025-10-27
|
||||
akkoma-frontends.admin-fe = throw "'akkoma-frontends.admin-fe' has been renamed to/replaced by 'akkoma-admin-fe'"; # Converted to throw 2025-10-27
|
||||
akkoma-frontends.akkoma-fe = throw "'akkoma-frontends.akkoma-fe' has been renamed to/replaced by 'akkoma-fe'"; # Converted to throw 2025-10-27
|
||||
alexandria = throw "'alexandria' has been removed as it was unmaintained upstream and depended on webkitgtk 4.0 and libsoup 2.4 via Tauri v1"; # Added 2026-06-07
|
||||
amazon-ecs-cli = throw "'amazon-ecs-cli' has been removed due to being unmaintained upstream"; # Added 2026-01-19
|
||||
amazon-qldb-shell = throw "'amazon-qldb-shell' has been removed due to being unmaintained upstream"; # Added 2025-07-30
|
||||
AMB-plugins = amb-plugins; # Added 2026-02-08
|
||||
|
|
@ -436,6 +437,7 @@ mapAliases {
|
|||
cargo-espflash = throw "'cargo-espflash' has been renamed to/replaced by 'espflash'"; # Converted to throw 2025-10-27
|
||||
cargo-raze = throw "'cargo-raze' has been removed, as it is unmaintained"; # Added 2026-05-04
|
||||
cargo-sync-readme = throw "'cargo-sync-readme' has been removed because upstream 404s"; # Converted to throw 2025-12-18
|
||||
cargo-tauri_1 = throw "'cargo-tauri_1' has been removed as it required webkitgtk 4.0 and libsoup 2.4"; # Added 2026-06-07
|
||||
cargonode = throw "'cargonode' has been removed due to lack of upstream maintenance"; # Added 2025-06-18
|
||||
carp = throw "'carp' has been removed due to being broken for more than a year; see RFC 180"; # Added 2026-02-05
|
||||
cask = throw "'cask' has been renamed to/replaced by 'emacs.pkgs.cask'"; # Converted to throw 2025-10-27
|
||||
|
|
@ -628,6 +630,7 @@ mapAliases {
|
|||
degit-rs = throw "'degit-rs' has been removed because it is unmaintained upstream and has vulnerable dependencies."; # Added 2025-07-11
|
||||
deltachat-cursed = throw "'deltachat-cursed' has been renamed to/replaced by 'arcanechat-tui'"; # Converted to throw 2025-10-27
|
||||
deltatouch = throw "'deltatouch' has been removed as it depended on qt5 webengine which reached EOL"; # Added 2026-04-25
|
||||
desktop-postflop = throw "'desktop-postflop' has been removed as it has been unmaintained upstream since October 2023 and depended on webkitgtk 4.0"; # Added 2026-06-07
|
||||
devdocs-desktop = throw "'devdocs-desktop' has been removed as it is unmaintained upstream and vendors insecure dependencies"; # Added 2025-06-11
|
||||
dfilemanager = throw "'dfilemanager' has been dropped as it was unmaintained"; # Added 2025-06-03
|
||||
discord-screenaudio = throw "discord-screenaudio has been removed because it was archived upstream. Use vesktop instead."; # added 2025-11-29
|
||||
|
|
@ -769,6 +772,7 @@ mapAliases {
|
|||
flutter327 = throw "flutter327 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2025-10-28
|
||||
fmsynth = throw "'fmsynth' has been removed as it was broken and unmaintained both upstream and in nixpkgs."; # Added 2025-09-01
|
||||
follow = warnAlias "follow has been renamed to folo" folo; # Added 2025-05-18
|
||||
fondo = throw "'fondo' has been removed as it was unmaintained upstream and depended on libsoup 2.4"; # Added 2026-06-07
|
||||
fontadobe75dpi = font-adobe-75dpi; # Added 2026-01-19
|
||||
fontadobe100dpi = font-adobe-100dpi; # Added 2026-02-04
|
||||
fontadobeutopia75dpi = font-adobe-utopia-75dpi; # Added 2026-01-19
|
||||
|
|
@ -835,6 +839,7 @@ mapAliases {
|
|||
g4music = throw "'g4music' has been renamed to/replaced by 'gapless'"; # Converted to throw 2025-10-27
|
||||
galene-stt = throw "'galene-stt' has been removed as it is unmaintained and broken"; # Added 2026-01-27
|
||||
gamecube-tools = throw "gamecube-tools was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
|
||||
gamehub = throw "'gamehub' has been removed as it was archived upstream and depended on webkitgtk 4.0"; # Added 2026-06-07
|
||||
gandi-cli = throw "'gandi-cli' has been removed as it is unmaintained upstream"; # Added 2026-01-11
|
||||
garage_0_8 = throw "'garage_0_8' has been removed as it is unmaintained upstream"; # Added 2025-06-23
|
||||
garage_0_8_7 = throw "'garage_0_8_7' has been removed as it is unmaintained upstream"; # Added 2025-06-23
|
||||
|
|
@ -886,6 +891,7 @@ mapAliases {
|
|||
glfw-wayland = throw "'glfw-wayland' has been renamed to/replaced by 'glfw'"; # Converted to throw 2025-10-27
|
||||
glfw-wayland-minecraft = throw "'glfw-wayland-minecraft' has been renamed to/replaced by 'glfw3-minecraft'"; # Converted to throw 2025-10-27
|
||||
globalprotect-openconnect = throw "'globalprotect-openconnect' was removed because it was unmaintained in Nixpkgs and needed upgrading to the Tauri rewrite, as the old version depends on the removed Qt 5 WebEngine"; # Added 2026-04-26
|
||||
glom = throw "'glom' has been removed as it was archived upstream and depended on libsoup 2.4"; # Added 2026-06-07
|
||||
glxinfo = throw "'glxinfo' has been renamed to/replaced by 'mesa-demos'"; # Converted to throw 2025-10-27
|
||||
gmnisrv = throw "'gmnisrv' has been removed due to lack of maintenance upstream"; # Added 2025-06-07
|
||||
gmu = throw "'gmu' has been removed as it was broken and unmaintained in Nixpkgs"; # Added 2026-04-04
|
||||
|
|
@ -954,6 +960,7 @@ mapAliases {
|
|||
grub4dos = throw "'grub4dos' has been removed due to being broken for more than a year; see RFC 180"; # Added 2026-02-05
|
||||
gscrabble = throw "'gscrabble' has been removed, as it is unmaintained upstream, and broken in nixpkgs"; # Added 2026-01-03
|
||||
gsettings-qt = lomiri.gsettings-qt; # Added 2025-12-06
|
||||
gssdp = throw "'gssdp' (version 1.4) has been removed as it was unmaintained upstream and depended on libsoup 2.4. Consider using `gssdp_1_6` instead"; # Added 2026-06-07
|
||||
gtkcord4 = throw "'gtkcord4' has been renamed to/replaced by 'dissent'"; # Converted to throw 2025-10-27
|
||||
gtkextra = throw "'gtkextra' has been removed due to lack of maintenance upstream."; # Added 2025-06-10
|
||||
gtkgnutella = gtk-gnutella; # Added 2026-05-21
|
||||
|
|
@ -961,6 +968,7 @@ mapAliases {
|
|||
gui-for-clash = throw "'gui-for-clash' has been removed, as it is unmaintained"; # Added 2026-05-28
|
||||
guile-disarchive = throw "'guile-disarchive' has been renamed to/replaced by 'disarchive'"; # Converted to throw 2025-10-27
|
||||
guile-sdl = throw "guile-sdl has been removed, as it was broken"; # Added 2025-08-25
|
||||
gupnp = throw "'gupnp' (version 1.4) has been removed as it was unmaintained upstream and depended on libsoup 2.4. Consider using 'gupnp_1_6' instead"; # Added 2026-06-07
|
||||
gutenprintBin = gutenprint-bin; # Added 2025-08-21
|
||||
gwrap = warnAlias "The 'gwrap' alias has been removed. The correct name of the package is 'g-wrap'" g-wrap; # Added 2026-01-25
|
||||
gxneur = throw "'gxneur' has been removed due to lack of maintenance and reliance on gnome2 and 2to3."; # Added 2025-08-17
|
||||
|
|
@ -1143,6 +1151,7 @@ mapAliases {
|
|||
libdevil-nox = throw "libdevil has been removed, as it was unmaintained in Nixpkgs and upstream since 2017"; # Added 2025-09-16
|
||||
libdwarf-lite = throw "`libdwarf-lite` has been replaced by `libdwarf` as it's mostly a mirror"; # Added 2025-06-16
|
||||
libdynd = throw "'libdynd' has been removed due to lack of maintenance"; # Added 2026-03-24
|
||||
libepc = throw "'libepc' has been removed as it was archived upstream and depended on libsoup 2.4"; # Added 2026-06-07
|
||||
libertine-g = warnAlias "'libertine-g' has been renamed to 'linux-libertine-g'" linux-libertine-g; # Added 2026-02-20
|
||||
libevdevplus = throw "'libevdevplus' has been removed, as it was unmaintained upstream since 2021, no longer builds, and is no longer used by anything"; # Added 2025-11-02
|
||||
libfakeXinerama = warnAlias "'libfakeXinerama' has been renamed to 'libfakexinerama'" libfakexinerama; # Added 2026-02-08
|
||||
|
|
@ -1196,6 +1205,7 @@ mapAliases {
|
|||
libSM = libsm; # Added 2026-02-04
|
||||
libsmartcols = warnAlias "'util-linux' should be used instead of 'libsmartcols'" util-linux; # Added 2025-09-03
|
||||
libsoup = throw "'libsoup' has been renamed to/replaced by 'libsoup_2_4'"; # Converted to throw 2025-10-27
|
||||
libsoup_2_4 = throw "'libsoup_2_4' has been removed as it was end-of-life and has many known unfixed security issues. Consider migrating to 'libsoup_3' instead"; # Added 2026-06-07
|
||||
libtap = throw "libtap has been removed, as it was unused and deprecated by its author in favour of cmocka"; # Added 2025-09-16
|
||||
libtcod = throw "'libtcod' has been removed due to being unused and having an incompatible build-system"; # Added 2025-10-04
|
||||
libtensorflow-bin = throw "'libtensorflow-bin' has been renamed to/replaced by 'libtensorflow'"; # Converted to throw 2025-10-27
|
||||
|
|
@ -1497,6 +1507,7 @@ mapAliases {
|
|||
moralerspace-hwnf = throw "moralerspace-hwnf has been removed, use moralerspace-hw instead."; # Added 2025-08-30
|
||||
moralerspace-nf = throw "moralerspace-nf has been removed, use moralerspace instead."; # Added 2025-08-30
|
||||
morty = throw "morty has been removed, as searxng removed support for it and it was unmaintained."; # Added 2025-09-26
|
||||
mouse-actions-gui = throw "'mouse-actions-gui' has been removed as it depended on webkitgtk 4.0 and libsoup 2.4"; # Added 2026-06-07
|
||||
move-mount-beneath = throw "move-mount-beneath has been removed, it is now superseded by util-linux's mount"; # Added 2026-05-19
|
||||
moz-phab = throw "'moz-phab' has been renamed to/replaced by 'mozphab'"; # Converted to throw 2025-10-27
|
||||
mp3splt = throw "'mp3splt' has been removed due to lack of maintenance upstream."; # Added 2025-05-17
|
||||
|
|
@ -2057,6 +2068,7 @@ mapAliases {
|
|||
springLobby = throw "springLobby has been removed, as it had been broken since 2023"; # Added 2025-09-16
|
||||
sqlar = throw "'sqlar' has been removed, as it is umaintained upstream, and depends on fuse2. Consider using the sqlite builtin VACUUM";
|
||||
sqlbag = throw "sqlbag has been removed because it has been marked as broken since May 2024."; # Added 2025-10-11
|
||||
squirreldisk = throw "'squirreldisk' has been removed as it depended on webkitgtk 4.0"; # Added 2026-06-07
|
||||
src = throw "The \"src\" package has been renamed to \"simple-revision-control\". If you encounter this error and did not intend to use that package you may have a falsely constructed overlay."; # Added 2025-11-19
|
||||
ssm-agent = throw "'ssm-agent' has been renamed to/replaced by 'amazon-ssm-agent'"; # Converted to throw 2025-10-27
|
||||
stacer = throw "'stacer' has been removed because it was abandoned upstream and relied upon vulnerable software"; # Added 2025-11-08
|
||||
|
|
@ -2682,6 +2694,7 @@ mapAliases {
|
|||
xow_dongle-firmware = throw "'xow_dongle-firmware' has been renamed to/replaced by 'xone-dongle-firmware'"; # Added 2025-12-30
|
||||
xp-pen-deco-01-v2-driver = warnAlias "'xp-pen-deco-01-v2-driver' has been replaced by 'xppen_4'. Consider using it with 'programs.xppen' module." xppen_4; # Added 2026-02-02
|
||||
xp-pen-g430-driver = warnAlias "'xp-pen-g430-driver' has been replaced by 'xppen_3'. Consider using it with 'programs.xppen' module." xppen_3; # Added 2026-02-02
|
||||
xplorer = throw "'xplorer' has been removed as was unmaintained in Nixpkgs and needed upgrading to the experimental Tauri v2 rewrite, as the old version depended on webkitgtk 4.0"; # Added 2026-06-07
|
||||
xsw = throw "'xsw' has been removed due to lack of upstream maintenance"; # Added 2025-08-22
|
||||
xsynth-dssi = throw "'xsynth-dssi' was removed due to lack of upstream maintenance and relying on gtk2"; # Added 2025-12-02
|
||||
xtrap = throw "XTrap was a proposed X11 extension that hasn't been in Xorg since X11R6 in 1994, it is deprecated and archived upstream."; # added 2025-12-13
|
||||
|
|
|
|||
|
|
@ -753,19 +753,6 @@ with pkgs;
|
|||
|
||||
makeDesktopItem = callPackage ../build-support/make-desktopitem { };
|
||||
|
||||
installFonts = 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;
|
||||
};
|
||||
} ../build-support/setup-hooks/install-fonts.sh;
|
||||
|
||||
copyPkgconfigItems = makeSetupHook {
|
||||
name = "copy-pkg-config-items-hook";
|
||||
meta.license = lib.licenses.mit;
|
||||
|
|
@ -6311,8 +6298,6 @@ with pkgs;
|
|||
|
||||
libsigcxx30 = callPackage ../development/libraries/libsigcxx/3.0.nix { };
|
||||
|
||||
libsoup_2_4 = callPackage ../development/libraries/libsoup { };
|
||||
|
||||
libsoup_3 = callPackage ../development/libraries/libsoup/3.x.nix { };
|
||||
|
||||
libtorrent-rasterbar = libtorrent-rasterbar-2_0_x;
|
||||
|
|
|
|||
|
|
@ -3702,12 +3702,17 @@ with self;
|
|||
|
||||
CatalystPluginAuthentication = buildPerlPackage {
|
||||
pname = "Catalyst-Plugin-Authentication";
|
||||
version = "0.10023";
|
||||
version = "0.10_027";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Authentication-0.10023.tar.gz";
|
||||
hash = "sha256-NgOaq9rLB+Zoek16i/rHj+nQ+7BM2o1tlm1sHjJZ0Gw=";
|
||||
url = "mirror://cpan/authors/id/E/ET/ETHER/Catalyst-Plugin-Authentication-0.10_027.tar.gz";
|
||||
hash = "sha256-XSnccFKKKnFGYChaHjQh8VSur4hNCXjVPyR6pKugq6w=";
|
||||
};
|
||||
buildInputs = [ TestException ];
|
||||
buildInputs = [
|
||||
TestException
|
||||
TestFatal
|
||||
CatalystPluginSessionStateCookie
|
||||
];
|
||||
doCheck = false; # t/live_app.t fails on crypted password tests with Perl 5.42
|
||||
propagatedBuildInputs = [ CatalystPluginSession ];
|
||||
meta = {
|
||||
description = "Infrastructure plugin for the Catalyst authentication framework";
|
||||
|
|
|
|||
|
|
@ -566,11 +566,6 @@
|
|||
"libsodium"
|
||||
]
|
||||
},
|
||||
"libsoup-gnome-2.4": {
|
||||
"attrPath": [
|
||||
"libsoup_2_4"
|
||||
]
|
||||
},
|
||||
"libssh2": {
|
||||
"attrPath": [
|
||||
"libssh2"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue