🚑 fix opentelemetry-collector-contrib problems
All checks were successful
Build all NixOS Configurations / nix build (push) Successful in 10m45s
All checks were successful
Build all NixOS Configurations / nix build (push) Successful in 10m45s
https://github.com/NixOS/nixpkgs/issues/356708
This commit is contained in:
Ingolf Wagner
parent
579540ed3c
commit
d3a10cc4b4
2 changed files with 56 additions and 13 deletions
43
flake.lock
43
flake.lock
|
|
@ -330,11 +330,11 @@
|
|||
"nixpkgs-lib": "nixpkgs-lib_5"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1727826117,
|
||||
"narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
|
||||
"lastModified": 1730504689,
|
||||
"narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
|
||||
"rev": "506278e768c2a08bec68eb62932193e341f55c90",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -747,6 +747,22 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-legacy_2411": {
|
||||
"locked": {
|
||||
"lastModified": 1731755305,
|
||||
"narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-24.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"lastModified": 1717284937,
|
||||
|
|
@ -797,14 +813,14 @@
|
|||
},
|
||||
"nixpkgs-lib_5": {
|
||||
"locked": {
|
||||
"lastModified": 1727825735,
|
||||
"narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=",
|
||||
"lastModified": 1730504152,
|
||||
"narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
|
||||
}
|
||||
},
|
||||
"nixpkgs-unstable-small": {
|
||||
|
|
@ -1020,6 +1036,7 @@
|
|||
"nixpkgs-legacy_2211": "nixpkgs-legacy_2211",
|
||||
"nixpkgs-legacy_2311": "nixpkgs-legacy_2311",
|
||||
"nixpkgs-legacy_2405": "nixpkgs-legacy_2405",
|
||||
"nixpkgs-legacy_2411": "nixpkgs-legacy_2411",
|
||||
"nixpkgs-unstable-small": "nixpkgs-unstable-small",
|
||||
"permown": "permown",
|
||||
"polygon-art": "polygon-art",
|
||||
|
|
@ -1219,11 +1236,11 @@
|
|||
"treefmt-nix": "treefmt-nix_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729088108,
|
||||
"narHash": "sha256-5rhe/VW3XdFS+0rw3BFzCo8AX07OnV8L/5IpjX9zNxE=",
|
||||
"lastModified": 1731905778,
|
||||
"narHash": "sha256-FbqW86sjLQxveHQH5v3yP7jhYNjbsyFh1BpejmtfAVg=",
|
||||
"owner": "mrvandalo",
|
||||
"repo": "nixos-telemetry",
|
||||
"rev": "8ad47f66e92d5ad3f8ca55776289f83c227caaff",
|
||||
"rev": "09ef4118927704541ba11793dffeab26ab10daf4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1395,11 +1412,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1727984844,
|
||||
"narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=",
|
||||
"lastModified": 1730321837,
|
||||
"narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64",
|
||||
"rev": "746901bb8dba96d154b66492a29f5db0693dbfcc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
26
flake.nix
26
flake.nix
|
|
@ -25,6 +25,7 @@
|
|||
nixpkgs-legacy_2211.url = "github:nixos/nixpkgs/nixos-22.11";
|
||||
nixpkgs-legacy_2311.url = "github:nixos/nixpkgs/nixos-23.11";
|
||||
nixpkgs-legacy_2405.url = "github:nixos/nixpkgs/nixos-24.05";
|
||||
nixpkgs-legacy_2411.url = "github:nixos/nixpkgs/nixos-24.11";
|
||||
nixpkgs-unstable-small.url = "github:nixos/nixpkgs/nixos-unstable-small";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
permown.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
|
@ -71,6 +72,7 @@
|
|||
nixpkgs-legacy_2211,
|
||||
nixpkgs-legacy_2311,
|
||||
nixpkgs-legacy_2405,
|
||||
nixpkgs-legacy_2411,
|
||||
nixpkgs-unstable-small,
|
||||
permown,
|
||||
polygon-art,
|
||||
|
|
@ -298,6 +300,30 @@
|
|||
./features
|
||||
./modules # todo : spread this across features and components
|
||||
#./system/all # todo : spread this across features and components
|
||||
(
|
||||
{ lib, pkgs, ... }:
|
||||
{
|
||||
|
||||
telemetry.netdata.enable = false;
|
||||
|
||||
# "fixes" https://github.com/NixOS/nixpkgs/issues/356708
|
||||
#services.opentelemetry-collector.package = lib.mkForce pkgs.legacy_2405.opentelemetry-collector-contrib;
|
||||
|
||||
services.opentelemetry-collector.package = lib.mkForce (
|
||||
pkgs.opentelemetry-collector-contrib.overrideAttrs (old: rec {
|
||||
version = "0.110.0";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-collector-contrib";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bDtP7EFKus0NJpLccbD+HlzEusc+KAbKWmS/KGthtwY=";
|
||||
};
|
||||
vendorHash = "sha256-pDDEqtXu167b+J1+k7rC1BE5/ehxzG0ZAkhxqmJpHsg=";
|
||||
})
|
||||
);
|
||||
|
||||
}
|
||||
)
|
||||
|
||||
# some modules I always use
|
||||
telemetry.nixosModules.telemetry
|
||||
|
|
|
|||
Loading…
Reference in a new issue