Merge staging-next into staging
This commit is contained in:
@@ -12633,6 +12633,12 @@
|
||||
githubId = 30251156;
|
||||
name = "Jesse Moore";
|
||||
};
|
||||
jesssullivan = {
|
||||
email = "jess@sulliwood.org";
|
||||
github = "Jesssullivan";
|
||||
githubId = 37297218;
|
||||
name = "Jess Sullivan";
|
||||
};
|
||||
jethair = {
|
||||
email = "jethair@duck.com";
|
||||
github = "JetHair";
|
||||
@@ -25376,12 +25382,6 @@
|
||||
githubId = 487050;
|
||||
name = "Shea Levy";
|
||||
};
|
||||
shlok = {
|
||||
email = "sd-nix-maintainer@quant.is";
|
||||
github = "shlok";
|
||||
githubId = 3000933;
|
||||
name = "Shlok Datye";
|
||||
};
|
||||
shmish111 = {
|
||||
email = "shmish111@gmail.com";
|
||||
github = "shmish111";
|
||||
|
||||
@@ -24,6 +24,8 @@
|
||||
|
||||
- Python 2 has been removed from the top-level package set, as it is long past end-of-life. The `python2`, `python27`, `python2Full`, `python27Full`, `python2Packages`, and `python27Packages` attributes, along with the legacy `python`, `pythonFull`, and `pythonPackages` aliases, now throw an error directing you to `python3`. The `isPy2` and `isPy27` package flags have been removed accordingly. The only remaining Python 2 interpreter is vendored inside the `resholve` package for its `oil` dependency and is not exposed for general use.
|
||||
|
||||
- `services.timesyncd.extraConfig` has been removed in favor of the structured [](#opt-services.timesyncd.settings.Time) option. Use `services.timesyncd.settings.Time` to set any `timesyncd.conf(5)` option directly. For example, replace `services.timesyncd.extraConfig = "PollIntervalMaxSec=180";` with `services.timesyncd.settings.Time.PollIntervalMaxSec = 180;`.
|
||||
|
||||
## Other Notable Changes {#sec-release-26.11-notable-changes}
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
@@ -181,8 +181,23 @@ in
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
security.enableWrappers = lib.mkEnableOption "SUID/SGID wrappers" // {
|
||||
security.enableWrappers = lib.mkEnableOption "" // {
|
||||
default = true;
|
||||
description = ''
|
||||
Whether to enable SUID/SGID wrappers.
|
||||
|
||||
::: {.warning}
|
||||
ONLY DISABLE THIS OPTION IF YOU KNOW WHAT YOU'RE DOING.
|
||||
:::
|
||||
|
||||
A normal interactive NixOS system requires SUID/SGID wrappers (e.g. for
|
||||
PAM and sudo). Disabling them, thus will lock you out from your system.
|
||||
|
||||
Disabling the SUID/SGID binaries is useful for non-interactive systems
|
||||
(like a firewall appliance) to minimize the attack surface. In the
|
||||
future, this might become available for interactive systems as well
|
||||
(e.g. with systemd's [run0](https://www.freedesktop.org/software/systemd/man/latest/run0)).
|
||||
'';
|
||||
};
|
||||
|
||||
security.wrappers = lib.mkOption {
|
||||
|
||||
@@ -14,6 +14,7 @@ let
|
||||
optional
|
||||
;
|
||||
inherit (lib.types)
|
||||
nullOr
|
||||
bool
|
||||
port
|
||||
str
|
||||
@@ -43,10 +44,10 @@ in
|
||||
type = submodule {
|
||||
inherit freeformType;
|
||||
options = {
|
||||
port = mkOption {
|
||||
local_address = mkOption {
|
||||
type = str;
|
||||
default = ":3333";
|
||||
description = "HTTP server listen port";
|
||||
description = "HTTP server listen address";
|
||||
};
|
||||
};
|
||||
};
|
||||
@@ -94,6 +95,20 @@ in
|
||||
};
|
||||
};
|
||||
};
|
||||
tmdb = mkOption {
|
||||
default = { };
|
||||
description = "TMDB api settings";
|
||||
type = submodule {
|
||||
inherit freeformType;
|
||||
options = {
|
||||
api_key = mkOption {
|
||||
type = nullOr str;
|
||||
default = null;
|
||||
description = "TMDB api key, to avoid api limits. Leave null to use the default shared key.";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
@@ -129,6 +144,7 @@ in
|
||||
]
|
||||
++ optional cfg.useLocalPostgresDB "postgresql.target";
|
||||
requires = optional cfg.useLocalPostgresDB "postgresql.target";
|
||||
restartTriggers = [ config.environment.etc."xdg/bitmagnet/config.yml".source ];
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
DynamicUser = true;
|
||||
@@ -138,6 +154,7 @@ in
|
||||
Restart = "on-failure";
|
||||
WorkingDirectory = "/var/lib/bitmagnet";
|
||||
StateDirectory = "bitmagnet";
|
||||
BindReadOnlyPaths = [ "/etc/xdg/bitmagnet/config.yml" ];
|
||||
|
||||
# Sandboxing (sorted by occurrence in https://www.freedesktop.org/software/systemd/man/systemd.exec.html)
|
||||
ProtectSystem = "strict";
|
||||
|
||||
@@ -1,26 +1,37 @@
|
||||
{ config, lib, ... }:
|
||||
|
||||
with lib;
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
utils,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
cfg = config.services.timesyncd;
|
||||
in
|
||||
{
|
||||
|
||||
imports = [
|
||||
(lib.mkRemovedOptionModule [
|
||||
"services"
|
||||
"timesyncd"
|
||||
"extraConfig"
|
||||
] "Use services.timesyncd.settings.Time instead.")
|
||||
];
|
||||
|
||||
options = {
|
||||
|
||||
services.timesyncd = with types; {
|
||||
enable = mkOption {
|
||||
services.timesyncd = {
|
||||
enable = lib.mkOption {
|
||||
default = !config.boot.isContainer;
|
||||
defaultText = literalExpression "!config.boot.isContainer";
|
||||
type = bool;
|
||||
defaultText = lib.literalExpression "!config.boot.isContainer";
|
||||
type = lib.types.bool;
|
||||
description = ''
|
||||
Enables the systemd NTP client daemon.
|
||||
'';
|
||||
};
|
||||
servers = mkOption {
|
||||
servers = lib.mkOption {
|
||||
default = null;
|
||||
type = nullOr (listOf str);
|
||||
type = lib.types.nullOr (lib.types.listOf lib.types.str);
|
||||
description = ''
|
||||
The set of NTP servers from which to synchronise.
|
||||
|
||||
@@ -31,10 +42,10 @@ in
|
||||
See {manpage}`timesyncd.conf(5)` for details.
|
||||
'';
|
||||
};
|
||||
fallbackServers = mkOption {
|
||||
fallbackServers = lib.mkOption {
|
||||
default = config.networking.timeServers;
|
||||
defaultText = literalExpression "config.networking.timeServers";
|
||||
type = nullOr (listOf str);
|
||||
defaultText = lib.literalExpression "config.networking.timeServers";
|
||||
type = lib.types.nullOr (lib.types.listOf lib.types.str);
|
||||
description = ''
|
||||
The set of fallback NTP servers from which to synchronise.
|
||||
|
||||
@@ -45,21 +56,23 @@ in
|
||||
See {manpage}`timesyncd.conf(5)` for details.
|
||||
'';
|
||||
};
|
||||
extraConfig = mkOption {
|
||||
default = "";
|
||||
type = lines;
|
||||
example = ''
|
||||
PollIntervalMaxSec=180
|
||||
'';
|
||||
settings.Time = lib.mkOption {
|
||||
default = { };
|
||||
type = lib.types.submodule {
|
||||
freeformType = lib.types.attrsOf utils.systemdUtils.unitOptions.unitOption;
|
||||
};
|
||||
example = {
|
||||
PollIntervalMaxSec = 180;
|
||||
};
|
||||
description = ''
|
||||
Extra config options for systemd-timesyncd. See
|
||||
{manpage}`timesyncd.conf(5)` for available options.
|
||||
Settings for systemd-timesyncd. See {manpage}`timesyncd.conf(5)` for
|
||||
available options.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
config = lib.mkIf cfg.enable {
|
||||
|
||||
systemd.additionalUpstreamSystemUnits = [ "systemd-timesyncd.service" ];
|
||||
|
||||
@@ -76,16 +89,17 @@ in
|
||||
environment.LD_LIBRARY_PATH = config.system.nssModules.path;
|
||||
};
|
||||
|
||||
environment.etc."systemd/timesyncd.conf".text = ''
|
||||
[Time]
|
||||
''
|
||||
+ optionalString (cfg.servers != null) ''
|
||||
NTP=${concatStringsSep " " cfg.servers}
|
||||
''
|
||||
+ optionalString (cfg.fallbackServers != null) ''
|
||||
FallbackNTP=${concatStringsSep " " cfg.fallbackServers}
|
||||
''
|
||||
+ cfg.extraConfig;
|
||||
services.timesyncd.settings.Time = lib.mkMerge [
|
||||
(lib.mkIf (cfg.servers != null) {
|
||||
NTP = lib.mkDefault (lib.concatStringsSep " " cfg.servers);
|
||||
})
|
||||
(lib.mkIf (cfg.fallbackServers != null) {
|
||||
FallbackNTP = lib.mkDefault (lib.concatStringsSep " " cfg.fallbackServers);
|
||||
})
|
||||
];
|
||||
|
||||
environment.etc."systemd/timesyncd.conf".text =
|
||||
utils.systemdUtils.lib.settingsToSections cfg.settings;
|
||||
|
||||
users.users.systemd-timesync = {
|
||||
uid = config.ids.uids.systemd-timesync;
|
||||
|
||||
@@ -1666,6 +1666,7 @@ in
|
||||
systemd-sysusers-immutable = runTest ./systemd-sysusers-immutable.nix;
|
||||
systemd-sysusers-mutable = runTest ./systemd-sysusers-mutable.nix;
|
||||
systemd-sysusers-password-option-override-ordering = runTest ./systemd-sysusers-password-option-override-ordering.nix;
|
||||
systemd-timesyncd = runTest ./systemd-timesyncd.nix;
|
||||
systemd-timesyncd-nscd-dnssec = runTest ./systemd-timesyncd-nscd-dnssec.nix;
|
||||
systemd-user-linger = runTest ./systemd-user-linger.nix;
|
||||
systemd-user-linger-purge = runTest ./systemd-user-linger-purge.nix;
|
||||
|
||||
@@ -20,7 +20,7 @@ let
|
||||
ntpIP = "192.0.2.1";
|
||||
in
|
||||
{
|
||||
name = "systemd-timesyncd";
|
||||
name = "systemd-timesyncd-nscd-dnssec";
|
||||
nodes.machine =
|
||||
{
|
||||
pkgs,
|
||||
@@ -50,9 +50,7 @@ in
|
||||
# Configure systemd-timesyncd to use our NTP hostname
|
||||
services.timesyncd.enable = lib.mkForce true;
|
||||
services.timesyncd.servers = [ ntpHostname ];
|
||||
services.timesyncd.extraConfig = ''
|
||||
FallbackNTP=${ntpHostname}
|
||||
'';
|
||||
services.timesyncd.settings.Time.FallbackNTP = ntpHostname;
|
||||
|
||||
# The debug output is necessary to determine whether systemd-timesyncd successfully resolves our NTP hostname or not
|
||||
systemd.services.systemd-timesyncd.environment.SYSTEMD_LOG_LEVEL = "debug";
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
{
|
||||
name = "systemd-timesyncd";
|
||||
meta = {
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
nodes.machine =
|
||||
{ lib, ... }:
|
||||
{
|
||||
services.timesyncd = {
|
||||
enable = lib.mkForce true;
|
||||
servers = [ "ntp.example.com" ];
|
||||
fallbackServers = [ "fallback.example.com" ];
|
||||
settings.Time = {
|
||||
PollIntervalMaxSec = "180";
|
||||
RootDistanceMaxSec = "5";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
|
||||
with subtest("settings.Time renders timesyncd.conf"):
|
||||
machine.succeed("grep -F '[Time]' /etc/systemd/timesyncd.conf")
|
||||
machine.succeed("grep -F 'NTP=ntp.example.com' /etc/systemd/timesyncd.conf")
|
||||
machine.succeed("grep -F 'FallbackNTP=fallback.example.com' /etc/systemd/timesyncd.conf")
|
||||
machine.succeed("grep -F 'PollIntervalMaxSec=180' /etc/systemd/timesyncd.conf")
|
||||
machine.succeed("grep -F 'RootDistanceMaxSec=5' /etc/systemd/timesyncd.conf")
|
||||
'';
|
||||
}
|
||||
@@ -12,26 +12,26 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
sources = {
|
||||
"x86_64-linux" = {
|
||||
arch = "linux-x64";
|
||||
hash = "sha256-Jma7CafP5MCMmPdfxJLaOtQJsinfZUPmPZs2DhkV4k8=";
|
||||
hash = "sha256-l1bwzuEi8sCBsdad2a5UDPN12QtlHhhgXBfsNxP5GwA=";
|
||||
};
|
||||
"x86_64-darwin" = {
|
||||
arch = "darwin-x64";
|
||||
hash = "sha256-rNtisGPnKAWVnKNc1enOSwMeU2IBS89GWgem6SEQ7/o=";
|
||||
hash = "sha256-31Sj5KlZnRKa0sR2J4A4CRuDF8fwXlzikukH+OX/GpU=";
|
||||
};
|
||||
"aarch64-linux" = {
|
||||
arch = "linux-arm64";
|
||||
hash = "sha256-0HGbwuy0SgPY4Ojp3+rhRxGz4TnVmE8PKjbzxMcAeIM=";
|
||||
hash = "sha256-7m9or/105/YIjhMlwMFLcN9tP9hj/4NU85Y3/5DDuDw=";
|
||||
};
|
||||
"aarch64-darwin" = {
|
||||
arch = "darwin-arm64";
|
||||
hash = "sha256-G3HphZX5yTr1sNwjEWA1ZEGR87/gwUmuxGmzHEn9NNg=";
|
||||
hash = "sha256-q7mGGv/L9N7hwM0EIKF7d+lxcl0V00a6I/CK8j5E8SE=";
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
name = "ruff";
|
||||
publisher = "charliermarsh";
|
||||
version = "2026.42.0";
|
||||
version = "2026.46.0";
|
||||
}
|
||||
// sources.${stdenvNoCC.hostPlatform.system}
|
||||
or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");
|
||||
|
||||
@@ -5110,8 +5110,8 @@ let
|
||||
mktplcRef = {
|
||||
publisher = "vscjava";
|
||||
name = "vscode-java-dependency";
|
||||
version = "0.27.4";
|
||||
hash = "sha256-nEONTcT0chv+gpi43naszDCh3R0aKnwC91hZ8hqje7s=";
|
||||
version = "0.27.5";
|
||||
hash = "sha256-epLCQeNIZkwM8U/dKQ1dIAlWVKts2AlJivhSuJHXy2o=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
|
||||
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "latex-workshop";
|
||||
publisher = "James-Yu";
|
||||
version = "10.15.2";
|
||||
hash = "sha256-H/WJdkwfiNIFBc4dW6XqB6QopKZYjYN/zDVUpoY3erk=";
|
||||
version = "10.16.1";
|
||||
hash = "sha256-QhqBCQjWADmuPK9ryMCoQPWE1pyIeO9XfYvN40ipL0Y=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog";
|
||||
|
||||
@@ -7,19 +7,19 @@
|
||||
let
|
||||
supported = {
|
||||
x86_64-linux = {
|
||||
hash = "sha256-B1ymOFv6CPGhlyA14wis7qn+JlHv09FOt0OYyPtnyEA=";
|
||||
hash = "sha256-HECflrFni3eWxMs+BpjWBhU3pqF5jjMIEjkp9ibx784=";
|
||||
arch = "linux-x64";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
hash = "sha256-127gG0MZ+SikOLrDyQgmiPukkCXjR/tWOCmT9lDphBU=";
|
||||
hash = "sha256-dCkSOClWWq3DGU9psrinI5f5oC69K+AhdHdXwKIQsFw=";
|
||||
arch = "darwin-x64";
|
||||
};
|
||||
aarch64-linux = {
|
||||
hash = "sha256-UJ515dYrIdP4EyZXSrI3OzM620WUHwlemd1mfoXRw4E=";
|
||||
hash = "sha256-XNIx2ibOe1/1lo8RkYkAv+oBDYpqnmMcIjpoulbrr+w=";
|
||||
arch = "linux-arm64";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
hash = "sha256-amlxTRVVIFmcXErvGBh2ZSXoSzJN1Pmr2uWcnRRpcJU=";
|
||||
hash = "sha256-rXVuQN0SDmymQNncFZzyD4H+j6hxp1yoiaNXnbzrlo0=";
|
||||
arch = "darwin-arm64";
|
||||
};
|
||||
};
|
||||
@@ -34,7 +34,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = base // {
|
||||
name = "tombi";
|
||||
publisher = "tombi-toml";
|
||||
version = "0.9.24";
|
||||
version = "1.1.1";
|
||||
};
|
||||
meta = {
|
||||
description = "TOML Language Server";
|
||||
|
||||
@@ -56,8 +56,8 @@ let
|
||||
}
|
||||
else
|
||||
{
|
||||
version = "2026.1";
|
||||
hash = "sha256-2VoxP1bbfgXuOiHlD1gv3uUXbC9guQC6skYf2Vxegb4=";
|
||||
version = "2026.2";
|
||||
hash = "sha256-0n5EVegkYXeVI2Z5hjGg2tny4fVnQApsuFShaNzAUN0=";
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "asdbctl";
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "juliuszint";
|
||||
repo = "asdbctl";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-S5m1iQlchGKc0PODQNDHpNzaNXRepmk5zfK5aXdiMiM=";
|
||||
hash = "sha256-jDflaksnsw55RHMgamfJNRE7GwThQMYfXtLAWbOnoMw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-OPmnGh6xN6XeREeIgyYB2aeHUpdQ5hFS5MivcTeY29E=";
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "balatro-mod-manager";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skyline69";
|
||||
repo = "balatro-mod-manager";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ISEgmyGA96r+OolKc/8qiKee43ruNonmWdqfM4pr3p8=";
|
||||
hash = "sha256-cazd6Cns87cjwBORQIsAD5rBes7eTGCAz7bytZO+TsQ=";
|
||||
};
|
||||
|
||||
nodeModules = stdenv.mkDerivation {
|
||||
@@ -52,13 +52,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash =
|
||||
{
|
||||
x86_64-linux = "sha256-97O4DrnjZO2mhSrCQz9xbcRCSaxMNNa4NaLNPlmecJg=";
|
||||
aarch64-linux = "sha256-0H14Be8jhBwOBG2Ui8gYrnAcTtatLVsBxFVfTyzmutw=";
|
||||
x86_64-linux = "sha256-SQCF05uuJg16Il7SvCXlzkm64wJyPfNzVqfgDj7YldI=";
|
||||
aarch64-linux = "sha256-YobKPWe+0StlyJkYEeUmNzYAinGwR042HWpdwWOCt6Q=";
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or (throw "Unsupported system ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
|
||||
cargoHash = "sha256-TPZf4jtv/3mIpe6ASzPkIusQC/iPFpYN51XiiH6pkZc=";
|
||||
cargoHash = "sha256-m27OdD+hpj1fGiTbe9VmdY+2EFBZKJ3o/4WMdpCpRSw=";
|
||||
|
||||
dontUseCargoParallelTests = true;
|
||||
checkFlags = [
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "better-commits";
|
||||
version = "1.23.1";
|
||||
version = "1.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Everduin94";
|
||||
repo = "better-commits";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-4ixxgpqyjU1juU200Dc0YTSC+bvVYHpqzylCR3Yy+Yk=";
|
||||
hash = "sha256-OzQ6/ShE5V49hOvTbG2v6J/orDCulgaAQnU6S9w/Ayw=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-18fkqQ3Y0fflSGXDPaMpHW7nC0ARMoCStxBzkEXiujs=";
|
||||
npmDepsHash = "sha256-1ASVbn8MqWDiDKx+vYs2DNv9GuvHg4Acv8Kuj7JVBHE=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cargo-semver-checks";
|
||||
version = "0.47.0";
|
||||
version = "0.48.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "obi1kenobi";
|
||||
repo = "cargo-semver-checks";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-1D6WFsiMOl/bJr0J+mmvLlgnRSKN6rPhDSnDsdLTC9E=";
|
||||
hash = "sha256-fF29YLYNL0gRD5ZcgBL19wO9DqLpXTQsxQkXlVw8U7A=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-YbtYIHj899eJSrp5n5jODgTkL9L26EnruzECwBrBF00=";
|
||||
cargoHash = "sha256-VHxgPvlhasM3GnK1uMDA2vi0z3TxHWpCOlkWJhcV/F8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -12,19 +12,19 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cmdstan";
|
||||
version = "2.38.0";
|
||||
version = "2.39.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stan-dev";
|
||||
repo = "cmdstan";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-4Mx4LvXW2lYOSSOgNT0f+unry6mBobgGTDLwtiypHBU=";
|
||||
hash = "sha256-7vGEqIJOFWeESq4xL2z2ZjNaVWEqqzPmGT6tpWBzrU0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace stan/lib/stan_math/make/libraries \
|
||||
--replace "/usr/bin/env bash" "bash"
|
||||
--replace-fail "/usr/bin/env bash" "bash"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "containerd";
|
||||
version = "2.3.0";
|
||||
version = "2.3.1";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -28,7 +28,7 @@ buildGoModule rec {
|
||||
owner = "containerd";
|
||||
repo = "containerd";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-qdwzcXrMWZ/r0tsNw5OpJC3X2Kw3Yn92wRxNCjZhMw0=";
|
||||
hash = "sha256-BpKBrMluU5MmojJp/9Og5UrkUBLHav5qx6Re1SFhlhY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cyme";
|
||||
version = "2.3.0";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tuna-f1sh";
|
||||
repo = "cyme";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Jgm/IIrtsoUQQ6WmS3Ol20rc+oQJsfpOyHqP06jcPfM=";
|
||||
hash = "sha256-5BDvFtqBkMxhZu9Yk8Ov30Hmfg8xD1kRnD7lnEvR6v0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-0CeyrHoqKdt5cy9F+LpZAsCR2nXMtXvyk1Dr+f9SS44=";
|
||||
cargoHash = "sha256-kzpYbpCo8E5KQBkPwxe5pz+vjD1H3J51fnVdOW9LawM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -24,9 +24,9 @@ buildGoModule (finalAttrs: {
|
||||
"-X main.version=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
doInstallCheck = true;
|
||||
|
||||
nativeCheckInputs = [ versionCheckHook ];
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ mkDprintPlugin }:
|
||||
mkDprintPlugin {
|
||||
description = "Biome (JS/TS/JSON) wrapper plugin";
|
||||
hash = "sha256-k+o4eiLwzoCF6MPX0dEn/3modSwvFYFuzMe47cdJWo8=";
|
||||
hash = "sha256-0zbtVqdL86r69ahRS61qJ2r7qUtRzfY1qO1FL+SWt+g=";
|
||||
initConfig = {
|
||||
configExcludes = [ "**/node_modules" ];
|
||||
configKey = "biome";
|
||||
@@ -17,6 +17,6 @@ mkDprintPlugin {
|
||||
};
|
||||
pname = "dprint-plugin-biome";
|
||||
updateUrl = "https://plugins.dprint.dev/dprint/biome/latest.json";
|
||||
url = "https://plugins.dprint.dev/biome-0.12.11.wasm";
|
||||
version = "0.12.11";
|
||||
url = "https://plugins.dprint.dev/biome-0.12.12.wasm";
|
||||
version = "0.12.12";
|
||||
}
|
||||
|
||||
@@ -11,17 +11,17 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "firebase-tools";
|
||||
version = "15.18.0";
|
||||
version = "15.19.1";
|
||||
nodejs = nodejs_22;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firebase";
|
||||
repo = "firebase-tools";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-bsCBDiHOkov3OgjGy29wmZVXDBX6AmH34wNYOPve6uI=";
|
||||
hash = "sha256-ofKgbByTlQgU0qVxsAdnOLruZwboHqEmBIOHmptEUcY=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-qJezxPI1ao6/G4Ku7qjOFbdEaJohAH+7DWeP9QY/jOs=";
|
||||
npmDepsHash = "sha256-1F1jMl8JFWf/f6smd30W3GQvuoxHtappDOnh3P67/08=";
|
||||
|
||||
# No more package-lock.json in upstream src
|
||||
postPatch = ''
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "fluxcd-operator";
|
||||
version = "0.49.0";
|
||||
version = "0.50.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "controlplaneio-fluxcd";
|
||||
repo = "fluxcd-operator";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-hWMXoJ47+kDmMGkGV9GOJ9ssdK6RVvcmxf3fiQYhvgM=";
|
||||
hash = "sha256-4FIsad3/57KtyTVQE0T4jhQGEvuEw9/ZFWsriLyc6Ok=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-UANjDzaYJ5t10ZzG0a7oftKQVqj1HcE6/LmlnLapCPY=";
|
||||
vendorHash = "sha256-DxXTepwTjgc+Xy3MAIFcYZ/XZZ3zGgyStmXN2/BqM74=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "fly";
|
||||
version = "8.2.2";
|
||||
version = "8.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "concourse";
|
||||
repo = "concourse";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-eqzrrbIpX6hS56SQe24gWlnBPMlLH1lz+NwxdNZ3OoE=";
|
||||
hash = "sha256-mg95mi2pose/vqLPeekv2lfS7rLtuyn+k9yeqbzlwm0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZNhGt+nyl7zmQIHT+5f/c2hixyZ8kLmCWO5qa7CAGuY=";
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "flyctl";
|
||||
version = "0.4.54";
|
||||
version = "0.4.57";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "superfly";
|
||||
@@ -22,11 +22,11 @@ buildGoModule rec {
|
||||
cd "$out"
|
||||
git rev-parse HEAD > COMMIT
|
||||
'';
|
||||
hash = "sha256-Ygy9UmB+n32+ihfbRdeEYx4P4o4o++fcJOTBQmoSwno=";
|
||||
hash = "sha256-1yI3YWXOqm3Y+lHaJFW5vgu7yYpW/hT2uGy0qgb7c5Y=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-naSKK8CmmUQuMJgJ/pOR0IeV4dYsg4BZey3jUWLDXhQ=";
|
||||
vendorHash = "sha256-pqEMVtTXxSQtEILKHNpfiYPiHBrLnP+dRGmczIti7uQ=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fna3d";
|
||||
version = "26.05";
|
||||
version = "26.06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FNA-XNA";
|
||||
repo = "FNA3D";
|
||||
tag = finalAttrs.version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-b0s7aKRTKNYIIckSItmjsY2Or8td/YvTELx6tOFhiKM=";
|
||||
hash = "sha256-p85nZzpegjXQTUv64Pxhn6BxBTUN5bOs73cgqLu79GI=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "forgejo-mcp";
|
||||
version = "2.26.0";
|
||||
version = "2.28.0";
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
owner = "goern";
|
||||
repo = "forgejo-mcp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-jUo3nSorlelAknb6fSoy5+mrW+y0337bRQ8WjtB9V7g=";
|
||||
hash = "sha256-nq5Mccz2mKWfkrEyqQXli4BB3+99NFwT3c1Mf2vZ3sc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-QDJRbF4mZzBv1vxvo1ZQJaUJayRHj1jMgjaRfAmLMik=";
|
||||
|
||||
@@ -30,13 +30,13 @@ let
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "frankenphp";
|
||||
version = "1.12.3";
|
||||
version = "1.12.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "php";
|
||||
repo = "frankenphp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-TYpbHwlFZ9S4uqdhZoU0YqhOrLHrKaMVlJLEi+heEgE=";
|
||||
hash = "sha256-DzncOAhdDyc5qOipMI8OPss0WciAQIam6GmaUoe8mR8=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/caddy";
|
||||
@@ -44,7 +44,7 @@ buildGoModule (finalAttrs: {
|
||||
# frankenphp requires C code that would be removed with `go mod tidy`
|
||||
# https://github.com/golang/go/issues/26366
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-xmaMQIhImi9E7H/zA8DqrGG4oK5KIQWUTn+c1eas0Ho=";
|
||||
vendorHash = "sha256-XY5a8pd5vJ/ouZMASzVqPoeXVfPbnEVDJFKkVNQF+2M=";
|
||||
|
||||
buildInputs = [
|
||||
phpUnwrapped
|
||||
|
||||
@@ -46,6 +46,7 @@
|
||||
cumulusSupport ? false,
|
||||
irdpSupport ? true,
|
||||
mgmtdSupport ? true,
|
||||
scriptingSupport ? true,
|
||||
# Experimental as of 10.1, reconsider if upstream changes defaults
|
||||
grpcSupport ? false,
|
||||
|
||||
@@ -120,7 +121,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
python3
|
||||
readline
|
||||
rtrlib
|
||||
lua53Packages.lua
|
||||
sqlite
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
@@ -135,11 +135,17 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
++ lib.optionals grpcSupport [
|
||||
grpc
|
||||
protobuf
|
||||
]
|
||||
++ lib.optionals scriptingSupport [
|
||||
lua53Packages.lua
|
||||
];
|
||||
|
||||
# otherwise in cross-compilation: "configure: error: no working python version found"
|
||||
depsBuildBuild = [
|
||||
buildPackages.python3
|
||||
]
|
||||
++ lib.optionals scriptingSupport [
|
||||
buildPackages.lua53Packages.lua
|
||||
];
|
||||
|
||||
# cross-compiling: clippy is compiled with the build host toolchain, split it out to ease
|
||||
@@ -157,7 +163,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"--enable-logfile-mask=0640"
|
||||
"--enable-multipath=${toString numMultipath}"
|
||||
"--enable-config-rollbacks"
|
||||
"--enable-scripting"
|
||||
"--enable-user=frr"
|
||||
"--enable-vty-group=frrvty"
|
||||
"--localstatedir=/var"
|
||||
@@ -171,6 +176,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(lib.strings.enableFeature irdpSupport "irdp")
|
||||
(lib.strings.enableFeature mgmtdSupport "mgmtd")
|
||||
(lib.strings.enableFeature grpcSupport "grpc")
|
||||
(lib.strings.enableFeature scriptingSupport "scripting")
|
||||
|
||||
# routing protocols
|
||||
(lib.strings.enableFeature bgpdSupport "bgpd")
|
||||
|
||||
@@ -1,27 +1,51 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
writableTmpDirAsHomeHook,
|
||||
rustPlatform,
|
||||
pkg-config,
|
||||
openssl,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "function-runner";
|
||||
version = "9.0.0";
|
||||
version = "9.1.2";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Shopify";
|
||||
repo = "function-runner";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-xzajHtFs7cp7D1ZdG3jBFbjheTSgWR/Vz4fkew3iAkc=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-KvReKvmF3i4zlfM8uj3KHamjfudcrhqrKGfK8O5tMpE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-fRLBKHsb+y2uyqWejRBmJm+t5CAkL9ScQl6iVCksahU=";
|
||||
cargoHash = "sha256-gnEps/o+C8UpukO1oRF4qlhNsoAmyUmxMKGAgSykNY0=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
nativeCheckInputs = [ writableTmpDirAsHomeHook ];
|
||||
|
||||
# Failed to download trampoline: error sending request for url
|
||||
checkFlags = map (t: "--skip=${t}") [
|
||||
"engine::tests::test_wasm_api_v1_function"
|
||||
"tests::run_wasm_api_v1_function"
|
||||
"tests::run_wasm_api_v2_function"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "CLI tool which allows you to run Wasm Functions intended for the Shopify Functions infrastructure";
|
||||
mainProgram = "function-runner";
|
||||
homepage = "https://github.com/Shopify/function-runner";
|
||||
changelog = "https://github.com/Shopify/function-runner/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ nintron ];
|
||||
maintainers = with lib.maintainers; [
|
||||
nintron
|
||||
kybe236
|
||||
];
|
||||
mainProgram = "function-runner";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -18,16 +18,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "gg";
|
||||
version = "0.37.2";
|
||||
version = "0.39.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gulbanana";
|
||||
repo = "gg";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-xs8UmHKtu+fzNrw77JAifkxDOAx1w/UUKK/4rhWjf2I=";
|
||||
hash = "sha256-0f1MM9iXjYuj7Anu6TMVtAjo3fg0IeOyrKfpeODrvA8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-iEWdN6xVXrZiAcsung9LrsTsJdx3cnlr6x3NMrKSi+k=";
|
||||
cargoHash = "sha256-oDAA4lFfp/zMQ2gm595OgnNyP3tiPSC1M0hiozOH/ss=";
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit (finalAttrs)
|
||||
@@ -36,7 +36,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
src
|
||||
patches
|
||||
;
|
||||
hash = "sha256-jAzIaLRACIDjsn8bHTr3erBoC/02jz8xhyHpFxwH+Y4=";
|
||||
hash = "sha256-aZSBKEVftMfPuIOnwc/ykbjdmb3Np+gJl1Jq9yv4pck=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "go-httpbin";
|
||||
version = "2.22.1";
|
||||
version = "2.23.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mccutchen";
|
||||
repo = "go-httpbin";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-N0lq11tF5z+n7AlrOLdJ4eZvaZljSKafpkwma6jPW3k=";
|
||||
hash = "sha256-BQf6G02BRtVGcPVEfHPWwBfEh8CCbHRkaLV2FX6SeJc=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -13,13 +13,13 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "home-assistant-matter-hub";
|
||||
version = "2.0.45";
|
||||
version = "2.0.46";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RiDDiX";
|
||||
repo = "home-assistant-matter-hub";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-fEPcUq0OejfJXhzxfxXzQMIZ+L6nYEjoflA2GZdu3hg=";
|
||||
hash = "sha256-lVsLvniPU7VAgxrUMZsGh9/cWgqap6iyX44r+Ap2Tjk=";
|
||||
};
|
||||
|
||||
# The bundled cli.js imports transitive dependencies (e.g. @noble/curves)
|
||||
@@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
;
|
||||
inherit pnpm;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-n/LQhY6HWFlkslodO6ERuTcm5ux+vd+8CwzX19oC7c8=";
|
||||
hash = "sha256-CuO+DTLPBr1WMyUMPKKzwYUrdWJLdWfj0IqmOyysaFo=";
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hwinfo";
|
||||
version = "25.2";
|
||||
version = "25.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opensuse";
|
||||
repo = "hwinfo";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-eYUUec9IRzR573i8SiZcxBQWGFGkUnuOR3e1u+AZfiw=";
|
||||
hash = "sha256-lc+x81aPbfoAV8YXH77r+BBERUFbv4stSPq3U36HXAI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "icloudpd";
|
||||
version = "1.32.2";
|
||||
version = "1.32.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "icloud-photos-downloader";
|
||||
repo = "icloud_photos_downloader";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-XwMY3OBGYDA/DKTXYgxuMV9pbamy8NbitMrEbsEmlMk=";
|
||||
hash = "sha256-u7fG/rPNzeru+DU84G/77BqrLHONz8yEg18xG3gsP70=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
let
|
||||
version = "0.1.0";
|
||||
version = "0.1.1";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "icnsify";
|
||||
@@ -14,15 +14,15 @@ rustPlatform.buildRustPackage {
|
||||
owner = "uncenter";
|
||||
repo = "icnsify";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-v8jwN29S6ZTt2XkPpZM+lJugbP9ClzPhqu52mdwdP00=";
|
||||
hash = "sha256-9BZTY175GaaNCq8gcfw4Wl5vzphy4k+hNhW5m6z3adw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-EDnwoDqQkb3G6/3/ib0p2Zh3dbMbeXozjEaNtYoCj4s=";
|
||||
cargoHash = "sha256-SutIlmGVdXb+B0JE7UDG5cKWUdpFlnXBQjBntmUNQVA=";
|
||||
|
||||
meta = {
|
||||
description = "Convert PNGs to .icns";
|
||||
homepage = "https://github.com/uncenter/icnsify";
|
||||
license = lib.licenses.mit;
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ uncenter ];
|
||||
mainProgram = "icnsify";
|
||||
};
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "jazz2";
|
||||
version = "3.5.0";
|
||||
version = "3.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deathkiller";
|
||||
repo = "jazz2-native";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-rmmVFsRTnWbVNg6X9O6BHr5yTt9m/DSA8Y+HLnG80Zc=";
|
||||
hash = "sha256-Ijm5OyQT5JceF9hDLX4z9BZfTY/XYtSdmpMfjgqzCe4=";
|
||||
};
|
||||
|
||||
patches = [ ./nocontent.patch ];
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
@@ -16,6 +17,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
};
|
||||
|
||||
cargoHash = "sha256-yuzjyP1iy6pgUJev1dJPjU85A3W5n7G2B+Pa1R47KiQ=";
|
||||
buildFeatures = [ "cli" ];
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Minimal Djot CLI";
|
||||
|
||||
@@ -13,20 +13,20 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lasuite-docs-collaboration-server";
|
||||
version = "5.1.0";
|
||||
version = "5.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "suitenumerique";
|
||||
repo = "docs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Ptg3C+5DbUiWVS8nMCmqmSFMmNI4NW8NYBF+G5xOqSg=";
|
||||
hash = "sha256-38+pRhqCRUOGHZwcoeXZG+E/iM6SthhQPd4uT8WRUCs=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/src/frontend";
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${finalAttrs.src}/src/frontend/yarn.lock";
|
||||
hash = "sha256-GW60XK+iOM4A/Pyvh120MnNde8dPiZu46aOTfHOczZg=";
|
||||
hash = "sha256-6uZF4op81QzYCAogvlcyZAkJsCqs72scyLKc1bc2QBU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -12,20 +12,20 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lasuite-docs-frontend";
|
||||
version = "5.1.0";
|
||||
version = "5.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "suitenumerique";
|
||||
repo = "docs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Ptg3C+5DbUiWVS8nMCmqmSFMmNI4NW8NYBF+G5xOqSg=";
|
||||
hash = "sha256-38+pRhqCRUOGHZwcoeXZG+E/iM6SthhQPd4uT8WRUCs=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/src/frontend";
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${finalAttrs.src}/src/frontend/yarn.lock";
|
||||
hash = "sha256-GW60XK+iOM4A/Pyvh120MnNde8dPiZu46aOTfHOczZg=";
|
||||
hash = "sha256-6uZF4op81QzYCAogvlcyZAkJsCqs72scyLKc1bc2QBU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,12 +11,12 @@
|
||||
yarnConfigHook,
|
||||
}:
|
||||
let
|
||||
version = "5.1.0";
|
||||
version = "5.2.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "suitenumerique";
|
||||
repo = "docs";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Ptg3C+5DbUiWVS8nMCmqmSFMmNI4NW8NYBF+G5xOqSg=";
|
||||
hash = "sha256-38+pRhqCRUOGHZwcoeXZG+E/iM6SthhQPd4uT8WRUCs=";
|
||||
};
|
||||
|
||||
mail-templates = stdenv.mkDerivation {
|
||||
@@ -29,7 +29,7 @@ let
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${src}/src/mail/yarn.lock";
|
||||
hash = "sha256-CKKGY87C5ifv0sHm9ExCzaGM3mV4C0NsWLCbw+ALqGc=";
|
||||
hash = "sha256-MYzADDcXHGieGkygmlbZQbYcS68NdKWyHYGgoSaqDO8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -52,13 +52,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
patches = [
|
||||
# Support configuration throught environment variables for SECURE_*
|
||||
./secure_settings.patch
|
||||
|
||||
# Fix creation of unsafe C function in postgresql migrations
|
||||
./postgresql_fix.patch
|
||||
|
||||
# Fix installing all modules with uv_build
|
||||
# https://github.com/suitenumerique/docs/pull/2295
|
||||
./uv.patch
|
||||
];
|
||||
|
||||
# They use a old version of mistralai which exported a class
|
||||
@@ -91,6 +84,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
boto3
|
||||
celery
|
||||
emoji
|
||||
dj-database-url
|
||||
django
|
||||
django-configurations
|
||||
django-cors-headers
|
||||
@@ -120,6 +114,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
mozilla-django-oidc
|
||||
nested-multipart-parser
|
||||
openai
|
||||
posthog
|
||||
psycopg
|
||||
pycrdt
|
||||
pydantic-ai-slim
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
diff --git a/core/migrations/0027_auto_20251120_0956.py b/core/migrations/0027_auto_20251120_0956.py
|
||||
index fe795ff5..0db2090c 100644
|
||||
--- a/core/migrations/0027_auto_20251120_0956.py
|
||||
+++ b/core/migrations/0027_auto_20251120_0956.py
|
||||
@@ -11,11 +11,6 @@ class Migration(migrations.Migration):
|
||||
operations = [
|
||||
migrations.RunSQL(
|
||||
sql="""
|
||||
- CREATE OR REPLACE FUNCTION public.immutable_unaccent(regdictionary, text)
|
||||
- RETURNS text
|
||||
- LANGUAGE c IMMUTABLE PARALLEL SAFE STRICT AS
|
||||
- '$libdir/unaccent', 'unaccent_dict';
|
||||
-
|
||||
CREATE OR REPLACE FUNCTION public.f_unaccent(text)
|
||||
RETURNS text
|
||||
LANGUAGE sql IMMUTABLE PARALLEL SAFE STRICT
|
||||
@@ -1,19 +0,0 @@
|
||||
diff --git a/__init__.py b/__init__.py
|
||||
deleted file mode 100644
|
||||
index e69de29b..00000000
|
||||
diff --git a/pyproject.toml b/pyproject.toml
|
||||
index eb8ef0a0..dbb9f619 100644
|
||||
--- a/pyproject.toml
|
||||
+++ b/pyproject.toml
|
||||
@@ -97,6 +97,11 @@ dev = [
|
||||
]
|
||||
|
||||
[tool.uv.build-backend]
|
||||
+module-name = [
|
||||
+ "core",
|
||||
+ "demo",
|
||||
+ "impress"
|
||||
+]
|
||||
module-root = ""
|
||||
source-exclude = [
|
||||
"**/tests/**",
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "lazygit";
|
||||
version = "0.62.1";
|
||||
version = "0.62.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jesseduffield";
|
||||
repo = "lazygit";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-JBSsLfng0W7uIbm6Jl/uDqYkl9cP+snbmDV9a83ZnR8=";
|
||||
hash = "sha256-V/dW7zx3D+RuYLqvTvblc93qrpwHB/wnysGdKS5FhoA=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "lazysql";
|
||||
version = "0.5.1";
|
||||
version = "0.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jorgerojas26";
|
||||
repo = "lazysql";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-rdXZmvyBzVcvycFP/AmrnOuVauQKrmJ1ZTIXc0TWxSI=";
|
||||
hash = "sha256-XjBEbaNxdKnfheTeb0wPkqzYMs62TDJ6ZrUmvfxzdew=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-FbAt/HsjoxqAKWQqqWN2xuyyTG2Ic4DcyEU4O0rjpQE=";
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
perl,
|
||||
elfutils,
|
||||
python3,
|
||||
buildPackages,
|
||||
variant ? null,
|
||||
}:
|
||||
|
||||
@@ -58,7 +57,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=${placeholder "out"}"
|
||||
"STRIP=${stdenv.cc.targetPrefix}strip"
|
||||
]
|
||||
++ lib.optionals (variant == "sev") [
|
||||
"SEV=1"
|
||||
@@ -67,14 +65,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"TDX=1"
|
||||
];
|
||||
|
||||
depsBuildBuild = [
|
||||
elfutils
|
||||
buildPackages.stdenv.cc
|
||||
];
|
||||
|
||||
# Fixes https://github.com/containers/libkrunfw/issues/55
|
||||
env = lib.optionalAttrs stdenv.targetPlatform.isAarch64 {
|
||||
NIX_CFLAGS_COMPILE_FOR_TARGET = "-march=armv8-a+crypto";
|
||||
NIX_CFLAGS_COMPILE = "-march=armv8-a+crypto";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libphonenumber";
|
||||
version = "9.0.31";
|
||||
version = "9.0.32";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "libphonenumber";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-5LJVlcii0uolu4p+z4R9uvYnzLBIdJEQp9AUUnNB5mE=";
|
||||
hash = "sha256-/weh6uAaK77MrPuxq45vFet1Wk9te0iGQP6ZASsbfA4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -76,6 +76,7 @@ LICENSE_NORMALIZATION = {
|
||||
"BSD-3-Clause": "lib.licenses.bsd3",
|
||||
"GPL-2+": "lib.licenses.gpl2Plus",
|
||||
"GPL-2.0": "lib.licenses.gpl2Only",
|
||||
"GPL-2.0+": "lib.licenses.gpl2Plus",
|
||||
"GPL-2.0-only": "lib.licenses.gpl2Only",
|
||||
"GPL-2.0-or-later": "lib.licenses.gpl2Plus",
|
||||
"GPL-3.0": "lib.licenses.gpl3Only",
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "m-cli";
|
||||
version = "2.0.7";
|
||||
version = "2.0.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rgcr";
|
||||
repo = "m-cli";
|
||||
tag = "v${version}";
|
||||
sha256 = "sha256-a/X7HaShb8mXJIYtTDxEPN4DcskUDourRFgHnOXksYM=";
|
||||
sha256 = "sha256-Esq7ECkl34L+hk5jGS3pTmUu9vnI9hfn0Q+w0/AbvgY=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "matterjs-server";
|
||||
version = "0.7.1";
|
||||
version = "0.8.0";
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
@@ -20,10 +20,10 @@ buildNpmPackage (finalAttrs: {
|
||||
owner = "matter-js";
|
||||
repo = "matterjs-server";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-iWFhpPeqY3RVfIrZa+Y2KmwWIZtMtj8EjwjoWYaA/Ao=";
|
||||
hash = "sha256-AjCfPovhYKUeU4Xrsh6uL0pPG+ja0n+efFTbwre83m4=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-ZjznhmsLavnLsNHNzH9IlZdLRMYpbLKz1q2O9A/ut+Y=";
|
||||
npmDepsHash = "sha256-1q8eRCLrYJDdD4Tku3NVCvXHSY+bmyw8vZk95WvsYOI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeBinaryWrapper
|
||||
@@ -32,6 +32,8 @@ buildNpmPackage (finalAttrs: {
|
||||
|
||||
buildInputs = [ udev ];
|
||||
|
||||
env.CXXFLAGS = "-std=c++20";
|
||||
|
||||
preBuild = "npm run version -- --apply";
|
||||
|
||||
dontNpmInstall = true;
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mihomo";
|
||||
version = "1.19.24";
|
||||
version = "1.19.26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MetaCubeX";
|
||||
repo = "mihomo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RQ6ZnOkIJyIA7n/AhHxOEtWcoXbyusc0GwIHr4VKUxM=";
|
||||
hash = "sha256-As0MqIGHs1Gn+aUWpeFsC231n9v7lBNmGlQdAwVWcJs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-wAd5VKpQT9aE/S3J/6gLlkYs56TqR3b+H0s+peOQ3R4=";
|
||||
vendorHash = "sha256-ySpBMR/djPPs1aTw7yiCrCFxDFsvRfTJEChg8v1C408=";
|
||||
|
||||
excludedPackages = [ "./test" ];
|
||||
|
||||
|
||||
@@ -30,13 +30,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "music-assistant-desktop";
|
||||
version = "0.3.6";
|
||||
version = "0.3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "music-assistant";
|
||||
repo = "desktop-app";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-GL9Cpk6NDhRV0npVXwGjR3Dm0H/uo9cD4ebaI751VLM=";
|
||||
hash = "sha256-QhKc5GBUnI1ae6+XK14YRWEpWuVtL6s90sSuWKLwNpk=";
|
||||
};
|
||||
|
||||
# hide update feature
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "nix-fast-build";
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Mic92";
|
||||
repo = "nix-fast-build";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-sH/KWX8NO8iurnnkI7w8eWMkbnRBbvEIK9IW4LnR0qQ=";
|
||||
hash = "sha256-8csvAFJtFzA/9hX3C784sMlaQME40LQmWI2V+YzCNhc=";
|
||||
};
|
||||
|
||||
build-system = [ python3Packages.setuptools ];
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "noson";
|
||||
version = "5.6.13";
|
||||
version = "5.6.25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "janbar";
|
||||
repo = "noson-app";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-XJBkPhyDPeyVrcY5Q5W9LtESuVxcbcQ8JoyOzKg+0NU=";
|
||||
hash = "sha256-Y+kyadcrGGpqxY7y1xkYh3BMDItE2LLwT6nJ2YuHp10=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "nvme-rs";
|
||||
version = "0.2.1";
|
||||
version = "0.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "liberodark";
|
||||
repo = "nvme-rs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-AhvjwrrX4Av6eZlg5yMamtVkqSKIY8hwuOwzRwXT94M=";
|
||||
hash = "sha256-leD7Y3QdpppaY98QbTw98QDJBAlL3rDnuuqNR8OIXqQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-I7cpLnE9d/GwKBkAok4qNNQiBwHXrsAbtiHDKMw+QYY=";
|
||||
cargoHash = "sha256-D1pgXq+eCiKE9CamdocmNmXIqkzpFkXGifABzCv7bv8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
stdenv,
|
||||
addDriverRunpath,
|
||||
nix-update-script,
|
||||
coreutils,
|
||||
|
||||
cmake,
|
||||
gitMinimal,
|
||||
@@ -22,6 +21,7 @@
|
||||
vulkan-tools,
|
||||
vulkan-headers,
|
||||
vulkan-loader,
|
||||
spirv-headers,
|
||||
shaderc,
|
||||
ccache,
|
||||
|
||||
@@ -108,6 +108,17 @@ let
|
||||
|
||||
cudaPath = lib.removeSuffix "-${cudaMajorVersion}" cudaToolkit;
|
||||
|
||||
# Since v0.30, llama.cpp is consumed via CMake FetchContent rather than
|
||||
# vendored in-tree. Pre-stage the pinned commit (read from upstream's
|
||||
# `LLAMA_CPP_VERSION` file — currently `b9493`) so the FetchContent step
|
||||
# uses our copy instead of trying to clone over the network in the sandbox.
|
||||
llamaCppSrc = fetchFromGitHub {
|
||||
owner = "ggml-org";
|
||||
repo = "llama.cpp";
|
||||
rev = "a731805cedc83c0514cbd808a2e38ec46c759cc2"; # tag b9493
|
||||
hash = "sha256-DO9J1mx9Jlp6qtCiJp2ZEi6R7H2YX1/sD7DGgBCtt0U=";
|
||||
};
|
||||
|
||||
wrapperOptions = [
|
||||
# ollama embeds llama-cpp binaries which actually run the ai models
|
||||
# these llama-cpp binaries are unaffected by the ollama binary's DT_RUNPATH
|
||||
@@ -132,25 +143,25 @@ let
|
||||
if enableCuda then
|
||||
buildGoModule.override { stdenv = cudaPackages.backendStdenv; }
|
||||
else if enableRocm then
|
||||
buildGoModule.override { stdenv = rocmPackages.stdenv; }
|
||||
buildGoModule.override { inherit (rocmPackages) stdenv; }
|
||||
else if enableVulkan then
|
||||
buildGoModule.override { stdenv = vulkan-tools.stdenv; }
|
||||
buildGoModule.override { inherit (vulkan-tools) stdenv; }
|
||||
else
|
||||
buildGoModule;
|
||||
inherit (lib) licenses platforms maintainers;
|
||||
in
|
||||
goBuild (finalAttrs: {
|
||||
pname = "ollama";
|
||||
version = "0.24.0";
|
||||
version = "0.30.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ollama";
|
||||
repo = "ollama";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-cSZtbF0oUI7a++baTipF6OUu+w8tBpILzE0Wm1Y6wUk=";
|
||||
hash = "sha256-IHX8o1Ty4Sdht5YeUYLnNPjOV7O95WeNng/coO+MHS8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Lc1Ktdqtv2VhJQssk8K1UOimeEjVNvDWePE9WkamCos=";
|
||||
vendorHash = "sha256-lZdGzGb9xRjTm1Rm7/wHjqM490gLznLEndmb4mNbCX0=";
|
||||
proxyVendor = true;
|
||||
|
||||
env =
|
||||
@@ -181,6 +192,10 @@ goBuild (finalAttrs: {
|
||||
]
|
||||
++ lib.optionals enableVulkan [
|
||||
ccache
|
||||
# ggml-vulkan/CMakeLists.txt does `find_package(SPIRV-Headers REQUIRED)`
|
||||
# at configure time (it builds shader code into the vulkan backend).
|
||||
# Header-only — nativeBuildInputs is the right slot.
|
||||
spirv-headers
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
@@ -190,25 +205,31 @@ goBuild (finalAttrs: {
|
||||
++ lib.optionals enableVulkan vulkanLibs;
|
||||
|
||||
# replace inaccurate version number with actual release version
|
||||
# and replace core utils tools from their FHS location to nix store
|
||||
postPatch = ''
|
||||
substituteInPlace version/version.go \
|
||||
--replace-fail 0.0.0 '${finalAttrs.version}'
|
||||
substituteInPlace cmd/launch/openclaw_test.go \
|
||||
--replace-fail '/bin/mkdir' '${coreutils}/bin/mkdir' \
|
||||
--replace-fail '/bin/cat' '${coreutils}/bin/cat' \
|
||||
--replace-fail '/usr/bin/env' '${coreutils}/bin/env' \
|
||||
--replace-fail '/usr/bin/sort' '${coreutils}/bin/sort' \
|
||||
--replace-fail '/bin/chmod' '${coreutils}/bin/chmod'
|
||||
substituteInPlace cmd/launch/hermes_test.go \
|
||||
--replace-fail '/bin/mkdir' '${coreutils}/bin/mkdir' \
|
||||
--replace-fail '/bin/cat' '${coreutils}/bin/cat' \
|
||||
--replace-fail '/bin/chmod' '${coreutils}/bin/chmod'
|
||||
substituteInPlace cmd/launch/kimi_test.go \
|
||||
--replace-fail '/bin/mkdir' '${coreutils}/bin/mkdir' \
|
||||
--replace-fail '/bin/cat' '${coreutils}/bin/cat' \
|
||||
--replace-fail '/bin/chmod' '${coreutils}/bin/chmod'
|
||||
|
||||
# cmd/launch/*_test.go are integration tests for user-facing CLI
|
||||
# launchers (claude, qwen, cline, codex, kimi, droid, openclaw, hermes,
|
||||
# …) that install the target binary via npm and then exec it on PATH.
|
||||
# Both prerequisites are unavailable in the nix sandbox, so the launch
|
||||
# subpackage's tests can't pass here. Drop them.
|
||||
rm cmd/launch/*_test.go
|
||||
|
||||
rm -r app
|
||||
|
||||
# Pre-stage llama.cpp for the FetchContent step and apply Ollama's
|
||||
# compat patch. When FETCHCONTENT_SOURCE_DIR_LLAMA_CPP is set, neither
|
||||
# `cmake/local.cmake` nor `llama/server/CMakeLists.txt` auto-applies
|
||||
# the patch (the parent's ExternalProject_Add passes
|
||||
# OLLAMA_LLAMA_CPP_SKIP_COMPAT_PATCH=ON to the child build) — the
|
||||
# caller has to. The apply-patch.cmake script is idempotent so this
|
||||
# is safe to re-run.
|
||||
cp -r ${llamaCppSrc} $TMPDIR/llama-cpp-src
|
||||
chmod -R +w $TMPDIR/llama-cpp-src
|
||||
( cd $TMPDIR/llama-cpp-src && \
|
||||
cmake -DPATCH_DIR=$NIX_BUILD_TOP/source/llama/compat \
|
||||
-P $NIX_BUILD_TOP/source/llama/compat/apply-patch.cmake )
|
||||
''
|
||||
# disable tests that fail in sandbox due to Metal init failure
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
@@ -217,12 +238,10 @@ goBuild (finalAttrs: {
|
||||
rm model/models/nemotronh/model_omni_test.go
|
||||
'';
|
||||
|
||||
overrideModAttrs = (
|
||||
finalAttrs: prevAttrs: {
|
||||
# don't run llama.cpp build in the module fetch phase
|
||||
preBuild = "";
|
||||
}
|
||||
);
|
||||
overrideModAttrs = _: _: {
|
||||
# don't run llama.cpp build in the module fetch phase
|
||||
preBuild = "";
|
||||
};
|
||||
|
||||
preBuild =
|
||||
let
|
||||
@@ -236,20 +255,75 @@ goBuild (finalAttrs: {
|
||||
cudaArchitectures = builtins.concatStringsSep ";" (map removeSMPrefix cudaArches);
|
||||
rocmTargets = builtins.concatStringsSep ";" rocmGpuTargets;
|
||||
|
||||
# Since 0.30, Ollama splits the llama.cpp build into per-accelerator
|
||||
# "runners" gated by OLLAMA_LLAMA_BACKENDS. Without setting it the
|
||||
# build silently produces only the CPU runner — ollama-cuda would
|
||||
# ship without `libggml-cuda.so` and fall back to CPU at runtime.
|
||||
# The accepted values map to cmake/local.cmake's elseif chain
|
||||
# (cuda_v12 / cuda_v13 / rocm_v7_1 / rocm_v7_2 / vulkan / cuda_jetpack*).
|
||||
rocmMajorVersion = lib.versions.major rocmPackages.clr.version;
|
||||
rocmMinorVersion = lib.versions.minor rocmPackages.clr.version;
|
||||
llamaBackend =
|
||||
if enableCuda then
|
||||
"cuda_v${cudaMajorVersion}"
|
||||
else if enableRocm then
|
||||
"rocm_v${rocmMajorVersion}_${rocmMinorVersion}"
|
||||
else if enableVulkan then
|
||||
"vulkan"
|
||||
else
|
||||
"";
|
||||
|
||||
cmakeFlagsCudaArchitectures = lib.optionalString enableCuda "-DCMAKE_CUDA_ARCHITECTURES='${cudaArchitectures}'";
|
||||
cmakeFlagsRocmTargets = lib.optionalString enableRocm "-DAMDGPU_TARGETS='${rocmTargets}'";
|
||||
cmakeFlagsBackend = lib.optionalString (
|
||||
llamaBackend != ""
|
||||
) "-DOLLAMA_LLAMA_BACKENDS=${llamaBackend}";
|
||||
|
||||
in
|
||||
''
|
||||
${lib.optionalString enableVulkan ''
|
||||
# Ollama builds each per-accelerator llama.cpp runner via
|
||||
# cmake/local.cmake's ExternalProject_Add(ollama-llama-server-vulkan …).
|
||||
# Two things need to cross the parent → child boundary:
|
||||
#
|
||||
# 1. The SPIRV-Headers cmake config — so `find_package(SPIRV-Headers
|
||||
# REQUIRED)` at ggml-vulkan/CMakeLists.txt:14 succeeds in the
|
||||
# child. CMAKE_PREFIX_PATH as a flag wouldn't propagate; as env
|
||||
# var it does.
|
||||
# 2. The SPIRV-Headers include directory in the compile env. The
|
||||
# ggml-vulkan target's `target_link_libraries(... Vulkan::Vulkan)`
|
||||
# notably does NOT link `SPIRV-Headers::SPIRV-Headers`, so the
|
||||
# interface include directory the cmake config exports never
|
||||
# flows into the compile commands — even though the find_package
|
||||
# call succeeded. `#include <spirv/unified1/spirv.hpp>` then
|
||||
# fails at compile time. Patching upstream's CMakeLists for
|
||||
# one missing link line is fragile across llama.cpp pins;
|
||||
# NIX_CFLAGS_COMPILE forces the include path globally and
|
||||
# survives version bumps.
|
||||
export CMAKE_PREFIX_PATH="${spirv-headers}''${CMAKE_PREFIX_PATH:+:$CMAKE_PREFIX_PATH}"
|
||||
export NIX_CFLAGS_COMPILE="-isystem ${spirv-headers}/include $NIX_CFLAGS_COMPILE"
|
||||
''}
|
||||
cmake -B build \
|
||||
-DCMAKE_SKIP_BUILD_RPATH=ON \
|
||||
-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
|
||||
-DFETCHCONTENT_SOURCE_DIR_LLAMA_CPP="$TMPDIR/llama-cpp-src" \
|
||||
${cmakeFlagsCudaArchitectures} \
|
||||
${cmakeFlagsRocmTargets} \
|
||||
${cmakeFlagsBackend}
|
||||
|
||||
cmake --build build -j $NIX_BUILD_CORES
|
||||
'';
|
||||
|
||||
# The llama.cpp sub-build is driven by ExternalProject_Add and does
|
||||
# not inherit the parent's CMAKE_SKIP_BUILD_RPATH setting, so its
|
||||
# `.so` payloads end up with build-dir entries in RPATH. Drop them
|
||||
# before the forbidden-references check. $ORIGIN is preserved
|
||||
# unconditionally; only absolute /nix/store entries are kept.
|
||||
preFixup = ''
|
||||
find $out/lib/ollama -type f \( -name '*.so' -o -name '*.so.*' \) \
|
||||
-exec patchelf --shrink-rpath --allowed-rpath-prefixes /nix/store {} +
|
||||
'';
|
||||
|
||||
# ollama looks for acceleration libs in ../lib/ollama/ (now also for CPU-only with arch specific optimizations)
|
||||
# https://github.com/ollama/ollama/blob/v0.21.1/docs/development.md#library-detection
|
||||
postInstall = ''
|
||||
|
||||
@@ -1,25 +1,55 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchzip,
|
||||
fetchFromGitHub,
|
||||
installFonts,
|
||||
python3,
|
||||
woff2,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "pixel-code";
|
||||
version = "2.2";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/qwerasd205/PixelCode/releases/download/v${version}/otf.zip";
|
||||
hash = "sha256-GNYEnv0bIWz5d8821N46FD2NBNBf3Dd7DNqjSdJKDoE=";
|
||||
stripRoot = false;
|
||||
outputs = [
|
||||
"out"
|
||||
"webfont"
|
||||
];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qwerasd205";
|
||||
repo = "PixelCode";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-jpOj6MndjCTTPESIjh3VJW1FKK5n99W8GBgPqloaKFM=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
strictDeps = true;
|
||||
|
||||
install -D -m444 -t $out/share/fonts/opentype $src/otf/*.otf
|
||||
nativeBuildInputs = [
|
||||
(python3.withPackages (
|
||||
ps: with ps; [
|
||||
fontmake
|
||||
fonttools
|
||||
ufolib2
|
||||
pillow
|
||||
]
|
||||
))
|
||||
woff2
|
||||
installFonts
|
||||
];
|
||||
|
||||
runHook postInstall
|
||||
postPatch = ''
|
||||
substituteInPlace src/build.sh \
|
||||
--replace-fail \
|
||||
'# Activate python virtual environment.
|
||||
../activate.sh
|
||||
source ../.venv/bin/activate' ""
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
src/build.sh
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
meta = {
|
||||
@@ -28,4 +58,4 @@ stdenvNoCC.mkDerivation rec {
|
||||
license = lib.licenses.ofl;
|
||||
maintainers = with lib.maintainers; [ mattpolzin ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
+17
-12
@@ -1,20 +1,24 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
pkgsHostTarget,
|
||||
fetchFromGitHub,
|
||||
autoreconfHook,
|
||||
gmp,
|
||||
libffi,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "polyml";
|
||||
version = "5.9.2";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "polyml";
|
||||
repo = "polyml";
|
||||
rev = "v${version}";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-dHP5XNoLcFIqASfZVWu3MtY3B3H66skEl8ohlwTGyyM=";
|
||||
};
|
||||
|
||||
@@ -32,6 +36,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
libffi
|
||||
gmp
|
||||
pkgsHostTarget.stdenv.cc
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
@@ -42,14 +47,13 @@ stdenv.mkDerivation rec {
|
||||
"--with-gmp"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
make check
|
||||
runHook postCheck
|
||||
preInstall = ''
|
||||
substituteInPlace polyc \
|
||||
--replace-fail "LINK=\"$CXX\"" "LINK=\"${lib.getExe' pkgsHostTarget.stdenv.cc "c++"}\""
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Standard ML compiler and interpreter";
|
||||
longDescription = ''
|
||||
@@ -58,8 +62,9 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://www.polyml.org/";
|
||||
license = lib.licenses.lgpl21;
|
||||
platforms = with lib.platforms; (linux ++ darwin);
|
||||
maintainers = with lib.maintainers; [
|
||||
kovirobi
|
||||
];
|
||||
# Broken as make target `polyimport.o` requires running code
|
||||
# compiled by the cross-compiler
|
||||
broken = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform);
|
||||
maintainers = with lib.maintainers; [ sempiternal-aurora ];
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -75,9 +75,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
cargoRoot = "app/src-tauri";
|
||||
buildAndTestSubdir = finalAttrs.cargoRoot;
|
||||
|
||||
docheck = true;
|
||||
doInstallCheck = true;
|
||||
|
||||
nativeCheckInputs = [ versionCheckHook ];
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -8,18 +8,18 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "pv-migrate";
|
||||
version = "3.4.0";
|
||||
version = "3.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "utkuozdemir";
|
||||
repo = "pv-migrate";
|
||||
tag = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-FJalS3cUaYFs1ChAH1JA6qrRYorDQaLvWzKIE21jYPs=";
|
||||
sha256 = "sha256-2gHWpBPl4Dpt+1WZh2W+p+t1/HWnVtjTaRC1U8dw1ZI=";
|
||||
};
|
||||
|
||||
subPackages = [ "cmd/pv-migrate" ];
|
||||
|
||||
vendorHash = "sha256-KFcz6SAUIg8hi+Vo/Wf6jDF6QcZ5uNueee3sG9t2zyU=";
|
||||
vendorHash = "sha256-mQIJBmsop3CqtsUv1FbnExfByxiHmS+crcVaTif5JiI=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -10,12 +10,12 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
pname = "qmidinet";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/qmidinet/qmidinet-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-9V1KXK6LAYxM+kei14pof93hZQUDs7/ywRaSz6pwyyk=";
|
||||
hash = "sha256-gBAaK32rabujVsCIOJcNZluaKpFz1KjICcRbKgvmXaQ=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
@@ -13,15 +13,15 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rust-analyzer-unwrapped";
|
||||
version = "2026-04-27";
|
||||
version = "2026-06-01";
|
||||
|
||||
cargoHash = "sha256-QXEJhBzKof1UONW2FwQUeO6UAo1Xfm2nPpOo1uNiRM8=";
|
||||
cargoHash = "sha256-5njpo8AKVOSgCFwuqTL9sVODyjgsEfg5kHI3qM0DK9k=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-lang";
|
||||
repo = "rust-analyzer";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-f8YJfwAOsLFpIoqZuX3yF69UvMLrkx7iVzMH1pJU7cM=";
|
||||
hash = "sha256-yJIyzYb6LhvbVMmj2EH62Mt0JHU3pQefr+oPEgaoaI8=";
|
||||
};
|
||||
|
||||
cargoBuildFlags = [
|
||||
|
||||
@@ -25,9 +25,9 @@ buildGoModule (finalAttrs: {
|
||||
"-X main.version=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
doInstallCheck = true;
|
||||
|
||||
nativeCheckInputs = [ versionCheckHook ];
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -43,6 +43,16 @@ buildGo126Module (finalAttrs: {
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
nativeCheckInputs = [ writableTmpDirAsHomeHook ];
|
||||
|
||||
checkFlags = [
|
||||
# This subtest hardcodes a go-humanize relative-time string ("35 years ago")
|
||||
# for a fixed 1990 date instead of computing it, so it breaks once enough
|
||||
# wall-clock time passes (now "36 years ago"). go-humanize truncates the
|
||||
# elapsed time by a fixed 360-day year (Year = 12*Month, Month = 30*Day), so
|
||||
# diff/Year rolled 35 -> 36 on 2026-05-12. Upstream keeps bumping the
|
||||
# literal by hand rather than fixing it, so skip the time-dependent subtest.
|
||||
"-skip=^TestMarshal/structWithMapsInSection$"
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
$out/bin/scw autocomplete script basename=scw shell=bash >scw.bash
|
||||
$out/bin/scw autocomplete script basename=scw shell=fish >scw.fish
|
||||
|
||||
@@ -0,0 +1,70 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
ninja,
|
||||
sdl3,
|
||||
testers,
|
||||
nix-update-script,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sdl3-net";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libsdl-org";
|
||||
repo = "SDL_net";
|
||||
tag = "release-${finalAttrs.version}";
|
||||
hash = "sha256-PDnkVqFOMT79wC/hlxsIQRProhIRbAIXBF6hcNKmVbI=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
"lib"
|
||||
"dev"
|
||||
"out"
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
];
|
||||
|
||||
buildInputs = [ sdl3 ];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
|
||||
(lib.cmakeBool "SDLNET_SAMPLES_INSTALL" true)
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
moveToOutput "libexec/installed-tests" "$out"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests.pkg-config = testers.hasPkgConfigModules {
|
||||
package = finalAttrs.finalPackage;
|
||||
versionCheck = true;
|
||||
};
|
||||
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
"release-(3\\..*)"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Portable network library for use with SDL";
|
||||
homepage = "https://github.com/libsdl-org/SDL_net";
|
||||
changelog = "https://github.com/libsdl-org/SDL_net/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.zlib;
|
||||
teams = [ lib.teams.sdl ];
|
||||
platforms = lib.platforms.unix;
|
||||
pkgConfigModules = [ "sdl3-net" ];
|
||||
};
|
||||
})
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "spacectl";
|
||||
version = "1.21.5";
|
||||
version = "1.21.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spacelift-io";
|
||||
repo = "spacectl";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-BHf5oDBWRGg8uKuctCiztEvgRmOEOVebGmvjk7Da0y4=";
|
||||
hash = "sha256-iGXDdTnWepOqhOgRWwdLI5cdVVATCLs0kFKk+yVlxZ0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-NvnsRvLnUJgxhx65nse2er65RRPatZF28rLiRBMnNhY=";
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ssh-vault";
|
||||
version = "1.2.9";
|
||||
version = "1.2.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ssh-vault";
|
||||
repo = "ssh-vault";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-2EriGn507ojvZVQrwza/hkad4YgxuB5HcmskS0cCnv4=";
|
||||
hash = "sha256-bvTZTsNnEKN1Ghf4ySpGxTmchJh82jZ4bkz4Z3cG+Ug=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-n37iK0ZftL1KBYnHzrM7LU3ApYw672vs6MZjKI0J1lg=";
|
||||
cargoHash = "sha256-s7AOT5T6rLmTrWV8hMGGHLk4HGiOoHYDt/4DejGhWLg=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
ocamlPackages.buildDunePackage rec {
|
||||
pname = "stanc";
|
||||
version = "2.38.0";
|
||||
version = "2.39.0";
|
||||
|
||||
minimalOCamlVersion = "4.12";
|
||||
|
||||
@@ -14,7 +14,7 @@ ocamlPackages.buildDunePackage rec {
|
||||
owner = "stan-dev";
|
||||
repo = "stanc3";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-j05PMQKIqkM9UWJzSVnkYWe6d+iUnmFOh1W8pZ7Fdyk=";
|
||||
hash = "sha256-ZAH9uFEZu75BC2xYGUXg62RHiADmKYBYP2Nt8bwEVRY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with ocamlPackages; [
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "subtitleedit";
|
||||
version = "4.0.15";
|
||||
version = "4.0.16";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/SubtitleEdit/subtitleedit/releases/download/${version}/SE${
|
||||
lib.replaceStrings [ "." ] [ "" ] version
|
||||
}.zip";
|
||||
hash = "sha256-MI74IN0idWSF5TrNodhj2t4GW39VyyDNl2eDEuvfEl0=";
|
||||
hash = "sha256-SXM5aMBNXI/ClrhvoXDeo86KUntU2Ad3fxx8O3dr+j0=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"out"
|
||||
"dev"
|
||||
];
|
||||
version = "15.74.3";
|
||||
version = "15.78.3";
|
||||
|
||||
src =
|
||||
let
|
||||
@@ -38,11 +38,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
{
|
||||
x86_64-linux = fetchurl {
|
||||
url = "${base_url}/teamviewer_${finalAttrs.version}_amd64.deb";
|
||||
hash = "sha256-7QQlGzIr3BBFaur8ycGY0VuYz21cJI+EfCsRuCAr8XA=";
|
||||
hash = "sha256-wrmLIr8qNLvfW5MMj6faF/uhldg9Dj+eDmlckEOqnmo=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "${base_url}/teamviewer_${finalAttrs.version}_arm64.deb";
|
||||
hash = "sha256-prz3RaeMykgLrK9ai3/ivzRsUFT1dyWP1xymEl3s4eA=";
|
||||
hash = "sha256-RAPTxDs6jcMar74M25+j/gzIt0B1JnF+mOVROO98h0k=";
|
||||
};
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tinyssh";
|
||||
version = "20260401";
|
||||
version = "20260601";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "janmojzis";
|
||||
repo = "tinyssh";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-ux3QTYYmgFOOKxgm+5lbLaS3YXv8BOxr3Kp0uYvIdck=";
|
||||
hash = "sha256-/BvJ+y4AaUUmIs+uB9Qlt39N7x/8KyiPUH5pd7IWpRw=";
|
||||
};
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-function-declaration";
|
||||
|
||||
@@ -2,15 +2,16 @@
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchurl,
|
||||
nix-update-script,
|
||||
_7zz,
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "unnaturalscrollwheels";
|
||||
version = "1.3.0";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ther0n/UnnaturalScrollWheels/releases/download/${finalAttrs.version}/UnnaturalScrollWheels-${finalAttrs.version}.dmg";
|
||||
sha256 = "1c6vlf0kc7diz0hb1fmrqaj7kzzfvr65zcchz6xv5cxf0md4n70r";
|
||||
hash = "sha256-KJQnV/XWM+JpW3O29nyGo64Jte6Gw3I54bXfFSAkUrc=";
|
||||
};
|
||||
sourceRoot = ".";
|
||||
|
||||
@@ -26,12 +27,18 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Invert scroll direction for physical scroll wheels";
|
||||
homepage = "https://github.com/ther0n/UnnaturalScrollWheels";
|
||||
changelog = "https://github.com/ther0n/UnnaturalScrollWheels/releases/tag/${finalAttrs.version}";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
maintainers = with lib.maintainers; [ emilytrau ];
|
||||
maintainers = with lib.maintainers; [
|
||||
emilytrau
|
||||
jesssullivan
|
||||
];
|
||||
platforms = lib.platforms.darwin;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "valdi";
|
||||
version = "1.0.11";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Snapchat";
|
||||
repo = "Valdi";
|
||||
rev = "e4f8ab9fa885ac044121ae61186164e36824f18a";
|
||||
hash = "sha256-VWcV7Jg4B50gtMm/6vDZqIo7PG8rqVSA4e9fn3Jw5eI=";
|
||||
rev = "d0f3ae863e218c776af1789bcd9848b148ed1a64";
|
||||
hash = "sha256-HJmWPlLC1/2etwEm+xSfOwcbXY1qx+QlM0QgDJ4FIcg=";
|
||||
};
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "vhdl-ls";
|
||||
version = "0.87.0";
|
||||
version = "0.87.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VHDL-LS";
|
||||
repo = "rust_hdl";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-tQdBiUoPRmPBNDutgCTkaUq022blrujT6G562KdQPqE=";
|
||||
hash = "sha256-+7kjRjRtsb038xw0x+yojhWVChvkBz6kTlqSc3rTwXE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-m/wYku+RRoZ2zULb/guVswG7SWoWjhp04R0sNI6HXgs=";
|
||||
cargoHash = "sha256-NAi/YY6bu/yHHPWfgv5fimS3Ac4PL12T/U1Jknj/Zc8=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace vhdl_lang/src/config.rs \
|
||||
|
||||
@@ -67,7 +67,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vivaldi";
|
||||
version = "8.0.4033.34";
|
||||
version = "8.0.4033.42";
|
||||
|
||||
suffix =
|
||||
{
|
||||
@@ -80,8 +80,8 @@ stdenv.mkDerivation rec {
|
||||
url = "https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-1_${suffix}.deb";
|
||||
hash =
|
||||
{
|
||||
aarch64-linux = "sha256-K5R/h+BZ0thqejG/3VM12efeZwS4Mw3tq1iHr96HIHQ=";
|
||||
x86_64-linux = "sha256-0sQQsiJLStBTzjrd6JRKzrZ/HUZpT68O3tLdLECl7IQ=";
|
||||
aarch64-linux = "sha256-qHIUVfD+rVIrBse5xsmJwVjCAszieAJzuHAC/oKzCHA=";
|
||||
x86_64-linux = "sha256-abaU3PiUQNhpliCnmih96pkU6CgW/S1GgxFKFo8PBmo=";
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
|
||||
+3
-9
@@ -4,14 +4,10 @@
|
||||
fetchurl,
|
||||
cmake,
|
||||
pkg-config,
|
||||
wrapQtAppsHook,
|
||||
qtbase,
|
||||
qt5,
|
||||
libGLU,
|
||||
libGL,
|
||||
libglut ? null,
|
||||
openal ? null,
|
||||
SDL2 ? null,
|
||||
SDL2,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -26,15 +22,13 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
qt5.wrapQtAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qt5.qtbase
|
||||
qt5.qtmultimedia
|
||||
libGLU
|
||||
libGL
|
||||
libglut
|
||||
openal
|
||||
SDL2
|
||||
];
|
||||
|
||||
@@ -36,13 +36,13 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zipline";
|
||||
version = "4.6.1";
|
||||
version = "4.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "diced";
|
||||
repo = "zipline";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-uLGa6ZIMJE2IWz5wF9H6yOICTeFvZerrpecLEja+PU4=";
|
||||
hash = "sha256-U4Rl1WiOg9DVFEnghKOy/WabeXf3l3zpaxqAmjneil0=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C $out rev-parse --short HEAD > $out/.git_head
|
||||
|
||||
@@ -19,15 +19,15 @@
|
||||
libx11,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
pname = "xdg-desktop-portal-pantheon";
|
||||
version = "8.2.0";
|
||||
version = "8.2.0-unstable-2026-06-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = "portals";
|
||||
tag = version;
|
||||
hash = "sha256-LmPLjOZVVHKMfYTEyOH2IkB/fw47pK0VqdWrckdBQ6w=";
|
||||
rev = "c5f6fa1179bfa51429ddf4b2d268c7f2295dfff8";
|
||||
hash = "sha256-gHWvY205Jy69LpNtqCr+prtalf7bSVZ971sGbhMuqnA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,55 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
autoreconfHook,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
let
|
||||
version = "5.6";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "polyml";
|
||||
inherit version;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace configure.ac \
|
||||
--replace-fail 'AC_FUNC_ALLOCA' "AC_FUNC_ALLOCA
|
||||
AH_TEMPLATE([_Static_assert])
|
||||
AC_DEFINE([_Static_assert], [static_assert])
|
||||
"
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
substituteInPlace configure.ac --replace-fail stdc++ c++
|
||||
'';
|
||||
|
||||
patches = [
|
||||
# glibc 2.34 compat
|
||||
(fetchpatch {
|
||||
url = "https://src.fedoraproject.org/rpms/polyml/raw/4d8868ca5a1ce3268f212599a321f8011c950496/f/polyml-pthread-stack-min.patch";
|
||||
sha256 = "1h5ihg2sxld9ymrl3f2mpnbn2242ka1fsa0h4gl9h90kndvg6kby";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/polyml/polyml.${version}.tar.gz";
|
||||
sha256 = "05d6l2a5m9jf32a8kahwg2p2ph4x9rjf1nsl83331q3gwn5bkmr0";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Standard ML compiler and interpreter";
|
||||
longDescription = ''
|
||||
Poly/ML is a full implementation of Standard ML.
|
||||
'';
|
||||
homepage = "https://www.polyml.org/";
|
||||
license = lib.licenses.lgpl21;
|
||||
platforms = with lib.platforms; linux;
|
||||
maintainers = [
|
||||
# Add your name here!
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -1,34 +0,0 @@
|
||||
For 5.7 the copyright header is different.
|
||||
|
||||
From ad32de7f181acaffaba78d5c3d9e5aa6b84a741c Mon Sep 17 00:00:00 2001
|
||||
From: David Matthews <dm@prolingua.co.uk>
|
||||
Date: Sun, 7 Apr 2019 13:41:33 +0100
|
||||
Subject: [PATCH] Remove FFI_SYSV from abi table for X86/64 Unix. It appears
|
||||
that this has been removed in upstream versions of libffi and causes problems
|
||||
when building using the system libffi.
|
||||
|
||||
---
|
||||
libpolyml/polyffi.cpp | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/libpolyml/polyffi.cpp b/libpolyml/polyffi.cpp
|
||||
index 5424dd84..3dc9cc7c 100644
|
||||
--- a/libpolyml/polyffi.cpp
|
||||
+++ b/libpolyml/polyffi.cpp
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
Title: New Foreign Function Interface
|
||||
|
||||
- Copyright (c) 2015 David C.J. Matthews
|
||||
+ Copyright (c) 2015, 2019 David C.J. Matthews
|
||||
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
@@ -109,7 +109,6 @@ static struct _abiTable { const char *abiName; ffi_abi abiCode; } abiTable[] =
|
||||
#elif defined(X86_WIN64)
|
||||
{"win64", FFI_WIN64},
|
||||
#elif defined(X86_ANY)
|
||||
- {"sysv", FFI_SYSV},
|
||||
{"unix64", FFI_UNIX64},
|
||||
#endif
|
||||
{ "default", FFI_DEFAULT_ABI}
|
||||
@@ -1,68 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
autoreconfHook,
|
||||
gmp,
|
||||
libffi,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "polyml";
|
||||
version = "5.7.1";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace configure.ac \
|
||||
--replace-fail 'AC_FUNC_ALLOCA' "AC_FUNC_ALLOCA
|
||||
AH_TEMPLATE([_Static_assert])
|
||||
AC_DEFINE([_Static_assert], [static_assert])
|
||||
"
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
substituteInPlace configure.ac --replace-fail stdc++ c++
|
||||
'';
|
||||
|
||||
patches = [
|
||||
./5.7-new-libffi-FFI_SYSV.patch
|
||||
|
||||
# glibc 2.34 compat
|
||||
(fetchpatch {
|
||||
url = "https://src.fedoraproject.org/rpms/polyml/raw/4d8868ca5a1ce3268f212599a321f8011c950496/f/polyml-pthread-stack-min.patch";
|
||||
sha256 = "1h5ihg2sxld9ymrl3f2mpnbn2242ka1fsa0h4gl9h90kndvg6kby";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libffi
|
||||
gmp
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-shared"
|
||||
"--with-system-libffi"
|
||||
"--with-gmp"
|
||||
];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "polyml";
|
||||
repo = "polyml";
|
||||
rev = "v${version}";
|
||||
sha256 = "0j0wv3ijfrjkfngy7dswm4k1dchk3jak9chl5735dl8yrl8mq755";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Standard ML compiler and interpreter";
|
||||
longDescription = ''
|
||||
Poly/ML is a full implementation of Standard ML.
|
||||
'';
|
||||
homepage = "https://www.polyml.org/";
|
||||
license = lib.licenses.lgpl21;
|
||||
platforms = with lib.platforms; (linux ++ darwin);
|
||||
# never built on aarch64-darwin since first introduction in nixpkgs
|
||||
# The last successful Darwin Hydra build was in 2024
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
};
|
||||
}
|
||||
@@ -453,9 +453,6 @@ package-maintainers:
|
||||
- massiv
|
||||
- massiv-io
|
||||
- massiv-test
|
||||
shlok:
|
||||
- streamly-archive
|
||||
- streamly-lmdb
|
||||
slotThe:
|
||||
- X11
|
||||
- X11-xft
|
||||
|
||||
@@ -669605,7 +669605,6 @@ self: {
|
||||
description = "Stream data from archives using the streamly library";
|
||||
license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
maintainers = [ lib.maintainers.shlok ];
|
||||
broken = true;
|
||||
}
|
||||
) { archive = null; };
|
||||
@@ -670069,7 +670068,6 @@ self: {
|
||||
description = "Stream data to or from LMDB databases using the streamly library";
|
||||
license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
maintainers = [ lib.maintainers.shlok ];
|
||||
broken = true;
|
||||
}
|
||||
) { inherit (pkgs) lmdb; };
|
||||
|
||||
@@ -103,7 +103,16 @@ clangStdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-z0B2ocoqZHiO3KjEUtjrto1eKWXliP5Go4igFlE+3OQ=";
|
||||
};
|
||||
|
||||
patches = lib.optionals clangStdenv.hostPlatform.isLinux [
|
||||
patches = [
|
||||
# Fix build with system malloc
|
||||
# See: https://bugs.webkit.org/show_bug.cgi?id=316083
|
||||
(fetchpatch {
|
||||
url = "https://github.com/WebKit/WebKit/commit/a6bc685a685c8f16c919dc6310a62a26971d396e.patch";
|
||||
hash = "sha256-X3E9SYykYomoBeAL4vS1Iuw2fPdO8fI7MvAW/kEhTMc=";
|
||||
name = "fix-build-with-system-malloc.patch";
|
||||
})
|
||||
]
|
||||
++ lib.optionals clangStdenv.hostPlatform.isLinux [
|
||||
(replaceVars ./fix-bubblewrap-paths.patch {
|
||||
inherit (builtins) storeDir;
|
||||
inherit (addDriverRunpath) driverLink;
|
||||
|
||||
@@ -1008,15 +1008,15 @@ final: prev: {
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "fzf-lua";
|
||||
version = "0.0.2654-1";
|
||||
version = "0.0.2657-1";
|
||||
knownRockspec =
|
||||
(fetchurl {
|
||||
url = "mirror://luarocks/fzf-lua-0.0.2654-1.rockspec";
|
||||
sha256 = "19msswvglynba5xy0f14xlcidjln6mphnrnydx9x7k03770qmbj9";
|
||||
url = "mirror://luarocks/fzf-lua-0.0.2657-1.rockspec";
|
||||
sha256 = "0c7q9gjx9p0gqgsf89b510g729hz8301qffd936m86pwqgzxmvqi";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/ibhagwan/fzf-lua/archive/fea9eedc6894c44d44cbb772a5cd11c93b82d7a1.zip";
|
||||
sha256 = "09ayadlmdkljhcm5ncby8w6w8b1kfyhmw0bf3zhl6r8cfansixc2";
|
||||
url = "https://github.com/ibhagwan/fzf-lua/archive/988416cc782dfe28bff3f0da9b8c943b236cd86a.zip";
|
||||
sha256 = "0hh2dkgpf1002b9ik2r1iakszs60qk9yb84db1jnkj2ks5mah98g";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
@@ -3314,17 +3314,17 @@ final: prev: {
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "lualine.nvim";
|
||||
version = "scm-4";
|
||||
version = "scm-5";
|
||||
knownRockspec =
|
||||
(fetchurl {
|
||||
url = "mirror://luarocks/lualine.nvim-scm-4.rockspec";
|
||||
sha256 = "03yxpng1jmkas8qndq2fygi4jh31y8asibj9c9nsjn5pzbyfxm1f";
|
||||
url = "mirror://luarocks/lualine.nvim-scm-5.rockspec";
|
||||
sha256 = "02sll9l2j03h5wv5mlm1wwqijhs9a8sgn5k4mi21f58si1s7ycda";
|
||||
}).outPath;
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-lualine";
|
||||
repo = "lualine.nvim";
|
||||
rev = "131a558e13f9f28b15cd235557150ccb23f89286";
|
||||
hash = "sha256-5+JKZD4w80QZxnFv+1OxkFVety8fgmcGVOuxfYouxhI=";
|
||||
rev = "221ce6b2d999187044529f49da6554a92f740a96";
|
||||
hash = "sha256-6PjGu30Ed4/e/HQ3mIFQuUOxcCiti/71jjlMsjN7EoA=";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
@@ -6366,7 +6366,7 @@ final: prev: {
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "vicious";
|
||||
version = "2.7.1-3";
|
||||
version = "2.7.1-4";
|
||||
knownRockspec =
|
||||
(fetchurl {
|
||||
url = "mirror://luarocks/vicious-2.7.1-4.rockspec";
|
||||
|
||||
@@ -13,16 +13,16 @@
|
||||
python-dateutil,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "aioamazondevices";
|
||||
version = "13.8.2";
|
||||
version = "14.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chemelli74";
|
||||
repo = "aioamazondevices";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-abmirmeDmGF7YuD2SDW9Dc549KeR2ESK1DmDm+uXWoU=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ZF3w5lg6NijVBkJKoItmblay90VzUsDqPVxk712sXRU=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
@@ -45,10 +45,10 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/chemelli74/aioamazondevices/blob/${src.tag}/CHANGELOG.md";
|
||||
changelog = "https://github.com/chemelli74/aioamazondevices/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
description = "Python library to control Amazon devices";
|
||||
homepage = "https://github.com/chemelli74/aioamazondevices";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -10,47 +10,45 @@
|
||||
scapy,
|
||||
|
||||
# tests
|
||||
blockbuster,
|
||||
pytest-asyncio,
|
||||
pytest-cov-stub,
|
||||
pytestCheckHook,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "aiodhcpwatcher";
|
||||
version = "1.2.1";
|
||||
version = "1.2.7";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bdraco";
|
||||
repo = "aiodhcpwatcher";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+BF3sBam8O9I4tY7QqnA4iNcJFsK9+imS8pY3N/v1HY=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-a6svFLu0nmVVVVCg/evdmygTPj8VP+mjKTaaZGA0TQk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i "/addopts =/d" pyproject.toml
|
||||
'';
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
dependencies = [ scapy ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
blockbuster
|
||||
pytest-asyncio
|
||||
pytest-cov-stub
|
||||
pytestCheckHook
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "aiodhcpwatcher" ];
|
||||
|
||||
meta = {
|
||||
description = "Watch for DHCP packets with asyncio";
|
||||
homepage = "https://github.com/bdraco/aiodhcpwatcher";
|
||||
changelog = "https://github.com/bdraco/aiodhcpwatcher/blob/${src.rev}/CHANGELOG.md";
|
||||
changelog = "https://github.com/bdraco/aiodhcpwatcher/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ hexa ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "aiodocker";
|
||||
version = "0.26.0";
|
||||
version = "0.27.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aio-libs";
|
||||
repo = "aiodocker";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-XpHEgBmcxYoOlzP16BtVOtfuqb+wj0LN0KxXj7p2atk=";
|
||||
hash = "sha256-l7CATx+kqT9aG3c523ctK0ooJDaJHw1Hf8Ow7EqFkDs=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
cryptography,
|
||||
noiseprotocol,
|
||||
protobuf,
|
||||
tzdata,
|
||||
tzlocal,
|
||||
zeroconf,
|
||||
|
||||
@@ -26,19 +27,20 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "aioesphomeapi";
|
||||
version = "44.24.1"; # must track the major version that home-assistant pins
|
||||
version = "45.3.1"; # must track the major version that home-assistant pins
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "esphome";
|
||||
repo = "aioesphomeapi";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-D2MJISyHz4s0Rk6wGMrYVJHfvA/Xbw2UEp2KqTqS2nA=";
|
||||
hash = "sha256-+8P6OL+4Y+qrKLYqXtjBL2ylcamsF24Ccn00Vt9ohD0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "setuptools>=82.0.1" setuptools
|
||||
--replace-fail "setuptools>=82.0.1" setuptools \
|
||||
--replace-fail "Cython>=3.2.5" Cython
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
@@ -46,7 +48,10 @@ buildPythonPackage (finalAttrs: {
|
||||
cython
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [ "cryptography" ];
|
||||
pythonRelaxDeps = [
|
||||
"aiohappyeyeballs"
|
||||
"cryptography"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
aiohappyeyeballs
|
||||
@@ -55,6 +60,7 @@ buildPythonPackage (finalAttrs: {
|
||||
cryptography
|
||||
noiseprotocol
|
||||
protobuf
|
||||
tzdata
|
||||
tzlocal
|
||||
zeroconf
|
||||
];
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiohttp-asyncmdnsresolver";
|
||||
version = "0.1.1";
|
||||
version = "0.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aio-libs";
|
||||
repo = "aiohttp-asyncmdnsresolver";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-gtB5vnlOVeAFACnhR5DIS5p3caZkOXrollXFINl/7hQ=";
|
||||
hash = "sha256-wqeWK7IoX2o+4Cmjq9nKh3rod0Y2C5dxP0Cju9Uk6hE=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -15,16 +15,16 @@
|
||||
zeroconf,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "aioshelly";
|
||||
version = "13.25.0";
|
||||
version = "13.26.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "home-assistant-libs";
|
||||
repo = "aioshelly";
|
||||
tag = version;
|
||||
hash = "sha256-BZsuvYtP2tuRb3QGN09lwTXadMKqM1TLPKEQU5+qz6w=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-mOqHHgyx1Eevhr8BHkfFQa7g6x7vt9KJe4E72fr9HPg=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -50,8 +50,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Python library to control Shelly";
|
||||
homepage = "https://github.com/home-assistant-libs/aioshelly";
|
||||
changelog = "https://github.com/home-assistant-libs/aioshelly/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/home-assistant-libs/aioshelly/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "aiounifi";
|
||||
version = "90";
|
||||
version = "91";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.13";
|
||||
@@ -27,13 +27,13 @@ buildPythonPackage (finalAttrs: {
|
||||
owner = "Kane610";
|
||||
repo = "aiounifi";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-xM2x4SwVav2gsuG0G1hJjg4AcdsuCYf3O1fma++EYow=";
|
||||
hash = "sha256-E98qUl+LpWCz33crrlrYF3aQBqioT0uPANKUYif7zFo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "setuptools==82.0.1" "setuptools" \
|
||||
--replace-fail "wheel==0.46.3" "wheel"
|
||||
--replace-fail "wheel==0.47.0" "wheel"
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "axis";
|
||||
version = "71";
|
||||
version = "72";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.14";
|
||||
@@ -24,7 +24,7 @@ buildPythonPackage (finalAttrs: {
|
||||
owner = "Kane610";
|
||||
repo = "axis";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-2CMfKpXd2u2cNTyCc4xxHcjYhR9oBRiccT7dcfY4DcA=";
|
||||
hash = "sha256-xNqV3j7fQ+FmOZavVdV907m1ndAhk5HWIV5xE/a8hFI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -12,22 +12,22 @@
|
||||
zigpy,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "bellows";
|
||||
version = "0.49.1";
|
||||
version = "0.49.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zigpy";
|
||||
repo = "bellows";
|
||||
tag = version;
|
||||
hash = "sha256-dt4cwew/jRpmXaZORfjNCivUMynFbRJITOnmP34Aq+I=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-upnlzuzkogMwcAkOd98NZrBHv9pmcPsYIgR7j6It54c=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail '"setuptools-git-versioning<2"' "" \
|
||||
--replace-fail 'dynamic = ["version"]' 'version = "${version}"'
|
||||
--replace-fail 'dynamic = ["version"]' 'version = "${finalAttrs.version}"'
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -50,9 +50,9 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Python module to implement EZSP for EmberZNet devices";
|
||||
homepage = "https://github.com/zigpy/bellows";
|
||||
changelog = "https://github.com/zigpy/bellows/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/zigpy/bellows/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ mvnetbiz ];
|
||||
mainProgram = "bellows";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "bittensor-wallet";
|
||||
version = "4.0.1";
|
||||
version = "4.1.0";
|
||||
pyproject = true;
|
||||
|
||||
__structuredAttrs = true;
|
||||
@@ -24,12 +24,12 @@ buildPythonPackage (finalAttrs: {
|
||||
owner = "latent-to";
|
||||
repo = "btwallet";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-L774RPoasixvW+0Z4WuJ6eLuazLQscckRU++VCAiFug=";
|
||||
hash = "sha256-XjDldS3B3d9cR21M7HElqTAIyWjCdhSw1yBWHarVOcI=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-ETr7XhSmUTqtWDGzJMq5ijaLL8+tqmLJa/ngmzwWiFg=";
|
||||
hash = "sha256-Dy9/yD/dT7cjKpM7S+h0iaXQUBnqYDMtQVZfIuaY1Ck=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -19,14 +19,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "bleak-esphome";
|
||||
version = "3.7.5";
|
||||
version = "3.9.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bluetooth-devices";
|
||||
repo = "bleak-esphome";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ZV7C+ohEbRXYpAUmZ4wVbv8Ng4eZcLofc+o9Q5Rqp2E=";
|
||||
hash = "sha256-6qwg6jI9zFf3x0Yfp03C62f+LMO/RIDju+/ykoiOCI4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -1,27 +1,28 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
bleak,
|
||||
blockbuster,
|
||||
bluetooth-adapters,
|
||||
dbus-fast,
|
||||
buildPythonPackage,
|
||||
dbus-fast,
|
||||
fetchFromGitHub,
|
||||
poetry-core,
|
||||
pytestCheckHook,
|
||||
pytest-asyncio,
|
||||
pytest-cov-stub,
|
||||
stdenv,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "bleak-retry-connector";
|
||||
version = "4.6.0";
|
||||
version = "4.6.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Bluetooth-Devices";
|
||||
repo = "bleak-retry-connector";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-wUfIP0UHL60AAq38j4Kc2enTccdhT7aaSrXWJ1y5+7I=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-SGQ+9HjD6VhxZwmjh1K/EHbUIFE/bbtLBwmauU/IEJM=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
@@ -35,6 +36,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
blockbuster
|
||||
pytest-asyncio
|
||||
pytest-cov-stub
|
||||
pytestCheckHook
|
||||
@@ -48,8 +50,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Connector for Bleak Clients that handles transient connection failures";
|
||||
homepage = "https://github.com/bluetooth-devices/bleak-retry-connector";
|
||||
changelog = "https://github.com/Bluetooth-Devices/bleak-retry-connector/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/Bluetooth-Devices/bleak-retry-connector/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user