gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-09-26 00:15:56 +00:00
committed by GitHub
parent 0d3c018124 b5a8c8e16a
commit 595dedae63
43 changed files with 1172 additions and 695 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CONTRIBUTING.md
+6
View File
@@ -661,6 +661,12 @@ If you have any problems with formatting, please ping the [formatting team](http
As an exception, an explicit conditional expression with null can be used when fixing a important bug without triggering a mass rebuild.
If this is done a follow up pull request _should_ be created to change the code to `lib.optional(s)`.
- Any style choices not covered here but that can be expressed as general rules should be left at the discretion of the authors of changes and _not_ commented in reviews.
The purpose of this is:
- to avoid churn as contributors with different style preferences undo each other's changes,
- to ensure that style rules are written down and consistent (and can thus be followed when authoring changes, reducing review cycles),
- and to encourage reviews to focus on more impactful considerations.
# Practical contributing advice
To contribute effectively and efficiently, you need to be aware of how the process generally works.
maintainers/maintainer-list.nix
+10 -1
View File
@@ -10125,10 +10125,11 @@
name = "Heisfer";
};
HeitorAugustoLN = {
email = "IAm.HeitorALN@proton.me";
email = "nixpkgs.woven713@passmail.net";
github = "HeitorAugustoLN";
githubId = 44377258;
name = "Heitor Augusto";
matrix = "@heitoraugusto:matrix.org";
};
heitorPB = {
email = "heitorpbittencourt@gmail.com";
@@ -13331,6 +13332,14 @@
matrix = "@kenran_:matrix.org";
name = "Johannes Maier";
};
kenshineto = {
name = "Freya Murphy";
email = "contact@freyacat.org";
matrix = "@freya:freya.cat";
github = "kenshineto";
githubId = 28487599;
keys = [ { fingerprint = "D9AF 0A42 09B7 C2DE 11A8 84BF ACBC 5536 60D9 993D"; } ];
};
kentjames = {
email = "jameschristopherkent@gmail.com";
github = "KentJames";
nixos/modules/services/home-automation/wyoming/piper.nix
-4
View File
@@ -42,8 +42,6 @@ in
options = {
enable = mkEnableOption "Wyoming Piper server";
piper = mkPackageOption pkgs "piper-tts" { };
voice = mkOption {
type = str;
example = "en-us-ryan-medium";
@@ -159,8 +157,6 @@ in
"/var/lib/wyoming/piper"
"--uri"
options.uri
"--piper"
(lib.getExe options.piper)
"--voice"
options.voice
"--speaker"
pkgs/applications/audio/espeak-ng/default.nix
+17 -16
View File
@@ -28,16 +28,17 @@
sonicSupport ? true,
speechPlayerSupport ? true,
ucdSupport ? false,
buildPackages,
}:
let
version = "1.52.0";
version = "1.52.0.1-unstable-2025-09-09";
src = fetchFromGitHub {
owner = "espeak-ng";
repo = "espeak-ng";
tag = version;
hash = "sha256-mmh5QPSVD5YQ0j16R+bEL5vcyWLtTNOJ/irBNzWY3ro=";
rev = "0d451f8c1c6ae837418b823bd9c4cbc574ea9ff5";
hash = "sha256-wpPi+YjSLhsEWfE3KEbL4A7o48qtz9fLRZ/u4xGOM2g=";
};
ucd-tools = stdenv.mkDerivation {
@@ -59,22 +60,14 @@ in
stdenv.mkDerivation rec {
pname = "espeak-ng";
version = "1.52.0";
src = fetchFromGitHub {
owner = "espeak-ng";
repo = "espeak-ng";
tag = version;
hash = "sha256-mmh5QPSVD5YQ0j16R+bEL5vcyWLtTNOJ/irBNzWY3ro=";
};
inherit version src;
patches = [
# https://github.com/espeak-ng/espeak-ng/pull/2274
./libsonic.patch
(fetchpatch {
name = "espeak-ng-text-to-phonemes-with-terminator.patch";
url = "https://github.com/espeak-ng/espeak-ng/commit/2108b1e8ae02f49cc909894a1024efdfde6682fd.patch";
hash = "sha256-XjEc1r7F88xZOfeUey0R6Xv6vu4Wy8GtWxXFG2NTf9g=";
name = "libsonic.patch";
url = "https://github.com/espeak-ng/espeak-ng/commit/83e646e711af608fafa8c01dd812cd29e073f644.patch";
hash = "sha256-UHuURyqRy/JVYYJH5EI5J2cpBfCNeTE24sMmheb+D2Q=";
})
]
++ lib.optionals mbrolaSupport [
@@ -98,6 +91,10 @@ stdenv.mkDerivation rec {
ronn
makeWrapper
which
]
# Provide a native espeak-ng when cross compiling so intonations can be built
++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
buildPackages.espeak-ng
];
buildInputs =
@@ -113,6 +110,10 @@ stdenv.mkDerivation rec {
(lib.cmakeBool "USE_LIBSONIC" sonicSupport)
(lib.cmakeBool "USE_MBROLA" mbrolaSupport)
(lib.cmakeBool "USE_SPEECHPLAYER" speechPlayerSupport)
]
# Point CMake to the native build’s binary dir when cross compiling
++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"-DNativeBuild_DIR=${buildPackages.espeak-ng}/bin/"
];
postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
@@ -127,7 +128,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Speech synthesizer that supports more than hundred languages and accents";
homepage = "https://github.com/espeak-ng/espeak-ng";
changelog = "https://github.com/espeak-ng/espeak-ng/blob/${src.tag}/ChangeLog.md";
changelog = "https://github.com/espeak-ng/espeak-ng/blob/${src.rev}/ChangeLog.md";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ aske ];
platforms = lib.platforms.all;
pkgs/applications/audio/espeak-ng/libsonic.patch
-41
View File
@@ -1,41 +0,0 @@
diff --git a/cmake/deps.cmake b/cmake/deps.cmake
index b63ced21..2cd1727b 100644
--- a/cmake/deps.cmake
+++ b/cmake/deps.cmake
@@ -13,20 +13,22 @@ endif(PTHREAD_LIB)
if (MBROLA_BIN)
set(HAVE_MBROLA ON)
endif(MBROLA_BIN)
-if (SONIC_LIB AND SONIC_INC)
- set(HAVE_LIBSONIC ON)
-else()
- FetchContent_Declare(sonic-git
- GIT_REPOSITORY https://github.com/waywardgeek/sonic.git
- GIT_TAG fbf75c3d6d846bad3bb3d456cbc5d07d9fd8c104
- )
- FetchContent_MakeAvailable(sonic-git)
- FetchContent_GetProperties(sonic-git)
- add_library(sonic OBJECT ${sonic-git_SOURCE_DIR}/sonic.c)
- target_include_directories(sonic PUBLIC ${sonic-git_SOURCE_DIR})
- set(HAVE_LIBSONIC ON)
- set(SONIC_LIB sonic)
- set(SONIC_INC ${sonic-git_SOURCE_DIR})
+if (USE_LIBSONIC)
+ if (SONIC_LIB AND SONIC_INC)
+ set(HAVE_LIBSONIC ON)
+ else()
+ FetchContent_Declare(sonic-git
+ GIT_REPOSITORY https://github.com/waywardgeek/sonic.git
+ GIT_TAG fbf75c3d6d846bad3bb3d456cbc5d07d9fd8c104
+ )
+ FetchContent_MakeAvailable(sonic-git)
+ FetchContent_GetProperties(sonic-git)
+ add_library(sonic OBJECT ${sonic-git_SOURCE_DIR}/sonic.c)
+ target_include_directories(sonic PUBLIC ${sonic-git_SOURCE_DIR})
+ set(HAVE_LIBSONIC ON)
+ set(SONIC_LIB sonic)
+ set(SONIC_INC ${sonic-git_SOURCE_DIR})
+ endif()
endif()
if (PCAUDIO_LIB AND PCAUDIO_INC)
set(HAVE_LIBPCAUDIO ON)
pkgs/applications/editors/vim/plugins/non-generated/sonarlint-nvim/default.nix
+3 -3
View File
@@ -6,13 +6,13 @@
}:
vimUtils.buildVimPlugin {
pname = "sonarlint.nvim";
version = "0-unstable-2025-08-02";
version = "0-unstable-2025-09-18";
src = fetchFromGitLab {
owner = "schrieveslaach";
repo = "sonarlint.nvim";
rev = "5c3e0bb647be90cec844022991f33d50b6838964";
hash = "sha256-lER6vBhiLK8/S2iJOc4jaDUMqkc9d2VLcj3GqbiZANs=";
rev = "dc5702556f90eedce587233f3c1a0ae671ea3648";
hash = "sha256-IBXQ9ijAG8TdnwkSTNbBtzziQC5bbCbkAmC8gM7G5E4=";
};
passthru.updateScript = nix-update-script {
pkgs/applications/emulators/libretro/cores/bsnes.nix
+3 -3
View File
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "bsnes";
version = "0-unstable-2025-07-18";
version = "0-unstable-2025-09-19";
src = fetchFromGitHub {
owner = "libretro";
repo = "bsnes-libretro";
rev = "28c358173a39d6311841c756ac0e82975d798048";
hash = "sha256-hRWc8jcpEHl15rESCLdoKXuQn8Jr5YJdOiJ7gOww6oM=";
rev = "aeb76d7dc33c1f136db43d65ba9622c14e81b0fa";
hash = "sha256-DpCG+DyeSCMdAF+TGB6zSRp/fttoyw9eCXy8PLvRjaY=";
};
makefile = "Makefile";
pkgs/applications/emulators/libretro/cores/flycast.nix
+3 -3
View File
@@ -8,13 +8,13 @@
}:
mkLibretroCore {
core = "flycast";
version = "0-unstable-2025-09-12";
version = "0-unstable-2025-09-19";
src = fetchFromGitHub {
owner = "flyinghead";
repo = "flycast";
rev = "ac32a8035243951803d8a8e9f45ad2317a2da91f";
hash = "sha256-JyC804cArKvrBYvChD1zUmzUAxQZyBvYswpuA9COvF8=";
rev = "851dd226648c3e2706cef99a02a5cddad3e2f4b1";
hash = "sha256-bBIHmKViwC5+8bM3Tdb4DKxsWw988nGVdAwSHsFciNE=";
fetchSubmodules = true;
};
pkgs/applications/misc/stog/default.nix
+4 -5
View File
@@ -22,19 +22,18 @@
buildDunePackage rec {
pname = "stog";
version = "1.0.0";
version = "1.1.0";
minimalOCamlVersion = "4.13";
src = fetchFromGitLab {
domain = "framagit.org";
owner = "zoggy";
repo = "stog";
rev = version;
hash = "sha256-hMb6D6VSq2o2NjycwxZt3mZKy1FR+3afEwbOmTc991g=";
tag = version;
hash = "sha256-seaVco5AoOxjEuw8zYsrA25vcyo1Un3eUJUU9FT57WU=";
};
nativeBuildInputs = [ menhir ];
buildInputs = [
fmt
lwt_ppx
ocf_ppx
ppx_blob
@@ -43,11 +42,11 @@ buildDunePackage rec {
propagatedBuildInputs = [
dune-build-info
dune-site
fmt
higlo
logs
lwt
ocf
ppx_blob
ptime
uri
uutf
pkgs/by-name/cd/cdncheck/package.nix
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "cdncheck";
version = "1.2.0";
version = "1.2.2";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "cdncheck";
tag = "v${version}";
hash = "sha256-2+o2CIR8zcoOxdg8Cp+E1U3mjrxQhLUGuMTep0bXnMo=";
hash = "sha256-Nu0u/lTl6qpzvHq8gEOxBqzL6kyFt+ZaQitLEbgpAfk=";
};
vendorHash = "sha256-21giZLgfNgDouU+T/8N28BEbJP2u44A3glZOwDBaiHY=";
pkgs/by-name/ch/chirp/package.nix
+3 -3
View File
@@ -11,14 +11,14 @@
python3Packages.buildPythonApplication {
pname = "chirp";
version = "0.4.0-unstable-2025-09-11";
version = "0.4.0-unstable-2025-09-22";
pyproject = true;
src = fetchFromGitHub {
owner = "kk7ds";
repo = "chirp";
rev = "8d7cf0b140ee75ca1fa758df4b2ae23fe0dbfa3f";
hash = "sha256-62RYdnipNwgXwvmEzoyvsENueE3plOKFXAtsZEeg7Ok=";
rev = "d958adbc6c332d6bbac4e2844025ca7331bb01b9";
hash = "sha256-htpdcm705Pm5a+me8vo5aQVWRAKTVPYac/0KgIpRKuA=";
};
nativeBuildInputs = [
pkgs/by-name/cn/cnspec/package.nix
+3 -3
View File
@@ -6,18 +6,18 @@
buildGoModule rec {
pname = "cnspec";
version = "12.1.0";
version = "12.2.1";
src = fetchFromGitHub {
owner = "mondoohq";
repo = "cnspec";
tag = "v${version}";
hash = "sha256-XGZJCjWVWf2XFtcN6M10I750gIvY7UBsePDTcfpnmRY=";
hash = "sha256-DmLA/JysdJT8/9Z6mmdAbZAkQZ1aAlzcvesdP5Qn1ik=";
};
proxyVendor = true;
vendorHash = "sha256-L2zom8FpZb7koqIAewGXGQhNVZlJgBNZWjoDr4NJDmk=";
vendorHash = "sha256-nqLHa6m8IeTg6Ac3vkRxyIRyO59WaN+Teaqm/qac53A=";
subPackages = [ "apps/cnspec" ];
pkgs/by-name/co/codex/package.nix
+10 -3
View File
@@ -4,29 +4,32 @@
rustPlatform,
fetchFromGitHub,
installShellFiles,
makeBinaryWrapper,
nix-update-script,
pkg-config,
openssl,
ripgrep,
versionCheckHook,
installShellCompletions ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "codex";
version = "0.40.0";
version = "0.41.0";
src = fetchFromGitHub {
owner = "openai";
repo = "codex";
tag = "rust-v${finalAttrs.version}";
hash = "sha256-IBYx362R2ueYNg7/vcjGa2kKAfGlPm6JcZ/A4XKtMT4=";
hash = "sha256-Dz+RE3Ejr7BcJBJq5+UMP2Pb6v8A2intn3LzozoWovE=";
};
sourceRoot = "${finalAttrs.src.name}/codex-rs";
cargoHash = "sha256-fWrZXXQfrm0L3epquDZUj0SuLRn3WiHX3nQA3d+xnUg=";
cargoHash = "sha256-0sCmo3/3kY+nCufATBySAif5Z/T89Le0UedVgCrZiW8=";
nativeBuildInputs = [
installShellFiles
makeBinaryWrapper
pkg-config
];
@@ -47,6 +50,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
--zsh <($out/bin/codex completion zsh)
'';
postFixup = ''
wrapProgram $out/bin/codex --prefix PATH : ${lib.makeBinPath [ ripgrep ]}
'';
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
+2 -2
View File
@@ -14,14 +14,14 @@
python3Packages.buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.138.0";
version = "1.138.2";
format = "pyproject";
src = fetchFromGitHub {
owner = "element-hq";
repo = "synapse";
rev = "v${version}";
hash = "sha256-mzBX5cLXF52p3SIq4rSvERbjyD07wRKVxL4yGsYNUaw=";
hash = "sha256-hnF0RPVH+5OBUZnaYCleTNLJYl9a+nf2PzJnLaJ5kzI=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
pkgs/by-name/pa/paretosecurity/package.nix
+3 -3
View File
@@ -17,16 +17,16 @@ buildGoModule (finalAttrs: {
webkitgtk_4_1
];
pname = "paretosecurity";
version = "0.3.6";
version = "0.3.8";
src = fetchFromGitHub {
owner = "ParetoSecurity";
repo = "agent";
rev = finalAttrs.version;
hash = "sha256-7orZ9+vLUooHOmgw/i1JP6wOFvGaChX+EujtuYipxm0=";
hash = "sha256-pqqcyWFyJX5IJkkLxAafbQu/8yygBsQL1/BAENFdk4g=";
};
vendorHash = "sha256-y9x5RplVOr4mIOPTg86VvFWXkvZ1FTc9Ulc/yXb9/WU=";
vendorHash = "sha256-6OQ9SPr9z+uoGeeJwo3jrr1nMECcHgULMvjn2G4uLx4=";
proxyVendor = true;
# Skip building the Windows installer
pkgs/by-name/pm/pmix/package.nix
+2 -2
View File
@@ -20,13 +20,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "pmix";
version = "5.0.8";
version = "5.0.9";
src = fetchFromGitHub {
repo = "openpmix";
owner = "openpmix";
tag = "v${finalAttrs.version}";
hash = "sha256-oYqDFXycNCYv0YK4VbkW5SQWLq+FTJEyY9rvH50nbYI=";
hash = "sha256-3z3NZPssaKBujulASYEJXwX/dhyCQxmRmjy31kOMpAQ=";
fetchSubmodules = true;
};
pkgs/by-name/po/postfix/package.nix
+3
View File
@@ -38,6 +38,9 @@ let
"-DUSE_CYRUS_SASL"
"-I${cyrus_sasl.dev}/include/sasl"
"-DHAS_DB_BYPASS_MAKEDEFS_CHECK"
# Fix build with gcc15, no upstream fix for stable releases:
# https://www.mail-archive.com/postfix-devel@postfix.org/msg01270.html
"-std=gnu17"
]
++ lib.optional withPgSQL "-DHAS_PGSQL"
++ lib.optionals withMySQL [
pkgs/by-name/ti/tigerbeetle/package.nix
+4 -4
View File
@@ -10,14 +10,14 @@ let
platform =
if stdenvNoCC.hostPlatform.isDarwin then "universal-macos" else stdenvNoCC.hostPlatform.system;
hash = builtins.getAttr platform {
"universal-macos" = "sha256-XVYnzs9BF35pdB9uKSoX/+DWa8drWls0rtrNO9IZJtE=";
"x86_64-linux" = "sha256-rNlAikb/DrFYnE/OEgTPz3G82bQCnySeOp6dZAWxFn4=";
"aarch64-linux" = "sha256-wNuy8hq9Zt2UP/4zI/lgkWHv3X/mIKhaKoN8b/WRS2U=";
"universal-macos" = "sha256-l9B4PHezptsADNNYw695Pv4vHQzPlv/JVgDDcCrJpdw=";
"x86_64-linux" = "sha256-ufO4AdWxReZBHKESrI3nlRkFnWMX7GXux1QkF04QhNU=";
"aarch64-linux" = "sha256-j+/WGP1oVyW0umClZL64JdEmu4BGWKxarWYSO9+KXlg=";
};
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "tigerbeetle";
version = "0.16.57";
version = "0.16.59";
src = fetchzip {
url = "https://github.com/tigerbeetle/tigerbeetle/releases/download/${finalAttrs.version}/tigerbeetle-${platform}.zip";
pkgs/by-name/un/unofficial-homestuck-collection/0001-disable-git-rev-check.patch
+47
View File
@@ -0,0 +1,47 @@
From 9f69077286540c75a245b44f6fd7b7cd03da2d44 Mon Sep 17 00:00:00 2001
From: Freya Murphy <freya@freyacat.org>
Date: Sun, 20 Jul 2025 11:53:51 -0400
Subject: [PATCH 1/3] disable git rev check
---
vue.config.js | 21 +++------------------
1 file changed, 3 insertions(+), 18 deletions(-)
diff --git a/vue.config.js b/vue.config.js
index 04b61d3..559b119 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,27 +1,12 @@
const webpack = require('webpack')
const { execSync } = require('child_process')
-const git_branch = execSync('git rev-parse --abbrev-ref HEAD').toString()
-
var build_info = {
- 'process.env.BUILD_BRANCH': JSON.stringify(
- git_branch.trim()
- ),
+ 'process.env.BUILD_BRANCH': "@git_branch@",
'process.env.BUILD_DATE': JSON.stringify(new Date().toISOString()),
'process.env.BUILD_PLATFORM': JSON.stringify(process.platform),
- 'process.env.BUILD_GIT_REVISION': JSON.stringify(
- execSync('git rev-parse HEAD').toString().trim()
- )
-}
-
-try {
- const git_remote = execSync(`git config --get branch.${git_branch.trim()}.remote`).toString()
- const git_remote_url = execSync(`git config --get remote.${git_remote.trim()}.url`).toString()
-
- build_info['process.env.BUILD_GIT_REMOTE'] = JSON.stringify(git_remote_url.trim())
-} catch (e) {
- build_info['process.env.BUILD_GIT_REMOTE'] = JSON.stringify("(no remote)")
- console.warn("No git remote")
+ 'process.env.BUILD_GIT_REVISION': "@git_revision@",
+ 'process.env.BUILD_GIT_REMOTE': "@git_remote@",
}
module.exports = {
--
2.50.1
pkgs/by-name/un/unofficial-homestuck-collection/0002-disable-update-check.patch
+63
View File
@@ -0,0 +1,63 @@
From 03ab3354eb9acb41c271238e7b9a5e77570809ae Mon Sep 17 00:00:00 2001
From: Freya Murphy <freya@freyacat.org>
Date: Sun, 20 Jul 2025 12:06:21 -0400
Subject: [PATCH 2/3] disable update check
---
src/components/SystemPages/Settings.vue | 15 +++++++++------
src/components/UIElements/Updater.vue | 13 +------------
2 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/src/components/SystemPages/Settings.vue b/src/components/SystemPages/Settings.vue
index 3371358..47c5ea6 100644
--- a/src/components/SystemPages/Settings.vue
+++ b/src/components/SystemPages/Settings.vue
@@ -598,12 +598,15 @@ export default {
label: "Use system window decorations",
desc: "Use OS-native window decorations instead of the electron title bar. <strong>Will restart the application.</strong>",
platform_whitelist: ['electron']
- }, {
- model: "allowSysUpdateNotifs",
- label: "Update notifications",
- desc: "Unless this setting is disabled, the collection will check to see if there's a new version of the app available when it starts up and alert you if there is.",
- platform_whitelist: ['electron']
- }, {
+ },
+ // MOD: patch out update notifs
+ // {
+ // model: "allowSysUpdateNotifs",
+ // label: "Update notifications",
+ // desc: "Unless this setting is disabled, the collection will check to see if there's a new version of the app available when it starts up and alert you if there is.",
+ // platform_whitelist: ['electron']
+ // },
+ {
model: "useTabbedBrowsing",
label: "Tabbed Browsing",
desc: "By default, the web app only shows one page at a time, like a standard website. This setting re-enables the in-app tab bar, and the app will store your tabs in settings.",
diff --git a/src/components/UIElements/Updater.vue b/src/components/UIElements/Updater.vue
index 6b3f677..d9bae45 100644
--- a/src/components/UIElements/Updater.vue
+++ b/src/components/UIElements/Updater.vue
@@ -73,18 +73,7 @@ export default {
watch: {
},
mounted(){
- const is_flatpak = !!(process.env.container)
- if (this.$localData.settings.allowSysUpdateNotifs && !is_flatpak) {
- const now = new Date()
- const last_checked = new Date(this.$localData.settings.lastCheckedUpdate)
- const one_day = (12 * 60 * 60 * 1000)
- if (last_checked == "Invalid Date" || now - last_checked > one_day) {
- this.doUpdateCheck()
- this.$localData.settings.lastCheckedUpdate = now.toISOString()
- } else {
- this.$logger.info("Skipping update check, already checked", last_checked)
- }
- }
+ // MOD: patch out update check
}
}
</script>
--
2.50.1
pkgs/by-name/un/unofficial-homestuck-collection/0003-make-compatible-with-native-electron.patch
+101
View File
@@ -0,0 +1,101 @@
From 6be6ba5922363b478eca447135cd2421f8c598ab Mon Sep 17 00:00:00 2001
From: Freya Murphy <freya@freyacat.org>
Date: Sun, 20 Jul 2025 12:01:12 -0400
Subject: [PATCH 3/3] make compatible with native electron
---
src/background.js | 15 +++++----------
src/components/SystemPages/Settings.vue | 12 +++++++-----
src/components/UIElements/MediaEmbed.vue | 20 ++------------------
3 files changed, 14 insertions(+), 33 deletions(-)
diff --git a/src/background.js b/src/background.js
index d75c5fc..6fa2256 100644
--- a/src/background.js
+++ b/src/background.js
@@ -314,16 +314,8 @@ if (assetDir === undefined) {
is_first_run = true
} else {
try {
- if (store.has('settings.ruffleFallback') && store.get('settings.ruffleFallback') === true) {
- logger.info("Ruffle fallback enabled, disabling ppapi-level flash player")
- } else {
- // Pick the appropriate flash plugin for the user's platform
- const flashPath = getFlashPath()
-
- if (fs.existsSync(flashPath)) {
- app.commandLine.appendSwitch('ppapi-flash-path', flashPath)
- } else throw Error(`Flash plugin not located at ${flashPath}`)
- }
+ // MOD: always use ruffle
+ logger.info("Ruffle fallback enabled, disabling ppapi-level flash player")
if (store.has('settings.smoothScrolling') && store.get('settings.smoothScrolling') === false)
app.commandLine.appendSwitch('disable-smooth-scrolling')
@@ -755,6 +747,9 @@ async function createWindow () {
autoHideMenuBar: true,
webPreferences: {
nodeIntegration: process.env.ELECTRON_NODE_INTEGRATION,
+ // MOD: disable isolation to get
+ // collection to work with electron 35
+ contextIsolation: false,
enableRemoteModule: true,
plugins: true,
webviewTag: true
diff --git a/src/components/SystemPages/Settings.vue b/src/components/SystemPages/Settings.vue
index 47c5ea6..5630625 100644
--- a/src/components/SystemPages/Settings.vue
+++ b/src/components/SystemPages/Settings.vue
@@ -619,11 +619,13 @@ export default {
label: "Reduce Motion",
desc: "Attempts to reduce the amount of automatic motion in the comic by replacing animated gifs with a manual scrubber, and requiring an explicit click before playing Flash animations.",
platform_whitelist: ['electron']
- }, {
- model: "ruffleFallback",
- label: "Ruffle flash emulation fallback",
- desc: "If the built-in flash player is non-functional, use the <a href='https://ruffle.rs/'>Ruffle</a> Flash emulator in place of Flash."
- }
+ },
+ // MOD: always use ruffle
+ // {
+ // model: "ruffleFallback",
+ // label: "Ruffle flash emulation fallback",
+ // desc: "If the built-in flash player is non-functional, use the <a href='https://ruffle.rs/'>Ruffle</a> Flash emulator in place of Flash."
+ // }
],
retconList: [
{
diff --git a/src/components/UIElements/MediaEmbed.vue b/src/components/UIElements/MediaEmbed.vue
index 760fec4..53f34ff 100644
--- a/src/components/UIElements/MediaEmbed.vue
+++ b/src/components/UIElements/MediaEmbed.vue
@@ -156,24 +156,8 @@ export default {
return ret
},
ruffleEmbed() {
- // At some point between 2025.3.14 and 2025.4.13 ruffle stopped supporting our old runtime. Damn. -->
- if (this.$localData.settings.ruffleFallback) {
- if (this.$isWebApp) {
- return '<script src="https://unpkg.com/@ruffle-rs/ruffle"><\/script>'
- } else {
- // 0.1.0-nightly.2024.04.13 OK
- // ...
- // 0.1.0-nightly.2024.07.19 OK
- // 0.1.0-nightly.2024.07.20 scale issue
- // ...
- // 0.1.0-nightly.2025.04.07 scale issue
- // 0.1.0-nightly.2025.04.13 syntax issue
- // return '<script src="https://unpkg.com/@ruffle-rs/ruffle@0.1.0-nightly.2024.7.19"><\/script>'
- return `<script src="${this.$getResourceURL("assets://js/ruffle/ruffle.js")}"><\/script>`
- }
- } else {
- return '<!-- Using real flash -->'
- }
+ // MOD: always use ruffle
+ return `<script src="${this.$getResourceURL("assets://js/ruffle/ruffle.js")}"><\/script>`
},
flashSrc() {
return `
--
2.50.1
pkgs/by-name/un/unofficial-homestuck-collection/electron-builder.yml
+21
View File
@@ -0,0 +1,21 @@
directories:
output: dist_electron
buildResources: build
app: dist_electron/bundled
files:
- filter:
- '**'
extends: null
appId: com.bambosh.unofficialhomestuckcollection
productName: The Unofficial Homestuck Collection
copyright: Copyright © 2025 GiovanH
protocols:
name: Unofficial Homestuck Collection
role: Viewer
schemes:
- mspa
linux:
asarUnpack:
- '**/*.node'
maintainer: GiovanH <uhscollection@icloud.com>
category: game
pkgs/by-name/un/unofficial-homestuck-collection/package.nix
+117
View File
@@ -0,0 +1,117 @@
{
lib,
stdenv,
electron,
fetchFromGitHub,
fetchurl,
fetchYarnDeps,
fixup-yarn-lock,
replaceVars,
writableTmpDirAsHomeHook,
makeWrapper,
nodejs,
yarn,
libglvnd,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "unofficial-homestuck-collection";
version = "2.7.2";
src = fetchFromGitHub {
owner = "GiovanH";
repo = "unofficial-homestuck-collection";
rev = "v${finalAttrs.version}";
hash = "sha256-0RPZfXdcdBo1OxJU3eSRF7fEO5EYMyJCcAZLEqzDMRk=";
};
patches = [
(replaceVars ./0001-disable-git-rev-check.patch {
git_branch = "'main'";
git_revision = "'${finalAttrs.src.rev}'";
git_remote = "'${finalAttrs.src.url}'";
})
./0002-disable-update-check.patch
./0003-make-compatible-with-native-electron.patch
];
offlineCache = fetchYarnDeps {
yarnLock = "${finalAttrs.src}/yarn.lock";
hash = "sha256-mo5Ir/pLoqc6K/0AOJqKC0yup7vx9UrNfQ+casIgBCo=";
};
nativeBuildInputs = [
fixup-yarn-lock
makeWrapper
nodejs
writableTmpDirAsHomeHook
yarn
];
configurePhase = ''
runHook preConfigure
# setup yarn
fixup-yarn-lock yarn.lock
yarn config --offline set ignore-engines true
yarn config --offline set yarn-offline-mirror $offlineCache
yarn install --offline --frozen-lockfile --ignore-scripts --no-progress
patchShebangs node_modules
# fixup node_modules
echo > node_modules/phantomjs-prebuilt/install.js
echo > node_modules/electron/index.js
runHook postConfigure
'';
buildPhase = ''
runHook preBuild
make src/imods.tar.gz
make src/js/crc_imods.json
env NODE_OPTIONS=--max_old_space_size=8192 \
yarn run vue-cli-service electron:build \
--dir \
-c.electronDist=${electron.dist} \
-c.electronVersion=${electron.version} \
--config ${./electron-builder.yml}
runHook postBuild
'';
installPhase = ''
runHook preInstall
for i in 16x16 24x24 48x48 64x64 128x128 256x256 512x512; do
install -Dm644 build/icons/$i.png $out/share/icons/hicolor/$i/apps/dev.bambosh.UnofficialHomestuckCollection.png
done
install -Dm644 build/dev.bambosh.UnofficialHomestuckCollection.metainfo.xml $out/share/metainfo/dev.bambosh.UnofficialHomestuckCollection.metainfo.xml
install -Dm644 build/dev.bambosh.UnofficialHomestuckCollection.desktop $out/share/applications/dev.bambosh.UnofficialHomestuckCollection.desktop
install -d $out/bin $out/share/unofficial-homestuck-collection
cp -r dist_electron/*-unpacked/{locales,resources{,.pak}} $out/share/unofficial-homestuck-collection
makeWrapper ${lib.getExe electron} $out/bin/unofficial-homestuck-collection \
--add-flags $out/share/unofficial-homestuck-collection/resources/app.asar \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
--add-flags --no-sandbox \
--set LD_LIBRARY_PATH "${
lib.makeLibraryPath [
libglvnd
]
}" \
--inherit-argv0
runHook postInstall
'';
meta = {
description = "Offline collection of Homestuck and its related works (ruffle only)";
homepage = "https://homestuck.giovanh.com/unofficial-homestuck-collection/";
changelog = "https://github.com/GiovanH/unofficial-homestuck-collection/releases/tag/v${finalAttrs.version}";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [
kenshineto
];
mainProgram = "unofficial-homestuck-collection";
platforms = lib.platforms.linux;
};
})
pkgs/by-name/vu/vuls/package.nix
+3 -3
View File
@@ -6,17 +6,17 @@
buildGo124Module rec {
pname = "vuls";
version = "0.34.0";
version = "0.35.0";
src = fetchFromGitHub {
owner = "future-architect";
repo = "vuls";
tag = "v${version}";
hash = "sha256-pmih1Nh5KESIrxmYuEku3lkG5oZvMNilzW77U2syExc=";
hash = "sha256-Vrfqn2hZiUyJX2bBw3skWfIxNgtWwFrmknE97gz91Q0=";
fetchSubmodules = true;
};
vendorHash = "sha256-4PbQvWS9IFkb9r+b92MJoSGxP4qDMQul4lGlaAEPP2k=";
vendorHash = "sha256-vhbHHhtDtwyrXZ/mSNKXwSSEzVZ2nCu/7Qs+LJEww5o=";
ldflags = [
"-s"
pkgs/by-name/xr/xremap/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
}:
let
pname = "xremap";
version = "0.13.0";
version = "0.14.0";
src = fetchFromGitHub {
owner = "xremap";
repo = "xremap";
tag = "v${version}";
hash = "sha256-h2vufEy4/Z3rSZFxXMDpqAkl16duSqwwmcUmVZ2owFo=";
hash = "sha256-UJcnlAwCbBDubMp0ScIK+RfN09UsC5kzFIFLIr80jfk=";
};
cargoHash = "sha256-AH3K7xmDxoit6i4/KWfyyL7rQS0nRkXuwuwmkfdojpU=";
cargoHash = "sha256-QcAF/zKWClvpnEaQP7wyEgYpQw9F3TmYdmu4Y38H+Aw=";
buildXremap =
{
pkgs/development/compilers/temurin-bin/generate-sources.py
+1 -1
View File
@@ -6,7 +6,7 @@ import re
import requests
import sys
feature_versions = (8, 11, 17, 21, 23, 24)
feature_versions = (8, 11, 17, 21, 23, 24, 25)
oses = ("mac", "linux", "alpine-linux")
types = ("jre", "jdk")
impls = ("hotspot",)
pkgs/development/compilers/temurin-bin/jdk-darwin.nix
+3
View File
@@ -24,4 +24,7 @@ in
jdk-24 = common { sourcePerArch = sources.jdk.openjdk24; };
jre-24 = common { sourcePerArch = sources.jre.openjdk24; };
jdk-25 = common { sourcePerArch = sources.jdk.openjdk25; };
jre-25 = common { sourcePerArch = sources.jre.openjdk25; };
}
pkgs/development/compilers/temurin-bin/jdk-linux.nix
+3
View File
@@ -29,4 +29,7 @@ in
jdk-24 = common { sourcePerArch = sources.jdk.openjdk24; };
jre-24 = common { sourcePerArch = sources.jre.openjdk24; };
jdk-25 = common { sourcePerArch = sources.jdk.openjdk25; };
jre-25 = common { sourcePerArch = sources.jre.openjdk25; };
}
pkgs/development/compilers/temurin-bin/sources.json
+120
View File
@@ -70,6 +70,22 @@
"version": "24.0.2"
}
},
"openjdk25": {
"aarch64": {
"build": "36",
"sha256": "1f18ba69ca7d674724307a66928a9b80049748b4276c629450935543db2cdfb1",
"url": "https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25%2B36/OpenJDK25U-jdk_aarch64_alpine-linux_hotspot_25_36.tar.gz",
"version": "25.0.0"
},
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
"build": "36",
"sha256": "637e47474d411ed86134f413af7d5fef4180ddb0bf556347b7e74a88cf8904c8",
"url": "https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25%2B36/OpenJDK25U-jdk_x64_alpine-linux_hotspot_25_36.tar.gz",
"version": "25.0.0"
}
},
"openjdk8": {
"packageType": "jdk",
"vmType": "hotspot",
@@ -150,6 +166,22 @@
"version": "24.0.2"
}
},
"openjdk25": {
"aarch64": {
"build": "36",
"sha256": "e88496ca31d2e0a0cdeeba385ab4ea668bbb53a03018f30c8933e97f4f9fda47",
"url": "https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25%2B36/OpenJDK25U-jre_aarch64_alpine-linux_hotspot_25_36.tar.gz",
"version": "25.0.0"
},
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
"build": "36",
"sha256": "aa5160aa130f0f0b4379fc62a0d5198c065815224e01318272864e56f260de34",
"url": "https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25%2B36/OpenJDK25U-jre_x64_alpine-linux_hotspot_25_36.tar.gz",
"version": "25.0.0"
}
},
"openjdk8": {
"packageType": "jre",
"vmType": "hotspot",
@@ -322,6 +354,34 @@
"version": "24.0.2"
}
},
"openjdk25": {
"aarch64": {
"build": "36",
"sha256": "95716d04bdfc8b10c94f4448ea8d57a3ba872d98b53c752e4c6b48f1c95bc582",
"url": "https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25%2B36/OpenJDK25U-jdk_aarch64_linux_hotspot_25_36.tar.gz",
"version": "25.0.0"
},
"packageType": "jdk",
"powerpc64le": {
"build": "36",
"sha256": "b060bb12b3a192a0599f03ebb9495492f78c48cb61e291e336a8b00e7798ffb0",
"url": "https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25%2B36/OpenJDK25U-jdk_ppc64le_linux_hotspot_25_36.tar.gz",
"version": "25.0.0"
},
"riscv64": {
"build": "36",
"sha256": "3fc35759502b620f010a9cd2b3da8454f8a49a156ceaebb00de1fd8335682d40",
"url": "https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25%2B36/OpenJDK25U-jdk_riscv64_linux_hotspot_25_36.tar.gz",
"version": "25.0.0"
},
"vmType": "hotspot",
"x86_64": {
"build": "36",
"sha256": "ee04de95ab9da7287d40bd2173076ecc2a6dd662f007bedfc6eb0380c0ef90e8",
"url": "https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25%2B36/OpenJDK25U-jdk_x64_linux_hotspot_25_36.tar.gz",
"version": "25.0.0"
}
},
"openjdk8": {
"aarch64": {
"build": "8",
@@ -516,6 +576,34 @@
"version": "24.0.2"
}
},
"openjdk25": {
"aarch64": {
"build": "36",
"sha256": "939a1517971985363b2b57b8c6008f4bd48b91f565366d6eb3bae3aa503a05e2",
"url": "https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25%2B36/OpenJDK25U-jre_aarch64_linux_hotspot_25_36.tar.gz",
"version": "25.0.0"
},
"packageType": "jre",
"powerpc64le": {
"build": "36",
"sha256": "f593d6c435f6498cfbdb1ca07d7b1fa33829b159abb31b992b6234c324794dad",
"url": "https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25%2B36/OpenJDK25U-jre_ppc64le_linux_hotspot_25_36.tar.gz",
"version": "25.0.0"
},
"riscv64": {
"build": "36",
"sha256": "3ec1d5906104fb273821a5865235b673fcd2b55674c5aee68d15b429fdc7837c",
"url": "https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25%2B36/OpenJDK25U-jre_riscv64_linux_hotspot_25_36.tar.gz",
"version": "25.0.0"
},
"vmType": "hotspot",
"x86_64": {
"build": "36",
"sha256": "5e3de13a1487ecc90f8b0cddc83a6cd4e053b4cd48ddcfe5d1f19178e6089fba",
"url": "https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25%2B36/OpenJDK25U-jre_x64_linux_hotspot_25_36.tar.gz",
"version": "25.0.0"
}
},
"openjdk8": {
"aarch64": {
"build": "8",
@@ -634,6 +722,22 @@
"version": "24.0.2"
}
},
"openjdk25": {
"aarch64": {
"build": "36",
"sha256": "6630ea0f19db61843a8fa84a84b2c71cd120c4155bb5a0e42a74593b0d70fee4",
"url": "https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25%2B36/OpenJDK25U-jdk_aarch64_mac_hotspot_25_36.tar.gz",
"version": "25.0.0"
},
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
"build": "36",
"sha256": "9eca779ae00a5e2e06744ed096be91ec52c2f545d8d9495e5b57fa2892bcca20",
"url": "https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25%2B36/OpenJDK25U-jdk_x64_mac_hotspot_25_36.tar.gz",
"version": "25.0.0"
}
},
"openjdk8": {
"packageType": "jdk",
"vmType": "hotspot",
@@ -726,6 +830,22 @@
"version": "24.0.2"
}
},
"openjdk25": {
"aarch64": {
"build": "36",
"sha256": "82e29c997cb50d8c011e689e25fc85c1a63958d12623ca94a58de08d1be14902",
"url": "https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25%2B36/OpenJDK25U-jre_aarch64_mac_hotspot_25_36.tar.gz",
"version": "25.0.0"
},
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
"build": "36",
"sha256": "70843c642a998d627aa3731535493fcb2ac94dac8ad5b24516fd89ebec094c4d",
"url": "https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25%2B36/OpenJDK25U-jre_x64_mac_hotspot_25_36.tar.gz",
"version": "25.0.0"
}
},
"openjdk8": {
"packageType": "jre",
"vmType": "hotspot",
pkgs/development/ocaml-modules/xtmpl/default.nix
+5 -4
View File
@@ -3,6 +3,7 @@
buildDunePackage,
fetchFromGitLab,
iri,
logs,
re,
sedlex,
uutf,
@@ -10,18 +11,18 @@
buildDunePackage rec {
pname = "xtmpl";
version = "0.19.0";
duneVersion = "3";
version = "1.1.0";
src = fetchFromGitLab {
domain = "framagit.org";
owner = "zoggy";
repo = "xtmpl";
rev = version;
sha256 = "sha256:0vwj0aayg60wm98d91fg3hmj90730liljy4cn8771dpxvz8m07bw";
tag = version;
hash = "sha256-CgVbSjHuRp+5IZdfkxGzaBP8p7pQdXu6S/MMgiPMw3E=";
};
propagatedBuildInputs = [
iri
logs
re
sedlex
uutf
pkgs/development/ocaml-modules/xtmpl/ppx.nix
-2
View File
@@ -6,8 +6,6 @@
buildDunePackage {
pname = "xtmpl_ppx";
minimalOCamlVersion = "4.11";
duneVersion = "3";
inherit (xtmpl) src version;
pkgs/development/python-modules/boto3-stubs/default.nix
+2 -2
View File
@@ -359,7 +359,7 @@
buildPythonPackage rec {
pname = "boto3-stubs";
version = "1.40.37";
version = "1.40.38";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -367,7 +367,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "boto3_stubs";
inherit version;
hash = "sha256-+fjxqvisDPM/59RhG3aZ8Xm63+KwBm1ZrpKPv4SwsrE=";
hash = "sha256-DReGNcerzovjkikXz9gnTmbCFpcQEnYFG65iWQNTOFI=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/msmart-ng/default.nix
+2 -2
View File
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "msmart-ng";
version = "2025.9.0";
version = "2025.9.2";
pyproject = true;
src = fetchFromGitHub {
owner = "mill1000";
repo = "midea-msmart";
tag = version;
hash = "sha256-pBAwEq1/fRLyJ9ioMmU5u1YgKQ6nW4+ol1HLh6/Wg8Y=";
hash = "sha256-+A3Mk/S5FZLe3y5J3olZ+kBlIlkLXlX92IdrvudFriE=";
};
build-system = [
pkgs/development/python-modules/mypy-boto3/default.nix
+10 -10
View File
@@ -130,8 +130,8 @@ rec {
"sha256-LNfDzqjQNQkvt61VHFc8aFdEBicRACvSmuM9W/SWQng=";
mypy-boto3-appstream =
buildMypyBoto3Package "appstream" "1.40.4"
"sha256-AgYaQp4AQUly5DO83NgCojU7cKOP5LdStYr1X3lMAE0=";
buildMypyBoto3Package "appstream" "1.40.38"
"sha256-YM34Xd3WnYAgCnUsZX6d3oO/z3TRtLHOuv7o2qfpZRo=";
mypy-boto3-appsync =
buildMypyBoto3Package "appsync" "1.40.0"
@@ -258,8 +258,8 @@ rec {
"sha256-ghgArlI9Z/rk9kM6k6b+0x/Fugp7q25+uV+Y2dZFtSU=";
mypy-boto3-cloudwatch =
buildMypyBoto3Package "cloudwatch" "1.40.27"
"sha256-81COvDAaq4MASZCpALSWhT9WTdTf0LgurwY44MPs0mc=";
buildMypyBoto3Package "cloudwatch" "1.40.38"
"sha256-JCKTfyeEvYsw8b2EOGJVh+Y6lgpzMFecj2y35o3K9Mo=";
mypy-boto3-codeartifact =
buildMypyBoto3Package "codeartifact" "1.40.17"
@@ -386,8 +386,8 @@ rec {
"sha256-I5xvx5UCp1h2H1c2xI6mSI4ZaXsONs/09/BJfRXCr3A=";
mypy-boto3-dax =
buildMypyBoto3Package "dax" "1.40.17"
"sha256-LjLWri3u0r973OARtntun5k18oNnKp2vUrEV8mkidbA=";
buildMypyBoto3Package "dax" "1.40.38"
"sha256-jzNdzI1E16m8/5XdD4nKVfyYFbisU5Kc59+0Ei+cnDo=";
mypy-boto3-detective =
buildMypyBoto3Package "detective" "1.40.14"
@@ -761,8 +761,8 @@ rec {
"sha256-ntnY800namdoyhCPe0Pg5573l2J75Wqd+yFat5KEaMc=";
mypy-boto3-kms =
buildMypyBoto3Package "kms" "1.40.0"
"sha256-n6tXvgy1xKbgCFW1Ynx0N5gGhLSG2GaTqF+Nf1lKfg8=";
buildMypyBoto3Package "kms" "1.40.38"
"sha256-QDYeiQE6F7nC1M1cazbXFmMhK6SCWmjdDWTObja94ws=";
mypy-boto3-lakeformation =
buildMypyBoto3Package "lakeformation" "1.40.19"
@@ -941,8 +941,8 @@ rec {
"sha256-w/km0Eq/rEX182tDtxVsFCm3bK2pUr1Fh6ZnsX6thAI=";
mypy-boto3-neptune =
buildMypyBoto3Package "neptune" "1.40.22"
"sha256-I2YroCl0veUVR3vJ+jXN09SU4oHjhrWS3fR3ZvTV6sY=";
buildMypyBoto3Package "neptune" "1.40.38"
"sha256-3vbUWdYw7jqTM5TPM3btPROlXPW1xR+3cI29ImVrt1w=";
mypy-boto3-neptunedata =
buildMypyBoto3Package "neptunedata" "1.40.0"
pkgs/development/python-modules/publicsuffixlist/default.nix
+2 -2
View File
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "publicsuffixlist";
version = "1.0.2.20250923";
version = "1.0.2.20250925";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-sQdK/pfT0VPdlXiv31nRtLspBRu0p7omWKVmeQlInkk=";
hash = "sha256-/Y3HJais185YGLoXHXAOHWWMl414rblSGP8L7NQIMc8=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/pycaption/default.nix
+6 -10
View File
@@ -1,7 +1,6 @@
{
lib,
buildPythonPackage,
pythonOlder,
fetchFromGitHub,
setuptools,
beautifulsoup4,
@@ -14,17 +13,14 @@
buildPythonPackage rec {
pname = "pycaption";
version = "2.2.16";
disabled = pythonOlder "3.8";
version = "2.2.18";
pyproject = true;
src = fetchFromGitHub {
owner = "pbs";
repo = "pycaption";
tag = version;
hash = "sha256-w617mOxvL1alj7jauH4TVsYO0wxMHIFjevdhb4+542s=";
hash = "sha256-7XI7vZiFNIvRD1enXC7SffqGIRMX6lPfcioLPJuszEk=";
};
build-system = [ setuptools ];
@@ -44,11 +40,11 @@ buildPythonPackage rec {
pytestCheckHook
];
meta = with lib; {
changelog = "https://github.com/pbs/pycaption/blob/${version}/docs/changelog.rst";
meta = {
changelog = "https://github.com/pbs/pycaption/blob/${src.tag}/docs/changelog.rst";
description = "Closed caption converter";
homepage = "https://github.com/pbs/pycaption";
license = licenses.asl20;
maintainers = with maintainers; [ dotlambda ];
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ dotlambda ];
};
}
pkgs/development/python-modules/pytransportnswv2/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pytransportnswv2";
version = "2.0.1";
version = "2.0.2";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "PyTransportNSWv2";
inherit version;
hash = "sha256-tFQnCGYgekXFrDXDpH8MZNlL1v9xeumMHmQvU6bwVZc=";
hash = "sha256-hJy3oUyi+7o3ICWNiPXv944SsfOHQJutIYYyXv9Phbg=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+2 -2
View File
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "tencentcloud-sdk-python";
version = "3.0.1464";
version = "3.0.1466";
pyproject = true;
src = fetchFromGitHub {
owner = "TencentCloud";
repo = "tencentcloud-sdk-python";
tag = version;
hash = "sha256-61K03CL8cF3B8rT0Wt8MuGql8ltRaE64gPiRe6k6Bqg=";
hash = "sha256-+kCnMw2gVSW6NL4Rt5lfRgtBSXTCaJJu2RVr8hRFkyo=";
};
build-system = [ setuptools ];
pkgs/servers/home-assistant/custom-components/midea_ac/package.nix
+2 -2
View File
@@ -10,13 +10,13 @@
buildHomeAssistantComponent rec {
owner = "mill1000";
domain = "midea_ac";
version = "2025.9.0";
version = "2025.9.1";
src = fetchFromGitHub {
owner = "mill1000";
repo = "midea-ac-py";
tag = version;
hash = "sha256-gpCxSTUQdkpLQWIHA2kKmM9bi21tCq1+du4qU5s+Uwk=";
hash = "sha256-fmVX+b7x4+172+mcJ8+LFhljQEQrhLFXwXn6eI1f36Y=";
};
dependencies = [ msmart-ng ];
pkgs/tools/admin/meshcentral/default.nix
+4 -4
View File
@@ -8,11 +8,11 @@
}:
yarn2nix-moretea.mkYarnPackage {
version = "1.1.50";
version = "1.1.51";
src = fetchzip {
url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.50.tgz";
sha256 = "1irjwypaygjf08y6p78dgfvmqd69i12bdm2zs87mkyq8igh8m8ph";
url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.51.tgz";
sha256 = "1l3x1rhcw38pg0rh27qyfg2dm5biwnyzicdd6l07c3km4x6xi5pr";
};
patches = [
@@ -24,7 +24,7 @@ yarn2nix-moretea.mkYarnPackage {
offlineCache = fetchYarnDeps {
yarnLock = ./yarn.lock;
hash = "sha256-rSkbrbI+AgBszwIRA30AfMK5hx/vvhx0MsDFHYMu7nQ=";
hash = "sha256-jmsRlHJgSrUtXwRcfX+tMH4SmrKVtD7gEK1+oW5mYIs=";
};
# Tarball has CRLF line endings. This makes patching difficult, so let's convert them.
pkgs/tools/admin/meshcentral/package.json
+2 -2
View File
@@ -1,6 +1,6 @@
{
"name": "meshcentral",
"version": "1.1.50",
"version": "1.1.51",
"keywords": [
"Remote Device Management",
"Remote Device Monitoring",
@@ -73,7 +73,7 @@
"jwt-simple": "*",
"openid-client": "5.7.1",
"passport-saml": "*",
"@duosecurity/duo_universal": "*",
"@duosecurity/duo_universal": "2.1.0",
"archiver": "7.0.1",
"body-parser": "1.20.3",
"cbor": "5.2.0",
pkgs/tools/admin/meshcentral/yarn.lock
+571 -546
View File
File diff suppressed because it is too large Load Diff
pkgs/top-level/all-packages.nix
+2
View File
@@ -4532,6 +4532,8 @@ with pkgs;
powerline = with python3Packages; toPythonApplication powerline;
### DEVELOPMENT / COMPILERS
temurin-bin-25 = javaPackages.compiler.temurin-bin.jdk-25;
temurin-jre-bin-25 = javaPackages.compiler.temurin-bin.jre-25;
temurin-bin-24 = javaPackages.compiler.temurin-bin.jdk-24;
temurin-jre-bin-24 = javaPackages.compiler.temurin-bin.jre-24;