Merge staging-next into staging
This commit is contained in:
nixpkgs-ci[bot]
@@ -175,6 +175,10 @@ of pulling the upstream container image from Docker Hub. If you want the old beh
|
||||
If you need to rotate, a [3rd-party tool, `grafana-secretkey-rotation-tool`](https://github.com/erooke/grafana-secretkey-rotation-tool/tree/d9dc788902fa5185e15cb15ce6129f7237ab6138) is a tested option.
|
||||
When using a secret for this value, make sure to use [Grafana's variable expansion to inject secrets](https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#variable-expansion).
|
||||
|
||||
- `services.promtail` has been removed, as `promtail` reached its end of life.
|
||||
Consider migrating to [](#opt-services.alloy.enable), or, if you are looking for something light-weight, [](#opt-services.fluent-bit.enable).
|
||||
See <https://grafana.com/docs/alloy/latest/set-up/migrate/> or <https://docs.fluentbit.io/manual/data-pipeline/outputs/loki>.
|
||||
|
||||
- Ethercalc and its associated module have been removed, as the package is unmaintained and cannot be installed from source with npm now.
|
||||
|
||||
- `services.immich` no longer supports pgvecto.rs since the package has been removed from nixpkgs.
|
||||
|
||||
@@ -745,7 +745,6 @@
|
||||
./services/logging/logcheck.nix
|
||||
./services/logging/logrotate.nix
|
||||
./services/logging/logstash.nix
|
||||
./services/logging/promtail.nix
|
||||
./services/logging/rsyslogd.nix
|
||||
./services/logging/syslog-ng.nix
|
||||
./services/logging/syslogd.nix
|
||||
|
||||
@@ -221,6 +221,17 @@ in
|
||||
]
|
||||
"The grafana-agent module has been removed. Consider migrating to `grafana-alloy` (`services.alloy.enable`). See <https://grafana.com/docs/alloy/latest/set-up/migrate/>"
|
||||
)
|
||||
(mkRemovedOptionModule
|
||||
[
|
||||
"services"
|
||||
"promtail"
|
||||
]
|
||||
''
|
||||
The promtail module has been removed, as promtail reached its end of life.
|
||||
Consider migrating to `grafana-alloy` (`services.alloy.enable`), or, if you are looking for something light-weight, `fluent-bit` (`services.fluent-bit.enable`).
|
||||
See <https://grafana.com/docs/alloy/latest/set-up/migrate/> or <https://docs.fluentbit.io/manual/data-pipeline/outputs/loki>.
|
||||
''
|
||||
)
|
||||
(mkRemovedOptionModule [ "services" "homeassistant-satellite" ]
|
||||
"The `services.homeassistant-satellite` module has been replaced by `services.wyoming-satellite`."
|
||||
)
|
||||
|
||||
@@ -1,119 +0,0 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.services.promtail;
|
||||
|
||||
format = pkgs.formats.json { };
|
||||
prettyJSON =
|
||||
conf:
|
||||
with lib;
|
||||
pipe conf [
|
||||
(flip removeAttrs [ "_module" ])
|
||||
(format.generate "promtail-config.json")
|
||||
];
|
||||
|
||||
allowSystemdJournal =
|
||||
cfg.configuration ? scrape_configs && lib.any (v: v ? journal) cfg.configuration.scrape_configs;
|
||||
|
||||
allowPositionsFile = !lib.hasPrefix "/var/cache/promtail" positionsFile;
|
||||
positionsFile = cfg.configuration.positions.filename;
|
||||
|
||||
configFile = if cfg.configFile != null then cfg.configFile else prettyJSON cfg.configuration;
|
||||
|
||||
in
|
||||
{
|
||||
options.services.promtail = with types; {
|
||||
enable = mkEnableOption "the Promtail ingresser";
|
||||
|
||||
configuration = mkOption {
|
||||
type = format.type;
|
||||
description = ''
|
||||
Specify the configuration for Promtail in Nix.
|
||||
This option will be ignored if `services.promtail.configFile` is defined.
|
||||
'';
|
||||
};
|
||||
|
||||
configFile = mkOption {
|
||||
type = nullOr path;
|
||||
default = null;
|
||||
description = ''
|
||||
Config file path for Promtail.
|
||||
If this option is defined, the value of `services.promtail.configuration` will be ignored.
|
||||
'';
|
||||
};
|
||||
|
||||
extraFlags = mkOption {
|
||||
type = listOf str;
|
||||
default = [ ];
|
||||
example = [ "--server.http-listen-port=3101" ];
|
||||
description = ''
|
||||
Specify a list of additional command line flags,
|
||||
which get escaped and are then passed to Loki.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.promtail.configuration.positions.filename = mkDefault "/var/cache/promtail/positions.yaml";
|
||||
|
||||
systemd.services.promtail = {
|
||||
description = "Promtail log ingress";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
stopIfChanged = false;
|
||||
|
||||
serviceConfig = {
|
||||
Restart = "on-failure";
|
||||
TimeoutStopSec = 10;
|
||||
|
||||
ExecStartPre = "${lib.getExe pkgs.promtail} -config.file=${configFile} -check-syntax";
|
||||
ExecStart = "${pkgs.promtail}/bin/promtail -config.file=${configFile} ${escapeShellArgs cfg.extraFlags}";
|
||||
|
||||
ProtectSystem = "strict";
|
||||
ProtectHome = true;
|
||||
PrivateTmp = true;
|
||||
PrivateDevices = true;
|
||||
ProtectKernelTunables = true;
|
||||
ProtectControlGroups = true;
|
||||
RestrictSUIDSGID = true;
|
||||
PrivateMounts = true;
|
||||
CacheDirectory = "promtail";
|
||||
ReadWritePaths = lib.optional allowPositionsFile (dirOf positionsFile);
|
||||
|
||||
User = "promtail";
|
||||
Group = "promtail";
|
||||
|
||||
CapabilityBoundingSet = "";
|
||||
NoNewPrivileges = true;
|
||||
|
||||
ProtectKernelModules = true;
|
||||
SystemCallArchitectures = "native";
|
||||
ProtectKernelLogs = true;
|
||||
ProtectClock = true;
|
||||
|
||||
LockPersonality = true;
|
||||
ProtectHostname = true;
|
||||
RestrictRealtime = true;
|
||||
MemoryDenyWriteExecute = true;
|
||||
PrivateUsers = true;
|
||||
|
||||
SupplementaryGroups = lib.optional allowSystemdJournal "systemd-journal";
|
||||
}
|
||||
// (optionalAttrs (!pkgs.stdenv.hostPlatform.isAarch64) {
|
||||
# FIXME: figure out why this breaks on aarch64
|
||||
SystemCallFilter = "@system-service";
|
||||
});
|
||||
};
|
||||
|
||||
users.groups.promtail = { };
|
||||
users.users.promtail = {
|
||||
description = "Promtail service user";
|
||||
isSystemUser = true;
|
||||
group = "promtail";
|
||||
};
|
||||
};
|
||||
}
|
||||
+16
-35
@@ -1,4 +1,4 @@
|
||||
{ lib, pkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
name = "loki";
|
||||
@@ -12,45 +12,26 @@
|
||||
enable = true;
|
||||
configFile = "${pkgs.grafana-loki.src}/cmd/loki/loki-local-config.yaml";
|
||||
};
|
||||
services.promtail = {
|
||||
enable = true;
|
||||
configuration = {
|
||||
server = {
|
||||
http_listen_port = 9080;
|
||||
grpc_listen_port = 0;
|
||||
};
|
||||
clients = [ { url = "http://localhost:3100/loki/api/v1/push"; } ];
|
||||
scrape_configs = [
|
||||
{
|
||||
job_name = "system";
|
||||
static_configs = [
|
||||
{
|
||||
targets = [ "localhost" ];
|
||||
labels = {
|
||||
job = "varlogs";
|
||||
__path__ = "/var/log/*log";
|
||||
};
|
||||
}
|
||||
];
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
import json
|
||||
import time
|
||||
|
||||
machine.start
|
||||
machine.wait_for_unit("loki.service")
|
||||
machine.wait_for_unit("promtail.service")
|
||||
machine.wait_for_open_port(3100)
|
||||
machine.wait_for_open_port(9080)
|
||||
machine.succeed("echo 'Loki Ingestion Test' > /var/log/testlog")
|
||||
# should not have access to journal unless specified
|
||||
machine.fail(
|
||||
"systemctl show --property=SupplementaryGroups promtail | grep -q systemd-journal"
|
||||
)
|
||||
machine.wait_until_succeeds(
|
||||
"${pkgs.grafana-loki}/bin/logcli --addr='http://localhost:3100' query --no-labels '{job=\"varlogs\",filename=\"/var/log/testlog\"}' | grep -q 'Loki Ingestion Test'"
|
||||
)
|
||||
|
||||
payload = json.dumps({
|
||||
"streams": [{
|
||||
"stream": {"job": "test"},
|
||||
"values": [
|
||||
[str(time.time_ns()), "Loki Ingestion Test"],
|
||||
],
|
||||
}],
|
||||
})
|
||||
machine.succeed(f"curl --json '{payload}' http://localhost:3100/loki/api/v1/push")
|
||||
|
||||
machine.wait_until_succeeds("logcli query --no-labels '{job=\"test\"}' | grep -q 'Loki Ingestion Test'")
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -645,6 +645,19 @@ final: prev: {
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
actions-nvim = buildVimPlugin {
|
||||
pname = "actions.nvim";
|
||||
version = "0-unstable-2026-04-02";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mrtnvgr";
|
||||
repo = "actions.nvim";
|
||||
rev = "b78239fb1097d220feba105c26af60f88d3d9ac8";
|
||||
hash = "sha256-AvCU8p68JeDvVliC1dRbNrHEaFRLVyS0js5ifc8iotc=";
|
||||
};
|
||||
meta.homepage = "https://github.com/mrtnvgr/actions.nvim/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
actions-preview-nvim = buildVimPlugin {
|
||||
pname = "actions-preview.nvim";
|
||||
version = "0-unstable-2025-10-03";
|
||||
|
||||
@@ -49,6 +49,7 @@ https://github.com/Alligator/accent.vim/,HEAD,
|
||||
https://github.com/mileszs/ack.vim/,,
|
||||
https://github.com/eikenb/acp/,,
|
||||
https://github.com/aznhe21/actions-preview.nvim/,,
|
||||
https://github.com/mrtnvgr/actions.nvim/,HEAD,
|
||||
https://github.com/aaronhallaert/advanced-git-search.nvim/,HEAD,
|
||||
https://github.com/Mofiqul/adwaita.nvim/,HEAD,
|
||||
https://github.com/stevearc/aerial.nvim/,,
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "mednafen-lynx";
|
||||
version = "0-unstable-2025-05-10";
|
||||
version = "0-unstable-2026-03-31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "beetle-lynx-libretro";
|
||||
rev = "efd1797c7aa5a83c354507b1b61ac24222ebaa58";
|
||||
hash = "sha256-K+VZYqNl3G1eE7dSlfmZFCoS5bKIyGSNNu2i737bKnM=";
|
||||
rev = "40226b7b4fdd2604aa817fb7ded895b665282e25";
|
||||
hash = "sha256-HjqNFfx4e1+DPq05Ii3scNocMn2FLA/LcI1vfT3TUes=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -778,13 +778,13 @@
|
||||
"vendorHash": "sha256-mnKXYT0GfIS+ODzBCS9l4rLF1ugadesmpgdOgj74nLg="
|
||||
},
|
||||
"jianyuan_sentry": {
|
||||
"hash": "sha256-iiFDZfTM3DoYEd33P3YFjwsnEJ1klVrIyWIB4vVRIB0=",
|
||||
"hash": "sha256-5PXljI0uRjmpJXwJZsoEod/GCgxCA4ti94ubflyaNJY=",
|
||||
"homepage": "https://registry.terraform.io/providers/jianyuan/sentry",
|
||||
"owner": "jianyuan",
|
||||
"repo": "terraform-provider-sentry",
|
||||
"rev": "v0.14.11",
|
||||
"rev": "v0.14.13",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-LGqH/XLNbU31acdzTO4RB5+LBxlNH2jEiK6SujUfX5U="
|
||||
"vendorHash": "sha256-RAVDPsbCnZ/3TSpq5lZb9Ega0AigNLxyG5wsLWPkoaU="
|
||||
},
|
||||
"joneshf_openwrt": {
|
||||
"hash": "sha256-z78IceF2VJtiQpVqC+rTUDsph73LZawIK+az3rEhljA=",
|
||||
|
||||
@@ -185,6 +185,11 @@ let
|
||||
# Tests require network
|
||||
"test_urls"
|
||||
"test_get_commit_message_with_custom_prompt"
|
||||
|
||||
# Tests require network access to fetch model information from GitHub
|
||||
"test_cmd_read_only_with_image_file"
|
||||
"test_cmd_tokens_output"
|
||||
"test_max_context_tokens"
|
||||
# FileNotFoundError
|
||||
"test_get_commit_message"
|
||||
# Expected 'launch_gui' to have been called once
|
||||
|
||||
@@ -60,7 +60,7 @@ let
|
||||
'';
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "3.11.0";
|
||||
version = "3.11.1";
|
||||
pname = "botan";
|
||||
|
||||
__structuredAttrs = true;
|
||||
@@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "randombit";
|
||||
repo = "botan";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-jjrO43SItFi+6FrU9B45Y1GK+6V5ZIgaYaMHkgRh4IE=";
|
||||
hash = "sha256-AzQ/IblJF2atUXBTwI+84gmcceVQ6aMMElS3wOsfUDM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,6 +6,8 @@
|
||||
go-md2man,
|
||||
pkg-config,
|
||||
libcap,
|
||||
libkrun,
|
||||
libkrun-sev,
|
||||
libseccomp,
|
||||
python3,
|
||||
systemdMinimal,
|
||||
@@ -13,6 +15,8 @@
|
||||
nixosTests,
|
||||
criu,
|
||||
versionCheckHook,
|
||||
withLibkrun ? lib.meta.availableOn stdenv.hostPlatform libkrun,
|
||||
withLibkrunSEV ? false,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -70,6 +74,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libseccomp
|
||||
systemdMinimal
|
||||
yajl
|
||||
]
|
||||
++ lib.optionals withLibkrun [
|
||||
libkrun
|
||||
]
|
||||
++ lib.optionals withLibkrunSEV [
|
||||
libkrun-sev
|
||||
];
|
||||
|
||||
configureFlags = lib.optionals withLibkrun [
|
||||
"--with-libkrun"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
@@ -88,6 +102,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
${lib.concatMapStringsSep "\n" (
|
||||
e: "substituteInPlace Makefile.am --replace-fail 'tests/${e}' ''"
|
||||
) disabledTests}
|
||||
''
|
||||
+ lib.optionalString withLibkrun ''
|
||||
substituteInPlace src/libcrun/handlers/krun.c \
|
||||
--replace-fail '"libkrun.so.1"' '"${libkrun}/lib/libkrun.so.1"'
|
||||
''
|
||||
+ lib.optionalString withLibkrunSEV ''
|
||||
substituteInPlace src/libcrun/handlers/krun.c \
|
||||
--replace-fail '"libkrun-sev.so.1"' '"${libkrun-sev}/lib/libkrun-sev.so.1"'
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGo126Module (finalAttrs: {
|
||||
pname = "crush";
|
||||
version = "0.51.2";
|
||||
version = "0.55.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charmbracelet";
|
||||
repo = "crush";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-gKn/TcrCcmRF/FajsvzSR5t6SEuuxQWhiLaSmLdR8bg=";
|
||||
hash = "sha256-7rndFGEeRiCd9wSu/TSjbvMVSIb2JMmLEqaIFdR0av4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-EHESno8r2dDGcOjRHCU4799Ug7l0z8oSg/60l2HyaAg=";
|
||||
vendorHash = "sha256-leQHNLt3WebIvV/2nY+Lo+SVOV2SQ8EL9Mopu4lro9s=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
args:
|
||||
fetchurl {
|
||||
name = "librusty_v8-${args.version}";
|
||||
url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a.gz";
|
||||
url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_simdutf_release_${stdenv.hostPlatform.rust.rustcTarget}.a.gz";
|
||||
sha256 = args.shas.${stdenv.hostPlatform.system};
|
||||
meta = {
|
||||
inherit (args) version;
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
{ fetchLibrustyV8 }:
|
||||
|
||||
fetchLibrustyV8 {
|
||||
version = "146.1.0";
|
||||
version = "147.0.0";
|
||||
shas = {
|
||||
x86_64-linux = "sha256-PYCBh8+RY1nvPOKXMCns5mDRo2j0SB3Edw/ut7npjxo=";
|
||||
aarch64-linux = "sha256-EGlTttOowHhoFBy8FQeokCnbPLi4tfkIhSek28TfcGQ=";
|
||||
x86_64-darwin = "sha256-61d4tQ/PcNPUvDuQsMNTNUO43zLZSVEHOjdGFG0u4W8=";
|
||||
aarch64-darwin = "sha256-BMKybPdxP9+7QD/yfbnPnFxD8N7kHPUkMcEEf4P4iSE=";
|
||||
x86_64-linux = "sha256-PXLRowkOBRVWeonQDTN6e4BQlSLK/kobCX7eE0Y1NLY=";
|
||||
aarch64-linux = "sha256-6jaFVmmYYOZNZmk6UHUAGyibSBQn51Ie57hB7CIZBFI=";
|
||||
x86_64-darwin = "sha256-yTrxJ5ABXg1r0myZqy4J3m/ivYdXnsgG089PrD5cMhY=";
|
||||
aarch64-darwin = "sha256-HVr7hNzZk4qQTct2Px7DvSJAnyq1duJCqJawY475SR4=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -30,17 +30,17 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "deno";
|
||||
version = "2.7.4";
|
||||
version = "2.7.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "denoland";
|
||||
repo = "deno";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true; # required for tests
|
||||
hash = "sha256-L1dLMcA7YDNMF8uRImHZlQ0mXox3kpGln6MXeB9cMLU=";
|
||||
hash = "sha256-asRSIDpVN8sZgck5cocqfjcFNnP3CekR0lwBi0jr6GM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ebozsCns5J95u+C4smysslJB9xVltHeVOdfD2IBuLtI=";
|
||||
cargoHash = "sha256-lL9ZeMUi5cwrqikg+GiR5hQNgWPKlpAN7yQIXSsr93k=";
|
||||
|
||||
patches = [
|
||||
./patches/0002-tests-replace-hardcoded-paths.patch
|
||||
|
||||
@@ -26,7 +26,7 @@ const fetchArchShaTasks = (version: string, arches: Architecture[]) =>
|
||||
async (arch: Architecture): Promise<PrefetchResult> => {
|
||||
log("Fetching:", arch.nix);
|
||||
const sha256 = await run("nix-prefetch-url", [
|
||||
`https://github.com/denoland/rusty_v8/releases/download/v${version}/librusty_v8_release_${arch.rust}.a.gz`
|
||||
`https://github.com/denoland/rusty_v8/releases/download/v${version}/librusty_v8_simdutf_release_${arch.rust}.a.gz`
|
||||
]);
|
||||
const sha256_sri = await run("nix-hash", ["--type", "sha256", "--to-sri", sha256]);
|
||||
log("Done: ", arch.nix);
|
||||
|
||||
@@ -49,7 +49,7 @@ let
|
||||
depsHash
|
||||
else
|
||||
{
|
||||
x86_64-linux = "sha256-ty429bQBZRNKMWsjUUv07ICrq5d4FjR1zjtO+nbbqiA=";
|
||||
x86_64-linux = "sha256-dQpkB4jRfJOB14AO5ynoL3VObI1af7nTI3vbMr5N6/g=";
|
||||
aarch64-linux = "sha256-59sY+bpGsKMDthcj+jw00WhN+vsP5MOTXy0m8HJxebM=";
|
||||
}
|
||||
.${stdenv.system} or (throw "unsupported system ${stdenv.system}");
|
||||
|
||||
@@ -1,25 +1,22 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
makeWrapper,
|
||||
nix-update-script,
|
||||
nixosTests,
|
||||
systemd,
|
||||
testers,
|
||||
grafana-loki,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
version = "3.6.8";
|
||||
version = "3.7.1";
|
||||
pname = "grafana-loki";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "loki";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-KyTuVNpBsjsO/0jkhuDzdvrCWQGIf27KGFni8k4aqZ4=";
|
||||
hash = "sha256-SSsTwqk6Cebk5dtSdPQzn3jrwMluoQgsd8JsV2WhaTY=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
@@ -28,21 +25,10 @@ buildGoModule (finalAttrs: {
|
||||
# TODO split every executable into its own package
|
||||
"cmd/loki"
|
||||
"cmd/loki-canary"
|
||||
"clients/cmd/promtail"
|
||||
"cmd/logcli"
|
||||
"cmd/lokitool"
|
||||
];
|
||||
|
||||
tags = [ "promtail_journal_enabled" ];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ systemd.dev ];
|
||||
|
||||
preFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
wrapProgram $out/bin/promtail \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.getLib systemd}/lib"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
inherit (nixosTests) loki;
|
||||
@@ -71,7 +57,7 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
meta = {
|
||||
description = "Like Prometheus, but for logs";
|
||||
mainProgram = "promtail";
|
||||
mainProgram = "loki";
|
||||
license = with lib.licenses; [
|
||||
agpl3Only
|
||||
asl20
|
||||
|
||||
@@ -1,13 +1,14 @@
|
||||
{
|
||||
"audio_service_mpris": "sha256-IVv1ioBpiK0VbnOFqnc9NbNn3Z+l9VN2clpCQjckBRo=",
|
||||
"desktop_webview_window": "sha256-4nTulOxPTV7sePokTY7xJTwulyucvf4JZKw860P8pbA=",
|
||||
"media_kit": "sha256-3eAIaq8VFGreb2DUK5WDIiesX2+sr9NpDP/WH8Ztzrc=",
|
||||
"media_kit_libs_android_video": "sha256-3eAIaq8VFGreb2DUK5WDIiesX2+sr9NpDP/WH8Ztzrc=",
|
||||
"media_kit_libs_ios_video": "sha256-3eAIaq8VFGreb2DUK5WDIiesX2+sr9NpDP/WH8Ztzrc=",
|
||||
"media_kit_libs_linux": "sha256-3eAIaq8VFGreb2DUK5WDIiesX2+sr9NpDP/WH8Ztzrc=",
|
||||
"media_kit_libs_macos_video": "sha256-3eAIaq8VFGreb2DUK5WDIiesX2+sr9NpDP/WH8Ztzrc=",
|
||||
"media_kit_libs_ohos": "sha256-3eAIaq8VFGreb2DUK5WDIiesX2+sr9NpDP/WH8Ztzrc=",
|
||||
"media_kit_libs_video": "sha256-3eAIaq8VFGreb2DUK5WDIiesX2+sr9NpDP/WH8Ztzrc=",
|
||||
"media_kit_libs_windows_video": "sha256-3eAIaq8VFGreb2DUK5WDIiesX2+sr9NpDP/WH8Ztzrc=",
|
||||
"media_kit_video": "sha256-3eAIaq8VFGreb2DUK5WDIiesX2+sr9NpDP/WH8Ztzrc=",
|
||||
"media_kit": "sha256-75fNdeaGtpGMOsK+oiLoIdqJe3+5cTO/8ftS0r7AU6I=",
|
||||
"media_kit_libs_android_video": "sha256-75fNdeaGtpGMOsK+oiLoIdqJe3+5cTO/8ftS0r7AU6I=",
|
||||
"media_kit_libs_ios_video": "sha256-75fNdeaGtpGMOsK+oiLoIdqJe3+5cTO/8ftS0r7AU6I=",
|
||||
"media_kit_libs_linux": "sha256-75fNdeaGtpGMOsK+oiLoIdqJe3+5cTO/8ftS0r7AU6I=",
|
||||
"media_kit_libs_macos_video": "sha256-75fNdeaGtpGMOsK+oiLoIdqJe3+5cTO/8ftS0r7AU6I=",
|
||||
"media_kit_libs_ohos": "sha256-75fNdeaGtpGMOsK+oiLoIdqJe3+5cTO/8ftS0r7AU6I=",
|
||||
"media_kit_libs_video": "sha256-75fNdeaGtpGMOsK+oiLoIdqJe3+5cTO/8ftS0r7AU6I=",
|
||||
"media_kit_libs_windows_video": "sha256-75fNdeaGtpGMOsK+oiLoIdqJe3+5cTO/8ftS0r7AU6I=",
|
||||
"media_kit_video": "sha256-75fNdeaGtpGMOsK+oiLoIdqJe3+5cTO/8ftS0r7AU6I=",
|
||||
"webview_windows": "sha256-YMOv3wRqsXqoccdDCv4dj10Pc1UkO9OuJWckNujMr5A="
|
||||
}
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.0.5";
|
||||
version = "2.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Predidit";
|
||||
repo = "Kazumi";
|
||||
tag = version;
|
||||
hash = "sha256-sIFgy8opaGxUyKfJqdzf1h3C6R6/7RhJXc1245COXhU=";
|
||||
hash = "sha256-GOO98wfIhBHzhCLKfRdwWPgBwyeot1C8Zy0D1cbG5fo=";
|
||||
};
|
||||
in
|
||||
flutter338.buildFlutterApplication {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -8,11 +8,11 @@
|
||||
|
||||
let
|
||||
pname = "ledger-live-desktop";
|
||||
version = "2.145.0";
|
||||
version = "4.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
|
||||
hash = "sha256-BGd/NRw6befb2+cEgJjAaQnJzwUxywgltO7oSsaiukc=";
|
||||
hash = "sha256-aM6hHOJ3ZlBEoTDfHxb37WqqyCfHJRaeqg14w/jQLvg=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mediawriter";
|
||||
version = "5.2.9";
|
||||
version = "5.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FedoraQt";
|
||||
repo = "MediaWriter";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-tZ0GzaEzhklD/FJocnRmet+dvBwZoNYVhJfF1NY6puE=";
|
||||
hash = "sha256-oicnUxyo+5nuDh7A3oL9Pgrm69Lv7CWeNaJdMfuESu8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -140,13 +140,13 @@ let
|
||||
in
|
||||
goBuild (finalAttrs: {
|
||||
pname = "ollama";
|
||||
version = "0.19.0";
|
||||
version = "0.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ollama";
|
||||
repo = "ollama";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-hfiEj2aTt/96Mou5BiWiSXpLEjglpTX+iqL3EnO3iJ8=";
|
||||
hash = "sha256-QQKPXdXlsT+uMGGIyqkVZqk6OTa7VHrwDVmgDdgdKOY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Lc1Ktdqtv2VhJQssk8K1UOimeEjVNvDWePE9WkamCos=";
|
||||
|
||||
@@ -15,14 +15,14 @@ let
|
||||
in
|
||||
ocamlPackages.buildDunePackage {
|
||||
pname = "owi";
|
||||
version = "0.2-unstable-2026-03-16";
|
||||
version = "0.2-unstable-2026-04-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ocamlpro";
|
||||
repo = "owi";
|
||||
rev = "7fb7af27025501c732d8dda903865b47bc5d4901";
|
||||
rev = "f109b9a448771c2877d8f52b38a01edb4c0591b1";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-aRNJiW6UTcpJU3fIcEQB3gujmAxsp2dwR1hFeWJrhzs=";
|
||||
hash = "sha256-Ubw7LCum/lNgBphCHo8FdW1qRMU1lKX1c9eIKxRv56I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with ocamlPackages; [
|
||||
|
||||
@@ -4,46 +4,41 @@ Date: Sun, 26 May 2024 12:17:01 -0500
|
||||
Subject: [PATCH] envoy: allow specification of external binary
|
||||
|
||||
---
|
||||
pkg/envoy/envoy.go | 20 ++++++++++++++++----
|
||||
1 file changed, 16 insertions(+), 4 deletions(-)
|
||||
pkg/envoy/envoy.go | 17 +++++++++++++----
|
||||
1 file changed, 13 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/pkg/envoy/envoy.go b/pkg/envoy/envoy.go
|
||||
index 85c725629..4a726a44b 100644
|
||||
--- a/pkg/envoy/envoy.go
|
||||
+++ b/pkg/envoy/envoy.go
|
||||
@@ -8,9 +8,9 @@ import (
|
||||
@@ -8,10 +8,10 @@ import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
+ "io/fs"
|
||||
"net"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"os"
|
||||
"os/exec"
|
||||
- "path"
|
||||
"path/filepath"
|
||||
"regexp"
|
||||
"runtime"
|
||||
@@ -36,8 +36,17 @@ import (
|
||||
|
||||
const (
|
||||
@@ -44,6 +44,11 @@ const (
|
||||
configFileName = "envoy-config.yaml"
|
||||
+ workingDirectoryName = ".pomerium-envoy"
|
||||
+ embeddedEnvoyPermissions fs.FileMode = 0o700
|
||||
)
|
||||
|
||||
|
||||
+var OverrideEnvoyPath = ""
|
||||
+
|
||||
+type serverOptions struct {
|
||||
+ services string
|
||||
+ logLevel config.LogLevel
|
||||
+}
|
||||
+const workingDirectoryName = ".pomerium-envoy"
|
||||
+const embeddedEnvoyPermissions fs.FileMode = 0o700
|
||||
+
|
||||
// A Server is a pomerium proxy implemented via envoy.
|
||||
type Server struct {
|
||||
ServerOptions
|
||||
@@ -95,14 +104,17 @@ func NewServer(ctx context.Context, src config.Source, builder *envoyconfig.Buil
|
||||
@@ -100,14 +105,17 @@ func NewServer(
|
||||
log.Ctx(ctx).Debug().Err(err).Msg("couldn't preserve RLIMIT_NOFILE before starting Envoy")
|
||||
}
|
||||
|
||||
|
||||
- envoyPath, err := Extract()
|
||||
+ envoyPath := OverrideEnvoyPath
|
||||
+ wd := filepath.Join(os.TempDir(), workingDirectoryName)
|
||||
@@ -53,14 +48,14 @@ index 85c725629..4a726a44b 100644
|
||||
- return nil, fmt.Errorf("extracting envoy: %w", err)
|
||||
+ return nil, fmt.Errorf("error creating temporary working directory for envoy: %w", err)
|
||||
}
|
||||
|
||||
|
||||
srv := &Server{
|
||||
ServerOptions: options,
|
||||
- wd: path.Dir(envoyPath),
|
||||
+ wd: wd,
|
||||
builder: builder,
|
||||
grpcPort: src.GetConfig().GRPCPort,
|
||||
httpPort: src.GetConfig().HTTPPort,
|
||||
--
|
||||
ServerOptions: options,
|
||||
- wd: path.Dir(envoyPath),
|
||||
+ wd: wd,
|
||||
builder: builder,
|
||||
grpcPort: src.GetConfig().GRPCPort,
|
||||
httpPort: src.GetConfig().HTTPPort,
|
||||
--
|
||||
2.49.0
|
||||
|
||||
|
||||
@@ -4,9 +4,8 @@
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
envoy,
|
||||
yarnConfigHook,
|
||||
yarnBuildHook,
|
||||
fetchYarnDeps,
|
||||
npmHooks,
|
||||
fetchNpmDeps,
|
||||
nodejs,
|
||||
nixosTests,
|
||||
pomerium-cli,
|
||||
@@ -22,32 +21,37 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "pomerium";
|
||||
version = "0.30.5";
|
||||
version = "0.32.4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pomerium";
|
||||
repo = "pomerium";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-3SmcuLEWqsw/B10jTIG2TKGa7tyMLa/lpkD6Iq/Fm4g=";
|
||||
hash = "sha256-XTj0ZLPRe8I3a5be0oRTxRUuT2wHnbsms7wIvLUg9ms=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-mOTjBH8VqsMdyW5jTIZ76bf55WnHw9XuUSh6zsBktt0=";
|
||||
vendorHash = "sha256-EYXmeS4jtueI9FwVQdMlsYX3CSRGH9Dft0Syf88nf7o=";
|
||||
|
||||
ui = stdenv.mkDerivation {
|
||||
pname = "pomerium-ui";
|
||||
inherit version;
|
||||
src = "${src}/ui";
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${src}/ui/yarn.lock";
|
||||
hash = "sha256-V2nSSMvTCK+SYmEhTbLMArIOmNs/AgB5xfhQGx3e/x8=";
|
||||
npmDeps = fetchNpmDeps {
|
||||
src = "${src}/ui";
|
||||
hash = "sha256-2fzINp3LBPHPJlzJnUggPWUZHrjuX9TYPD2XvioonSw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
yarnConfigHook
|
||||
yarnBuildHook
|
||||
npmHooks.npmConfigHook
|
||||
nodejs
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
npm run build
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
cp -R dist $out
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "pphack";
|
||||
version = "0.1.0";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "edoardottt";
|
||||
repo = "pphack";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-SWMY+t8NzbUqAeLsqia5KAXXOjoMRMZVVa8YdTLcG5A=";
|
||||
hash = "sha256-SVoIFrdiuFQDrqfqo+edXGXSMXEbmdecoHn8LzPuMUE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-smJp3GDo1KOrEjEJnxtyrlHmb/L70QqhDWjCZ4U1qJs=";
|
||||
vendorHash = "sha256-zrC+QNv6Tat7rMsPbVAkbqT6WEImgGg5XSgIN3xSd2w=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
{ grafana-loki }:
|
||||
|
||||
grafana-loki.overrideAttrs (previousAttrs: {
|
||||
pname = "promtail";
|
||||
subPackages = [ "clients/cmd/promtail" ];
|
||||
env = previousAttrs.env or { } // {
|
||||
CGO_ENABLED = 1;
|
||||
};
|
||||
})
|
||||
Generated
+8
-8
@@ -11,8 +11,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "BouncyCastle.Cryptography",
|
||||
"version": "2.5.1",
|
||||
"hash": "sha256-ISDd8fS6/cIJIXBFDd7F3FQ0wzWkAo4r8dvycb8iT6c="
|
||||
"version": "2.6.2",
|
||||
"hash": "sha256-Yjk2+x/RcVeccGOQOQcRKCiYzyx1mlFnhS5auCII+Ms="
|
||||
},
|
||||
{
|
||||
"pname": "Castle.Core",
|
||||
@@ -116,8 +116,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "MailKit",
|
||||
"version": "4.13.0",
|
||||
"hash": "sha256-mDQpvjLB36QFdBW0EK5Ok3+vk59WxbqEsJ3yO1r+Msc="
|
||||
"version": "4.15.1",
|
||||
"hash": "sha256-ZI2ASxX1dY53YxWRii0Dow4aojR8VCEWzCWZLrH7wPw="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.ApplicationInsights",
|
||||
@@ -476,8 +476,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "MimeKit",
|
||||
"version": "4.13.0",
|
||||
"hash": "sha256-mPFMFcK+ks4aoA02JfC6JUhUyc1LTVp5siW9t3wUgNo="
|
||||
"version": "4.15.1",
|
||||
"hash": "sha256-MI4Wr+JWoxR9wsYhKmW8j1EdJ59W/O4jv5D9Zb8mEUw="
|
||||
},
|
||||
{
|
||||
"pname": "Mono.Nat",
|
||||
@@ -824,8 +824,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "SixLabors.ImageSharp",
|
||||
"version": "3.1.11",
|
||||
"hash": "sha256-MlRF+3SGfahbsB1pZGKMOrsfUCx//hCo7ECrXr03DpA="
|
||||
"version": "3.1.12",
|
||||
"hash": "sha256-FR8v74w4P/1AZdW5ARW0y8zgDqLtvhxQmL1CKv68xR0="
|
||||
},
|
||||
{
|
||||
"pname": "SourceGear.sqlite3",
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
applyPatches,
|
||||
}:
|
||||
let
|
||||
version = "6.0.4.10291";
|
||||
version = "6.1.1.10360";
|
||||
# The dotnet8 compatibility patches also change `yarn.lock`, so we must pass
|
||||
# the already patched lockfile to `fetchYarnDeps`.
|
||||
src = applyPatches {
|
||||
@@ -29,7 +29,7 @@ let
|
||||
owner = "Radarr";
|
||||
repo = "Radarr";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-SDkLVKHTqAnZQ4AYIW9fHvnga8EV/NVfzia/Ce0G+Uc=";
|
||||
hash = "sha256-AtvuZFAF+KJmEp46KWrA9qHv3+IejSXxUyol2W8BWdk=";
|
||||
};
|
||||
postPatch = ''
|
||||
mv src/NuGet.config NuGet.Config
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "rime-ice";
|
||||
version = "2025.12.08";
|
||||
version = "2026.03.26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iDvel";
|
||||
repo = "rime-ice";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-GyiOlTr1Nw2ANTE7/fdyrPQkvRFWOyal3oAcDvsqF5A=";
|
||||
hash = "sha256-hRtA1cYAQm7M+dPSThedqKogr8YMkP9WQFEZw5pdCbU=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -12,11 +12,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rundeck";
|
||||
version = "5.19.0-20260202";
|
||||
version = "5.20.0-20260402";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://packagecloud.io/pagerduty/rundeck/packages/java/org.rundeck/rundeck-${finalAttrs.version}.war/artifacts/rundeck-${finalAttrs.version}.war/download?distro_version_id=167";
|
||||
hash = "sha256-KUITEp0aq1fg531VUwBnCdY8o9wMUe3daAVfNYzuPVI=";
|
||||
hash = "sha256-XE/v1CTQ/pFhBLfpo/066Co1l10nwYvuAvZU2ux7Pc0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sentry-native";
|
||||
version = "0.13.1";
|
||||
version = "0.13.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getsentry";
|
||||
repo = "sentry-native";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-AKQtqtcUz8ni3/38VezKBppjmmAAv7WQ9/pG6F6mJXA=";
|
||||
hash = "sha256-8eRiLvwLDqAN8oZayJQ5jDXouXTi4PFb2HtHp0UHAg4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "zed";
|
||||
version = "0.36.0";
|
||||
version = "0.36.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "authzed";
|
||||
repo = "zed";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-n5qHfjckTNNry8L2lJV8RBjTnAknwZGPg9E0R/1VLdQ=";
|
||||
hash = "sha256-42c2utcrUOhLwFS7AdsR2/6vtBLo7Vitx3i9k7pFs7o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-eNC8sGjVjL+QRnqXBFzdyfTxd3IZdj6JodGmDDV4nUA=";
|
||||
vendorHash = "sha256-WgTOwXdH1jgK7Un8UA/PX9iYt0VyAGMdpxYVXM6KyWE=";
|
||||
|
||||
ldflags = [ "-X 'github.com/jzelinskie/cobrautil/v2.Version=${finalAttrs.src.tag}'" ];
|
||||
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "sqlfluff";
|
||||
version = "4.0.4";
|
||||
version = "4.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sqlfluff";
|
||||
repo = "sqlfluff";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-0Zu3hx35LPG6+v1D7fAenuh8tI6M4oJw6XxKU833cr8=";
|
||||
hash = "sha256-ABadTClJDc5MXweZbc6Y4GqEq/Xgd6t+FhT6aGw1eZo=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "click" ];
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "temporal";
|
||||
version = "1.30.2";
|
||||
version = "1.30.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "temporalio";
|
||||
repo = "temporal";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Rk1H07UqLr/GLIT4VW4eC3SezYPAZPxlC4TTpZm/F9Q=";
|
||||
hash = "sha256-5fGnEDbsmlb1ZmZeGwc3eCSamvcJP21eP8E6if5Jh4g=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-YJbovD2woypOiYfn9axO8lshIg/6gO9Sa8a3DIt8QFg=";
|
||||
|
||||
@@ -9,19 +9,19 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "tombi";
|
||||
version = "0.9.6";
|
||||
version = "0.9.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tombi-toml";
|
||||
repo = "tombi";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-sqzdZqs8qMCA3VSXPsBTVZ4fgZUogVl7mQKnbateV/Y=";
|
||||
hash = "sha256-UOojaKqBXFWkQ3ZzWBRt5Lz4mTEHP/0NWT0ezlEPScA=";
|
||||
};
|
||||
|
||||
# Tests relies on the presence of network
|
||||
doCheck = false;
|
||||
cargoBuildFlags = [ "--package tombi-cli" ];
|
||||
cargoHash = "sha256-bW7VfL/3XIGVhQOPNDXURsolGG3gBHAsTEC7FO2P0bI=";
|
||||
cargoHash = "sha256-dJL20p9Uz12EwfKTKwc3ScuwH7wP0jHcg2Nf8itqdFk=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Cargo.toml \
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "trufflehog";
|
||||
version = "3.93.8";
|
||||
version = "3.94.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trufflesecurity";
|
||||
repo = "trufflehog";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-8pG1hknaBBGT9HmCObd8Z3Fd9UXhHlZ4uTFV3T4x/zo=";
|
||||
hash = "sha256-tjE91KLupm4Mbt1XrYRTPlI6Ewfz2QMD/7KiHnB4h3I=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZTm8qn31SjfcP38vPBKVAs4Tjhb7cyBhKj2oIjNna2Y=";
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ty";
|
||||
version = "0.0.27";
|
||||
version = "0.0.28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astral-sh";
|
||||
repo = "ty";
|
||||
tag = finalAttrs.version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-PhPEUNoEGw5tKm1HDHAjJQcYsV6H/b2IpOosSD+sbMA=";
|
||||
hash = "sha256-X4bCWl7fkCleQewoHXaJqFC6MLsiFrH8YgbZK9QeDSI=";
|
||||
};
|
||||
|
||||
# For Darwin platforms, remove the integration test for file notifications,
|
||||
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
cargoBuildFlags = [ "--package=ty" ];
|
||||
|
||||
cargoHash = "sha256-ARSE/TnZ6vRAb6v8XFathQfpCxfzqYaphKRfhIzHUtc=";
|
||||
cargoHash = "sha256-DCTFjFl/fCbXwj7AGPNnrjvSTqxNW6PVWsUhbSGe/wI=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -30,18 +30,18 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "typesetter";
|
||||
version = "0.12.1";
|
||||
version = "0.12.3";
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
owner = "haydn";
|
||||
repo = "typesetter";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-WH1UIWUKh2JcLx6nJMo7b7zDHjClnl1sN2O9VZzy0vU=";
|
||||
hash = "sha256-p2MKLcMtguz/oRrNenD+jlIJ62DYyDm0eW7bZ/FhajA=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-uslZfcO40kfwXGXqPYyTVvVukZutbnrsesfpLTytK+g=";
|
||||
hash = "sha256-vQQ9xMuzv+5DPXDw2GUXBwbkBf5YOFZwA05NwidRKzQ=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
buildGo126Module,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
nixosTests,
|
||||
withServer ? true, # the actual metrics server
|
||||
@@ -11,15 +11,15 @@
|
||||
withVmctl ? true, # vmctl is used to migrate time series
|
||||
}:
|
||||
|
||||
buildGo126Module (finalAttrs: {
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "VictoriaMetrics";
|
||||
version = "1.138.0";
|
||||
version = "1.139.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VictoriaMetrics";
|
||||
repo = "VictoriaMetrics";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-7gEmaslhTmk72/GiL2xfWn4Pb/e/35wDXePGrvmuTUg=";
|
||||
hash = "sha256-5+Hlt9cF/V3x+4TGrMd1NPaApQsIWWvDIYmN/BLhLMU=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -18,18 +18,18 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "waytrogen";
|
||||
version = "0.9.1";
|
||||
version = "0.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nikolaizombie1";
|
||||
repo = "waytrogen";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-airVCuwwh+FujJqBHXnRcwooUJWO/mrANbmzX9HciIM=";
|
||||
hash = "sha256-0WBV6s6THXSg8HabnFFi+Gco+sXy7zQO21IgXykMBHc=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-FHLyVgBrTWOWyfILm7Gv9B6/WudvrwCNKoRJybKJBTM=";
|
||||
hash = "sha256-UKd/h/O9EE7gZ8B+QtFVGJEit0BIQ0OC0CG/GLYzMEo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "wireguard-vanity-keygen";
|
||||
version = "0.1.3";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "axllent";
|
||||
repo = "wireguard-vanity-keygen";
|
||||
rev = version;
|
||||
hash = "sha256-TpfSowOS1dNKIcoTV1hTnMzEbAax8uwYoan3SIJ03Lc=";
|
||||
hash = "sha256-vAHVhW2BYND1Lz8WEFbbuJRMP7dXzZXQR8/bewb/ZUg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-eh7zTM88qgXKqmhf1WyWsKve+YneQAUji2mDMEHUCIA=";
|
||||
vendorHash = "sha256-iBpfSS/T5xgYS0xiH5wNR7jfMdhW8t2LchXAx84YYHM=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "zabbix-agent2-plugin-postgresql";
|
||||
version = "7.4.7";
|
||||
version = "7.4.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cdn.zabbix.com/zabbix-agent2-plugins/sources/postgresql/zabbix-agent2-plugin-postgresql-${version}.tar.gz";
|
||||
hash = "sha256-Ks7uV6odjvJVkCLrQb6FNDqaIzcCDV4eoInRiPZ4omo=";
|
||||
hash = "sha256-OyK86KZqQRFwuxyvnjHkt4U/kTa0z+/IJNXDkpJR+/w=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -38,6 +38,7 @@ mkCoqDerivation {
|
||||
in
|
||||
with lib.versions;
|
||||
lib.switch coq.coq-version [
|
||||
(case (range "9.0" "9.1") "2.16")
|
||||
(case (range "8.19" "8.20") "2.15")
|
||||
(case (range "8.15" "8.19") "2.14")
|
||||
(case (range "8.15" "8.17") "2.13")
|
||||
@@ -45,6 +46,7 @@ mkCoqDerivation {
|
||||
(case (range "8.13" "8.15") "2.9")
|
||||
(case (range "8.12" "8.13") "2.8")
|
||||
] null;
|
||||
release."2.16".sha256 = "sha256-/IlFLiojtuENHE9d+j55Z2rYw5HUkltwVim75w/UFVE=";
|
||||
release."2.15".sha256 = "sha256-51k2W4efMaEO4nZ0rdkRT9rA8ZJLpot1YpFmd6RIAXw=";
|
||||
release."2.14".sha256 = "sha256-NHc1ZQ2VmXZy4lK2+mtyeNz1Qr9Nhj2QLxkPhhQB7Iw=";
|
||||
release."2.13".sha256 = "sha256-i6rvP3cpayBln5KHZOpeNfraYU5h0O9uciBQ4jRH4XA=";
|
||||
@@ -62,10 +64,9 @@ mkCoqDerivation {
|
||||
''
|
||||
+
|
||||
lib.optionalString
|
||||
(coq.coq-version != null && coq.coq-version != "dev" && lib.versions.isLe "8.20" coq.coq-version)
|
||||
(coq.coq-version != null && coq.coq-version != "dev" && lib.versions.isLe "9.1" coq.coq-version)
|
||||
''
|
||||
substituteInPlace Makefile \
|
||||
--replace-fail 'COQVERSION= ' 'COQVERSION= 8.20.1 or-else 8.19.2 or-else 8.17.1 or-else 8.16.1 or-else 8.16.0 or-else 8.15.2 or-else 8.15.1 or-else '\
|
||||
--replace-fail 'FLOYD_FILES=' 'FLOYD_FILES= ${toString extra_floyd_files}'
|
||||
'';
|
||||
|
||||
@@ -74,9 +75,9 @@ mkCoqDerivation {
|
||||
"COMPCERT=inst_dir"
|
||||
"COMPCERT_INST_DIR=${compcert.lib}/lib/coq/${coq.coq-version}/user-contrib/compcert"
|
||||
"INSTALLDIR=$(out)/lib/coq/${coq.coq-version}/user-contrib/VST"
|
||||
]
|
||||
++ lib.optional (coq.coq-version == "dev") "IGNORECOQVERSION=true"
|
||||
++ lib.optional (coq.coq-version == "dev") "IGNORECOMPCERTVERSION=true";
|
||||
"IGNORECOQVERSION=true"
|
||||
"IGNORECOMPCERTVERSION=true"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
for d in msl veric floyd sepcomp progs64
|
||||
|
||||
+68
-77
@@ -77,9 +77,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.2.57"
|
||||
version = "1.2.58"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7a0dd1ca384932ff3641c8718a02769f1698e7563dc6974ffd03346116310423"
|
||||
checksum = "e1e928d4b69e3077709075a938a05ffbedfa53a84c8f766efbf8220bb1ff60e1"
|
||||
dependencies = [
|
||||
"find-msvc-tools",
|
||||
"shlex",
|
||||
@@ -141,7 +141,7 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
|
||||
|
||||
[[package]]
|
||||
name = "css-inline"
|
||||
version = "0.20.1"
|
||||
version = "0.20.2"
|
||||
dependencies = [
|
||||
"cssparser",
|
||||
"html5ever",
|
||||
@@ -157,7 +157,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "css-inline-python"
|
||||
version = "0.20.1"
|
||||
version = "0.20.2"
|
||||
dependencies = [
|
||||
"built",
|
||||
"css-inline",
|
||||
@@ -420,9 +420,9 @@ checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
|
||||
|
||||
[[package]]
|
||||
name = "hyper"
|
||||
version = "1.8.1"
|
||||
version = "1.9.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11"
|
||||
checksum = "6299f016b246a94207e63da54dbe807655bf9e00044f73ded42c3ac5305fbcca"
|
||||
dependencies = [
|
||||
"atomic-waker",
|
||||
"bytes",
|
||||
@@ -433,7 +433,6 @@ dependencies = [
|
||||
"httparse",
|
||||
"itoa",
|
||||
"pin-project-lite",
|
||||
"pin-utils",
|
||||
"smallvec",
|
||||
"tokio",
|
||||
"want",
|
||||
@@ -607,9 +606,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "indexmap"
|
||||
version = "2.13.0"
|
||||
version = "2.13.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017"
|
||||
checksum = "45a8a2b9cb3e0b0c1803dbb0758ffac5de2f425b23c28f518faabd9d805342ff"
|
||||
dependencies = [
|
||||
"equivalent",
|
||||
"hashbrown",
|
||||
@@ -623,9 +622,9 @@ checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2"
|
||||
|
||||
[[package]]
|
||||
name = "iri-string"
|
||||
version = "0.7.11"
|
||||
version = "0.7.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d8e7418f59cc01c88316161279a7f665217ae316b388e58a0d10e29f54f1e5eb"
|
||||
checksum = "25e659a4bb38e810ebc252e53b5814ff908a8c58c2a9ce2fae1bbec24cbf4e20"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
"serde",
|
||||
@@ -639,25 +638,27 @@ checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
|
||||
|
||||
[[package]]
|
||||
name = "js-sys"
|
||||
version = "0.3.91"
|
||||
version = "0.3.94"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b49715b7073f385ba4bc528e5747d02e66cb39c6146efb66b781f131f0fb399c"
|
||||
checksum = "2e04e2ef80ce82e13552136fabeef8a5ed1f985a96805761cbb9a2c34e7664d9"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"futures-util",
|
||||
"once_cell",
|
||||
"wasm-bindgen",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.183"
|
||||
version = "0.2.184"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d"
|
||||
checksum = "48f5d2a454e16a5ea0f4ced81bd44e4cfc7bd3a507b61887c99fd3538b28e4af"
|
||||
|
||||
[[package]]
|
||||
name = "litemap"
|
||||
version = "0.8.1"
|
||||
version = "0.8.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77"
|
||||
checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0"
|
||||
|
||||
[[package]]
|
||||
name = "lock_api"
|
||||
@@ -708,9 +709,9 @@ checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
|
||||
|
||||
[[package]]
|
||||
name = "mio"
|
||||
version = "1.1.1"
|
||||
version = "1.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc"
|
||||
checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"wasi",
|
||||
@@ -826,12 +827,6 @@ version = "0.2.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
|
||||
|
||||
[[package]]
|
||||
name = "pin-utils"
|
||||
version = "0.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
|
||||
|
||||
[[package]]
|
||||
name = "portable-atomic"
|
||||
version = "1.13.1"
|
||||
@@ -840,9 +835,9 @@ checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49"
|
||||
|
||||
[[package]]
|
||||
name = "potential_utf"
|
||||
version = "0.1.4"
|
||||
version = "0.1.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77"
|
||||
checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564"
|
||||
dependencies = [
|
||||
"zerovec",
|
||||
]
|
||||
@@ -873,9 +868,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "pyo3"
|
||||
version = "0.28.2"
|
||||
version = "0.28.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cf85e27e86080aafd5a22eae58a162e133a589551542b3e5cee4beb27e54f8e1"
|
||||
checksum = "91fd8e38a3b50ed1167fb981cd6fd60147e091784c427b8f7183a7ee32c31c12"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"once_cell",
|
||||
@@ -887,9 +882,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "pyo3-build-config"
|
||||
version = "0.28.2"
|
||||
version = "0.28.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8bf94ee265674bf76c09fa430b0e99c26e319c945d96ca0d5a8215f31bf81cf7"
|
||||
checksum = "e368e7ddfdeb98c9bca7f8383be1648fd84ab466bf2bc015e94008db6d35611e"
|
||||
dependencies = [
|
||||
"target-lexicon",
|
||||
]
|
||||
@@ -902,9 +897,9 @@ checksum = "4bf83fcee540452241ba030140f50418b973e840a64727c967b9266660f0a690"
|
||||
|
||||
[[package]]
|
||||
name = "pyo3-ffi"
|
||||
version = "0.28.2"
|
||||
version = "0.28.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "491aa5fc66d8059dd44a75f4580a2962c1862a1c2945359db36f6c2818b748dc"
|
||||
checksum = "7f29e10af80b1f7ccaf7f69eace800a03ecd13e883acfacc1e5d0988605f651e"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"pyo3-build-config",
|
||||
@@ -912,9 +907,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "pyo3-macros"
|
||||
version = "0.28.2"
|
||||
version = "0.28.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f5d671734e9d7a43449f8480f8b38115df67bef8d21f76837fa75ee7aaa5e52e"
|
||||
checksum = "df6e520eff47c45997d2fc7dd8214b25dd1310918bbb2642156ef66a67f29813"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"pyo3-macros-backend",
|
||||
@@ -924,9 +919,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "pyo3-macros-backend"
|
||||
version = "0.28.2"
|
||||
version = "0.28.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "22faaa1ce6c430a1f71658760497291065e6450d7b5dc2bcf254d49f66ee700a"
|
||||
checksum = "c4cdc218d835738f81c2338f822078af45b4afdf8b2e33cbb5916f108b813acb"
|
||||
dependencies = [
|
||||
"heck",
|
||||
"proc-macro2",
|
||||
@@ -1119,9 +1114,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rustc-hash"
|
||||
version = "2.1.1"
|
||||
version = "2.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
|
||||
checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe"
|
||||
|
||||
[[package]]
|
||||
name = "rustc_version"
|
||||
@@ -1426,9 +1421,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tinystr"
|
||||
version = "0.8.2"
|
||||
version = "0.8.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869"
|
||||
checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d"
|
||||
dependencies = [
|
||||
"displaydoc",
|
||||
"zerovec",
|
||||
@@ -1646,9 +1641,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen"
|
||||
version = "0.2.114"
|
||||
version = "0.2.117"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6532f9a5c1ece3798cb1c2cfdba640b9b3ba884f5db45973a6f442510a87d38e"
|
||||
checksum = "0551fc1bb415591e3372d0bc4780db7e587d84e2a7e79da121051c5c4b89d0b0"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"once_cell",
|
||||
@@ -1659,23 +1654,19 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-futures"
|
||||
version = "0.4.64"
|
||||
version = "0.4.67"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e9c5522b3a28661442748e09d40924dfb9ca614b21c00d3fd135720e48b67db8"
|
||||
checksum = "03623de6905b7206edd0a75f69f747f134b7f0a2323392d664448bf2d3c5d87e"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"futures-util",
|
||||
"js-sys",
|
||||
"once_cell",
|
||||
"wasm-bindgen",
|
||||
"web-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-macro"
|
||||
version = "0.2.114"
|
||||
version = "0.2.117"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "18a2d50fcf105fb33bb15f00e7a77b772945a2ee45dcf454961fd843e74c18e6"
|
||||
checksum = "7fbdf9a35adf44786aecd5ff89b4563a90325f9da0923236f6104e603c7e86be"
|
||||
dependencies = [
|
||||
"quote",
|
||||
"wasm-bindgen-macro-support",
|
||||
@@ -1683,9 +1674,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-macro-support"
|
||||
version = "0.2.114"
|
||||
version = "0.2.117"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "03ce4caeaac547cdf713d280eda22a730824dd11e6b8c3ca9e42247b25c631e3"
|
||||
checksum = "dca9693ef2bab6d4e6707234500350d8dad079eb508dca05530c85dc3a529ff2"
|
||||
dependencies = [
|
||||
"bumpalo",
|
||||
"proc-macro2",
|
||||
@@ -1696,18 +1687,18 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-shared"
|
||||
version = "0.2.114"
|
||||
version = "0.2.117"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "75a326b8c223ee17883a4251907455a2431acc2791c98c26279376490c378c16"
|
||||
checksum = "39129a682a6d2d841b6c429d0c51e5cb0ed1a03829d8b3d1e69a011e62cb3d3b"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "web-sys"
|
||||
version = "0.3.91"
|
||||
version = "0.3.94"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "854ba17bb104abfb26ba36da9729addc7ce7f06f5c0f90f3c391f8461cca21f9"
|
||||
checksum = "cd70027e39b12f0849461e08ffc50b9cd7688d942c1c8e3c7b22273236b4dd0a"
|
||||
dependencies = [
|
||||
"js-sys",
|
||||
"wasm-bindgen",
|
||||
@@ -1976,15 +1967,15 @@ checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
|
||||
|
||||
[[package]]
|
||||
name = "writeable"
|
||||
version = "0.6.2"
|
||||
version = "0.6.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9"
|
||||
checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4"
|
||||
|
||||
[[package]]
|
||||
name = "yoke"
|
||||
version = "0.8.1"
|
||||
version = "0.8.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954"
|
||||
checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca"
|
||||
dependencies = [
|
||||
"stable_deref_trait",
|
||||
"yoke-derive",
|
||||
@@ -1993,9 +1984,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "yoke-derive"
|
||||
version = "0.8.1"
|
||||
version = "0.8.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
|
||||
checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@@ -2005,18 +1996,18 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "zerocopy"
|
||||
version = "0.8.47"
|
||||
version = "0.8.48"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "efbb2a062be311f2ba113ce66f697a4dc589f85e78a4aea276200804cea0ed87"
|
||||
checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9"
|
||||
dependencies = [
|
||||
"zerocopy-derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "zerocopy-derive"
|
||||
version = "0.8.47"
|
||||
version = "0.8.48"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0e8bc7269b54418e7aeeef514aa68f8690b8c0489a06b0136e5f57c4c5ccab89"
|
||||
checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@@ -2025,18 +2016,18 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "zerofrom"
|
||||
version = "0.1.6"
|
||||
version = "0.1.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
|
||||
checksum = "69faa1f2a1ea75661980b013019ed6687ed0e83d069bc1114e2cc74c6c04c4df"
|
||||
dependencies = [
|
||||
"zerofrom-derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "zerofrom-derive"
|
||||
version = "0.1.6"
|
||||
version = "0.1.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
|
||||
checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@@ -2052,9 +2043,9 @@ checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
|
||||
|
||||
[[package]]
|
||||
name = "zerotrie"
|
||||
version = "0.2.3"
|
||||
version = "0.2.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851"
|
||||
checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf"
|
||||
dependencies = [
|
||||
"displaydoc",
|
||||
"yoke",
|
||||
@@ -2063,9 +2054,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "zerovec"
|
||||
version = "0.11.5"
|
||||
version = "0.11.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002"
|
||||
checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239"
|
||||
dependencies = [
|
||||
"yoke",
|
||||
"zerofrom",
|
||||
@@ -2074,9 +2065,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "zerovec-derive"
|
||||
version = "0.11.2"
|
||||
version = "0.11.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
|
||||
checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
||||
@@ -17,14 +17,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "css-inline";
|
||||
version = "0.20.1";
|
||||
version = "0.20.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Stranger6667";
|
||||
repo = "css-inline";
|
||||
rev = "python-v${version}";
|
||||
hash = "sha256-8Se0Ehzsh5TWwdfpwriTOjEY50eTFuA2qOonLK/XuNk=";
|
||||
hash = "sha256-tJEeYvM7T2Lerz5SYpQTuuMoHS6obiMuFexfN8+quHc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -43,7 +43,7 @@ buildPythonPackage rec {
|
||||
cd bindings/python
|
||||
ln -s ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
hash = "sha256-mj+/WTm/etglMj32gwhOmpW3/DyrvQ+TxUBSYDd7YZE=";
|
||||
hash = "sha256-sScfevpg/BZngzipANHxwIjqDsaBPF4xCSgJc5YR2gM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "environs";
|
||||
version = "14.6.0";
|
||||
version = "15.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sloria";
|
||||
repo = "environs";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-TX8C3KIuvAkC+ArGFz9FXyqxd9pfTgmMqnLuYNIlA4o=";
|
||||
hash = "sha256-9BsMbrn9qwhrLO8uJe3hzzpsqmea3iKoDw1TbyfmAiI=";
|
||||
};
|
||||
|
||||
build-system = [ flit-core ];
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "freebox-api";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hacf-fr";
|
||||
repo = "freebox-api";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-3rmOIHneGUtaLw+0Z0UTKoCSoJs70KKLjDPi0gOtV6I=";
|
||||
hash = "sha256-3M29mboTZMG9lZSt816PvAXzl2DaqiC2nhikcpn+gqU=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
fetchpatch,
|
||||
pytestCheckHook,
|
||||
setuptools,
|
||||
writableTmpDirAsHomeHook,
|
||||
|
||||
packaging,
|
||||
pandas,
|
||||
@@ -25,16 +26,16 @@
|
||||
xyzservices,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "geopandas";
|
||||
version = "1.1.2";
|
||||
version = "1.1.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "geopandas";
|
||||
repo = "geopandas";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-TBb9Bb12OZ9RWiwAGU6JKqiumw1C11USycpKM8mJVdU=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-66FbHNewpSEVZ9RwngK7E4bcELa9Z2OQ9xVP9+fgeHQ=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -70,12 +71,9 @@ buildPythonPackage rec {
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
rtree
|
||||
writableTmpDirAsHomeHook
|
||||
]
|
||||
++ optional-dependencies.all;
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d);
|
||||
'';
|
||||
++ finalAttrs.passthru.optional-dependencies.all;
|
||||
|
||||
disabledTests = [
|
||||
# Requires network access
|
||||
@@ -89,8 +87,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Python geospatial data analysis framework";
|
||||
homepage = "https://geopandas.org";
|
||||
changelog = "https://github.com/geopandas/geopandas/blob/${src.tag}/CHANGELOG.md";
|
||||
changelog = "https://github.com/geopandas/geopandas/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.bsd3;
|
||||
teams = [ lib.teams.geospatial ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "google-cloud-vpc-access";
|
||||
version = "1.15.0";
|
||||
version = "1.16.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "google_cloud_vpc_access";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-kO/iNVmRbMzoNErXVnarpkATXY+PwJiLVSoKpLui4Us=";
|
||||
hash = "sha256-cVJ8Ok3K1dKGuTsBhDJUqhYEimNTEqOjfVSTqxke0NQ=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "google-cloud-workflows";
|
||||
version = "1.20.0";
|
||||
version = "1.21.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "google_cloud_workflows";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-aicI4O1m3L3gtnZ3eslGSKsFKyVTnWyr0SjNJdWxcfQ=";
|
||||
hash = "sha256-GaM/fyIJSHJ0r/8cz2aDYGGdIWw+LXgmnlRFKuv7e2I=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -32,13 +32,13 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "llama-stack-client";
|
||||
version = "0.5.2";
|
||||
version = "0.7.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "llama_stack_client";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-F8G7rZD3aZ2k6zyuJW6II8qk0r6UVRKkXIxviauJnyg=";
|
||||
hash = "sha256-kNipBRnLPvZEvORWbGp1IYT9ablgxXm0GIbXD+R8tE8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -30,14 +30,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "mistralai";
|
||||
version = "2.1.3";
|
||||
version = "2.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mistralai";
|
||||
repo = "client-python";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-d6z8l7h8PVPV72Phbb7zPg4pyhxcXA/V5q1Ao+Jtgms=";
|
||||
hash = "sha256-L+tmX2d5gfTgcYAFRBHOa17zFbNwGVEKbyAv1g7bKho=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
||||
@@ -11,12 +11,12 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "publicsuffixlist";
|
||||
version = "1.0.2.20260328";
|
||||
version = "1.0.2.20260403";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-RJ5QQVlEHC1g+2LMe3TEj6YtFHNaX4irhOTQ64ZnM/4=";
|
||||
hash = "sha256-kXg8lEvIBF6p2AfW7CjQheTU64qxko2AtSZYu+g5u98=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -30,7 +30,7 @@ let
|
||||
in
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pytorch-tokenizers";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@@ -38,7 +38,7 @@ buildPythonPackage (finalAttrs: {
|
||||
repo = "tokenizers";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-la1PH8KT6iWYjvwBNYcQu5KwRS1/6H7SX5Vu6bpD+vg=";
|
||||
hash = "sha256-4VWOKCdRx1VpYoJq7LYfpdcAAQeHnLD5mxI65XrrEHs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "verlib2";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
pyproject = true;
|
||||
|
||||
# This tarball doesn't include tests unfortunately, and the GitHub tarball
|
||||
@@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
# should work for us as well.
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-KGLxlSjbQA0TAlOitxx8NhbuFOHVS/aDO8CSnSzd0UE=";
|
||||
hash = "sha256-oKavmDjY0mwYIlowyNV/twcURi480p8kUeeYLVpR4h4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{
|
||||
version = "4.6.1-stable";
|
||||
hash = "sha256-C3AX+Gl6a3nX/k0TP6FYjYCK9AbKmtku+1ilYBu0R74=";
|
||||
version = "4.6.2-stable";
|
||||
hash = "sha256-alAW8i7wRcOsHvq3flYXgW7DPiIlAXxM1zFL87Kri6Y=";
|
||||
default = {
|
||||
exportTemplatesHash = "sha256-5tNyr9T9+q6VceteNWivzZbObbmlaSRANBVPrwrGmHU=";
|
||||
exportTemplatesHash = "sha256-lCNm3E4n52hqmdpNPPsbiujT65RE9tghfu8WJFtZnvI=";
|
||||
};
|
||||
mono = {
|
||||
exportTemplatesHash = "sha256-V5JmHtCJVQNX4OEJVK9pWEa+CjLtdJT6QKAAnjtaPqk=";
|
||||
exportTemplatesHash = "sha256-Ts9y+vdvluAQ0Wbdu+Pw+459+WMygmZqOpr9TuPgDn0=";
|
||||
nugetDeps = ./deps.json;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -473,14 +473,6 @@ let
|
||||
lib.optionals (lib.versionOlder version "4.6") [
|
||||
./Linux-fix-missing-library-with-builtin_glslang-false.patch
|
||||
]
|
||||
++ lib.optionals (lib.versionAtLeast version "4.6") [
|
||||
# https://github.com/godotengine/godot/pull/115450
|
||||
(fetchpatch {
|
||||
name = "fix-tls-handshake-fail-preventing-assetlib-use.patch";
|
||||
url = "https://github.com/godotengine/godot/commit/29acd734c71f06268d6ef4715d7df70b14731f48.patch";
|
||||
hash = "sha256-wxkr6jPtutUTG+mYrXoxcDcWIIZghlSJ79XqhFh/0P4=";
|
||||
})
|
||||
]
|
||||
++ lib.optionals (lib.versionOlder version "4.4") [
|
||||
(fetchpatch {
|
||||
name = "wayland-header-fix.patch";
|
||||
|
||||
@@ -15,14 +15,14 @@ let
|
||||
variants = {
|
||||
# ./update-xanmod.sh lts
|
||||
lts = {
|
||||
version = "6.18.20";
|
||||
hash = "sha256-CVwMRXmDq+vmepTs9Aja7+xJztz2my6Z5AZrUk3VoOA=";
|
||||
version = "6.18.21";
|
||||
hash = "sha256-56cRf+iTX+SbxEelp84q4m9JnJzGWuAaRBgWM+3MLQc=";
|
||||
isLTS = true;
|
||||
};
|
||||
# ./update-xanmod.sh main
|
||||
main = {
|
||||
version = "6.19.10";
|
||||
hash = "sha256-siYXwGPt/wO1DcYeCM7XPwwG6HkbT9c0oQai7QFJFBA=";
|
||||
version = "6.19.11";
|
||||
hash = "sha256-JbiS33MeAxtcB8e7JQUu+K8bh2Ad/B6wKGKqA98R9Wc=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -1648,6 +1648,7 @@ mapAliases {
|
||||
proj_7 = throw "proj_7 has been removed, as it was broken and unused"; # Added 2025-09-16
|
||||
prometheus-dmarc-exporter = throw "'prometheus-dmarc-exporter' has been renamed to/replaced by 'dmarc-metrics-exporter'"; # Converted to throw 2025-10-27
|
||||
prometheus-dovecot-exporter = throw "'prometheus-dovecot-exporter' has been renamed to/replaced by 'dovecot_exporter'"; # Converted to throw 2025-10-27
|
||||
promtail = throw "promtail has been removed, as it reached its end of life. Consider migrating to 'grafana-alloy' or 'fluent-bit'"; # Added 2026-03-30
|
||||
protobuf3_21 = throw "'protobuf3_21' has been renamed to/replaced by 'protobuf_21'"; # Converted to throw 2025-10-27
|
||||
protobuf3_24 = throw "'protobuf_24' has been removed from nixpkgs. Consider using a more recent version of the protobuf library"; # Added 2025-07-14
|
||||
protobuf_24 = throw "'protobuf_24' has been removed from nixpkgs. Consider using a more recent version of the protobuf library"; # Added 2025-07-14
|
||||
|
||||
@@ -252,10 +252,6 @@ let
|
||||
version =
|
||||
with lib.versions;
|
||||
lib.switch self.coq.version [
|
||||
{
|
||||
case = range "8.19" "8.20";
|
||||
out = "3.15";
|
||||
}
|
||||
{
|
||||
case = range "8.15" "8.18";
|
||||
out = "3.13.1";
|
||||
|
||||
Reference in New Issue
Block a user