Merge staging-next into staging

This commit is contained in:
nixpkgs-ci[bot] 2025-07-05 18:05:47 +00:00 committed by GitHub
commit 4ffb89ad41
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
118 changed files with 1317 additions and 547 deletions

View File

@ -6071,6 +6071,14 @@
github = "deinferno"; github = "deinferno";
githubId = 14363193; githubId = 14363193;
}; };
delafthi = {
name = "Thierry Delafontaine";
email = "delafthi@pm.me";
matrix = "@delafthi:matrix.org";
github = "delafthi";
githubId = 50531499;
keys = [ { fingerprint = "6DBB 0BB9 AEE6 2C2A 8059 7E1C 0092 6686 9818 63CB"; } ];
};
delehef = { delehef = {
name = "Franklin Delehelle"; name = "Franklin Delehelle";
email = "nix@odena.eu"; email = "nix@odena.eu";
@ -19829,12 +19837,6 @@
github = "pilz0"; github = "pilz0";
githubId = 48645439; githubId = 48645439;
}; };
pimeys = {
email = "julius@nauk.io";
github = "pimeys";
githubId = 34967;
name = "Julius de Bruijn";
};
pinage404 = { pinage404 = {
email = "pinage404+nixpkgs@gmail.com"; email = "pinage404+nixpkgs@gmail.com";
github = "pinage404"; github = "pinage404";

View File

@ -617,6 +617,9 @@
"module-services-nextcloud-httpd": [ "module-services-nextcloud-httpd": [
"index.html#module-services-nextcloud-httpd" "index.html#module-services-nextcloud-httpd"
], ],
"module-services-nextcloud-occ": [
"index.html#module-services-nextcloud-occ"
],
"installing-apps-php-extensions-nextcloud": [ "installing-apps-php-extensions-nextcloud": [
"index.html#installing-apps-php-extensions-nextcloud" "index.html#installing-apps-php-extensions-nextcloud"
], ],

View File

@ -251,8 +251,10 @@ PostgreSQL's versioning policy is described [here](https://www.postgresql.org/su
Technically, we'd not want to have EOL'ed packages in a stable NixOS release, which is to be supported until one month after the previous release. Thus, with NixOS' release schedule in May and November, the oldest PostgreSQL version in nixpkgs would have to be supported until December. It could be argued that a soon-to-be-EOL-ed version should thus be removed in May for the .05 release already. But since new security vulnerabilities are first disclosed in February of the following year, we agreed on keeping the oldest PostgreSQL major version around one more cycle in [#310580](https://github.com/NixOS/nixpkgs/pull/310580#discussion_r1597284693). Technically, we'd not want to have EOL'ed packages in a stable NixOS release, which is to be supported until one month after the previous release. Thus, with NixOS' release schedule in May and November, the oldest PostgreSQL version in nixpkgs would have to be supported until December. It could be argued that a soon-to-be-EOL-ed version should thus be removed in May for the .05 release already. But since new security vulnerabilities are first disclosed in February of the following year, we agreed on keeping the oldest PostgreSQL major version around one more cycle in [#310580](https://github.com/NixOS/nixpkgs/pull/310580#discussion_r1597284693).
Thus: Thus, our release workflow is as follows:
- In September/October the new major version will be released and added to nixos-unstable.
- In May, `nixpkgs` packages the beta release for an upcoming major version. This is packaged for nixos-unstable only and will not be part of any stable NixOS release.
- In September/October the new major version will be released, replacing the beta package in nixos-unstable.
- In November the last minor version for the oldest major will be released. - In November the last minor version for the oldest major will be released.
- Both the current stable .05 release and nixos-unstable should be updated to the latest minor that will usually be released in November. - Both the current stable .05 release and nixos-unstable should be updated to the latest minor that will usually be released in November.
- This is relevant for people who need to use this major for as long as possible. In that case its desirable to be able to pin nixpkgs to a commit that still has it, at the latest minor available. - This is relevant for people who need to use this major for as long as possible. In that case its desirable to be able to pin nixpkgs to a commit that still has it, at the latest minor available.

View File

@ -43,16 +43,6 @@ let
cfg = config.services.postgresql; cfg = config.services.postgresql;
# ensure that
# services.postgresql = {
# enableJIT = true;
# package = pkgs.postgresql_<major>;
# };
# works.
basePackage = if cfg.enableJIT then cfg.package.withJIT else cfg.package.withoutJIT;
postgresql = if cfg.extensions == [ ] then basePackage else basePackage.withPackages cfg.extensions;
toStr = toStr =
value: value:
if true == value then if true == value then
@ -72,13 +62,13 @@ let
); );
configFileCheck = pkgs.runCommand "postgresql-configfile-check" { } '' configFileCheck = pkgs.runCommand "postgresql-configfile-check" { } ''
${cfg.package}/bin/postgres -D${configFile} -C config_file >/dev/null ${cfg.finalPackage}/bin/postgres -D${configFile} -C config_file >/dev/null
touch $out touch $out
''; '';
groupAccessAvailable = versionAtLeast cfg.finalPackage.version "11.0"; groupAccessAvailable = versionAtLeast cfg.finalPackage.version "11.0";
extensionNames = map getName postgresql.installedExtensions; extensionNames = map getName cfg.finalPackage.installedExtensions;
extensionInstalled = extension: elem extension extensionNames; extensionInstalled = extension: elem extension extensionNames;
in in
@ -143,7 +133,18 @@ in
finalPackage = mkOption { finalPackage = mkOption {
type = types.package; type = types.package;
readOnly = true; readOnly = true;
default = postgresql; default =
let
# ensure that
# services.postgresql = {
# enableJIT = true;
# package = pkgs.postgresql_<major>;
# };
# works.
withJit = if cfg.enableJIT then cfg.package.withJIT else cfg.package.withoutJIT;
withJitAndPackages = if cfg.extensions == [ ] then withJit else withJit.withPackages cfg.extensions;
in
withJitAndPackages;
defaultText = "with config.services.postgresql; package.withPackages extensions"; defaultText = "with config.services.postgresql; package.withPackages extensions";
description = '' description = ''
The postgresql package that will effectively be used in the system. The postgresql package that will effectively be used in the system.
@ -636,6 +637,20 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
warnings = (
let
unstableState =
if lib.hasInfix "beta" cfg.package.version then
"in beta"
else if lib.hasInfix "rc" cfg.package.version then
"a release candidate"
else
null;
in
lib.optional (unstableState != null)
"PostgreSQL ${lib.versions.major cfg.package.version} is currently ${unstableState}, and is not advised for use in production environments."
);
assertions = map ( assertions = map (
{ name, ensureDBOwnership, ... }: { name, ensureDBOwnership, ... }:
{ {

View File

@ -45,6 +45,11 @@ let
${listToConf "add-priority-node" priorityNodes} ${listToConf "add-priority-node" priorityNodes}
${listToConf "add-exclusive-node" exclusiveNodes} ${listToConf "add-exclusive-node" exclusiveNodes}
${lib.optionalString prune ''
prune-blockchain=1
sync-pruned-blocks=1
''}
${extraConfig} ${extraConfig}
''; '';
@ -212,6 +217,15 @@ in
''; '';
}; };
prune = lib.mkOption {
type = lib.types.bool;
default = false;
description = ''
Whether to prune the blockchain.
https://www.getmonero.org/resources/moneropedia/pruning.html
'';
};
extraConfig = lib.mkOption { extraConfig = lib.mkOption {
type = lib.types.lines; type = lib.types.lines;
default = ""; default = "";

View File

@ -56,6 +56,37 @@ it's needed to add them to
Auto updates for Nextcloud apps can be enabled using Auto updates for Nextcloud apps can be enabled using
[`services.nextcloud.autoUpdateApps`](#opt-services.nextcloud.autoUpdateApps.enable). [`services.nextcloud.autoUpdateApps`](#opt-services.nextcloud.autoUpdateApps.enable).
## `nextcloud-occ` {#module-services-nextcloud-occ}
The management command [`occ`](https://docs.nextcloud.com/server/stable/admin_manual/occ_command.html) can be
invoked by using the `nextcloud-occ` wrapper that's globally available on a system with Nextcloud enabled.
It requires elevated permissions to become the `nextcloud` user. Given the way the privilege
escalation is implemented, parameters passed via the environment to Nextcloud (e.g. `OC_PASS`) are
currently ignored.
Custom service units that need to run `nextcloud-occ` either need elevated privileges
or the systemd configuration from `nextcloud-setup.service` (recommended):
```nix
{ config, ... }: {
systemd.services.my-custom-service = {
script = ''
nextcloud-occ …
'';
serviceConfig = {
inherit (config.systemd.services.nextcloud-cron.serviceConfig)
User
LoadCredential
KillMode;
};
};
}
```
Please note that the options required are subject to change. Please make sure to read the
release notes when upgrading.
## Common problems {#module-services-nextcloud-pitfalls-during-upgrade} ## Common problems {#module-services-nextcloud-pitfalls-during-upgrade}
- **General notes.** - **General notes.**

View File

@ -48,6 +48,6 @@ melpaBuild {
meta = { meta = {
description = "Core APIs of the Emacs binding for tree-sitter"; description = "Core APIs of the Emacs binding for tree-sitter";
license = lib.licenses.mit; license = lib.licenses.mit;
maintainers = with lib.maintainers; [ pimeys ]; maintainers = with lib.maintainers; [ ];
}; };
} }

View File

@ -30,18 +30,18 @@ let
in in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "mullvad"; pname = "mullvad";
version = "2025.6"; version = "2025.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mullvad"; owner = "mullvad";
repo = "mullvadvpn-app"; repo = "mullvadvpn-app";
tag = version; tag = version;
fetchSubmodules = true; fetchSubmodules = true;
hash = "sha256-WWJcfnp1v1LhEElJQdLx6Gz+bj7MdgbefD6BQ4nihMs="; hash = "sha256-q5RYgU7VlhTXAN0uQeHNTJ1eFCQZzymLo/eiKr805O8=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-r6WogC25hpzw2pHa8RQOhr9SWks9RKKatpVHblfs+Nc="; cargoHash = "sha256-UUYAmNdzTthoWOIU5wr7Q059MAezpuRvCadGTjwoKGM=";
cargoBuildFlags = [ cargoBuildFlags = [
"-p mullvad-daemon --bin mullvad-daemon" "-p mullvad-daemon --bin mullvad-daemon"
@ -95,7 +95,6 @@ rustPlatform.buildRustPackage rec {
cp dist-assets/ca.crt $out/share/mullvad cp dist-assets/ca.crt $out/share/mullvad
ln -s ${openvpn-mullvad}/bin/openvpn $out/share/mullvad ln -s ${openvpn-mullvad}/bin/openvpn $out/share/mullvad
ln -s ${shadowsocks-rust}/bin/sslocal $out/share/mullvad ln -s ${shadowsocks-rust}/bin/sslocal $out/share/mullvad
ln -s $out/lib/libtalpid_openvpn_plugin.so $out/share/mullvad
'' ''
+ +
# Set the directory where Mullvad will look for its resources by default to # Set the directory where Mullvad will look for its resources by default to
@ -123,7 +122,7 @@ rustPlatform.buildRustPackage rec {
meta = { meta = {
description = "Mullvad VPN command-line client tools"; description = "Mullvad VPN command-line client tools";
homepage = "https://github.com/mullvad/mullvadvpn-app"; homepage = "https://github.com/mullvad/mullvadvpn-app";
changelog = "https://github.com/mullvad/mullvadvpn-app/blob/2025.6/CHANGELOG.md"; changelog = "https://github.com/mullvad/mullvadvpn-app/blob/${version}/CHANGELOG.md";
license = lib.licenses.gpl3Only; license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ cole-h ]; maintainers = with lib.maintainers; [ cole-h ];
mainProgram = "mullvad"; mainProgram = "mullvad";

View File

@ -22,11 +22,11 @@ openvpn.overrideAttrs (
in in
rec { rec {
pname = "openvpn-mullvad"; pname = "openvpn-mullvad";
version = "2.6.0"; version = "2.6.8";
src = fetchurl { src = fetchurl {
url = "https://swupdate.openvpn.net/community/releases/openvpn-${version}.tar.gz"; url = "https://swupdate.openvpn.net/community/releases/openvpn-${version}.tar.gz";
sha256 = "sha256-6+yTMmPJhQ72984SXi8iIUvmCxy7jM/xiJJkP+CDro8="; sha256 = "sha256-Xt4VZcim2IAQD38jUxen7p7qg9UFLbVUfxOp52r3gF0=";
}; };
nativeBuildInputs = oldAttrs.nativeBuildInputs or [ ] ++ [ nativeBuildInputs = oldAttrs.nativeBuildInputs or [ ] ++ [
@ -69,38 +69,38 @@ openvpn.overrideAttrs (
# https://github.com/mullvad/openvpn/tags # https://github.com/mullvad/openvpn/tags
(fetchMullvadPatch { (fetchMullvadPatch {
# "Reduce PUSH_REQUEST_INTERVAL to one second" # "Reduce PUSH_REQUEST_INTERVAL to one second"
commit = "4084b49de84e64c56584a378e85faf37973b6d6d"; commit = "6fb5e33345831e2bb1df884343893b67ecb83be3";
sha256 = "sha256-MmYeFSw6c/QJh0LqLgkx+UxrbtTVv6zEFcnYEqznR1c="; sha256 = "sha256-MmYeFSw6c/QJh0LqLgkx+UxrbtTVv6zEFcnYEqznR1c=";
}) })
(fetchMullvadPatch { (fetchMullvadPatch {
# "Send an event to any plugins when authentication fails" # "Send an event to any plugins when authentication fails"
commit = "f24de7922d70c6e1ae06acf18bce1f62d9fa6b07"; commit = "96d5bf40610927684ed5d13f8b512b63e8f764ef";
sha256 = "sha256-RvlQbR6/s4NorYeA6FL7tE6geg6MIoZJtHeYxkVbdwA="; sha256 = "sha256-HsVx0ZlK7VIFSFet4bG+UEG9W38tavNIP/udesH+Mmg=";
}) })
(fetchMullvadPatch { (fetchMullvadPatch {
# "Shutdown when STDIN is closed" # "Shutdown when STDIN is closed"
commit = "81ae84271c044359b67991b15ebfb0cf9a32b3ad"; commit = "30708cefbd067928c896e3ef2420b22b82167ab8";
sha256 = "sha256-ilKMyU97ha2m0p1FD64aNQncnKo4Tyi/nATuD5yPmVw="; sha256 = "sha256-apL5CWc470DvleQ/pjracsTL+v0zT00apj5cTHWPQZs=";
}) })
(fetchMullvadPatch { (fetchMullvadPatch {
# "Undo dependency on Python docutils" # "Undo dependency on Python docutils"
commit = "a5064b4b6c598b68d8cabc3f4006e5addef1ec1e"; commit = "debde9db82d8c2bd4857482c5242722eb1c08e6a";
sha256 = "sha256-+B6jxL0M+W5LzeukXkir26hn1OaYnycVNBwMYFq6gsE="; sha256 = "sha256-UKbQa3MDTJLKg0kZ47N7Gier3a6HP2yB6A551yqhWZU=";
}) })
(fetchMullvadPatch { (fetchMullvadPatch {
# "Prevent signal when stdin is closed from being cleared (#10)" # "Prevent signal when stdin is closed from being cleared (#10)"
commit = "abe529e6d7f71228a036007c6c02624ec98ad6c1"; commit = "78812c51f3b2b6cb9efb73225e1002d055800889";
sha256 = "sha256-qJQeEtZO/+8kenXTKv4Bx6NltUYe8AwzXQtJcyhrjfc="; sha256 = "sha256-XaAE90nMgS862NZ5PWcdWKa0YClxr4S24Nq1OVXezTc=";
}) })
(fetchMullvadPatch { (fetchMullvadPatch {
# "Disable libcap-ng" # "Disable libcap-ng"
commit = "598014de7c063fa4e8ba1fffa01434229faafd04"; commit = "ca3d25f2eff82b5fbfe1012ce900a961d35b35de";
sha256 = "sha256-+cFX5gmMuG6XFkTs6IV7utiKRF9E47F5Pgo93c+zBXo="; sha256 = "sha256-6bEUJ1FHXi1mzxkAaNdrMIHVrhewWenhRnW53rr2o6E=";
}) })
(fetchMullvadPatch { (fetchMullvadPatch {
# "Remove libnsl dep" # "Remove libnsl dep"
commit = "845727e01ab3ec9bd58fcedb31b3cf2ebe2d5226"; commit = "2d9821971fb29fff7243b49292a74eedb4036236";
sha256 = "sha256-Via62wKVfMWHTmO7xIXXO7b5k0KYHs1D0JVg3qnXkeM="; sha256 = "sha256-Eeci6U6go1ujmbVQvIVM/xa4GSambLPSaowVIvtYlzQ=";
}) })
]; ];
postPatch = postPatch =

View File

@ -13,16 +13,16 @@
buildGoModule rec { buildGoModule rec {
pname = "netmaker"; pname = "netmaker";
version = "0.99.0"; version = "1.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gravitl"; owner = "gravitl";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-DUD6JTnTM3QVLhWIoRZ0Jc+Jre8GXtuKkV6MzLYCg4U="; hash = "sha256-CaN6sTD34hHAMwW90Ofe76me/vaO5rz7IlqQzEhgXQc=";
}; };
vendorHash = "sha256-QD9jkpsANzJeFHd4miShgACNOvI6sy38fs7pZNkPhms="; vendorHash = "sha256-Eo+7L1LffJXzsBwTcOMry2ZWUHBepLOcLm4bmkNMmLY=";
inherit subPackages; inherit subPackages;

View File

@ -19,16 +19,16 @@ let
}: }:
buildGoModule rec { buildGoModule rec {
pname = stname; pname = stname;
version = "1.29.5"; version = "1.29.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "syncthing"; owner = "syncthing";
repo = "syncthing"; repo = "syncthing";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-mM+llkF9aMFkMzLptcEz+nXyHcuMHt+dpnqkzJgOZqQ="; hash = "sha256-DEdXHthnCArVynSQLF01hEEKYn85+q9Bia+b3G2wL+Q=";
}; };
vendorHash = "sha256-5U0lsGSO4v++eMvz2r1rG5i/XPLbJAbvM9V66BKE6A8="; vendorHash = "sha256-j2eOKorXObhbDf3hR1ru/W4tnc/2e3dGtWcSjxkA10w=";
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
# Recent versions of macOS seem to require binaries to be signed when # Recent versions of macOS seem to require binaries to be signed when

View File

@ -23,11 +23,11 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "znc"; pname = "znc";
version = "1.9.1"; version = "1.10.0";
src = fetchurl { src = fetchurl {
url = "https://znc.in/releases/archive/znc-${finalAttrs.version}.tar.gz"; url = "https://znc.in/releases/archive/znc-${finalAttrs.version}.tar.gz";
hash = "sha256-6KfPgOGarVELTigur2G1a8MN+I6i4PZPrc3TA8SJTzw="; hash = "sha256-vmWtm2LvVFp+lIby90E07cU7pROtQ6adnYtHZgUzaxk=";
}; };
postPatch = '' postPatch = ''

View File

@ -6,13 +6,13 @@
flutter329.buildFlutterApplication rec { flutter329.buildFlutterApplication rec {
pname = "convertall"; pname = "convertall";
version = "1.0.1"; version = "1.0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "doug-101"; owner = "doug-101";
repo = "ConvertAll"; repo = "ConvertAll";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-wsSe7dVjEgLDOIavcMzdxW9LKZcZPaQMcw4RhsPS0jU="; hash = "sha256-esc2xhL0Jx5SaqM0GnnVzdtnSN9bX8zln66We/2RqoA=";
}; };
pubspecLock = lib.importJSON ./pubspec.lock.json; pubspecLock = lib.importJSON ./pubspec.lock.json;

View File

@ -11,16 +11,16 @@
buildGoModule rec { buildGoModule rec {
pname = "amazon-cloudwatch-agent"; pname = "amazon-cloudwatch-agent";
version = "1.300056.1"; version = "1.300057.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aws"; owner = "aws";
repo = "amazon-cloudwatch-agent"; repo = "amazon-cloudwatch-agent";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-toal+jvPXxe+SPurFHUBqi2YzImaRshp0sDE6yZ0bkE="; hash = "sha256-8ZjShOsTpzvXHR/q6PztbFgFbmxcAFcj6MuACOuOBBw=";
}; };
vendorHash = "sha256-UU8o2kCRCY0FdoqsBovTsu42DFy7VD1kdI+tOA3l/Ac="; vendorHash = "sha256-8pffeYCIzEYu7fLx0F6Dw0gDJMGVTctV/j8WGDySDJY=";
# See the list in https://github.com/aws/amazon-cloudwatch-agent/blob/v1.300049.1/Makefile#L68-L77. # See the list in https://github.com/aws/amazon-cloudwatch-agent/blob/v1.300049.1/Makefile#L68-L77.
subPackages = [ subPackages = [

View File

@ -3,6 +3,7 @@
stdenv, stdenv,
fetchFromGitHub, fetchFromGitHub,
fetchpatch2, fetchpatch2,
file,
python3Packages, python3Packages,
rsync, rsync,
versionCheckHook, versionCheckHook,
@ -30,6 +31,12 @@ python3Packages.buildPythonApplication rec {
}) })
]; ];
# https://github.com/EnterpriseDB/barman/blob/release/3.14.1/barman/encryption.py#L214
postPatch = ''
substituteInPlace barman/encryption.py \
--replace-fail '"file"' '"${lib.getExe file}"'
'';
build-system = with python3Packages; [ build-system = with python3Packages; [
distutils distutils
setuptools setuptools

View File

@ -16,13 +16,13 @@
buildNpmPackage rec { buildNpmPackage rec {
pname = "basedpyright"; pname = "basedpyright";
version = "1.29.4"; version = "1.29.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "detachhead"; owner = "detachhead";
repo = "basedpyright"; repo = "basedpyright";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-LT0ZixIxUXqNyK08ue+fbDAk/g+ibJVWQbi/LLrdLuM="; hash = "sha256-fD7A37G1kr7sWfwI8GXOm1cOlpnTSE9tN/WzotM8BeQ=";
}; };
npmDepsHash = "sha256-aJte4ApeXJQ9EYn87Uo+Xx7s+wi80I1JsZHeqklHGs4="; npmDepsHash = "sha256-aJte4ApeXJQ9EYn87Uo+Xx7s+wi80I1JsZHeqklHGs4=";

View File

@ -9,13 +9,13 @@
buildGoModule rec { buildGoModule rec {
pname = "bazel-watcher"; pname = "bazel-watcher";
version = "0.26.1"; version = "0.26.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bazelbuild"; owner = "bazelbuild";
repo = "bazel-watcher"; repo = "bazel-watcher";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-OtyCFwERUFpFGUnPABPXkfXYKvxVparLsj9KlZdBwJQ="; hash = "sha256-Hefg6PZfmuGUCEuYNwpJOkwPqt87qd1GpEG+IutPhDo=";
}; };
vendorHash = "sha256-H1Bqw5hbOLS4oJeQOdIXQ9c2H8jGtoW1J75BIkTNR9k="; vendorHash = "sha256-H1Bqw5hbOLS4oJeQOdIXQ9c2H8jGtoW1J75BIkTNR9k=";

View File

@ -16,13 +16,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bees"; pname = "bees";
version = "0.10"; version = "0.11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Zygo"; owner = "Zygo";
repo = "bees"; repo = "bees";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-f3P3BEd8uO6QOZ1/2hBzdcuOSggYvHxW3g9pGftKO8g="; hash = "sha256-qaiRWRd9+ElJ40QGOS3AxT2NvF3phQCyPnVz6RfTt8c=";
}; };
buildInputs = [ buildInputs = [

View File

@ -16,11 +16,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bililiverecorder"; pname = "bililiverecorder";
version = "2.17.0"; version = "2.17.1";
src = fetchzip { src = fetchzip {
url = "https://github.com/BililiveRecorder/BililiveRecorder/releases/download/v${version}/BililiveRecorder-CLI-any.zip"; url = "https://github.com/BililiveRecorder/BililiveRecorder/releases/download/v${version}/BililiveRecorder-CLI-any.zip";
hash = "sha256-6ucOngVWbtPQ1HTNrmbd15JTuzOPMt0Bj4QaoqUEUDQ="; hash = "sha256-XgZPnPwIbUn/KNou1VXp8QbYJL5U5bVs/bLWx43bh7w=";
stripRoot = false; stripRoot = false;
}; };

View File

@ -29,11 +29,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "blueman"; pname = "blueman";
version = "2.4.4"; version = "2.4.6";
src = fetchurl { src = fetchurl {
url = "https://github.com/blueman-project/blueman/releases/download/${version}/${pname}-${version}.tar.xz"; url = "https://github.com/blueman-project/blueman/releases/download/${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-00+RVMjGiH0VZ50Sl0SSKscvanHLK8z7ZmL4ykRuhfA="; sha256 = "sha256-xxKnN/mFWQZoTAdNFm1PEMfxZTeK+WYSgYu//Pv45WY=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -1,11 +1,11 @@
{ {
version = "3.9.0"; version = "3.9.1";
x86_64-linux = { x86_64-linux = {
url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-3.9.0-linux.deb"; url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-3.9.1-linux.deb";
sha256 = "sha256-OG+oZr5UHIjrQOxPmLs/DzGJuUAd5pAyvLuTOvhC+20="; sha256 = "sha256-BKfvV9oCzmIS/B1xoPmDELyT8MPLnGCoZ2sXk2aMh5A=";
}; };
x86_64-darwin = { x86_64-darwin = {
url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-3.9.0-mac.dmg"; url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-3.9.1-mac.dmg";
sha256 = "sha256-Tvb2Cum/Bavu+VAVS/1O7pxSIVLdP2XzTG27fhgIh9E="; sha256 = "sha256-NzxNOkncfZkaEaHqmrS4Xz0R5yly7yOff6+/czYgmB0=";
}; };
} }

View File

@ -12,17 +12,17 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "brush"; pname = "brush";
version = "0.2.19"; version = "0.2.20";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "reubeno"; owner = "reubeno";
repo = "brush"; repo = "brush";
tag = "brush-shell-v${version}"; tag = "brush-shell-v${version}";
hash = "sha256-IwBPeOD4BNaeDWlZBWfixhrpMtPu3mcbCFVDMMa8UmY="; hash = "sha256-yPd/dU/GOnx+R8tqkvWs+WsN0Zb6AHFITaE+N4m2rco=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-Z2K+0q8sPsudMhw+IY4Aq+gt9bSPRau0Z6cwpi98c+s="; cargoHash = "sha256-IrjBd+RswBjk/2QW0syU4Hkj2rLfOn/W+czvdEw86RE=";
nativeInstallCheckInputs = [ nativeInstallCheckInputs = [
versionCheckHook versionCheckHook

View File

@ -6,17 +6,17 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cargo-mutants"; pname = "cargo-mutants";
version = "25.1.0"; version = "25.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sourcefrog"; owner = "sourcefrog";
repo = "cargo-mutants"; repo = "cargo-mutants";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-boT8jptZSGTITBQzFBHIcZnQMlRKctCFoGllcZZ0Onw="; hash = "sha256-//OUOf4RUM69tHBB17p4OSs/cCvv0HnDjyRUzUZc8KE=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-iKK5sZKUSWB5+FfbGXaZndzGT023fU+0f6/g9YRJszA="; cargoHash = "sha256-QZrpH0nJ6a9AQAKNp/tkT1hpkUMWa2kh8kek2rY8wO4=";
# too many tests require internet access # too many tests require internet access
doCheck = false; doCheck = false;

View File

@ -9,17 +9,17 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cargo-shuttle"; pname = "cargo-shuttle";
version = "0.55.0"; version = "0.56.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "shuttle-hq"; owner = "shuttle-hq";
repo = "shuttle"; repo = "shuttle";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-/IsK0uH9Kbs5Sjhi7IErug2LyucBuOZJeWW7oz8q3c0="; hash = "sha256-Fr31BNTI8pVXHSSu46XPvlb0ic/S011OLWsLEfAZI4M=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-buSUvA9gB82SOc3nnAQyLIasd6UKeNn/hurq7euDWwE="; cargoHash = "sha256-2YnwBAt2M2MkMhraKlk+BXxaNQ+iZSKzlUER1GBPbCI=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

View File

@ -8,17 +8,17 @@
rustPlatform.buildRustPackage (finalAttrs: { rustPlatform.buildRustPackage (finalAttrs: {
pname = "cfspeedtest"; pname = "cfspeedtest";
version = "1.3.4"; version = "1.4.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "code-inflation"; owner = "code-inflation";
repo = "cfspeedtest"; repo = "cfspeedtest";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-6ea9qOAFP7+1UIrGASFiAPyem+VDVgzrgD44ELsXRzc="; hash = "sha256-MWHZllH0QVylmvwEwCX2uhNSEx9p5xEeW0u/zGyjNZE=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-uyLd4KQa9zWMCuurpdQv0OnCSguE180dm6FzHR+nC40="; cargoHash = "sha256-wTytRbue26KVaGb3LarTCNdq56psIayVDul4iQkwH2s=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];
@ -32,6 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
meta = { meta = {
description = "Unofficial CLI for speed.cloudflare.com"; description = "Unofficial CLI for speed.cloudflare.com";
homepage = "https://github.com/code-inflation/cfspeedtest"; homepage = "https://github.com/code-inflation/cfspeedtest";
changelog = "https://github.com/code-inflation/cfspeedtest/releases/tag/${finalAttrs.src.tag}";
license = with lib.licenses; [ mit ]; license = with lib.licenses; [ mit ];
maintainers = with lib.maintainers; [ maintainers = with lib.maintainers; [
colemickens colemickens

View File

@ -6,19 +6,19 @@
buildGoModule rec { buildGoModule rec {
pname = "coreth"; pname = "coreth";
version = "0.14.0"; version = "0.15.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ava-labs"; owner = "ava-labs";
repo = "coreth"; repo = "coreth";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-YUqrbTjye0eNNuf9hGQXtMidRq6y3m3pSKzIRVECy9E="; hash = "sha256-YPL/CJIAB/hkUrvyY0jcHWNKry6ddeO2mpxBiutNNMU=";
}; };
# go mod vendor has a bug, see: golang/go#57529 # go mod vendor has a bug, see: golang/go#57529
proxyVendor = true; proxyVendor = true;
vendorHash = "sha256-T6HvvvD4potKdcVUnUo2cfTwJkMCggbroTwpBToUE30="; vendorHash = "sha256-SGOg2xHWcwJc4j6RcR2KaicXrBkwY2PtknVEvQtatGs=";
ldflags = [ ldflags = [
"-s" "-s"

View File

@ -10,13 +10,13 @@
buildGoModule (finalAttrs: { buildGoModule (finalAttrs: {
pname = "databricks-cli"; pname = "databricks-cli";
version = "0.257.0"; version = "0.258.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "databricks"; owner = "databricks";
repo = "cli"; repo = "cli";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-1HLQl6tYzTMnpZholpo0grljTxCoptYfQZzRk9+gFQU="; hash = "sha256-8JVU0tn0KINBdEE0nS2VQ8v9TUn9h2euPGZELSCbcLA=";
}; };
# Otherwise these tests fail asserting that the version is 0.0.0-dev # Otherwise these tests fail asserting that the version is 0.0.0-dev
@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
--replace-fail "cli/0.0.0-dev" "cli/${finalAttrs.version}" --replace-fail "cli/0.0.0-dev" "cli/${finalAttrs.version}"
''; '';
vendorHash = "sha256-J3tu50ci9WBa0gLf3FWt2pRkeSSdVX+YlMjYU+5n2+U="; vendorHash = "sha256-veFhCZkkLnC6hVuHPiB+OjqsvUcxkp3B59lQikgjFbE=";
excludedPackages = [ excludedPackages = [
"bundle/internal" "bundle/internal"

View File

@ -7,6 +7,7 @@
openjdk21, openjdk21,
gnused, gnused,
autoPatchelfHook, autoPatchelfHook,
autoSignDarwinBinariesHook,
wrapGAppsHook3, wrapGAppsHook3,
gtk3, gtk3,
glib, glib,
@ -50,7 +51,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
wrapGAppsHook3 wrapGAppsHook3
autoPatchelfHook autoPatchelfHook
] ]
++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [ undmg ]; ++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [
undmg
autoSignDarwinBinariesHook
];
dontConfigure = true; dontConfigure = true;
dontBuild = true; dontBuild = true;
@ -119,9 +123,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
mkdir -p $out/{Applications/dbeaver.app,bin} mkdir -p $out/{Applications/dbeaver.app,bin}
cp -R . $out/Applications/dbeaver.app cp -R . $out/Applications/dbeaver.app
makeWrapper $out/{Applications/dbeaver.app/Contents/MacOS,bin}/dbeaver \ wrapProgram $out/Applications/dbeaver.app/Contents/MacOS/dbeaver \
--prefix PATH : "${openjdk21}/bin" \ --prefix PATH : "${openjdk21}/bin" \
--set JAVA_HOME "${openjdk21.home}" --set JAVA_HOME "${openjdk21.home}"
makeWrapper $out/{Applications/dbeaver.app/Contents/MacOS/dbeaver,bin/dbeaver}
runHook postInstall runHook postInstall
''; '';

View File

@ -15,13 +15,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "dump1090"; pname = "dump1090";
version = "10.1"; version = "10.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "flightaware"; owner = "flightaware";
repo = "dump1090"; repo = "dump1090";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-8J17fqNrn5Mqqv4lFHEp4zjc/zeyMUb+fWdk+ssPBwU="; hash = "sha256-kTJ8FMugBRJaxWas/jEj4E5TmVnNpNdhq4r2YFFwgTU=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

View File

@ -47,6 +47,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/awslabs/dynein"; homepage = "https://github.com/awslabs/dynein";
license = licenses.asl20; license = licenses.asl20;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ pimeys ]; maintainers = with maintainers; [ ];
}; };
} }

View File

@ -7,14 +7,14 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "esptool"; pname = "esptool";
version = "4.8.1"; version = "4.9.0";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "espressif"; owner = "espressif";
repo = "esptool"; repo = "esptool";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-cNEg2a3j7Vql06GwVaE9y86UtMkNsUdJYM00OEUra2w="; hash = "sha256-iIFjInqiqjeqiDYL7BU3vT99pCVnu8OhU7u9uKwe/SI=";
}; };
postPatch = '' postPatch = ''
@ -71,7 +71,7 @@ python3Packages.buildPythonApplication rec {
''; '';
meta = with lib; { meta = with lib; {
changelog = "https://github.com/espressif/esptool/blob/${src.rev}/CHANGELOG.md"; changelog = "https://github.com/espressif/esptool/blob/${src.tag}/CHANGELOG.md";
description = "ESP8266 and ESP32 serial bootloader utility"; description = "ESP8266 and ESP32 serial bootloader utility";
homepage = "https://github.com/espressif/esptool"; homepage = "https://github.com/espressif/esptool";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;

View File

@ -8,18 +8,18 @@
buildGoModule rec { buildGoModule rec {
pname = "filebeat"; pname = "filebeat";
version = "8.18.2"; version = "8.18.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "elastic"; owner = "elastic";
repo = "beats"; repo = "beats";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-8gpmrWBiJr5ibVNMqz/RYyOH7vIVTW1IPAsuDTn1BKc="; hash = "sha256-Lg+3M4zw0m7URBvC2G3aasXG7owc8JslMX4kI95qSCU=";
}; };
proxyVendor = true; # darwin/linux hash mismatch proxyVendor = true; # darwin/linux hash mismatch
vendorHash = "sha256-wBh6mWg1xuhcaDA3guWTWjs4WgSHkNGPW/6KWuZ5L7w="; vendorHash = "sha256-2Rl4OJOMbt74QVb57Or2JklYSjTFRkly5GXrW0LAkoI=";
subPackages = [ "filebeat" ]; subPackages = [ "filebeat" ];

View File

@ -6,17 +6,17 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "flake-checker"; pname = "flake-checker";
version = "0.2.7"; version = "0.2.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "DeterminateSystems"; owner = "DeterminateSystems";
repo = "flake-checker"; repo = "flake-checker";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-RwkyyrWm0QRNOn7Bb9jKOyJ049B6pPmhbrx8tXpUf4w="; hash = "sha256-elHpiMGwJ2KnN75EOTjsjpziYfXiRyTeixhY4rd85m0=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-lB7+2dQGfbn7IhmCAN0jvFTGjJDBpw57VHi3qIwwOZ4="; cargoHash = "sha256-QS38tAJ1V0Avd7N+Mhexv23oh+kxtmr/qvQZLRwP9zA=";
meta = with lib; { meta = with lib; {
description = "Health checks for your Nix flakes"; description = "Health checks for your Nix flakes";

View File

@ -16,17 +16,17 @@
rustPlatform.buildRustPackage { rustPlatform.buildRustPackage {
pname = "forecast"; pname = "forecast";
version = "0-unstable-2025-05-25"; version = "0-unstable-2025-07-03";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cosmic-utils"; owner = "cosmic-utils";
repo = "forecast"; repo = "forecast";
rev = "a31dacc0430fb9065755e53856ed925aa866d1ff"; rev = "066dfdd33bb9df6e70e0567ed87f1dd4107328be";
hash = "sha256-xi5HxDL2YS9LXIgeNxR5ZszMrbtifplysEfxfRj/Ik0="; hash = "sha256-5XBB0kQ6gJVO4NT+RbWw0QUA3RHr7iIeIcNB/66w+FA=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-cLObhwMVnaj1HvMhCgSQOYN7IRPKcSeYuAfIy2V5Fns="; cargoHash = "sha256-mZ6nVQo83/o1fAVcHJGPqulBaQtE/8MJk3eLBAUoMmc=";
nativeBuildInputs = [ nativeBuildInputs = [
libcosmicAppHook libcosmicAppHook

View File

@ -7,16 +7,16 @@
buildGoModule rec { buildGoModule rec {
pname = "frp"; pname = "frp";
version = "0.62.1"; version = "0.63.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fatedier"; owner = "fatedier";
repo = "frp"; repo = "frp";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-es8xngdSLLQ3/S0xdFGW7Pa4BJISo51oWPl1GE+7tBo="; hash = "sha256-xTR273szc1UWTaZ+kT6+Vur/EE2YxfF8gnUQwNz/dxY=";
}; };
vendorHash = "sha256-koeOCkqYy1TUYXp2I7M+BIjmQEJGXtizOnqJuvzhHJM="; vendorHash = "sha256-MNGn/ES+gfSFPTz/EeefmFlICg0e5fAMOBPB/jt4CDM=";
doCheck = false; doCheck = false;

View File

@ -13,13 +13,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "git-repo"; pname = "git-repo";
version = "2.55.2"; version = "2.56";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "android"; owner = "android";
repo = "tools_repo"; repo = "tools_repo";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-81MNrVtJfInjUuyV6c7xeCPGtY3B3YnO7GSKOSyUvTU="; hash = "sha256-zCmLFo3ssfO28F0mHnkQYbd7X/ncpulSzqS+fwfYAO8=";
}; };
# Fix 'NameError: name 'ssl' is not defined' # Fix 'NameError: name 'ssl' is not defined'

View File

@ -13,13 +13,13 @@
buildGoModule rec { buildGoModule rec {
pname = "git-town"; pname = "git-town";
version = "21.1.0"; version = "21.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "git-town"; owner = "git-town";
repo = "git-town"; repo = "git-town";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-T+5qZBziXiCeCJJaW/EcbgnRLv+AUKDD4ODKbJKvbjY="; hash = "sha256-/d3HXTkbb2z7+e141pquhDVvl+veFD6Z7m64026Xak4=";
}; };
vendorHash = null; vendorHash = null;

View File

@ -9,16 +9,16 @@
buildGoModule rec { buildGoModule rec {
pname = "goatcounter"; pname = "goatcounter";
version = "2.5.0"; version = "2.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "arp242"; owner = "arp242";
repo = "goatcounter"; repo = "goatcounter";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-lwiLk/YYxX4QwSDjpU/mAikumGXYMzleRzmPjZGruZU="; hash = "sha256-MF4ipSZfN5tAphe+gde7SPAypyi1uRyaDBv58u3lEQE=";
}; };
vendorHash = "sha256-YAb3uBWQc6hWzF1Z5cAg8RzJQSJV+6dkppfczKS832s="; vendorHash = "sha256-cwR3wCRbvISKyhHCnIYDIGSZ+1DowfGT4RAkF/d6F5Q=";
subPackages = [ "cmd/goatcounter" ]; subPackages = [ "cmd/goatcounter" ];
modRoot = "."; modRoot = ".";

View File

@ -14,8 +14,7 @@
nlohmann_json, nlohmann_json,
openssl, openssl,
pkg-config, pkg-config,
# upstream PR to update: https://github.com/googleapis/google-cloud-cpp/pull/14974 protobuf_31,
protobuf_29,
pkgsBuildHost, pkgsBuildHost,
# default list of APIs: https://github.com/googleapis/google-cloud-cpp/blob/v1.32.1/CMakeLists.txt#L173 # default list of APIs: https://github.com/googleapis/google-cloud-cpp/blob/v1.32.1/CMakeLists.txt#L173
apis ? [ "*" ], apis ? [ "*" ],
@ -23,24 +22,24 @@
}: }:
let let
# defined in cmake/GoogleapisConfig.cmake # defined in cmake/GoogleapisConfig.cmake
googleapisRev = "6a474b31c53cc1797710206824a17b364a835d2d"; googleapisRev = "f01a17a560b4fbc888fd552c978f4e1f8614100b";
googleapis = fetchFromGitHub { googleapis = fetchFromGitHub {
name = "googleapis-src"; name = "googleapis-src";
owner = "googleapis"; owner = "googleapis";
repo = "googleapis"; repo = "googleapis";
rev = googleapisRev; rev = googleapisRev;
hash = "sha256-t5oX6Gc1WSMSBDftXA9RZulckUenxOEHBYeq2qf8jnY="; hash = "sha256-eJA3KM/CZMKTR3l6omPJkxqIBt75mSNsxHnoC+1T4gw=";
}; };
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "google-cloud-cpp"; pname = "google-cloud-cpp";
version = "2.29.0"; version = "2.38.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "googleapis"; owner = "googleapis";
repo = "google-cloud-cpp"; repo = "google-cloud-cpp";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-gCq8Uc+s/rnJWsGlI7f+tvAZHH8K69+H/leUOKE2GCY="; sha256 = "sha256-TF3MLBmjUbKJkZVcaPXbagXrAs3eEhlNQBjYQf0VtT8=";
}; };
patches = [ patches = [
@ -62,7 +61,7 @@ stdenv.mkDerivation rec {
grpc grpc
nlohmann_json nlohmann_json
openssl openssl
protobuf_29 protobuf_31
gbenchmark gbenchmark
gtest gtest
]; ];

View File

@ -6,10 +6,10 @@
}: }:
let let
pname = "hydralauncher"; pname = "hydralauncher";
version = "3.6.1"; version = "3.6.2";
src = fetchurl { src = fetchurl {
url = "https://github.com/hydralauncher/hydra/releases/download/v${version}/hydralauncher-${version}.AppImage"; url = "https://github.com/hydralauncher/hydra/releases/download/v${version}/hydralauncher-${version}.AppImage";
hash = "sha256-NKQzOPujPEIPKq3GAphkNijOq9tVAyUy2yCOKZaJHbE="; hash = "sha256-ybSTrglU0ktDJahGtqoTBVqqCPATtQYgo83Bd53HSeM=";
}; };
appimageContents = appimageTools.extractType2 { inherit pname src version; }; appimageContents = appimageTools.extractType2 { inherit pname src version; };

View File

@ -16,14 +16,14 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "hydrus"; pname = "hydrus";
version = "624"; version = "627";
format = "other"; format = "other";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hydrusnetwork"; owner = "hydrusnetwork";
repo = "hydrus"; repo = "hydrus";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-fdg4ym3OT1OIG6gkYf1Y8PmKG2uxgnuEc7bCTJ11z/0="; hash = "sha256-7zV+sQ22hrvCqMk7ePlAhSYG2495pEAyZYrep3NYoXE=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -9,13 +9,13 @@
}: }:
buildGoModule rec { buildGoModule rec {
pname = "immich-go"; pname = "immich-go";
version = "0.26.3"; version = "0.27.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "simulot"; owner = "simulot";
repo = "immich-go"; repo = "immich-go";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-M7hvT7y11X6BN6WJqTIlb5b5x7kaa7MAdhbztZAvJ48="; hash = "sha256-TvvoFe7uyuollKTsioIkdcXTDOZqE+hPkZTPk+PNEqQ=";
# Inspired by: https://github.com/NixOS/nixpkgs/blob/f2d7a289c5a5ece8521dd082b81ac7e4a57c2c5c/pkgs/applications/graphics/pdfcpu/default.nix#L20-L32 # Inspired by: https://github.com/NixOS/nixpkgs/blob/f2d7a289c5a5ece8521dd082b81ac7e4a57c2c5c/pkgs/applications/graphics/pdfcpu/default.nix#L20-L32
# The intention here is to write the information into files in the `src`'s # The intention here is to write the information into files in the `src`'s
@ -32,7 +32,7 @@ buildGoModule rec {
''; '';
}; };
vendorHash = "sha256-7zOW1nRhxh+jpGNxAxgepC67NCBA3IIfcOKmniGjkwM="; vendorHash = "sha256-qJdxpOUB5OPKIz39cqELJorstsagwrJ0W5AKBDlIxzs=";
# options used by upstream: # options used by upstream:
# https://github.com/simulot/immich-go/blob/v0.25.0/.goreleaser.yaml # https://github.com/simulot/immich-go/blob/v0.25.0/.goreleaser.yaml

View File

@ -13,17 +13,17 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "jellyfin-tui"; pname = "jellyfin-tui";
version = "1.2.1"; version = "1.2.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dhonus"; owner = "dhonus";
repo = "jellyfin-tui"; repo = "jellyfin-tui";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-9TSg7J5Pbb2cpL9fEMs5ZJjmA70o8TEmbDkYIK2inTc="; hash = "sha256-ECMZ8sWzX/aZK0N8zGz5dMCndVVxwkZW/qSvmHu+87Q=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-dFUUJovJcf5pzH9nta7G+E7hcZTZONLPgQ1HAX4RYrY="; cargoHash = "sha256-rOKgaEDfOZfVuwMnp81Kd/mq0o0SkQD2lVNLubUq1HQ=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ buildInputs = [

View File

@ -7,13 +7,13 @@
}: }:
buildGoModule (finalAttrs: { buildGoModule (finalAttrs: {
pname = "jjui"; pname = "jjui";
version = "0.8.11"; version = "0.8.12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "idursun"; owner = "idursun";
repo = "jjui"; repo = "jjui";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-MBW0hjwyR0jguCWNnXiqZL0xa+vV9f2Ojfb2/61o9KY="; hash = "sha256-KqW5XwQxKF11qWXpqhcREVZHSVqPNnJCceaW0uvgpFg=";
}; };
vendorHash = "sha256-2nUU5rrVWBk+9ljC+OiAVLcRnWghPPfpvq5yoNSRdVk="; vendorHash = "sha256-2nUU5rrVWBk+9ljC+OiAVLcRnWghPPfpvq5yoNSRdVk=";

View File

@ -19,13 +19,13 @@
assert blas.implementation == "openblas" && lapack.implementation == "openblas"; assert blas.implementation == "openblas" && lapack.implementation == "openblas";
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "kaldi"; pname = "kaldi";
version = "0-unstable-2024-11-29"; version = "0-unstable-2025-04-28";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kaldi-asr"; owner = "kaldi-asr";
repo = "kaldi"; repo = "kaldi";
rev = "701f13107fda71195ab76a7f9f51ed45ce4ec728"; rev = "4b2bce7ffbb5777c40056784f7b6296037cebf29";
sha256 = "sha256-Uusj5nkLyOiPI0mAdlykBDNEzHWE+tU/kUhVYzwjhOY="; sha256 = "sha256-51IY07zasifeCMpW5RZ5x97JComBEddILwGpz/osEDs=";
}; };
cmakeFlags = [ cmakeFlags = [

View File

@ -18,17 +18,17 @@ let
in in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "lockbook-desktop"; pname = "lockbook-desktop";
version = "0.9.23"; version = "0.9.24";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lockbook"; owner = "lockbook";
repo = "lockbook"; repo = "lockbook";
tag = version; tag = version;
hash = "sha256-1SHAlhcQFuhwiYQReVOILX2T0gufNBojuy/E/EcECNw="; hash = "sha256-NEKmZlBw1OkikHHeohZH01/+E6bslQ6+EK0lhleI9UA=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-TAa/HuRDwRr5GBObcQwxebTiBjRrWeq52HFYT9h6Rq4="; cargoHash = "sha256-UDidgvZlFkUrNpnwJijEQ8ib2kiou0cHKOuBnk0u704=";
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config

View File

@ -12,17 +12,17 @@
rustPlatform.buildRustPackage (finalAttrs: { rustPlatform.buildRustPackage (finalAttrs: {
pname = "matrix-conduit"; pname = "matrix-conduit";
version = "0.10.4"; version = "0.10.5";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "famedly"; owner = "famedly";
repo = "conduit"; repo = "conduit";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-1EY1YTkNnjRIMOvsjowx57PquYMrkv2+8kolD1z19ls="; hash = "sha256-N1cs9P63DXCjzKOBweCLrjzR9MiwXWpzx+al3TH1pqc=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-IoqCv7ee+vvo0DLpZS4pLn5gBnOC9FyWMxjgWASCdOk="; cargoHash = "sha256-hQfN6s2uisjOuH9lmZa6nsk1jldncMdRVT4hXM5+lps=";
# Conduit enables rusqlite's bundled feature by default, but we'd rather use our copy of SQLite. # Conduit enables rusqlite's bundled feature by default, but we'd rather use our copy of SQLite.
preBuild = '' preBuild = ''
@ -59,7 +59,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
license = lib.licenses.asl20; license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ maintainers = with lib.maintainers; [
pstn pstn
pimeys
]; ];
mainProgram = "conduit"; mainProgram = "conduit";
}; };

View File

@ -8,11 +8,11 @@
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "mediawiki"; pname = "mediawiki";
version = "1.43.1"; version = "1.43.2";
src = fetchurl { src = fetchurl {
url = "https://releases.wikimedia.org/mediawiki/${lib.versions.majorMinor version}/mediawiki-${version}.tar.gz"; url = "https://releases.wikimedia.org/mediawiki/${lib.versions.majorMinor version}/mediawiki-${version}.tar.gz";
hash = "sha256-PIWqnEzWw1PGeASjpY57eWFdQUHD1msQHl8660BlPWw="; hash = "sha256-3ECvcM1O9Cd63DvgXHIijpjbI4vo5qo/Dln4XIAY504=";
}; };
postPatch = '' postPatch = ''

View File

@ -6,13 +6,13 @@
buildGoModule rec { buildGoModule rec {
pname = "mieru"; pname = "mieru";
version = "3.16.0"; version = "3.16.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "enfein"; owner = "enfein";
repo = "mieru"; repo = "mieru";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-xSV4ssVknOQyusoWeC5oqiNVLLq6yIPioKXwW9j98mk="; hash = "sha256-Bf8/NT/CvoP2c4uBBgv+aZ7/Z3GGyn1E1RjytNf5fWc=";
}; };
vendorHash = "sha256-pKcdvP38fZ2KFYNDx6I4TfmnnvWKzFDvz80xMkUojqM="; vendorHash = "sha256-pKcdvP38fZ2KFYNDx6I4TfmnnvWKzFDvz80xMkUojqM=";

View File

@ -7,13 +7,13 @@
buildGoModule rec { buildGoModule rec {
pname = "moar"; pname = "moar";
version = "1.31.10"; version = "1.32.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "walles"; owner = "walles";
repo = "moar"; repo = "moar";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-MnxElICkTCWwaY0lz9bsK0ioX4IFe8DgVcU7D1csBpI="; hash = "sha256-8fnvy2yEbJc3sHj/X54WFV/gFEQMcQc3irHUomw+LUQ=";
}; };
vendorHash = "sha256-eKL6R2Xmj6JOwXGuJJdSGwobEzDzZ0FUD8deO2d1unc="; vendorHash = "sha256-eKL6R2Xmj6JOwXGuJJdSGwobEzDzZ0FUD8deO2d1unc=";

View File

@ -67,7 +67,7 @@ let
systemd systemd
]; ];
version = "2025.3"; version = "2025.7";
selectSystem = selectSystem =
attrs: attrs:
@ -79,8 +79,8 @@ let
}; };
hash = selectSystem { hash = selectSystem {
x86_64-linux = "sha256-yELDdBoa8/Z4ttE/zR6246RBlNzq4YPWo3jcYWsF6M4="; x86_64-linux = "sha256-wKmwCLF+H/ByZFYGQMEJT6gmAt2Aa0vZalqaMptPjhU=";
aarch64-linux = "sha256-0KmJGfee+YwiWU3r1G3f6u1bNLyup2Qt97ra4ChRSAs="; aarch64-linux = "sha256-lsHpbxVxThxi+eKY+9c7VcXlDdxBTds6NQKrS0rxt34=";
}; };
in in

View File

@ -0,0 +1,28 @@
From 1a260f75baabc304ea398aa67d203dd9aee11525 Mon Sep 17 00:00:00 2001
From: Chris Moultrie <821688+tebriel@users.noreply.github.com>
Date: Wed, 2 Jul 2025 21:12:22 -0400
Subject: [PATCH] test(fix): Use /bin/sh as mock_mpv.sh interpreter - 4301
Not all systems have bash at `/bin/bash`. `/bin/sh` is POSIX and should
be present on all systems making this much more portable. No bash
features are currently used in the script so this change should be safe.
---
core/playback/mpv/mpv_test.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/playback/mpv/mpv_test.go b/core/playback/mpv/mpv_test.go
index 08432bef..20c02501 100644
--- a/core/playback/mpv/mpv_test.go
+++ b/core/playback/mpv/mpv_test.go
@@ -372,7 +372,7 @@ goto loop
`
} else {
scriptExt = ".sh"
- scriptContent = `#!/bin/bash
+ scriptContent = `#!/bin/sh
echo "$0"
for arg in "$@"; do
echo "$arg"
--
2.49.0

View File

@ -18,16 +18,16 @@
buildGo124Module rec { buildGo124Module rec {
pname = "navidrome"; pname = "navidrome";
version = "0.56.1"; version = "0.57.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "navidrome"; owner = "navidrome";
repo = "navidrome"; repo = "navidrome";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-Vq8qfBqxF/PVRtYYTsFydnJ7z/IuoNUWRWTLy/RM6xg="; hash = "sha256-KTgh+dA2YYPyNdGr2kYEUlYeRwNnEcSQlpQ7ZTbAjP0=";
}; };
vendorHash = "sha256-E7Q3wxUd5JAwERBKD2NZaVyj1kszOxvxeDY0s/fEDfY="; vendorHash = "sha256-/WeEimHCEQbTbCZ+4kXVJdHAa9PJEk1bG1d2j3V9JKM=";
npmRoot = "ui"; npmRoot = "ui";
@ -65,6 +65,11 @@ buildGo124Module rec {
patchShebangs ui/bin/update-workbox.sh patchShebangs ui/bin/update-workbox.sh
''; '';
patches = [
# Until https://github.com/navidrome/navidrome/pull/4302 is released
./0001-test-fix-Use-bin-sh-as-mock_mpv.sh-interpreter-4301.patch
];
preBuild = '' preBuild = ''
make buildjs make buildjs
''; '';

View File

@ -8,16 +8,16 @@
buildGoModule rec { buildGoModule rec {
pname = "netclient"; pname = "netclient";
version = "0.99.0"; version = "1.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gravitl"; owner = "gravitl";
repo = "netclient"; repo = "netclient";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-hSylhELMfiYNFHt03bJN1gTfy3EXSHJOj+ayUeU3+4w="; hash = "sha256-65U0cQpunLecvw7dZfBY4dFoj8Jp6+LqUWcCDfS0eSA=";
}; };
vendorHash = "sha256-bpXGXK97ohepYoAyJFZE49vo48ch3gAsVyax1+uLIfE="; vendorHash = "sha256-XF2OVgK5OrIrKqamY20lm49OF3u3RvxcW4TTtPkr5YU=";
buildInputs = lib.optional stdenv.hostPlatform.isLinux libX11; buildInputs = lib.optional stdenv.hostPlatform.isLinux libX11;

View File

@ -19,17 +19,17 @@
rustPlatform.buildRustPackage (finalAttrs: { rustPlatform.buildRustPackage (finalAttrs: {
pname = "newsboat"; pname = "newsboat";
version = "2.39"; version = "2.40";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "newsboat"; owner = "newsboat";
repo = "newsboat"; repo = "newsboat";
rev = "r${finalAttrs.version}"; rev = "r${finalAttrs.version}";
hash = "sha256-ypAn9Z27S20f82wqsZIELO1DHN0deqcTHYA77ddtb8g="; hash = "sha256-BxZq+y2MIIKAaXi7Z2P8JqTfHtX2BBY/ShUhGk7Cf/8=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-LDv5Rrv5ZKs7cspPTWt49omvLWY01y1TDGrfl7Jea3g="; cargoHash = "sha256-lIK7F52pxMMhrImtO+bAR/iGOvuhhe/g+oWn6iNA1mY=";
# TODO: Check if that's still needed # TODO: Check if that's still needed
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''

View File

@ -0,0 +1,8 @@
--- a/packages/opencode/src/provider/models-macro.ts
+++ b/packages/opencode/src/provider/models-macro.ts
@@ -1,4 +1,3 @@
export async function data() {
- const json = await fetch("https://models.dev/api.json").then((x) => x.text())
- return json
+ return process.env.MODELS_JSON || '{}';
}

View File

@ -1,60 +1,187 @@
{ {
lib, lib,
fetchFromGitHub, stdenvNoCC,
buildGoModule, buildGoModule,
versionCheckHook, bun,
fetchFromGitHub,
fetchurl,
nix-update-script, nix-update-script,
testers,
writableTmpDirAsHomeHook,
}: }:
buildGoModule (finalAttrs: { let
opencode-node-modules-hash = {
"aarch64-darwin" = "sha256-+eXXWskZg0CIY12+Ee4Y3uwpB5I92grDiZ600Whzx/I=";
"aarch64-linux" = "sha256-rxLPrYAIiKDh6de/GACPfcYXY7nIskqAu1Xi12y5DpU=";
"x86_64-darwin" = "sha256-LOz7N6gMRaZLPks+y5fDIMOuUCXTWpHIss1v0LHPnqw=";
"x86_64-linux" = "sha256-GKLR+T+lCa7GFQr6HqSisfa4uf8F2b79RICZmePmCBE=";
};
bun-target = {
"aarch64-darwin" = "bun-darwin-arm64";
"aarch64-linux" = "bun-linux-arm64";
"x86_64-darwin" = "bun-darwin-x64";
"x86_64-linux" = "bun-linux-x64";
};
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "opencode"; pname = "opencode";
version = "0.0.52"; version = "0.1.194";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sst"; owner = "sst";
repo = "opencode"; repo = "opencode";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-wniGu8EXOI2/sCI7gv2luQgODRdes7tt1CoJ6Gs09ig="; hash = "sha256-51Mc0Qrg3C0JTpXl2OECKEUvle+6X+j9+/Blu8Nu9Ao=";
}; };
vendorHash = "sha256-pnev0o2/jirTqG67amCeI49XUdMCCulpGq/jYqGqzRY="; tui = buildGoModule {
pname = "opencode-tui";
inherit (finalAttrs) version;
src = "${finalAttrs.src}/packages/tui";
vendorHash = "sha256-hxtQHlaV2Em8CyTK3BNaoo/LgnGbMjj5XafbleF+p9I=";
subPackages = [ "cmd/opencode" ];
env.CGO_ENABLED = 0;
ldflags = [ ldflags = [
"-s" "-s"
"-w" "-X=main.Version=${finalAttrs.version}"
"-X github.com/sst/opencode/internal/version.Version=${finalAttrs.version}"
]; ];
checkFlags = installPhase = ''
let runHook preInstall
skippedTests = [
# permission denied
"TestBashTool_Run"
"TestSourcegraphTool_Run"
"TestLsTool_Run"
# Difference with snapshot install -Dm755 $GOPATH/bin/opencode $out/bin/tui
"TestGetContextFromPaths"
runHook postInstall
'';
};
node_modules = stdenvNoCC.mkDerivation {
pname = "opencode-node_modules";
inherit (finalAttrs) version src;
impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
"GIT_PROXY_COMMAND"
"SOCKS_SERVER"
]; ];
in
[ "-skip=^${lib.concatStringsSep "$|^" skippedTests}$" ];
nativeCheckInputs = [ nativeBuildInputs = [
versionCheckHook bun
writableTmpDirAsHomeHook
]; ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru.updateScript = nix-update-script { }; dontConfigure = true;
meta = { buildPhase = ''
description = "Powerful terminal-based AI assistant providing intelligent coding assistance"; runHook preBuild
homepage = "https://github.com/sst/opencode";
changelog = "https://github.com/sst/opencode/releases/tag/v${finalAttrs.version}"; export BUN_INSTALL_CACHE_DIR=$(mktemp -d)
mainProgram = "opencode";
license = lib.licenses.mit; bun install \
maintainers = with lib.maintainers; [ --filter=opencode \
zestsystem --force \
--frozen-lockfile \
--no-progress
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/node_modules
cp -R ./node_modules $out
runHook postInstall
'';
# Required else we get errors that our fixed-output derivation references store paths
dontFixup = true;
outputHash = opencode-node-modules-hash.${stdenvNoCC.hostPlatform.system};
outputHashAlgo = "sha256";
outputHashMode = "recursive";
};
models-dev-data = fetchurl {
url = "https://models.dev/api.json";
sha256 = "sha256-igxQOC+Hz2FnXIW/S4Px9WhRuBhcIQIHO+7U8jHU1TQ=";
};
nativeBuildInputs = [ bun ];
patches = [ ./fix-models-macro.patch ];
configurePhase = ''
runHook preConfigure
cp -R ${finalAttrs.node_modules}/node_modules .
runHook postConfigure
'';
buildPhase = ''
runHook preBuild
export MODELS_JSON="$(cat ${finalAttrs.models-dev-data})"
bun build \
--define OPENCODE_VERSION="'${finalAttrs.version}'" \
--compile \
--minify \
--target=${bun-target.${stdenvNoCC.hostPlatform.system}} \
--outfile=opencode \
./packages/opencode/src/index.ts \
${finalAttrs.tui}/bin/tui
runHook postBuild
'';
dontStrip = true;
installPhase = ''
runHook preInstall
mkdir -p $out/bin
install -Dm755 opencode $out/bin/opencode
runHook postInstall
'';
passthru = {
tests.version = testers.testVersion {
package = finalAttrs.finalPackage;
command = "HOME=$(mktemp -d) opencode --version";
inherit (finalAttrs) version;
};
updateScript = nix-update-script {
extraArgs = [
"--subpackage"
"tui"
"--subpackage"
"node_modules"
"--subpackage"
"models-dev-data"
]; ];
}; };
};
meta = {
description = "AI coding agent built for the terminal";
longDescription = ''
OpenCode is a terminal-based agent that can build anything.
It combines a TypeScript/JavaScript core with a Go-based TUI
to provide an interactive AI coding experience.
'';
homepage = "https://github.com/sst/opencode";
license = lib.licenses.mit;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [
zestsystem
delafthi
];
mainProgram = "opencode";
};
}) })

View File

@ -12,16 +12,16 @@
buildGoModule rec { buildGoModule rec {
pname = "ov"; pname = "ov";
version = "0.41.0"; version = "0.42.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "noborus"; owner = "noborus";
repo = "ov"; repo = "ov";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-9J04E72pFcHs0JrdHPkkL8O0At/TXEYObnkwHlDnH4s="; hash = "sha256-CGsqH8jaMm8eybRRcr//Wot2rXdDb+8ofIuuV9dWlgo=";
}; };
vendorHash = "sha256-H7mS5Zjtr86s+nOljyzjNx3GlwupDiq7OrPQcHofJvU="; vendorHash = "sha256-tYWLULiYnVsW+9Hwy1JnMGYDduAlfoW7fgy0H8Zh9FI=";
ldflags = [ ldflags = [
"-s" "-s"

View File

@ -16,13 +16,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "p2pool"; pname = "p2pool";
version = "4.7"; version = "4.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SChernykh"; owner = "SChernykh";
repo = "p2pool"; repo = "p2pool";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-F8kgoGgnFk6vE1nNnV6TShwnEAnqxD1wbsCAnL7mHRM="; hash = "sha256-D1yQMcgRYVZf3/VGCmp6ZGu5YlWUmvlCx3pZqQF7JDM=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

View File

@ -72,7 +72,6 @@ rustPlatform.buildRustPackage rec {
platforms = platforms.unix; platforms = platforms.unix;
mainProgram = "prisma"; mainProgram = "prisma";
maintainers = with maintainers; [ maintainers = with maintainers; [
pimeys
tomhoule tomhoule
aqrln aqrln
]; ];

View File

@ -51,7 +51,6 @@ buildGoModule rec {
homepage = "https://www.planetscale.com/"; homepage = "https://www.planetscale.com/";
license = lib.licenses.asl20; license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ maintainers = with lib.maintainers; [
pimeys
kashw2 kashw2
]; ];
}; };

View File

@ -6,13 +6,13 @@
buildGoModule rec { buildGoModule rec {
pname = "rancher"; pname = "rancher";
version = "2.11.2"; version = "2.11.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rancher"; owner = "rancher";
repo = "cli"; repo = "cli";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-C7Ihl7JnURltVk6Qt7H/UYeHqjcfKuFyFCFx8ENPDyI="; hash = "sha256-MprXgoshJwbRrWhQRNCOzR9u/Kbkowrkpn0dedWhoRk=";
}; };
ldflags = [ ldflags = [
@ -23,7 +23,7 @@ buildGoModule rec {
"-static" "-static"
]; ];
vendorHash = "sha256-eUA+hm+vuVUpkF7ojruEydkXbtMM58i0Ka+6Z9G4EYQ="; vendorHash = "sha256-41Axi0vNGa+N+wzMbV8HeIuvVEpf5ErO/6KezqEEDhA=";
postInstall = '' postInstall = ''
mv $out/bin/cli $out/bin/rancher mv $out/bin/cli $out/bin/rancher

View File

@ -14,14 +14,14 @@
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "rc-9front"; pname = "rc-9front";
version = "0-unstable-2025-04-12"; version = "0-unstable-2025-06-14";
src = fetchFrom9Front { src = fetchFrom9Front {
domain = "shithub.us"; domain = "shithub.us";
owner = "cinap_lenrek"; owner = "cinap_lenrek";
repo = "rc"; repo = "rc";
rev = "ab2af6895d0e66aa9e5a94f77c2ba132c08f28d8"; rev = "3e907e648d7263c159c604dc51aa8ca5d5fcd7f8";
hash = "sha256-hpBZsZ+I2dS79bS6lkXOgx+KPri7vQftTLwuPEnomhc="; hash = "sha256-XucMQXlGdMcs3piMKRgmQNhuirSQP9mKmXbfTWbuePg=";
}; };
strictDeps = true; strictDeps = true;

View File

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "reth"; pname = "reth";
version = "1.4.8"; version = "1.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "paradigmxyz"; owner = "paradigmxyz";
repo = "reth"; repo = "reth";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-slVf2yVukW3fkDlpaz+rdPKf6QdsFa9HwySZkItHvoQ="; hash = "sha256-bEWgXRV82FIeJSO5voDewFxjUzphRlZ1W+k/QqJCigM=";
}; };
cargoHash = "sha256-vNe8eACwwlPspUQgI65T9O2SaQYl7FihDZRpljkA/4U="; cargoHash = "sha256-Mp5Ydf3/okos2nPK3ghc/hAS3y6b2kxgPS2+kZS/rF4=";
nativeBuildInputs = [ nativeBuildInputs = [
rustPlatform.bindgenHook rustPlatform.bindgenHook

View File

@ -15,13 +15,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rofi-calc"; pname = "rofi-calc";
version = "2.3.2"; version = "2.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "svenstaro"; owner = "svenstaro";
repo = "rofi-calc"; repo = "rofi-calc";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-ASZtIcUxaOYYAlINa77R9WgqonHtAR7Fdm9wDrbyRy0="; sha256 = "sha256-iTLi76GinRASawPSWAqmxSwLZPGvHesarHNoqO4m4dM=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
postPatch = '' postPatch = ''
substituteInPlace src/calc.c --replace-fail \ substituteInPlace src/calc.c --replace-fail \
"qalc_binary = \"qalc\"" \ "qalc_binary = \"qalc\"" \
"qalc_binary = \"${libqalculate}/bin/qalc\"" "qalc_binary = \"${lib.getExe libqalculate}\""
substituteInPlace src/meson.build --replace-fail \ substituteInPlace src/meson.build --replace-fail \
"rofi.get_variable('pluginsdir')" \ "rofi.get_variable('pluginsdir')" \

View File

@ -36,13 +36,13 @@ let
in in
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "s0ix-selftest-tool"; pname = "s0ix-selftest-tool";
version = "0-unstable-2024-09-22"; version = "0-unstable-2025-07-01";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "intel"; owner = "intel";
repo = "S0ixSelftestTool"; repo = "S0ixSelftestTool";
rev = "3af4af2009cb01da43ddae906f671d435494a0dc"; rev = "2707d34bf8130feb21e5902efbdecbd2dc915148";
hash = "sha256-phQxlbQB3J08tPtcw4vqupVgAT9gsSJxgPT044SMMNk="; hash = "sha256-2quAiVYt6elULJTqMFhnciNWork6ViTWcPTRJQfvu+I=";
}; };
# don't use the bundled turbostat binary # don't use the bundled turbostat binary

View File

@ -0,0 +1,38 @@
{
lib,
buildGoModule,
fetchFromGitHub,
versionCheckHook,
}:
buildGoModule rec {
pname = "shortscan";
version = "0.9.2";
src = fetchFromGitHub {
owner = "bitquark";
repo = "shortscan";
tag = "v${version}";
hash = "sha256-pJKhaeax1aHSR8OT6jp/Pe5bMBA7ASLF1MMlzd4Ppag=";
};
vendorHash = "sha256-KBQP4fFs6P6I+ch1n4Raeu1or2wWhFeTv1b3DpIWAP8=";
nativeInstallCheckInputs = [ versionCheckHook ];
ldflags = [
"-s"
"-w"
];
doInstallCheck = true;
meta = {
description = "IIS short filename enumeration tool";
homepage = "https://github.com/bitquark/shortscan";
changelog = "https://github.com/bitquark/shortscan/releases/tag/${src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fab ];
mainProgram = "shortscan";
};
}

View File

@ -8,13 +8,13 @@
buildGoModule rec { buildGoModule rec {
name = "sigtop"; name = "sigtop";
version = "0.19.0"; version = "0.20.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tbvdm"; owner = "tbvdm";
repo = "sigtop"; repo = "sigtop";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-HJYdz+vJE6CM9BH4Vx9nCfVyP5uXhhb+/1j4t01TucI="; sha256 = "sha256-1ZZBsKkgBnkNtYdlarbi+6DtCWBRvgcsoH0v4VNjKh0=";
}; };
vendorHash = "sha256-EWppsnZ/Ch7JjltkejOYKepZUfKNZY9+F7VbzjNCYNU="; vendorHash = "sha256-EWppsnZ/Ch7JjltkejOYKepZUfKNZY9+F7VbzjNCYNU=";

View File

@ -0,0 +1,36 @@
{
lib,
rustPlatform,
fetchFromGitHub,
versionCheckHook,
nix-update-script,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "similarity";
version = "0.2.4";
src = fetchFromGitHub {
owner = "mizchi";
repo = "similarity";
tag = "v${finalAttrs.version}";
hash = "sha256-Z2ZaKBpq7N8KIX8nOzPhm8evfoUxBzaAK0+4cU9qBDE=";
};
cargoHash = "sha256-oYqdCHGY6OZSbYXhjIt20ZL2JkZP7UEOhn0fhuZQnZo=";
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.pname}-ts";
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru.updateScript = nix-update-script { };
meta = {
description = "Code similarity detection tool";
homepage = "https://github.com/mizchi/similarity";
changelog = "https://github.com/mizchi/similarity/blob/v${finalAttrs.version}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ airrnot ];
};
})

View File

@ -8,7 +8,7 @@
}: }:
let let
version = "1.1297.2"; version = "1.1297.3";
in in
buildNpmPackage { buildNpmPackage {
pname = "snyk"; pname = "snyk";
@ -18,7 +18,7 @@ buildNpmPackage {
owner = "snyk"; owner = "snyk";
repo = "cli"; repo = "cli";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-guDCwLvl5cYzeZJbwOQvzCuBtXo3PNrvOimS2GmQwaY="; hash = "sha256-oyodfLDfgFKCmt8d4Bff/4SIEjyqX1pw5fp95uEmuf4=";
}; };
npmDepsHash = "sha256-SzrBhY7iWGlIPNB+5ROdaxAlQSetSKc3MPBp+4nNh+o="; npmDepsHash = "sha256-SzrBhY7iWGlIPNB+5ROdaxAlQSetSKc3MPBp+4nNh+o=";

View File

@ -11,13 +11,13 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sql-formatter"; pname = "sql-formatter";
version = "15.6.5"; version = "15.6.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sql-formatter-org"; owner = "sql-formatter-org";
repo = "sql-formatter"; repo = "sql-formatter";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-oNUQvNsdlLJn2JQdCV0Kp3oaXuLJuPGH+Pfe+gRog2E="; hash = "sha256-61E3DizwO9Lml0Uu4tOhpCbzaxiDrY5vPqk2TY7fIqo=";
}; };
yarnOfflineCache = fetchYarnDeps { yarnOfflineCache = fetchYarnDeps {

View File

@ -11,7 +11,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "structorizer"; pname = "structorizer";
version = "3.32-26"; version = "3.32-27";
desktopItems = [ desktopItems = [
(makeDesktopItem { (makeDesktopItem {
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
owner = "fesch"; owner = "fesch";
repo = "Structorizer.Desktop"; repo = "Structorizer.Desktop";
rev = version; rev = version;
hash = "sha256-hRcs0fey+6YCXcWXNTWuAnaRfmRNL2Cpn+dry8wYRSg="; hash = "sha256-Z60HB0s2LkO/Vs/OaHWc969Y6H+wBiN5slRGFf4JCro=";
}; };
patches = [ patches = [

View File

@ -6,16 +6,16 @@
buildGoModule rec { buildGoModule rec {
pname = "templ"; pname = "templ";
version = "0.3.898"; version = "0.3.906";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "a-h"; owner = "a-h";
repo = "templ"; repo = "templ";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-uSIu27VgYz/+b8WHKG5poVwFPrK7iYNrQyQlI22Qho8="; hash = "sha256-Og1FPCEkBnyt1nz45imDiDNZ4CuWSJJPxGYcPzRgBE8=";
}; };
vendorHash = "sha256-q4L+r6S0eMNd5hP9UQCI+GxSJoiMGpjd0UTxA8zb6KU="; vendorHash = "sha256-oObzlisjvS9LeMYh3DzP+l7rgqBo9bQcbNjKCUJ8rcY=";
subPackages = [ "cmd/templ" ]; subPackages = [ "cmd/templ" ];

View File

@ -23,13 +23,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "transcribe"; pname = "transcribe";
version = "9.41.2"; version = "9.42.0";
src = src =
if stdenv.hostPlatform.system == "x86_64-linux" then if stdenv.hostPlatform.system == "x86_64-linux" then
fetchzip { fetchzip {
url = "https://www.seventhstring.com/xscribe/downlo/xscsetup-${version}.tar.gz"; url = "https://www.seventhstring.com/xscribe/downlo/xscsetup-${version}.tar.gz";
sha256 = "sha256-VWfjtNbwK9ZiWgs161ubRy+IjSXXk3FEfMkmA6Jhz8A="; sha256 = "sha256-QCEkxOP1nWtBHFS259Oyqo2beehgCeR7zZ6wqBZe00s=";
} }
else else
throw "Platform not supported"; throw "Platform not supported";

View File

@ -8,7 +8,7 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "voicevox-core"; pname = "voicevox-core";
version = "0.15.7"; version = "0.15.8";
src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system}; src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system};
@ -42,19 +42,19 @@ stdenv.mkDerivation (finalAttrs: {
{ {
"x86_64-linux" = fetchCoreArtifact { "x86_64-linux" = fetchCoreArtifact {
id = "linux-x64"; id = "linux-x64";
hash = "sha256-7FgrJ1HlB8l5MHd2KM4lYRx2bYdxrD2+su1G33/ugUA="; hash = "sha256-n0rYSMR5wgjAtlQ4DWRAhJW/VevGG/Mmj6lXieG1U78=";
}; };
"aarch64-linux" = fetchCoreArtifact { "aarch64-linux" = fetchCoreArtifact {
id = "linux-arm64"; id = "linux-arm64";
hash = "sha256-fD7YMTo9jeB4vJibnVwX8VrukCUeAwS6VXGOr3VXG+c="; hash = "sha256-GOgBH0UinZMiNszTp2CWJKT9prTi84KH3V9fxpmweeU=";
}; };
"x86_64-darwin" = fetchCoreArtifact { "x86_64-darwin" = fetchCoreArtifact {
id = "osx-x64"; id = "osx-x64";
hash = "sha256-5h9qEKbdcvip50TLs3vf6lXkSv24VEjOrx6CTUo7Q4Q="; hash = "sha256-8TRlu1ztPciKDX9Igr0TKcyLzP8WRwTN9F11MjXNNW8=";
}; };
"aarch64-darwin" = fetchCoreArtifact { "aarch64-darwin" = fetchCoreArtifact {
id = "osx-arm64"; id = "osx-arm64";
hash = "sha256-0bFLhvP7LqDzuk3pyM9QZfc8eLMW0IgqVkaXsuS3qlY="; hash = "sha256-6Na7LBZg2bWaX1VN6r6zdyg0mszBNn0e7u+cmqKVuY0=";
}; };
}; };

View File

@ -1,26 +1,26 @@
diff --git a/pyproject.toml b/pyproject.toml diff --git a/pyproject.toml b/pyproject.toml
index fa23446..6a7705c 100644 index 42a636b..209893f 100644
--- a/pyproject.toml --- a/pyproject.toml
+++ b/pyproject.toml +++ b/pyproject.toml
@@ -40,7 +40,20 @@ use_parentheses = true @@ -23,6 +23,21 @@ dependencies = [
datas = "datas" # PyInstaller's argument "uvicorn>=0.34.0",
]
[tool.poetry] +[project.scripts]
-package-mode = false +voicevox-engine = "run:main"
+name = "voicevox-engine" +
+version = "@version@" +[build-system]
+authors = [] +requires = ["hatchling"]
+description = "" +build-backend = "hatchling.build"
+packages = [ { include = "voicevox_engine" } ] +
+include = [ +[tool.hatch.build]
+ { path = "resources/**/*", format = ["sdist", "wheel"] }, +only-include = [
+ { path = "run.py", format = ["sdist", "wheel"] }, + "voicevox_engine",
+ { path = "engine_manifest.json", format = ["sdist", "wheel"] }, + "resources",
+ { path = "presets.yaml", format = ["sdist", "wheel"] } + "run.py",
+ "engine_manifest.json",
+] +]
+ +
+[tool.poetry.scripts] [tool.uv]
+voicevox-engine = "run:main" default-groups = []
[tool.poetry.dependencies]
python = "~3.11"

View File

@ -1,92 +0,0 @@
diff --git a/lib/open_jtalk/src/mecab/src/char_property.h b/lib/open_jtalk/src/mecab/src/char_property.h
index 35f4b05..9c904ba 100644
--- a/lib/open_jtalk/src/mecab/src/char_property.h
+++ b/lib/open_jtalk/src/mecab/src/char_property.h
@@ -37,7 +37,7 @@ class CharProperty {
inline const char *seekToOtherType(const char *begin, const char *end,
CharInfo c, CharInfo *fail,
size_t *mblen, size_t *clen) const {
- register const char *p = begin;
+ const char *p = begin;
*clen = 0;
while (p != end && c.isKindOf(*fail = getCharInfo(p, end, mblen))) {
p += *mblen;
diff --git a/lib/open_jtalk/src/mecab/src/darts.h b/lib/open_jtalk/src/mecab/src/darts.h
index 91b2eae..d6736cf 100644
--- a/lib/open_jtalk/src/mecab/src/darts.h
+++ b/lib/open_jtalk/src/mecab/src/darts.h
@@ -404,10 +404,10 @@ class DoubleArrayImpl {
T result;
set_result(result, -1, 0);
- register array_type_ b = array_[node_pos].base;
- register array_u_type_ p;
+ array_type_ b = array_[node_pos].base;
+ array_u_type_ p;
- for (register size_t i = 0; i < len; ++i) {
+ for (size_t i = 0; i < len; ++i) {
p = b +(node_u_type_)(key[i]) + 1;
if (static_cast<array_u_type_>(b) == array_[p].check)
b = array_[p].base;
@@ -431,12 +431,12 @@ class DoubleArrayImpl {
size_t node_pos = 0) const {
if (!len) len = length_func_()(key);
- register array_type_ b = array_[node_pos].base;
- register size_t num = 0;
- register array_type_ n;
- register array_u_type_ p;
+ array_type_ b = array_[node_pos].base;
+ size_t num = 0;
+ array_type_ n;
+ array_u_type_ p;
- for (register size_t i = 0; i < len; ++i) {
+ for (size_t i = 0; i < len; ++i) {
p = b; // + 0;
n = array_[p].base;
if ((array_u_type_) b == array_[p].check && n < 0) {
@@ -469,8 +469,8 @@ class DoubleArrayImpl {
size_t len = 0) const {
if (!len) len = length_func_()(key);
- register array_type_ b = array_[node_pos].base;
- register array_u_type_ p;
+ array_type_ b = array_[node_pos].base;
+ array_u_type_ p;
for (; key_pos < len; ++key_pos) {
p = b +(node_u_type_)(key[key_pos]) + 1;
diff --git a/lib/open_jtalk/src/mecab/src/dictionary.cpp b/lib/open_jtalk/src/mecab/src/dictionary.cpp
index 5717d4d..3ab6e1f 100644
--- a/lib/open_jtalk/src/mecab/src/dictionary.cpp
+++ b/lib/open_jtalk/src/mecab/src/dictionary.cpp
@@ -66,7 +66,7 @@ int progress_bar_darts(size_t current, size_t total) {
}
template <typename T1, typename T2>
-struct pair_1st_cmp: public std::binary_function<bool, T1, T2> {
+struct pair_1st_cmp {
bool operator()(const std::pair<T1, T2> &x1,
const std::pair<T1, T2> &x2) {
return x1.first < x2.first;
diff --git a/lib/open_jtalk/src/mecab/src/viterbi.cpp b/lib/open_jtalk/src/mecab/src/viterbi.cpp
index 6277fe9..5ccefb7 100644
--- a/lib/open_jtalk/src/mecab/src/viterbi.cpp
+++ b/lib/open_jtalk/src/mecab/src/viterbi.cpp
@@ -318,11 +318,11 @@ template <bool IsAllPath> bool connect(size_t pos, Node *rnode,
const Connector *connector,
Allocator<Node, Path> *allocator) {
for (;rnode; rnode = rnode->bnext) {
- register long best_cost = 2147483647;
+ long best_cost = 2147483647;
Node* best_node = 0;
for (Node *lnode = end_node_list[pos]; lnode; lnode = lnode->enext) {
- register int lcost = connector->cost(lnode, rnode); // local cost
- register long cost = lnode->cost + lcost;
+ int lcost = connector->cost(lnode, rnode); // local cost
+ long cost = lnode->cost + lcost;
if (cost < best_cost) {
best_node = lnode;

View File

@ -2,32 +2,28 @@
lib, lib,
fetchFromGitHub, fetchFromGitHub,
python3Packages, python3Packages,
replaceVars,
voicevox-core, voicevox-core,
}: }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "voicevox-engine"; pname = "voicevox-engine";
version = "0.23.0"; version = "0.24.0";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "VOICEVOX"; owner = "VOICEVOX";
repo = "voicevox_engine"; repo = "voicevox_engine";
tag = version; tag = version;
hash = "sha256-kuWpLnDKRYcfV9FxYLeR6FmQFO2K12KxJx/Y/4MwhbM="; hash = "sha256-LFbKnNv+NNfA6dvgVGr8fGr+3o5/sAyZ8XFZan2EJUY=";
}; };
patches = [ patches = [
# the upstream package only uses poetry for dependency management, not for package definition # this patch makes the package installable via hatchling
# this patch makes the package installable via poetry-core ./make-installable.patch
(replaceVars ./make-installable.patch {
inherit version;
})
]; ];
build-system = with python3Packages; [ build-system = with python3Packages; [
poetry-core hatchling
]; ];
dependencies = dependencies =
@ -35,19 +31,21 @@ python3Packages.buildPythonApplication rec {
passthru.pyopenjtalk passthru.pyopenjtalk
] ]
++ (with python3Packages; [ ++ (with python3Packages; [
numpy
fastapi fastapi
jinja2 jinja2
python-multipart kanalizer
uvicorn numpy
soundfile
pyyaml
pyworld
semver
platformdirs platformdirs
soxr
pydantic pydantic
python-multipart
pyworld
pyyaml
semver
setuptools
soundfile
soxr
starlette starlette
uvicorn
]); ]);
pythonRemoveDeps = [ pythonRemoveDeps = [
@ -55,8 +53,6 @@ python3Packages.buildPythonApplication rec {
"fastapi-slim" "fastapi-slim"
]; ];
pythonRelaxDeps = true;
preConfigure = '' preConfigure = ''
# copy demo metadata to temporary directory # copy demo metadata to temporary directory
mv resources/character_info test_character_info mv resources/character_info test_character_info
@ -103,7 +99,7 @@ python3Packages.buildPythonApplication rec {
owner = "VOICEVOX"; owner = "VOICEVOX";
repo = "voicevox_resource"; repo = "voicevox_resource";
tag = version; tag = version;
hash = "sha256-6pxx+ebNzXd3qbrFa4gfMDM2e5XANo3ZPzSAegKoJBE="; hash = "sha256-/L7gqskzg7NFBO6Jg2MEMYuQeZK58hTWrRypTE42nGg=";
}; };
pyopenjtalk = python3Packages.callPackage ./pyopenjtalk.nix { }; pyopenjtalk = python3Packages.callPackage ./pyopenjtalk.nix { };

View File

@ -4,12 +4,13 @@
buildPythonPackage, buildPythonPackage,
fetchFromGitHub, fetchFromGitHub,
fetchzip, fetchzip,
setuptools, setuptools,
cython_0, setuptools-scm,
cython,
cmake, cmake,
numpy, numpy,
oldest-supported-numpy, oldest-supported-numpy,
six,
tqdm, tqdm,
}: }:
@ -22,32 +23,24 @@ let
in in
buildPythonPackage { buildPythonPackage {
pname = "pyopenjtalk"; pname = "pyopenjtalk";
version = "0-unstable-2023-09-08"; version = "0-unstable-2025-04-23";
pyproject = true; pyproject = true;
# needed because setuptools-scm doesn't like the 0-unstable format
env.SETUPTOOLS_SCM_PRETEND_VERSION = "0.0.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "VOICEVOX"; owner = "VOICEVOX";
repo = "pyopenjtalk"; repo = "pyopenjtalk";
rev = "b35fc89fe42948a28e33aed886ea145a51113f88"; rev = "74703b034dd90a1f199f49bb70bf3b66b1728a86";
hash = "sha256-DbZkCMdirI6wSRUQSJrkojyjGmViqGeQPO0kSKiw2gE="; hash = "sha256-UUUYoVEqENKux5N7ucbjcnrZ2+ewwxwP8S0WksaJEAQ=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
patches = [
# this patch fixes the darwin build
# open_jtalk uses mecab, which uses the register keyword and std::binary_function, which are not allowed in c++17
# this patch removes them
./mecab-remove-deprecated.patch
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail 'setuptools<v60.0' 'setuptools'
'';
build-system = [ build-system = [
setuptools setuptools
cython_0 setuptools-scm
cython
cmake cmake
numpy numpy
oldest-supported-numpy oldest-supported-numpy
@ -56,9 +49,7 @@ buildPythonPackage {
dontUseCmakeConfigure = true; dontUseCmakeConfigure = true;
dependencies = [ dependencies = [
setuptools # imports pkg_resources at runtime
numpy numpy
six
tqdm tqdm
]; ];

View File

@ -11,39 +11,38 @@ index cc5e2b9..29140f8 100644
"executionArgs": [], "executionArgs": [],
"host": "http://127.0.0.1:50021" "host": "http://127.0.0.1:50021"
} }
diff --git a/electron-builder.config.js b/electron-builder.config.js diff --git a/electron-builder.config.cjs b/electron-builder.config.cjs
index 10bd7dc..4597b23 100644 index d2a21b4..7b338c0 100644
--- a/electron-builder.config.js --- a/electron-builder.config.cjs
+++ b/electron-builder.config.js +++ b/electron-builder.config.cjs
@@ -38,18 +38,6 @@ const isArm64 = process.arch === "arm64"; @@ -40,17 +40,6 @@ const isArm64 = process.arch === "arm64";
// cf: https://k-hyoda.hatenablog.com/entry/2021/10/23/000349#%E8%BF%BD%E5%8A%A0%E5%B1%95%E9%96%8B%E3%83%95%E3%82%A1%E3%82%A4%E3%83%AB%E5%85%88%E3%81%AE%E8%A8%AD%E5%AE%9A // cf: https://k-hyoda.hatenablog.com/entry/2021/10/23/000349#%E8%BF%BD%E5%8A%A0%E5%B1%95%E9%96%8B%E3%83%95%E3%82%A1%E3%82%A4%E3%83%AB%E5%85%88%E3%81%AE%E8%A8%AD%E5%AE%9A
const extraFilePrefix = isMac ? "MacOS/" : ""; const extraFilePrefix = isMac ? "MacOS/" : "";
-const sevenZipFile = fs -const sevenZipFile = readdirSync(resolve(__dirname, "vendored", "7z")).find(
- .readdirSync(path.resolve(__dirname, "vendored", "7z"))
- .find(
- // Windows: 7za.exe, Linux: 7zzs, macOS: 7zz - // Windows: 7za.exe, Linux: 7zzs, macOS: 7zz
- (fileName) => ["7za.exe", "7zzs", "7zz"].includes(fileName), - (fileName) => ["7za.exe", "7zzs", "7zz"].includes(fileName),
- ); -);
- -
-if (!sevenZipFile) { -if (!sevenZipFile) {
- throw new Error( - throw new Error(
- "7z binary file not found. Run `node ./tools/download7z.js` first.", - "7z binary file not found. Run `node ./tools/download7z.ts` first.",
- ); - );
-} -}
-
/** @type {import("electron-builder").Configuration} */ /** @type {import("electron-builder").Configuration} */
const builderOptions = { const builderOptions = {
@@ -91,14 +79,6 @@ const builderOptions = { beforeBuild: async () => {
@@ -91,14 +80,6 @@ const builderOptions = {
from: "build/README.txt", from: "build/README.txt",
to: extraFilePrefix + "README.txt", to: extraFilePrefix + "README.txt",
}, },
- { - {
- from: VOICEVOX_ENGINE_DIR, - from: VOICEVOX_ENGINE_DIR,
- to: path.join(extraFilePrefix, "vv-engine"), - to: join(extraFilePrefix, "vv-engine"),
- }, - },
- { - {
- from: path.resolve(__dirname, "vendored", "7z", sevenZipFile), - from: resolve(__dirname, "vendored", "7z", sevenZipFile),
- to: extraFilePrefix + sevenZipFile, - to: extraFilePrefix + sevenZipFile,
- }, - },
], ],

View File

@ -2,31 +2,37 @@
lib, lib,
stdenv, stdenv,
fetchFromGitHub, fetchFromGitHub,
replaceVars,
pnpm_9,
nodejs,
makeDesktopItem, makeDesktopItem,
replaceVars,
copyDesktopItems, copyDesktopItems,
makeWrapper,
electron,
_7zz,
voicevox-engine,
dart-sass, dart-sass,
jq,
makeWrapper,
moreutils,
nodejs,
pnpm_9,
_7zz,
electron,
voicevox-engine,
}: }:
let
pnpm = pnpm_9;
in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "voicevox"; pname = "voicevox";
version = "0.23.0"; version = "0.24.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "VOICEVOX"; owner = "VOICEVOX";
repo = "voicevox"; repo = "voicevox";
tag = finalAttrs.version; tag = finalAttrs.version;
hash = "sha256-wCC4wl5LPJVJQtV+X795rIXnURseQYiCZ9B6YujTFFw="; hash = "sha256-2MXJOLt14zpoahYjd3l3q5UxT2yK/g/jksHO4Q7W6HA=";
}; };
patches = [ patches = [
./unlock-node-and-pnpm-versions.patch
(replaceVars ./hardcode-paths.patch { (replaceVars ./hardcode-paths.patch {
sevenzip_path = lib.getExe _7zz; sevenzip_path = lib.getExe _7zz;
voicevox_engine_path = lib.getExe voicevox-engine; voicevox_engine_path = lib.getExe voicevox-engine;
@ -34,26 +40,41 @@ stdenv.mkDerivation (finalAttrs: {
]; ];
postPatch = '' postPatch = ''
# unlock the overly specific pnpm package version pin
jq 'del(.packageManager)' package.json | sponge package.json
substituteInPlace package.json \ substituteInPlace package.json \
--replace-fail "999.999.999" "$version" \ --replace-fail "999.999.999" "$version" \
--replace-fail ' && electron-builder --config electron-builder.config.js --publish never' "" --replace-fail ' && electron-builder --config electron-builder.config.cjs --publish never' ""
''; '';
pnpmDeps = pnpm_9.fetchDeps { pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs) inherit (finalAttrs)
pname pname
version version
src src
patches patches
postPatch
; ;
hash = "sha256-IuyDHAomaGEvGbN4gLpyPfZGm/pF9XK+BkXSipaM7NQ=";
# let's just be safe and add these explicitly to nativeBuildInputs
# even though the fetcher already uses them in its implementation
nativeBuildInputs = [
jq
moreutils
];
hash = "sha256-RKgqFmHQnjHS7yeUIbH9awpNozDOCCHplc/bmfxmMyg=";
}; };
nativeBuildInputs = nativeBuildInputs =
[ [
dart-sass
jq
makeWrapper makeWrapper
pnpm_9.configHook moreutils
nodejs nodejs
pnpm.configHook
] ]
++ lib.optionals stdenv.hostPlatform.isLinux [ ++ lib.optionals stdenv.hostPlatform.isLinux [
copyDesktopItems copyDesktopItems
@ -67,9 +88,9 @@ stdenv.mkDerivation (finalAttrs: {
buildPhase = '' buildPhase = ''
runHook preBuild runHook preBuild
# force sass-embedded to use our own sass instead of the bundled one # force sass-embedded to use our own sass from PATH instead of the bundled one
substituteInPlace node_modules/sass-embedded/dist/lib/src/compiler-path.js \ substituteInPlace node_modules/sass-embedded/dist/lib/src/compiler-path.js \
--replace-fail 'compilerCommand = (() => {' 'compilerCommand = (() => { return ["${lib.getExe dart-sass}"];' --replace-fail 'compilerCommand = (() => {' 'compilerCommand = (() => { return ["dart-sass"];'
cp -r ${electron.dist} electron-dist cp -r ${electron.dist} electron-dist
chmod -R u+w electron-dist chmod -R u+w electron-dist
@ -79,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
pnpm exec electron-builder \ pnpm exec electron-builder \
--dir \ --dir \
--config electron-builder.config.js \ --config electron-builder.config.cjs \
-c.electronDist=electron-dist \ -c.electronDist=electron-dist \
-c.electronVersion=${electron.version} -c.electronVersion=${electron.version}

View File

@ -1,18 +0,0 @@
diff --git a/package.json b/package.json
index d0a58b4..b57b91c 100644
--- a/package.json
+++ b/package.json
@@ -4,13 +4,6 @@
"author": "Hiroshiba Kazuyuki",
"private": true,
"main": "./dist/main.js",
- "engines": {
- "node": ">=22.14.0 <23"
- },
- "volta": {
- "node": "22.14.0"
- },
- "packageManager": "pnpm@10.3.0",
"scripts": {
"// --- lint ---": "",
"lint": "eslint .",

View File

@ -1,14 +1,14 @@
{ {
"darwin": { "darwin": {
"hash": "sha256-7/gSUR9h9PzBrTgxERXNjqzJDtqxebjmD0cF3Vx2ySY=", "hash": "sha256-YXZbYooBqn3jGoWd+pvPs95Oq6V9sjEA2IC7dEsj2hs=",
"version": "0.2025.06.25.08.12.stable_01" "version": "0.2025.07.02.08.36.stable_02"
}, },
"linux_x86_64": { "linux_x86_64": {
"hash": "sha256-2VQzEBAAu6YasottOTu3YjQvvXR5gT3DAjGhp63wMNo=", "hash": "sha256-CXCCJhR6Re423ZxWTheh0qus7sh7EqsSHz2x0Tz0t1E=",
"version": "0.2025.06.25.08.12.stable_01" "version": "0.2025.07.02.08.36.stable_02"
}, },
"linux_aarch64": { "linux_aarch64": {
"hash": "sha256-5jpW7mUHLshGZUWigAJ8QgmpYnfosJN1JpRLeNvVK3Y=", "hash": "sha256-uaOTKWuufzfu9T8DW86Nur9QSRIcnNYCCahCrEEDPpg=",
"version": "0.2025.06.25.08.12.stable_01" "version": "0.2025.07.02.08.36.stable_02"
} }
} }

View File

@ -2,6 +2,7 @@
lib, lib,
stdenv, stdenv,
fetchFromGitLab, fetchFromGitLab,
fetchpatch,
abseil-cpp, abseil-cpp,
meson, meson,
ninja, ninja,
@ -21,6 +22,14 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-YR4ELukJgHMbfe80H+r8OiaZUCAqefGXmVOaTVVgOqA="; hash = "sha256-YR4ELukJgHMbfe80H+r8OiaZUCAqefGXmVOaTVVgOqA=";
}; };
patches = [
(fetchpatch {
name = "gcc-15-compat.patch";
url = "https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/commit/e9c78dc4712fa6362b0c839ad57b6b46dce1ba83.diff";
hash = "sha256-QXOtya7RA0UTV9VK4qpql5D8QcOKAn6qURZvPpWT+vg=";
})
];
outputs = [ outputs = [
"out" "out"
"dev" "dev"

View File

@ -8,15 +8,15 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "wiremix"; pname = "wiremix";
version = "0.4.0"; version = "0.5.0";
src = fetchCrate { src = fetchCrate {
inherit pname version; inherit pname version;
hash = "sha256-LtwKG3phUuNgwXlAJMhZkOenYHGyXGRhNcr6+WKxVz0="; hash = "sha256-8pXpbW6/XYiWUqulL8b+kGqhTa/X8+tkgL8EWguWs6c=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-Qc+VubikiYox1zqy2HO3InRI8aFT8AorrFZBQhNGFOQ="; cargoHash = "sha256-czhPbXkhuwUdwwP2uizU1Ob8t/x0nrJr3rquRO8Zktw=";
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config

View File

@ -6,17 +6,17 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "wit-bindgen"; pname = "wit-bindgen";
version = "0.42.1"; version = "0.43.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bytecodealliance"; owner = "bytecodealliance";
repo = "wit-bindgen"; repo = "wit-bindgen";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-zj+O8Rp/KXvDYCew0k5veBUokR91CGEIan398/mPY8w="; hash = "sha256-fysraQTB1+GIeXagXVAUEp1iKCX1zZNL/7UqsTLkAbg=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-epvE6qSKVUudqHXPJG5mP2X7xlR5XSm3UWDzZK0gHyA="; cargoHash = "sha256-A5HhJwH29U5nFVIyPrgPxpCiLLBo4zEqtApO8lv/5us=";
# Some tests fail because they need network access to install the `wasm32-unknown-unknown` target. # Some tests fail because they need network access to install the `wasm32-unknown-unknown` target.
# However, GitHub Actions ensures a proper build. # However, GitHub Actions ensures a proper build.

View File

@ -9,19 +9,19 @@
}: }:
let let
pname = "workout-tracker"; pname = "workout-tracker";
version = "2.3.0"; version = "2.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jovandeginste"; owner = "jovandeginste";
repo = "workout-tracker"; repo = "workout-tracker";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-dhuAa0gq++PluglLiU9A4Cve8WCvFz3JDWyhvjMdi0A="; hash = "sha256-CJiUSN0QmZD5B/KPlHY2SySQC3D/+aVdydS4mYTabz0=";
}; };
assets = buildNpmPackage { assets = buildNpmPackage {
pname = "${pname}-assets"; pname = "${pname}-assets";
inherit version src; inherit version src;
npmDepsHash = "sha256-te7A8RRBOM/Ft0wdeBI0rng2IB9Zs6KzI3OK4bfBRRE="; npmDepsHash = "sha256-kzHISDTACtqTJWyjMaXb5HtuM1oaBaSscDZl9EOuRV8=";
dontNpmBuild = true; dontNpmBuild = true;
makeCacheWritable = true; makeCacheWritable = true;
postPatch = '' postPatch = ''

View File

@ -100,7 +100,9 @@ buildPerlPackage rec {
# https://git.alpinelinux.org/aports/tree/main/po4a/APKBUILD#n11 # https://git.alpinelinux.org/aports/tree/main/po4a/APKBUILD#n11
# #
# Disabling tests on Darwin until https://github.com/NixOS/nixpkgs/issues/236560 is resolved. # Disabling tests on Darwin until https://github.com/NixOS/nixpkgs/issues/236560 is resolved.
doCheck = (!stdenv.hostPlatform.isMusl) && (!stdenv.hostPlatform.isDarwin); #
# Disabling tests on linux (gettext-0.25): https://github.com/mquinson/po4a/issues/580
doCheck = false;
checkPhase = '' checkPhase = ''
export SGML_CATALOG_FILES=${docbook_sgml_dtd_41}/sgml/dtd/docbook-4.1/docbook.cat export SGML_CATALOG_FILES=${docbook_sgml_dtd_41}/sgml/dtd/docbook-4.1/docbook.cat

View File

@ -1,6 +1,7 @@
{ {
lib, lib,
stdenv, stdenv,
fetchFromGitLab,
buildPythonPackage, buildPythonPackage,
isPy27, isPy27,
fetchPypi, fetchPypi,
@ -28,14 +29,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "ase"; pname = "ase";
version = "3.25.0"; version = "3.25.0-unstable-2025-06-24";
pyproject = true; pyproject = true;
disabled = isPy27; src = fetchFromGitLab {
owner = "ase";
src = fetchPypi { repo = "ase";
inherit pname version; rev = "4e22dabfbe7ae2329e50260ca1b6f08a83527ac3";
hash = "sha256-N0z4yp/liPBdboVto8nBfvJi3JaAJ7Ix1EkzQUDJYsI="; hash = "sha256-ehMyVtPxfTxT8T418VyLGnUEyYip4LPTTaGL0va7qgM=";
}; };
build-system = [ setuptools ]; build-system = [ setuptools ];
@ -62,10 +63,6 @@ buildPythonPackage rec {
]; ];
disabledTests = [ disabledTests = [
# AssertionError: assert (1 != 0) == False
# TypeError: list indices must be integers or slices, not numpy.bool
"test_long"
"test_fundamental_params" "test_fundamental_params"
"test_ase_bandstructure" "test_ase_bandstructure"
"test_imports" "test_imports"

View File

@ -3,53 +3,32 @@
buildPythonPackage, buildPythonPackage,
fetchFromGitHub, fetchFromGitHub,
pytestCheckHook, pytestCheckHook,
unittestCheckHook, flit-core,
setuptools,
django, django,
pytest-unmagic,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "django-cte"; pname = "django-cte";
version = "1.3.3"; version = "2.0.0";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dimagi"; owner = "dimagi";
repo = "django-cte"; repo = "django-cte";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-OCENg94xHBeeE4A2838Cu3q2am2im2X4SkFSjc6DuhE="; hash = "sha256-DPbvmxTh24gTGvqzBg1VVN1LHxhGc+r81RITCuyccfw=";
}; };
build-system = [ setuptools ]; build-system = [
flit-core
];
dependencies = [ django ]; dependencies = [ django ];
nativeCheckInputs = [ pytestCheckHook ]; nativeCheckInputs = [
pytestCheckHook
disabledTests = [ pytest-unmagic
# Require Database connection
"test_cte_queryset"
"test_experimental_left_outer_join"
"test_explain"
"test_left_outer_join_on_empty_result_set_cte"
"test_named_ctes"
"test_named_simple_ctes"
"test_non_cte_subquery"
"test_outerref_in_cte_query"
"test_simple_cte_query"
"test_update_cte_query"
"test_update_with_subquery"
"test_heterogeneous_filter_in_cte"
"test_raw_cte_sql"
"test_alias_as_subquery"
"test_alias_change_in_annotation"
"test_attname_should_not_mask_col_name"
"test_pickle_recursive_cte_queryset"
"test_recursive_cte_query"
"test_recursive_cte_reference_in_condition"
"test_union_with_first"
"test_union_with_select_related_and_first"
"test_union_with_select_related_and_order"
]; ];
pythonImportsCheck = [ "django_cte" ]; pythonImportsCheck = [ "django_cte" ];

View File

@ -0,0 +1,40 @@
{
lib,
fetchFromGitHub,
buildPythonPackage,
django,
django-pgtrigger,
poetry-core,
}:
buildPythonPackage rec {
pname = "django-pghistory";
version = "3.7.0";
pyproject = true;
src = fetchFromGitHub {
owner = "Opus10";
repo = "django-pghistory";
tag = "${version}";
hash = "sha256-HXnljqbLNnKqueDNDTEhKHNkm5FcQGsA54mdnk3rYNI=";
};
build-system = [
poetry-core
];
dependencies = [
django
django-pgtrigger
];
pythonImportsCheck = [ "pghistory" ];
meta = {
changelog = "https://github.com/Opus10/django-pghistory/releases/tag/${version}";
description = "History tracking for Django and Postgres";
homepage = "https://django-pghistory.readthedocs.io";
maintainers = with lib.maintainers; [ pyrox0 ];
license = lib.licenses.bsd3;
};
}

View File

@ -0,0 +1,41 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
poetry-core,
django,
psycopg2,
}:
buildPythonPackage rec {
pname = "django-pgtrigger";
version = "4.15.3";
pyproject = true;
src = fetchFromGitHub {
owner = "AmbitionEng";
repo = "django-pgtrigger";
tag = version;
hash = "sha256-aFjg4rCWM1F2O1zDBVo2zN1LhOPN+UyIZphuTHMAjhQ=";
};
build-system = [ poetry-core ];
dependencies = [
django
psycopg2
];
pythonImportsCheck = [ "pgtrigger" ];
meta = {
description = "Write Postgres triggers for your Django models";
homepage = "https://github.com/Opus10/django-pgtrigger";
changelog = "https://github.com/Opus10/django-pgtrigger/blob/${src.rev}/CHANGELOG.md";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [
raitobezarius
pyrox0
];
};
}

View File

@ -0,0 +1,71 @@
{
lib,
buildPythonPackage,
fetchurl,
fetchFromGitHub,
rustPlatform,
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "kanalizer";
version = "0.1.1";
pyproject = true;
src = fetchFromGitHub {
owner = "VOICEVOX";
repo = "kanalizer";
tag = version;
hash = "sha256-6GxTVlc0Ec80LYQoGgLVRVoi05u6vwt5WGkd4UYX2Lg=";
};
sourceRoot = "${src.name}/infer";
model =
let
modelTag = "v5";
in
fetchurl {
url = "https://huggingface.co/VOICEVOX/kanalizer-model/resolve/${modelTag}/model/c2k.safetensors";
hash = "sha256-sKhunAsN9Uwz2O1+eFQN8fh09eq67cFotTtLHsWJBRM=";
};
prePatch = ''
substituteInPlace Cargo.toml \
--replace-fail 'version = "0.0.0"' 'version = "${version}"'
ln -s "$model" crates/kanalizer-rs/models/model-c2k.safetensors
'';
cargoDeps = rustPlatform.fetchCargoVendor {
inherit
pname
version
src
sourceRoot
;
hash = "sha256-2vnld5ReLsjm0kRoRAXhm+d0yj7AjfEr83xXhuyPbOU=";
};
buildAndTestSubdir = "crates/kanalizer-py";
nativeBuildInputs = [
rustPlatform.cargoSetupHook
rustPlatform.maturinBuildHook
];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "kanalizer" ];
meta = {
description = "Library that guesses the Japanese pronounciation of English words";
homepage = "https://github.com/VOICEVOX/kanalizer";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ tomasajt ];
sourceProvenance = with lib.sourceTypes; [
fromSource
binaryNativeCode # the model file
];
};
}

View File

@ -120,8 +120,6 @@ buildPythonPackage rec {
pytestFlags = [ pytestFlags = [
"-Wignore::DeprecationWarning" "-Wignore::DeprecationWarning"
# snapshot mismatches
"--inline-snapshot=update"
]; ];
disabledTests = disabledTests =

View File

@ -245,9 +245,10 @@ dependencies = [
[[package]] [[package]]
name = "pycrdt" name = "pycrdt"
version = "0.12.22" version = "0.12.23"
dependencies = [ dependencies = [
"pyo3", "pyo3",
"serde_json",
"yrs", "yrs",
] ]

View File

@ -19,14 +19,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pycrdt"; pname = "pycrdt";
version = "0.12.22"; version = "0.12.23";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "y-crdt"; owner = "y-crdt";
repo = "pycrdt"; repo = "pycrdt";
tag = version; tag = version;
hash = "sha256-1RTH6u+B+u4+ILvQufHgKCRW1Pj3Tyz5PFOBP/bDWD4="; hash = "sha256-xMGu7L6aisTLzLx8pw/k4rXvjTiZsPANXsU1T1FOXKM=";
}; };
postPatch = '' postPatch = ''

View File

@ -13,11 +13,13 @@
glibcLocales, glibcLocales,
# dependencies # dependencies
bibtexparser,
joblib, joblib,
matplotlib, matplotlib,
monty, monty,
networkx, networkx,
numpy, numpy,
orjson,
palettable, palettable,
pandas, pandas,
plotly, plotly,
@ -50,7 +52,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pymatgen"; pname = "pymatgen";
version = "2025.1.24"; version = "2025.6.14";
pyproject = true; pyproject = true;
disabled = pythonAtLeast "3.13"; disabled = pythonAtLeast "3.13";
@ -59,7 +61,7 @@ buildPythonPackage rec {
owner = "materialsproject"; owner = "materialsproject";
repo = "pymatgen"; repo = "pymatgen";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-0P3/M6VI2RKPArMwXD95sjW7dYOTXxUeu4tOliN0IGk="; hash = "sha256-HMYYhXT5k/EjG1sIBq/53K9ogeSk8ZEJQBrDHCgz+SA=";
}; };
build-system = [ setuptools ]; build-system = [ setuptools ];
@ -70,11 +72,13 @@ buildPythonPackage rec {
]; ];
dependencies = [ dependencies = [
bibtexparser
joblib joblib
matplotlib matplotlib
monty monty
networkx networkx
numpy numpy
orjson
palettable palettable
pandas pandas
plotly plotly
@ -116,6 +120,11 @@ buildPythonPackage rec {
pythonImportsCheck = [ "pymatgen" ]; pythonImportsCheck = [ "pymatgen" ];
pytestFlagsArray = [
# We have not packaged moyopy yet.
"--deselect=tests/analysis/test_prototypes.py::test_get_protostructure_label_from_moyopy"
];
nativeCheckInputs = [ nativeCheckInputs = [
addBinToPathHook addBinToPathHook
pytestCheckHook pytestCheckHook
@ -158,6 +167,9 @@ buildPythonPackage rec {
"test_proj_bandstructure_plot" "test_proj_bandstructure_plot"
"test_structure" "test_structure"
"test_structure_environments" "test_structure_environments"
# attempt to insert nil object from objects[1]
"test_timer_10_2_7"
]; ];
disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [

View File

@ -0,0 +1,19 @@
commit 6df405512d33d432bb45553ddcffbc70edec51f6
Author: Lein Matsumaru <applePrincess@applePrincess.io>
Date: Sun Jun 29 12:59:57 2025 +0000
Coerce int
diff --git a/pyscf/ci/gcisd.py b/pyscf/ci/gcisd.py
index d58e0364c..050f83962 100644
--- a/pyscf/ci/gcisd.py
+++ b/pyscf/ci/gcisd.py
@@ -197,7 +197,7 @@ def from_fcivec(ci0, nelec, orbspin, frozen=None):
numpy.count_nonzero(orbspin[:nelec] == 1))
ucisdvec = ucisd.from_fcivec(ci0, norb//2, nelec, frozen)
nocc = numpy.count_nonzero(~frozen_mask[:sum(nelec)])
- return from_ucisdvec(ucisdvec, nocc, orbspin[~frozen_mask])
+ return from_ucisdvec(ucisdvec, int(nocc), orbspin[~frozen_mask])
def make_rdm1(myci, civec=None, nmo=None, nocc=None, ao_repr=False):

View File

@ -2,15 +2,23 @@
buildPythonPackage, buildPythonPackage,
lib, lib,
fetchFromGitHub, fetchFromGitHub,
# build-sysetm
cmake, cmake,
# build inputs
blas, blas,
libcint, libcint,
libxc, libxc,
xcfun, xcfun,
# dependencies
cppe, cppe,
h5py, h5py,
numpy, numpy,
scipy, scipy,
# tests
pytestCheckHook, pytestCheckHook,
}: }:
@ -26,6 +34,12 @@ buildPythonPackage rec {
hash = "sha256-UTeZXlNuSWDOcBRVbUUWJ3mQnZZQr17aTw6rRA5DRNI="; hash = "sha256-UTeZXlNuSWDOcBRVbUUWJ3mQnZZQr17aTw6rRA5DRNI=";
}; };
patches = [
# Converts numpy.int64 to int where necessary.
# Upstream issue: https://github.com/pyscf/pyscf/issues/2878
./coerce-numpy-to-int.patch
];
# setup.py calls Cmake and passes the arguments in CMAKE_CONFIGURE_ARGS to cmake. # setup.py calls Cmake and passes the arguments in CMAKE_CONFIGURE_ARGS to cmake.
build-system = [ cmake ]; build-system = [ cmake ];
dontUseCmakeConfigure = true; dontUseCmakeConfigure = true;
@ -60,6 +74,7 @@ buildPythonPackage rec {
# Numerically slightly off tests # Numerically slightly off tests
disabledTests = [ disabledTests = [
"test_rdm_trace"
"test_tdhf_singlet" "test_tdhf_singlet"
"test_ab_hf" "test_ab_hf"
"test_ea" "test_ea"
@ -99,14 +114,15 @@ buildPythonPackage rec {
"--ignore-glob=pyscf/grad/test/test_casscf.py" "--ignore-glob=pyscf/grad/test/test_casscf.py"
]; ];
meta = with lib; { meta = {
description = "Python-based simulations of chemistry framework"; description = "Python-based simulations of chemistry framework";
homepage = "https://github.com/pyscf/pyscf"; homepage = "https://github.com/pyscf/pyscf";
license = licenses.asl20; license = lib.licenses.asl20;
platforms = [ platforms = [
"x86_64-linux" "x86_64-linux"
"x86_64-darwin" "x86_64-darwin"
"aarch64-darwin"
]; ];
maintainers = [ maintainers.sheepforce ]; maintainers = [ lib.maintainers.sheepforce ];
}; };
} }

View File

@ -0,0 +1,39 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
pytestCheckHook,
flit-core,
pytest,
}:
buildPythonPackage rec {
pname = "pytest-unmagic";
version = "1.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "dimagi";
repo = "pytest-unmagic";
tag = "v${version}";
hash = "sha256-5WnLjQ0RuwLBIZAbOJoQ0KBEnb7yUWTUFBKy+WgNctQ=";
};
build-system = [
flit-core
];
dependencies = [ pytest ];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "unmagic" ];
meta = {
description = "Pytest fixtures with conventional import semantics";
homepage = "https://github.com/dimagi/pytest-unmagic";
license = lib.licenses.bsd3;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ jopejoe1 ];
};
}

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