about summary refs log tree commit diff
path: root/pkgs/servers
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@thalheim.io>2022-12-20 10:53:21 +0100
committerJörg Thalheim <joerg@thalheim.io>2022-12-20 10:53:21 +0100
commit6dc44378f4cf915c18e8ec7b77155b1c9ea2d216 (patch)
treeed76e09c4973364b85d4ec21718fc87f4f06f6c7 /pkgs/servers
parentcf4a841d71e2c711e1e71af4884412250b9cd27e (diff)
Revert "mimir: 2.4.0 -> 2.5.0"
This reverts commit 4e371517033d31305a50509004bd3a7003a26afe.

This broke the build as the source now returns 404.

The script seems also more bloat over just using `nix-update --commit --build mimir`
Diffstat (limited to 'pkgs/servers')
-rw-r--r--pkgs/servers/monitoring/mimir/default.nix11
-rw-r--r--pkgs/servers/monitoring/mimir/pin.json4
-rwxr-xr-xpkgs/servers/monitoring/mimir/update.sh25
3 files changed, 4 insertions, 36 deletions
diff --git a/pkgs/servers/monitoring/mimir/default.nix b/pkgs/servers/monitoring/mimir/default.nix
index bb7153a301a1f..94ef2ad9179d1 100644
--- a/pkgs/servers/monitoring/mimir/default.nix
+++ b/pkgs/servers/monitoring/mimir/default.nix
@@ -4,13 +4,13 @@ let
 in
 buildGoModule rec {
   pname = "mimir";
-  version = pinData.version;
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     rev = "${pname}-${version}";
     owner = "grafana";
     repo = pname;
-    sha256 = pinData.sha256;
+    sha256 = "sha256-OpQxVp4Q2+r3Tqrqw3SrBsJDU5KJqChxsuYneT0PvYQ=";
   };
 
   vendorSha256 = null;
@@ -20,11 +20,8 @@ buildGoModule rec {
     "cmd/mimirtool"
   ];
 
-  passthru = {
-    updateScript = ./update.sh;
-    tests = {
-      inherit (nixosTests) mimir;
-    };
+  passthru.tests = {
+    inherit (nixosTests) mimir;
   };
 
   ldflags = let t = "github.com/grafana/mimir/pkg/util/version";
diff --git a/pkgs/servers/monitoring/mimir/pin.json b/pkgs/servers/monitoring/mimir/pin.json
deleted file mode 100644
index 52e041745783f..0000000000000
--- a/pkgs/servers/monitoring/mimir/pin.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "version": "mimir-2.5.0",
-  "sha256": "sha256-lyF7ugnNEJug1Vx24ISrtENk6RoIt7H1zaCPYUZbBmM="
-}
diff --git a/pkgs/servers/monitoring/mimir/update.sh b/pkgs/servers/monitoring/mimir/update.sh
deleted file mode 100755
index 242767c2ecb2c..0000000000000
--- a/pkgs/servers/monitoring/mimir/update.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env nix-shell
-#! nix-shell -i oil -p jq sd nix-prefetch-github ripgrep
-
-# TODO set to `verbose` or `extdebug` once implemented in oil
-shopt --set xtrace
-# we need failures inside of command subs to get the correct vendorSha256
-shopt --unset inherit_errexit
-
-const directory = $(dirname $0 | xargs realpath)
-const owner = "grafana"
-const repo = "mimir"
-const latest_rev = $(curl -q https://api.github.com/repos/${owner}/${repo}/releases/latest | \
-  jq -r '.tag_name')
-const latest_version = $(echo $latest_rev | sd 'v' '')
-const current_version = $(jq -r '.version' $directory/pin.json)
-if ("$latest_version" === "$current_version") {
-  echo "$repo is already up-to-date"
-  return 0
-} else {
-  const tarball_meta = $(nix-prefetch-github $owner $repo --rev "$latest_rev")
-  const tarball_hash = "sha256-$(echo $tarball_meta | jq -r '.sha256')"
-
-  jq ".version = \"$latest_version\" | \
-      .\"sha256\" = \"$tarball_hash\"" $directory/pin.json | sponge $directory/pin.json
-}