From 648378b1675776fa723da3567cab53cc4924dcd6 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Thu, 30 Oct 2025 17:10:07 +0000 Subject: [PATCH] prometheus: Split source definition to separate file --- pkgs/by-name/pr/prometheus/package.nix | 19 ++++++++++++------- pkgs/by-name/pr/prometheus/source.nix | 6 ++++++ 2 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 pkgs/by-name/pr/prometheus/source.nix diff --git a/pkgs/by-name/pr/prometheus/package.nix b/pkgs/by-name/pr/prometheus/package.nix index 88050c435489..248b90242d2b 100644 --- a/pkgs/by-name/pr/prometheus/package.nix +++ b/pkgs/by-name/pr/prometheus/package.nix @@ -1,6 +1,5 @@ { stdenv, - buildPackages, lib, go, buildGoModule, @@ -33,14 +32,17 @@ }: let + source = import ./source.nix; + + inherit (source) version vendorHash; + pname = "prometheus"; - version = "3.8.0"; src = fetchFromGitHub { owner = "prometheus"; repo = "prometheus"; tag = "v${version}"; - hash = "sha256-bitRDX1oymFfzvQVYL31BON6UBfQYnqjZefQKc+yXx0="; + hash = source.hash; }; assets = buildNpmPackage { @@ -49,7 +51,7 @@ let src = "${src}/web/ui"; - npmDepsHash = "sha256-Uq7vikiYLqhRQNCpB49aMJgAE/uK4Mst/Iz6W+hdxBw="; + npmDepsHash = source.npmDepsHash; patches = [ # Disable old React app as it depends on deprecated create-react-apps @@ -79,7 +81,12 @@ let }; in buildGoModule (finalAttrs: { - inherit pname version src; + inherit + pname + version + vendorHash + src + ; outputs = [ "out" @@ -87,8 +94,6 @@ buildGoModule (finalAttrs: { "cli" ]; - vendorHash = "sha256-V+qLxjqGOaT1veEwtklqcS7iO31ufvDHBA9DbZLzDiE="; - excludedPackages = [ "documentation/prometheus-mixin" "internal/tools" diff --git a/pkgs/by-name/pr/prometheus/source.nix b/pkgs/by-name/pr/prometheus/source.nix new file mode 100644 index 000000000000..c3bc5b3c9f2a --- /dev/null +++ b/pkgs/by-name/pr/prometheus/source.nix @@ -0,0 +1,6 @@ +{ + version = "3.8.0"; + hash = "sha256-hRuZxwPPDLxQvy5MPKEyfmanNabcSjLRO+XbNKugPtk="; + npmDepsHash = "sha256-pOHEchYVDv7A/3v37hpN60kK620SgQduhVIn6GMyOLM="; + vendorHash = "sha256-5wDaG01vcTtGzrS/S33U5XWXoSWM+N9z3dzXZlILxD8="; +}