Merge staging-next into staging
This commit is contained in:
nixpkgs-ci[bot]
@@ -62,6 +62,8 @@
|
||||
|
||||
- NixOS display manager modules now strictly use tty1, where many of them previously used tty7. Options to configure display managers' VT have been dropped. A configuration with a display manager enabled will not start `getty@tty1.service`, even if the system is forced to boot into `multi-user.target` instead of `graphical.target`.
|
||||
|
||||
- [private-gpt](https://github.com/zylon-ai/private-gpt) service has been removed by lack of maintenance upstream.
|
||||
|
||||
## Other Notable Changes {#sec-nixpkgs-release-25.11-notable-changes}
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
@@ -158,7 +158,7 @@ The pre-existing `services.ankisyncd` has been marked deprecated and will be dro
|
||||
|
||||
- [pretalx](https://github.com/pretalx/pretalx), a conference planning tool. Available as [services.pretalx](#opt-services.pretalx.enable).
|
||||
|
||||
- [private-gpt](https://github.com/zylon-ai/private-gpt), a service to interact with your documents using the power of LLMs, 100% privately, no data leaks. Available as [services.private-gpt](#opt-services.private-gpt.enable).
|
||||
- [private-gpt](https://github.com/zylon-ai/private-gpt), a service to interact with your documents using the power of LLMs, 100% privately, no data leaks.
|
||||
|
||||
- [Prometheus DNSSEC Exporter](https://github.com/chrj/prometheus-dnssec-exporter): check for validity and expiration in DNSSEC signatures and expose metrics for Prometheus. Available as [services.prometheus.exporters.dnssec](#opt-services.prometheus.exporters.dnssec.enable).
|
||||
|
||||
|
||||
@@ -131,6 +131,8 @@
|
||||
|
||||
- The `wstunnel` module was converted to RFC42-style settings, you will need to update your NixOS config if you make use of this module.
|
||||
|
||||
- [private-gpt](https://github.com/zylon-ai/private-gpt) service has been removed by lack of maintenance upstream.
|
||||
|
||||
## Other Notable Changes {#sec-release-25.11-notable-changes}
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
@@ -897,7 +897,6 @@
|
||||
./services/misc/polaris.nix
|
||||
./services/misc/portunus.nix
|
||||
./services/misc/preload.nix
|
||||
./services/misc/private-gpt.nix
|
||||
./services/misc/pufferpanel.nix
|
||||
./services/misc/pykms.nix
|
||||
./services/misc/radicle.nix
|
||||
|
||||
@@ -348,7 +348,9 @@ in
|
||||
The signald project is unmaintained and has long been incompatible with the
|
||||
official Signal servers.
|
||||
'')
|
||||
|
||||
(mkRemovedOptionModule [ "services" "private-gpt" ] ''
|
||||
The private-gpt package and the corresponding module have been removed due to being broken and unmaintained.
|
||||
'')
|
||||
# Do NOT add any option renames here, see top of the file
|
||||
];
|
||||
}
|
||||
|
||||
@@ -318,6 +318,7 @@ in
|
||||
"/nix/store"
|
||||
"/run/wrappers"
|
||||
];
|
||||
serviceConfig.RestrictSUIDSGID = false;
|
||||
serviceConfig.Type = "oneshot";
|
||||
script = ''
|
||||
chmod 755 "${parentWrapperDir}"
|
||||
|
||||
@@ -1,122 +0,0 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
inherit (lib) types;
|
||||
|
||||
format = pkgs.formats.yaml { };
|
||||
cfg = config.services.private-gpt;
|
||||
in
|
||||
{
|
||||
options = {
|
||||
services.private-gpt = {
|
||||
enable = lib.mkEnableOption "private-gpt for local large language models";
|
||||
package = lib.mkPackageOption pkgs "private-gpt" { };
|
||||
|
||||
stateDir = lib.mkOption {
|
||||
type = types.path;
|
||||
default = "/var/lib/private-gpt";
|
||||
description = "State directory of private-gpt.";
|
||||
};
|
||||
|
||||
settings = lib.mkOption {
|
||||
type = format.type;
|
||||
default = {
|
||||
llm = {
|
||||
mode = "ollama";
|
||||
tokenizer = "";
|
||||
};
|
||||
embedding = {
|
||||
mode = "ollama";
|
||||
};
|
||||
ollama = {
|
||||
llm_model = "llama3";
|
||||
embedding_model = "nomic-embed-text";
|
||||
api_base = "http://localhost:11434";
|
||||
embedding_api_base = "http://localhost:11434";
|
||||
keep_alive = "5m";
|
||||
tfs_z = 1;
|
||||
top_k = 40;
|
||||
top_p = 0.9;
|
||||
repeat_last_n = 64;
|
||||
repeat_penalty = 1.2;
|
||||
request_timeout = 120;
|
||||
};
|
||||
vectorstore = {
|
||||
database = "qdrant";
|
||||
};
|
||||
qdrant = {
|
||||
path = "/var/lib/private-gpt/vectorstore/qdrant";
|
||||
};
|
||||
data = {
|
||||
local_data_folder = "/var/lib/private-gpt";
|
||||
};
|
||||
openai = { };
|
||||
azopenai = { };
|
||||
};
|
||||
description = ''
|
||||
settings-local.yaml for private-gpt
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
systemd.services.private-gpt = {
|
||||
description = "Interact with your documents using the power of GPT, 100% privately, no data leaks";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network.target" ];
|
||||
|
||||
preStart =
|
||||
let
|
||||
config = format.generate "settings-local.yaml" (cfg.settings // { server.env_name = "local"; });
|
||||
in
|
||||
''
|
||||
mkdir -p ${cfg.stateDir}/{settings,huggingface,matplotlib,tiktoken_cache}
|
||||
cp ${cfg.package.cl100k_base.tiktoken} ${cfg.stateDir}/tiktoken_cache/9b5ad71b2ce5302211f9c61530b329a4922fc6a4
|
||||
cp ${pkgs.python3Packages.private-gpt}/${pkgs.python3.sitePackages}/private_gpt/settings.yaml ${cfg.stateDir}/settings/settings.yaml
|
||||
cp "${config}" "${cfg.stateDir}/settings/settings-local.yaml"
|
||||
chmod 600 "${cfg.stateDir}/settings/settings-local.yaml"
|
||||
'';
|
||||
|
||||
environment = {
|
||||
PGPT_PROFILES = "local";
|
||||
PGPT_SETTINGS_FOLDER = "${cfg.stateDir}/settings";
|
||||
HF_HOME = "${cfg.stateDir}/huggingface";
|
||||
TRANSFORMERS_OFFLINE = "1";
|
||||
HF_DATASETS_OFFLINE = "1";
|
||||
MPLCONFIGDIR = "${cfg.stateDir}/matplotlib";
|
||||
};
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = lib.getExe cfg.package;
|
||||
WorkingDirectory = cfg.stateDir;
|
||||
StateDirectory = "private-gpt";
|
||||
RuntimeDirectory = "private-gpt";
|
||||
RuntimeDirectoryMode = "0755";
|
||||
PrivateTmp = true;
|
||||
DynamicUser = true;
|
||||
DevicePolicy = "closed";
|
||||
LockPersonality = true;
|
||||
MemoryDenyWriteExecute = true;
|
||||
PrivateUsers = true;
|
||||
ProtectHome = true;
|
||||
ProtectHostname = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelTunables = true;
|
||||
ProtectControlGroups = true;
|
||||
ProcSubset = "pid";
|
||||
RestrictNamespaces = true;
|
||||
RestrictRealtime = true;
|
||||
SystemCallArchitectures = "native";
|
||||
UMask = "0077";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
meta.maintainers = [ ];
|
||||
}
|
||||
@@ -280,6 +280,7 @@ in
|
||||
"network.hosts"
|
||||
"ssh.authorized_keys.root"
|
||||
];
|
||||
RestrictSUIDSGID = false;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -103,7 +103,7 @@ rec {
|
||||
opensshTest
|
||||
php
|
||||
postgresql
|
||||
python
|
||||
python3
|
||||
release-checks
|
||||
rsyslog
|
||||
stdenv
|
||||
|
||||
@@ -1226,7 +1226,6 @@ in
|
||||
_module.args.socket = false;
|
||||
_module.args.listenTcp = false;
|
||||
};
|
||||
private-gpt = runTest ./private-gpt.nix;
|
||||
privatebin = runTest ./privatebin.nix;
|
||||
privoxy = runTest ./privoxy.nix;
|
||||
prometheus = import ./prometheus { inherit runTest; };
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
{ pkgs, lib, ... }:
|
||||
let
|
||||
mainPort = "8001";
|
||||
in
|
||||
{
|
||||
name = "private-gpt";
|
||||
meta = with lib.maintainers; {
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
nodes = {
|
||||
machine =
|
||||
{ ... }:
|
||||
{
|
||||
services.private-gpt = {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.start()
|
||||
|
||||
machine.wait_for_unit("private-gpt.service")
|
||||
machine.wait_for_open_port(${mainPort})
|
||||
|
||||
machine.succeed("curl http://127.0.0.1:${mainPort}")
|
||||
'';
|
||||
}
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "mgba";
|
||||
version = "0-unstable-2025-05-18";
|
||||
version = "0-unstable-2025-07-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "mgba";
|
||||
rev = "c9bbf28b091c4c104485092279c7a6b114b2e8ff";
|
||||
hash = "sha256-yCRM2qkacGbFVr6x0ZHBCZ8xAMruFENBdcnNKzK0sY4=";
|
||||
rev = "affc86e4c07b6e1e8363e0bc1c5ffb813a2e32c9";
|
||||
hash = "sha256-4nKghnpMI1LuKOKc0vSknTuq+bA0wpBux/a5mGCyev8=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{
|
||||
"packageVersion": "140.0.4-1",
|
||||
"packageVersion": "141.0-1",
|
||||
"source": {
|
||||
"rev": "140.0.4-1",
|
||||
"hash": "sha256-/7Ynt0mKEu/ms9B5J3xfh6I5nnmdz8xI/7bm9uURE7M="
|
||||
"rev": "141.0-1",
|
||||
"hash": "sha256-sgs/96soNX6kHWzXSZW0Hkh5lBoMffRMhlOa3BJoY6I="
|
||||
},
|
||||
"firefox": {
|
||||
"version": "140.0.4",
|
||||
"hash": "sha512-PefAhxuKRWg/XCJvs+keWX6Pie8VSyCLKlfE0+qfOctcaey9Xso7baaNN3VojSKJwTYMfREMZ7sb4c8m74zzbQ=="
|
||||
"version": "141.0",
|
||||
"hash": "sha512-vWmYvOknxbXBhlN71BR1/J44CYKc6tsid7s4LQLTeA0qXldJSHVnp1t8njcm+XZixOwokkvEkcWj8h4uxIKNYw=="
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
# how to use
|
||||
# nix-update -u librewolf-unwrapped
|
||||
{
|
||||
writeScript,
|
||||
lib,
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
(callPackage ./generic.nix { }) {
|
||||
channel = "edge";
|
||||
version = "25.7.1";
|
||||
sha256 = "1aijd3ymh95hqa896iidmffc1wn7fs318z023vvqk80rryqha5pa";
|
||||
vendorHash = "sha256-5/WtI24m260I4yy3PgIhh3c60anzlEjIBua41V9Gb1E=";
|
||||
version = "25.7.4";
|
||||
sha256 = "19s32frf6ymfv88zvinakqh23yp7zlcj6dcyzlkkviayf4gk270x";
|
||||
vendorHash = "sha256-6cUWeJA0nxUMd+mrrHccPu9slebwZGUR0yGxev3k4ls=";
|
||||
}
|
||||
|
||||
@@ -99,11 +99,11 @@
|
||||
"vendorHash": "sha256-YIn8akPW+DCVF0eYZxsmJxmrJuYhK4QLG/uhmmrXd4c="
|
||||
},
|
||||
"auth0": {
|
||||
"hash": "sha256-Pr8cqPtmINxM5zYy8qrGlGoW/q2ha7sLwSy3oCPm/h8=",
|
||||
"hash": "sha256-kFlRAwvKpqcD0n5VKJC+Whr8ZeO4DUzkLT2umvLXgEA=",
|
||||
"homepage": "https://registry.terraform.io/providers/auth0/auth0",
|
||||
"owner": "auth0",
|
||||
"repo": "terraform-provider-auth0",
|
||||
"rev": "v1.24.0",
|
||||
"rev": "v1.24.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-uKzgEBNrLqcOkrrxKO9c5wKRwUjQInzeseN/euEI2G8="
|
||||
},
|
||||
@@ -171,11 +171,11 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"baiducloud": {
|
||||
"hash": "sha256-9NarSg8uXhdx+kJK7M9ftDoWXr9St1CEqL0N9+OJAXE=",
|
||||
"hash": "sha256-bmKoxLvWc1mX1NaV3ksHeuRX8yYDKnfFhPiASPBVlnM=",
|
||||
"homepage": "https://registry.terraform.io/providers/baidubce/baiducloud",
|
||||
"owner": "baidubce",
|
||||
"repo": "terraform-provider-baiducloud",
|
||||
"rev": "v1.22.8",
|
||||
"rev": "v1.22.9",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@@ -750,13 +750,13 @@
|
||||
"vendorHash": "sha256-LeMFN4pOJotTTqakEbVelHSTEb4p7CQIuKzeuX3SZUM="
|
||||
},
|
||||
"launchdarkly": {
|
||||
"hash": "sha256-ZiRHloNipUqiD1YC8c2oln1sknW8cazSQHrxX75o/ek=",
|
||||
"hash": "sha256-U3l2Tf7vcLAz7nZYKaGR0Nv/Qw2HgbGNV7w1dYBvSEc=",
|
||||
"homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly",
|
||||
"owner": "launchdarkly",
|
||||
"repo": "terraform-provider-launchdarkly",
|
||||
"rev": "v2.25.2",
|
||||
"rev": "v2.25.3",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-rw73A4dD+ObozIRYoxIwAx6/8zlSSBtQDpJIpgVhSp8="
|
||||
"vendorHash": "sha256-b9+0YLuv9AVszGDQ2v+VbYameN16PCdE3jUhL9efK6M="
|
||||
},
|
||||
"libvirt": {
|
||||
"hash": "sha256-6wG6J6SQGxR74gbGZlW5/8zgIqsBUo0Xg/gN0wNppSg=",
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "ansible-doctor";
|
||||
version = "7.0.9";
|
||||
version = "7.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thegeeklab";
|
||||
repo = "ansible-doctor";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-d7KPn+nCrGEYE9lzfV3+Fl8MDUq8x5S8MPKrwX8XZ5w=";
|
||||
hash = "sha256-RAfRzMtsXu1s3a1seG49+Zzd6nLtT8RObdDnO8nrymw=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "astyle";
|
||||
version = "3.6.10";
|
||||
version = "3.6.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
|
||||
hash = "sha256-HW7onAhKk93MKNGgVs2o0cNX0xjvjihEVtnwvSzrS20=";
|
||||
hash = "sha256-DqvuP9nQdAZ3KrzpMkHWLB9H1FbT+UHL8Vr5wj3HStY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "atlas";
|
||||
version = "0.36.0";
|
||||
version = "0.36.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ariga";
|
||||
repo = "atlas";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-NmlE0Wr5A2tt0cWudOWxGgyYwqE4fmCeEU68yuQKARU=";
|
||||
hash = "sha256-ApZbZuREKEUkxDNLzTB1ZK2aVDh/c9Tf7RGwURlkefQ=";
|
||||
};
|
||||
|
||||
modRoot = "cmd/atlas";
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "az-pim-cli";
|
||||
version = "1.6.1";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netr0m";
|
||||
repo = "az-pim-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-gf4VscHaUr3JtsJO5PAq1nyPeJxIwGPaiH/QdXKpvQ0=";
|
||||
hash = "sha256-X7+/2pXbpHFm22lwWy6LvyjIy6sxmYSiMrYV3faAZl4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "backblaze-b2";
|
||||
version = "4.3.3";
|
||||
version = "4.4.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Backblaze";
|
||||
repo = "B2_Command_Line_Tool";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-EMdExF+5BJDIozAwJ/tqnq5X20uGvteDHTKsgvPEnK0=";
|
||||
hash = "sha256-SZQilulk+07Ua1n9EbalYyTo/3vxK3MILGkXVthLETw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "biome";
|
||||
version = "2.1.2";
|
||||
version = "2.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "biomejs";
|
||||
repo = "biome";
|
||||
rev = "@biomejs/biome@${finalAttrs.version}";
|
||||
hash = "sha256-9Xw3Q77J+Lmu4tZWwkh5kwZL3d7LzW9ccCshmfwrNlo=";
|
||||
hash = "sha256-+fuOPdjfebgtwzckEu/ADd+bNLYtiDFlDJ0aVMKxgMY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-PGEiZ6eFUQQmlvb3nbyHHqKD/15dDW3QpTo02/mrmiU=";
|
||||
cargoHash = "sha256-4WrDWtNQkRUtYxGBl26meKLTn52/QWtn1bVOVFHpMz4=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-leptos";
|
||||
version = "0.2.38";
|
||||
version = "0.2.42";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "leptos-rs";
|
||||
repo = "cargo-leptos";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RrgWIT6pCD7MY8SwuVPNdlEl81iT5zhVbT6y9LcpY1Y=";
|
||||
hash = "sha256-hNkCkHgIKn1/angH70DOeRxX5G1gUtoLVgmYfsLPD44=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-0XsSa8/Utsqug+6rQ13drXQGgxJ7bxDwmACaZCmErws=";
|
||||
cargoHash = "sha256-hJND5X/Sn16OA7iHXqj6gNpg0JdykI8U3k6l4++qFb0=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -10,18 +10,18 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dotenv-cli";
|
||||
version = "8.0.0";
|
||||
version = "9.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "entropitor";
|
||||
repo = "dotenv-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-cqJGw6z0m1ImFEmG2jfcYjaKVhrGyM4hbOAHC7xNAFY=";
|
||||
hash = "sha256-mpVObsilwVCq1V2Z11uqK1T7VgwpfTYng2vqrTqJZE4=";
|
||||
};
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = "${src}/yarn.lock";
|
||||
hash = "sha256-/w9MZ+hNEwB41VwPSYEY6V0uWmZ4Tsev3h2fa/REm2E=";
|
||||
hash = "sha256-ak6QD9Z0tE0XgFVt3QkjZxk2kelUFPX9bEF855RiY2w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "eksctl";
|
||||
version = "0.211.0";
|
||||
version = "0.212.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "weaveworks";
|
||||
repo = "eksctl";
|
||||
rev = version;
|
||||
hash = "sha256-WscHv+4IieE3G87/Iicw2CFpf73C2Og58N/a5fbf0kU=";
|
||||
hash = "sha256-XOnRMD4EG0N8A2s4YlXqiukt9y6/YbHdJxGz9MM/iLc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-sUoidROptTEDqGdb30BFJazf/I2Ggmx3GUs6xE69nNI=";
|
||||
vendorHash = "sha256-WtrJJZRbH5RuKUJCXDqu9YuEIBflzvmIAWNqbTgcFeo=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -65,17 +65,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# patch relative gamescopereaper path with absolute
|
||||
./gamescopereaper.patch
|
||||
|
||||
# Revert change to always use vendored stb/glm libraries
|
||||
# Upstream discussion: https://github.com/ValveSoftware/gamescope/pull/1751
|
||||
# Pending upstream patch to allow using system libraries
|
||||
# See: https://github.com/ValveSoftware/gamescope/pull/1846
|
||||
(fetchpatch {
|
||||
url = "https://github.com/ValveSoftware/gamescope/commit/baae74c4b13676fa76a8b200f21ac78f55079734.patch";
|
||||
revert = true;
|
||||
hash = "sha256-XpbyLQ4R9KgBR3hlrgPzmM7Zxr2jm4Q10zGjyhh/Qxw=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/ValveSoftware/gamescope/commit/72bae179ba2ebbbc91ed07c7f66e7e4964a4cd9e.patch";
|
||||
revert = true;
|
||||
hash = "sha256-aglfGvEuycNyPlaFYxqqvPAgFpWns3xZ3B2GiAefxtg=";
|
||||
url = "https://github.com/ValveSoftware/gamescope/commit/4ce1a91fb219f570b0871071a2ec8ac97d90c0bc.diff";
|
||||
hash = "sha256-O358ScIIndfkc1S0A8g2jKvFWoCzcXB/g6lRJamqOI4=";
|
||||
})
|
||||
];
|
||||
|
||||
@@ -95,6 +89,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mesonFlags = [
|
||||
(lib.mesonBool "enable_gamescope" enableExecutable)
|
||||
(lib.mesonBool "enable_gamescope_wsi_layer" enableWsi)
|
||||
|
||||
(lib.mesonOption "glm_include_dir" "${lib.getInclude glm}/include")
|
||||
(lib.mesonOption "stb_include_dir" "${lib.getInclude stb}/include/stb")
|
||||
];
|
||||
|
||||
# don't install vendored vkroots etc
|
||||
@@ -111,10 +108,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pkg-config
|
||||
ninja
|
||||
wayland-scanner
|
||||
# For `libdisplay-info`
|
||||
python3
|
||||
hwdata
|
||||
v4l-utils
|
||||
|
||||
# For OpenVR
|
||||
cmake
|
||||
|
||||
@@ -124,6 +118,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
++ lib.optionals enableExecutable [
|
||||
makeBinaryWrapper
|
||||
glslang
|
||||
|
||||
# For `libdisplay-info`
|
||||
python3
|
||||
hwdata
|
||||
v4l-utils
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -133,8 +132,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
wayland
|
||||
wayland-protocols
|
||||
vulkan-loader
|
||||
glm
|
||||
luajit
|
||||
]
|
||||
++ lib.optionals enableWsi [
|
||||
vulkan-headers
|
||||
@@ -163,8 +160,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
gbenchmark
|
||||
pixman
|
||||
libcap
|
||||
stb
|
||||
lcms
|
||||
luajit
|
||||
]
|
||||
);
|
||||
|
||||
|
||||
@@ -11,18 +11,18 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ghost-cli";
|
||||
version = "1.27.1";
|
||||
version = "1.28.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TryGhost";
|
||||
repo = "Ghost-CLI";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ka+fqfUw6SSixrSHV2rbFsAqEM2f/yTQNcGONJKTRMc=";
|
||||
hash = "sha256-gpOaoR/UB8ermQCXlYgoVA3h+OdUGvP6ofjlFlMHA58=";
|
||||
};
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = finalAttrs.src + "/yarn.lock";
|
||||
hash = "sha256-SaekfV1QZw6PIJm8GtyjZmCSNIc0aXolz1mEyTwVERM=";
|
||||
hash = "sha256-4GJ6I0Iynu+/lmiKat3p/MIivVjcyxxhpXKPSOheBls=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -170,11 +170,11 @@ let
|
||||
|
||||
linux = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit pname meta passthru;
|
||||
version = "138.0.7204.168";
|
||||
version = "138.0.7204.183";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
|
||||
hash = "sha256-vfMEQOh9VZsLElld8qfeLY9B53z1AqyRTQ/7p2cxHYg=";
|
||||
hash = "sha256-GxdfHU6pskOL0i/rmN7kwGsuLYTotL1mEw6RV7qfl50=";
|
||||
};
|
||||
|
||||
# With strictDeps on, some shebangs were not being patched correctly
|
||||
@@ -275,11 +275,11 @@ let
|
||||
|
||||
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit pname meta passthru;
|
||||
version = "138.0.7204.169";
|
||||
version = "138.0.7204.184";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dl.google.com/release2/chrome/acwjggvog6ot2icovazewas35mgq_138.0.7204.169/GoogleChrome-138.0.7204.169.dmg";
|
||||
hash = "sha256-58/hSldBZ3gtzjY0GCt6GkxUX97GORwTh5uEfEjxM3A=";
|
||||
url = "http://dl.google.com/release2/chrome/acvbvqaeyyrjo6kygs27pc5y27ea_138.0.7204.184/GoogleChrome-138.0.7204.184.dmg";
|
||||
hash = "sha256-KM9fK5zaXNCdVfCRN9b0RxIvH7VxCln4Eo9YgOEd8PY=";
|
||||
};
|
||||
|
||||
dontPatch = true;
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "grafanactl";
|
||||
version = "0.0.6";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "grafanactl";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-XpXfoD2Ln3YgMl02mEqoP8BIdT9gz45hMclii28D5xQ=";
|
||||
hash = "sha256-l+Aj1n0ZU7tW5hTKeTkZQgvlnOBISaYJ2qFramD4eiY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-00FLRrQknuRPwmbkIazpCxRb34IY/OCxi/zgbuzBtWw=";
|
||||
vendorHash = "sha256-eEgGrb/un+KkT7DBJ1SMUUHauZQMYroKo6OBrgzGicM=";
|
||||
|
||||
ldflags = [
|
||||
"-X main.version=v${finalAttrs.version}"
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "lego";
|
||||
version = "4.23.1";
|
||||
version = "4.25.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "go-acme";
|
||||
repo = "lego";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-lFsxUPFFZpsGqcya70El04AefFPBubqA/abhY7Egz8Q=";
|
||||
hash = "sha256-71AaHvf2Vipmws38pcvZtsD+P6UX6dfY3d/4+0aOwVQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-L9fjkSrWoP4vs+BlWyEgK+SF3tWQFiEJjd0fJqcruVM=";
|
||||
vendorHash = "sha256-8135PtcC98XxbdQnF58sglAgZUkuBA+A3bSxK0+tQ9U=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "madonctl";
|
||||
version = "2.3.2";
|
||||
version = "3.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "McKael";
|
||||
repo = "madonctl";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-mo185EKjLkiujAKcAFM1XqkXWvcfYbnv+r3dF9ywaf8=";
|
||||
hash = "sha256-R/es9QVTBpLiCojB/THWDkgQcxexyX/iH9fF3Q2tq54=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -21,16 +21,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mise";
|
||||
version = "2025.7.17";
|
||||
version = "2025.7.29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jdx";
|
||||
repo = "mise";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lyj5ksasgeQhjsYI+LD5UhXQQHjCviphcMdjEW/AQmM=";
|
||||
hash = "sha256-rL1A6yMBJCgfbsFiSKZ/smxxSntOPYeobH04BXzyzhI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-So6ZYIkwxxh8cYaLGyA1LMoRU00jXda/R/fdYN55oVg=";
|
||||
cargoHash = "sha256-WIxB8PO5Ia8u7xEoUJasdQ+5MJr/zgL1jA4suxTaaKI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -85,6 +85,7 @@ buildGoModule (
|
||||
maintainers = with lib.maintainers; [
|
||||
arjan-s
|
||||
fpletz
|
||||
matthiasbeyer
|
||||
];
|
||||
mainProgram = "ntfy";
|
||||
};
|
||||
|
||||
@@ -81,18 +81,18 @@ buildGoModule (
|
||||
|
||||
{
|
||||
pname = "olivetin";
|
||||
version = "2025.7.28";
|
||||
version = "2025.7.29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OliveTin";
|
||||
repo = "OliveTin";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-gh0Nc7h2Z+Nz7TixmHihFAHI0X0Y2ZeA4OMv3jOYlh4=";
|
||||
hash = "sha256-QNwPc+qr26S2hl4deLVx58Xh9hkSfZyrxrdaO1NCTDc=";
|
||||
};
|
||||
|
||||
modRoot = "service";
|
||||
|
||||
vendorHash = "sha256-mI17WV+U4wbcZhSymX4NnxwvHqQNehubrvH9CxXe4/o=";
|
||||
vendorHash = "sha256-1vZCQBc/J3E/QRS8Bkfc1exDZJIn9739/gyPrpQpiHI=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
{
|
||||
python3Packages,
|
||||
makeBinaryWrapper,
|
||||
}:
|
||||
|
||||
python3Packages.toPythonApplication (
|
||||
python3Packages.private-gpt.overrideAttrs (oldAttrs: {
|
||||
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ makeBinaryWrapper ];
|
||||
|
||||
passthru = (oldAttrs.passthru or { }) // {
|
||||
cl100k_base = {
|
||||
inherit (python3Packages.private-gpt.cl100k_base) tiktoken;
|
||||
};
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
makeWrapper ${python3Packages.python.interpreter} $out/bin/private-gpt \
|
||||
--prefix PYTHONPATH : "$PYTHONPATH" \
|
||||
--add-flags "-m private_gpt"
|
||||
'';
|
||||
})
|
||||
)
|
||||
@@ -25,18 +25,18 @@ let
|
||||
platforms = {
|
||||
x86_64-linux = {
|
||||
archSuffix = "x86_64";
|
||||
hash = "sha256-b+YXBVnxu54HfC/tWapcs/ZYzwBOJswYbEbEU3SVNss=";
|
||||
hash = "sha256-BigVJ3TJ0tiDoxe+fX1iSyj6Q1o/8CkAo7fJ8aaftsQ=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
archSuffix = "arm64";
|
||||
hash = "sha256-l54FAtT+Rj4Mv3GuOF0/9WuKdJowgbZDZYo7VCh6Flg=";
|
||||
hash = "sha256-Ee7a8vi9inE4QZoeZtTipXBuZAg2urdicLcm/LUgw5Q=";
|
||||
};
|
||||
};
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "renoise";
|
||||
version = "3.4.4";
|
||||
version = "3.5.0";
|
||||
|
||||
src =
|
||||
if releasePath != null then
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "roddhjav-apparmor-rules";
|
||||
version = "0-unstable-2025-07-20";
|
||||
version = "0-unstable-2025-07-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "roddhjav";
|
||||
repo = "apparmor.d";
|
||||
rev = "e490a11c1a2ecfadd2cbc0759d77f4706bc2ee61";
|
||||
hash = "sha256-+UWVKs3xKitt8B/QCugnTuQaxWCgFcetJQ2RQNUDy00=";
|
||||
rev = "fc421183a024cb3abb4c3343ed7a1954f53e4511";
|
||||
hash = "sha256-V4sjCCie5LKXQTrso8ysFDCQJ60BUx/+OHuB9ntFLUs=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rust-motd";
|
||||
version = "1.1.0";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-motd";
|
||||
repo = "rust-motd";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pgmAf9izrIun6+EayxSNy9glTUFd0x/uy5r/aijVi4U=";
|
||||
hash = "sha256-NgNMTsm9C+0Lt6r1zYA486oSQpGIMxLsPozdDw7lILs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-TO2YCUmD+K4X7ArAPGCDhTH2W2UG8Ezr+yZjaQJTL0A=";
|
||||
cargoHash = "sha256-pm/N00H840WzuP/BcvyqgZ/9zbNsHKm/UZ0O88giasY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioamazondevices";
|
||||
version = "3.5.0";
|
||||
version = "3.6.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chemelli74";
|
||||
repo = "aioamazondevices";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-gFO0E5tphInHOTAgaifp+jNQQvs+HfLDhvErmLwwrPU=";
|
||||
hash = "sha256-CVwpu0TW6ah7Stx2GhQgw9EkmHJ6rRB7DN416EatUMo=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aws-sam-translator";
|
||||
version = "1.95.0";
|
||||
version = "1.98.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "aws";
|
||||
repo = "serverless-application-model";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Gz2lU/8QtcU02JYWsz3l9EqJajusr3h2LiTtFdwNc1k=";
|
||||
hash = "sha256-OfWH1V+F90ukVgan+eZKo00hrOMf/6x6HqxARzFiKHI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "habiticalib";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.12";
|
||||
@@ -28,7 +28,7 @@ buildPythonPackage rec {
|
||||
owner = "tr4nt0r";
|
||||
repo = "habiticalib";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-RYtTJavfw5gQTo0m/Dgkv/6ghv+T5SSaaweiI370OOA=";
|
||||
hash = "sha256-RHR7kXZkzv7wZ0napAT7Ukb4tJ2TiwmeZHiw20YpNkM=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -24,14 +24,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langchain-aws";
|
||||
version = "0.2.28";
|
||||
version = "0.2.29";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "langchain-ai";
|
||||
repo = "langchain-aws";
|
||||
tag = "langchain-aws==${version}";
|
||||
hash = "sha256-sfdijQxcw0TNK1/IOmHQTHznDIMDTvXqMWBb58cTPlI=";
|
||||
hash = "sha256-WV/z8hEOPtM3o7/4ZqZSw1cGI2d0NFAz1KajF1i/vQI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
requests,
|
||||
pytestCheckHook,
|
||||
requests-mock,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nsw-fuel-api-client";
|
||||
version = "1.1.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nickw444";
|
||||
repo = "nsw-fuel-api-client";
|
||||
tag = version;
|
||||
hash = "sha256-3nkBDLmFOfYLvG5fi2subA9zxb51c7zWlhT4GaCQo9I=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
requests
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
requests-mock
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"nsw_fuel"
|
||||
];
|
||||
|
||||
pytestFlags = [
|
||||
"nsw_fuel_tests/unit.py"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "API Client for NSW Government Fuel Check application";
|
||||
homepage = "https://github.com/nickw444/nsw-fuel-api-client";
|
||||
changelog = "https://github.com/nickw444/nsw-fuel-api-client/releases/tag/${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.jamiemagee ];
|
||||
};
|
||||
}
|
||||
@@ -6,6 +6,7 @@
|
||||
deprecated,
|
||||
hatchling,
|
||||
importlib-metadata,
|
||||
typing-extensions,
|
||||
opentelemetry-test-utils,
|
||||
pytestCheckHook,
|
||||
writeScript,
|
||||
@@ -14,7 +15,7 @@
|
||||
let
|
||||
self = buildPythonPackage rec {
|
||||
pname = "opentelemetry-api";
|
||||
version = "1.31.1";
|
||||
version = "1.34.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -24,7 +25,7 @@ let
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-python";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-/HXPZLcTDTGnwOMt+IfmlMCua75oEzj99u6i9s+nBwI=";
|
||||
hash = "sha256-fAXcS2VyDMk+UDW3ru5ZvwzXjydsY1uFcT2GvZuiGWw=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/opentelemetry-api";
|
||||
@@ -34,6 +35,7 @@ let
|
||||
dependencies = [
|
||||
deprecated
|
||||
importlib-metadata
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [ "importlib-metadata" ];
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
moto,
|
||||
opentelemetry-test-utils,
|
||||
opentelemetry-propagator-aws-xray,
|
||||
pytest-vcr,
|
||||
pytestCheckHook,
|
||||
aws-xray-sdk,
|
||||
}:
|
||||
@@ -31,6 +32,7 @@ buildPythonPackage {
|
||||
|
||||
nativeCheckInputs = [
|
||||
opentelemetry-test-utils
|
||||
pytest-vcr
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
@@ -45,6 +47,10 @@ buildPythonPackage {
|
||||
|
||||
pythonImportsCheck = [ "opentelemetry.instrumentation.botocore" ];
|
||||
|
||||
disabledTests = [
|
||||
"test_scan"
|
||||
];
|
||||
|
||||
meta = opentelemetry-instrumentation.meta // {
|
||||
homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-botocore";
|
||||
description = "Botocore instrumentation for OpenTelemetry";
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "opentelemetry-instrumentation";
|
||||
version = "0.52b1";
|
||||
version = "0.55b0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-python-contrib";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-zvqc8pP5hU7NPfMdlTQIRTGuXzX7L9DGPMxb1wS0qiY=";
|
||||
hash = "sha256-UM9ezCh3TVwyj257O0rvTCIgfrddobWcVIgJmBUj/Vo=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/opentelemetry-instrumentation";
|
||||
|
||||
@@ -1,112 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchurl,
|
||||
|
||||
# build-system
|
||||
poetry-core,
|
||||
|
||||
# dependencies
|
||||
cryptography,
|
||||
docx2txt,
|
||||
fastapi,
|
||||
injector,
|
||||
llama-index-core,
|
||||
llama-index-readers-file,
|
||||
python-multipart,
|
||||
pyyaml,
|
||||
transformers,
|
||||
watchdog,
|
||||
|
||||
# optional-dependencies
|
||||
python,
|
||||
huggingface-hub,
|
||||
gradio,
|
||||
|
||||
# tests
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "private-gpt";
|
||||
version = "0.6.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zylon-ai";
|
||||
repo = "private-gpt";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-IYTysU3W/NrtBuLe3ZJkztVSK+gzjkGIg0qcBYzB3bs=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"cryptography"
|
||||
"docx2txt"
|
||||
"fastapi"
|
||||
"llama-index-core"
|
||||
"llama-index-readers-file"
|
||||
"python-multipart"
|
||||
"watchdog"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
cryptography
|
||||
docx2txt
|
||||
fastapi
|
||||
injector
|
||||
llama-index-core
|
||||
llama-index-readers-file
|
||||
python-multipart
|
||||
pyyaml
|
||||
transformers
|
||||
watchdog
|
||||
]
|
||||
++ lib.flatten (builtins.attrValues optional-dependencies);
|
||||
|
||||
# This is needed for running the tests and the service in offline mode,
|
||||
# See related issue at https://github.com/zylon-ai/private-gpt/issues/1870
|
||||
passthru.cl100k_base.tiktoken = fetchurl {
|
||||
url = "https://openaipublic.blob.core.windows.net/encodings/cl100k_base.tiktoken";
|
||||
hash = "sha256-Ijkht27pm96ZW3/3OFE+7xAPtR0YyTWXoRO8/+hlsqc=";
|
||||
};
|
||||
|
||||
optional-dependencies = with python.pkgs; {
|
||||
embeddings-huggingface = [
|
||||
huggingface-hub
|
||||
llama-index-embeddings-huggingface
|
||||
];
|
||||
embeddings-ollama = [ llama-index-embeddings-ollama ];
|
||||
embeddings-openai = [ llama-index-embeddings-openai ];
|
||||
embeddings-sagemaker = [ boto3 ];
|
||||
llms-ollama = [ llama-index-llms-ollama ];
|
||||
llms-openai = [ llama-index-llms-openai ];
|
||||
llms-openai-like = [ llama-index-llms-openai-like ];
|
||||
llms-sagemaker = [ boto3 ];
|
||||
ui = [ gradio ];
|
||||
vector-stores-chroma = [ llama-index-vector-stores-chroma ];
|
||||
vector-stores-postgres = [ llama-index-vector-stores-postgres ];
|
||||
vector-stores-qdrant = [ llama-index-vector-stores-qdrant ];
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
cp settings*.yaml $out/${python.sitePackages}/private_gpt/
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "private_gpt" ];
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) private-gpt;
|
||||
};
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/zylon-ai/private-gpt/blob/${src.rev}/CHANGELOG.md";
|
||||
description = "Interact with your documents using the power of GPT, 100% privately, no data leaks";
|
||||
homepage = "https://github.com/zylon-ai/private-gpt";
|
||||
license = lib.licenses.asl20;
|
||||
mainProgram = "private-gpt";
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
};
|
||||
}
|
||||
@@ -101,9 +101,6 @@ buildPythonPackage rec {
|
||||
disabledTestPaths = [
|
||||
"pyscf/pbc/tdscf"
|
||||
"pyscf/pbc/gw"
|
||||
"*_slow.*py"
|
||||
"*_kproxy_.*py"
|
||||
"test_proxy.py"
|
||||
"pyscf/nac/test/test_sacasscf.py"
|
||||
"pyscf/grad/test/test_casscf.py"
|
||||
];
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyschlage";
|
||||
version = "2025.7.0";
|
||||
version = "2025.7.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "dknowles2";
|
||||
repo = "pyschlage";
|
||||
tag = version;
|
||||
hash = "sha256-XfYoui3xo8l3wi8nqvyzfYhsHsY8T1t/iYS4ZHNjGUE=";
|
||||
hash = "sha256-6IY+rCz/tMaj+c2ME8g9KzdYcakW2rcgM9DFHJSF3Jc=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysuezv2";
|
||||
version = "2.0.5";
|
||||
version = "2.0.7";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "jb101010-2";
|
||||
repo = "pySuez";
|
||||
tag = version;
|
||||
hash = "sha256-U5INSk3tcEgDJyRx17YaSDjPWgNwGeHIs2VB87E0l44=";
|
||||
hash = "sha256-nPRHpT5j/AAxhCJen4mFzoyUWi/+0hIWK2dnpfhP/Gk=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage {
|
||||
pname = "torchcrepe";
|
||||
version = "0.0.23";
|
||||
version = "0.0.24";
|
||||
pyproject = true;
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -24,9 +24,9 @@ buildPythonPackage {
|
||||
src = fetchFromGitHub {
|
||||
owner = "maxrmorrison";
|
||||
repo = "torchcrepe";
|
||||
# No releases: https://github.com/maxrmorrison/torchcrepe/commit/e2c305878ec7a89aec85a01f8d223a75a36d30b6
|
||||
rev = "e2c305878ec7a89aec85a01f8d223a75a36d30b6";
|
||||
hash = "sha256-fhBU5KFDNDG4g4KNivE/dRpMPyu1QNa9xKN6HIz3tK4=";
|
||||
# No releases: https://github.com/maxrmorrison/torchcrepe/commit/19e2ec3d494c0797a5ff2a11408ec5838fba6681
|
||||
rev = "19e2ec3d494c0797a5ff2a11408ec5838fba6681";
|
||||
hash = "sha256-w2T8D3ATCHVBCBhMdLSYdV0yb9vUYwZLz+B2X2gteEU=";
|
||||
};
|
||||
|
||||
dependencies = [
|
||||
|
||||
@@ -0,0 +1,54 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
requests,
|
||||
pytestCheckHook,
|
||||
requests-mock,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "wirelesstagpy";
|
||||
version = "0.8.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sergeymaysak";
|
||||
repo = "wirelesstagpy";
|
||||
tag = version;
|
||||
hash = "sha256-xmcXBlApteGAQwfNx6fmFkP7enRy3Iy19+6mAjc7LWA=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ requests ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
requests-mock
|
||||
];
|
||||
|
||||
enabledTests = [ "test" ];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Requires tl.testing dependency
|
||||
"test/test_cloud_push.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"wirelesstagpy"
|
||||
"wirelesstagpy.constants"
|
||||
"wirelesstagpy.notificationconfig"
|
||||
"wirelesstagpy.sensortag"
|
||||
"wirelesstagpy.binaryevent"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Simple python wrapper over wirelesstags REST API";
|
||||
homepage = "https://github.com/sergeymaysak/wirelesstagpy";
|
||||
changelog = "https://github.com/sergeymaysak/wirelesstagpy/releases/tag/${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.jamiemagee ];
|
||||
};
|
||||
}
|
||||
@@ -23,9 +23,9 @@ let
|
||||
};
|
||||
# ./update-zen.py lqx
|
||||
lqx = {
|
||||
version = "6.15.7"; # lqx
|
||||
version = "6.15.8"; # lqx
|
||||
suffix = "lqx1"; # lqx
|
||||
sha256 = "05pr17hqrlf4jfw3fxja9n0lfs4piy03fh4wqjhbd601sjif6akh"; # lqx
|
||||
sha256 = "1z85h8k49acw5w1m7z6lclnr62rgr6dbi2sci7in59qkq1zfvkb9"; # lqx
|
||||
isLqx = true;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2025.7.3";
|
||||
version = "2025.7.4";
|
||||
components = {
|
||||
"3_day_blinds" =
|
||||
ps: with ps; [
|
||||
@@ -4014,7 +4014,8 @@
|
||||
];
|
||||
"nsw_fuel_station" =
|
||||
ps: with ps; [
|
||||
]; # missing inputs: nsw-fuel-api-client
|
||||
nsw-fuel-api-client
|
||||
];
|
||||
"nsw_rural_fire_service_feed" =
|
||||
ps: with ps; [
|
||||
aio-geojson-nsw-rfs-incidents
|
||||
@@ -6510,7 +6511,8 @@
|
||||
];
|
||||
"wirelesstag" =
|
||||
ps: with ps; [
|
||||
]; # missing inputs: wirelesstagpy
|
||||
wirelesstagpy
|
||||
];
|
||||
"withings" =
|
||||
ps: with ps; [
|
||||
aiohasupervisor
|
||||
@@ -7372,6 +7374,7 @@
|
||||
"notify"
|
||||
"notify_events"
|
||||
"notion"
|
||||
"nsw_fuel_station"
|
||||
"nsw_rural_fire_service_feed"
|
||||
"ntfy"
|
||||
"nuheat"
|
||||
|
||||
@@ -354,7 +354,7 @@ let
|
||||
extraBuildInputs = extraPackages python.pkgs;
|
||||
|
||||
# Don't forget to run update-component-packages.py after updating
|
||||
hassVersion = "2025.7.3";
|
||||
hassVersion = "2025.7.4";
|
||||
|
||||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
@@ -375,13 +375,13 @@ python.pkgs.buildPythonApplication rec {
|
||||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
tag = version;
|
||||
hash = "sha256-FT77obtb081QOgw+nqbQvvW+3x/L2WUr3DLT8X1Wpwg=";
|
||||
hash = "sha256-2seMh1trP3PYnuQmWadTAiAPaI+v45+uzn9xkgUuGNE=";
|
||||
};
|
||||
|
||||
# Secondary source is pypi sdist for translations
|
||||
sdist = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-jO+rNIzEvtQ1vhSD1Xbq/SKV5XvBOb4MmkkczoeD1Kc=";
|
||||
hash = "sha256-KwiwgQ8gAMlHLzpuYYdcLXabVrukhnfFlaODyFpuF88=";
|
||||
};
|
||||
|
||||
build-system = with python.pkgs; [
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-homeassistant-custom-component";
|
||||
version = "0.13.262";
|
||||
version = "0.13.263";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.13";
|
||||
@@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "MatthewFlamm";
|
||||
repo = "pytest-homeassistant-custom-component";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-dlGZD9JNEMGaDpH4RiX1LJtx2owdRJvJX+V2b5QzD7U=";
|
||||
hash = "sha256-JqWe/tNYnNkFNx3D6E3X2TMyNwmfgoK2fkejX3f9NL8=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "homeassistant-stubs";
|
||||
version = "2025.7.3";
|
||||
version = "2025.7.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = python.version != home-assistant.python.version;
|
||||
@@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "KapJI";
|
||||
repo = "homeassistant-stubs";
|
||||
tag = version;
|
||||
hash = "sha256-iHNBFtdIQMAKiQGJ35xCBqDbYYphoAJPXjhmgIEEE5E=";
|
||||
hash = "sha256-boOhdro11wbLHWVuJHHSuov8qxSiOCuaS8yfJgIRyJk=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -23,7 +23,7 @@ let
|
||||
# NOTE: when updating this to a new non-patch version, please also try to
|
||||
# update the plugins. Plugins only work if they are compiled for the same
|
||||
# major/minor version.
|
||||
version = "0.105.1";
|
||||
version = "0.106.1";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "nushell";
|
||||
@@ -33,10 +33,10 @@ rustPlatform.buildRustPackage {
|
||||
owner = "nushell";
|
||||
repo = "nushell";
|
||||
tag = version;
|
||||
hash = "sha256-UcIcCzfe2C7qFJKLo3WxwXyGI1rBBrhQHtrglKNp6ck=";
|
||||
hash = "sha256-VrGsdO7RiTlf8JK3MBMcgj0z4cWUklDwikMN5Pu6JQI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-v3BtcEd1eMtHlDLsu0Y4i6CWA47G0CMOyVlMchj7EJo=";
|
||||
cargoHash = "sha256-GSpR54QGiY9Yrs/A8neoKK6hMvSr3ORtNnwoz4GGprY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
@@ -72,7 +72,13 @@ rustPlatform.buildRustPackage {
|
||||
--test-threads=$NIX_BUILD_CORES \
|
||||
--skip=repl::test_config_path::test_default_config_path \
|
||||
--skip=repl::test_config_path::test_xdg_config_bad \
|
||||
--skip=repl::test_config_path::test_xdg_config_empty
|
||||
--skip=repl::test_config_path::test_xdg_config_empty ${lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
\
|
||||
--skip=plugins::config::some \
|
||||
--skip=plugins::stress_internals::test_exit_early_local_socket \
|
||||
--skip=plugins::stress_internals::test_failing_local_socket_fallback \
|
||||
--skip=plugins::stress_internals::test_local_socket
|
||||
''}
|
||||
)
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "iperf";
|
||||
version = "3.19";
|
||||
version = "3.19.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.es.net/pub/iperf/iperf-${version}.tar.gz";
|
||||
hash = "sha256-BAFh2hVV7HQRqdgRkQSYMO83cX1CmpTubPCEJhjg4pw=";
|
||||
hash = "sha256-3GP4nsWB6pn4tVjY6zUQneBjgwENtaGQbCCKViugwnA=";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isLinux [ lksctp-tools ];
|
||||
|
||||
@@ -1666,6 +1666,7 @@ mapAliases {
|
||||
premake3 = throw "'premake3' has been removed since it is unmaintained. Consider using 'premake' instead"; # Added 2025-05-10
|
||||
prismlauncher-qt5 = throw "'prismlauncher-qt5' has been removed from nixpkgs. Please use 'prismlauncher'"; # Added 2024-04-20
|
||||
prismlauncher-qt5-unwrapped = throw "'prismlauncher-qt5-unwrapped' has been removed from nixpkgs. Please use 'prismlauncher-unwrapped'"; # Added 2024-04-20
|
||||
private-gpt = throw "'private-gpt' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2025-07-28
|
||||
probe-rs = probe-rs-tools; # Added 2024-05-23
|
||||
probe-run = throw "probe-run is deprecated upstream. Use probe-rs instead."; # Added 2024-05-23
|
||||
prometheus-dmarc-exporter = dmarc-metrics-exporter; # added 2022-05-31
|
||||
|
||||
@@ -10479,6 +10479,8 @@ self: super: with self; {
|
||||
|
||||
nskeyedunarchiver = callPackage ../development/python-modules/nskeyedunarchiver { };
|
||||
|
||||
nsw-fuel-api-client = callPackage ../development/python-modules/nsw-fuel-api-client { };
|
||||
|
||||
nsz = callPackage ../development/python-modules/nsz { };
|
||||
|
||||
ntc-templates = callPackage ../development/python-modules/ntc-templates { };
|
||||
@@ -11932,8 +11934,6 @@ self: super: with self; {
|
||||
|
||||
prison = callPackage ../development/python-modules/prison { };
|
||||
|
||||
private-gpt = callPackage ../development/python-modules/private-gpt { };
|
||||
|
||||
process-tests = callPackage ../development/python-modules/process-tests { };
|
||||
|
||||
procmon-parser = callPackage ../development/python-modules/procmon-parser { };
|
||||
@@ -19662,6 +19662,8 @@ self: super: with self; {
|
||||
|
||||
winsspi = callPackage ../development/python-modules/winsspi { };
|
||||
|
||||
wirelesstagpy = callPackage ../development/python-modules/wirelesstagpy { };
|
||||
|
||||
wirerope = callPackage ../development/python-modules/wirerope { };
|
||||
|
||||
withings-api = callPackage ../development/python-modules/withings-api { };
|
||||
|
||||
Reference in New Issue
Block a user