From 22ca41e0000c86746034d81e8f74322d9dbe82aa Mon Sep 17 00:00:00 2001
From: Marius DAVID <git@mariusdavid.fr>
Date: Wed, 12 Nov 2025 12:51:25 +0100
Subject: [PATCH] remove hydra code, fix nix build

---
 .hydra/declarative-jobsets.nix | 57 ----------------------------------
 .hydra/spec.json               | 31 ------------------
 build_atlas.sh                 |  3 --
 flake.nix                      |  3 +-
 4 files changed, 2 insertions(+), 92 deletions(-)
 delete mode 100644 .hydra/declarative-jobsets.nix
 delete mode 100644 .hydra/spec.json
 delete mode 100755 build_atlas.sh

diff --git a/.hydra/declarative-jobsets.nix b/.hydra/declarative-jobsets.nix
deleted file mode 100644
index 11e71040f..000000000
--- a/.hydra/declarative-jobsets.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-# Mostly copied from https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/blob/master/.hydra/declarative-jobsets.nix?ref_type=heads
-
-{ nixpkgs, pulls, ... }:
-
-let
-  pkgs = import nixpkgs {};
-
-  prs = builtins.fromJSON (builtins.readFile pulls);
-  prJobsets =  pkgs.lib.mapAttrs (num: info:
-    { enabled = 1;
-      hidden = false;
-      description = "PR ${num}: ${info.title}";
-      checkinterval = 60;
-      schedulingshares = 20;
-      enableemail = false;
-      emailoverride = "";
-      keepnr = 2;
-      type = 1;
-      flake = "gitlab:marius851000/fediverse-canvas-atlas-2024/merge-requests/${info.iid}/head?host=git.sc07.company";
-    }
-  ) prs;
-  /*mkFlakeJobset = branch: {
-    description = "Build ${branch} branch of Simple NixOS MailServer";
-    checkinterval = "60";
-    enabled = "1";
-    schedulingshares = 100;
-    enableemail = false;
-    emailoverride = "";
-    keepnr = 3;
-    hidden = false;
-    type = 1;
-    flake = "gitlab:simple-nixos-mailserver/nixos-mailserver/${branch}";
-  };*/
-
-  desc = prJobsets/* // {
-    "master" = mkFlakeJobset "master";
-    "nixos-23.11" = mkFlakeJobset "nixos-23.11";
-    "nixos-24.05" = mkFlakeJobset "nixos-24.05";
-  }*/;
-
-  log = {
-    pulls = prs;
-    jobsets = desc;
-  };
-
-in {
-  jobsets = pkgs.runCommand "spec-jobsets.json" {} ''
-    cat >$out <<EOF
-    ${builtins.toJSON desc}
-    EOF
-    # This is to get nice .jobsets build logs on Hydra
-    cat >tmp <<EOF
-    ${builtins.toJSON log}
-    EOF
-    ${pkgs.jq}/bin/jq . tmp
-  '';
-}
diff --git a/.hydra/spec.json b/.hydra/spec.json
deleted file mode 100644
index 6d7838510..000000000
--- a/.hydra/spec.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-	"enabled": 1,
-	"hidden": false,
-	"description": "Fediverse Canvas Atlas 2024",
-	"nixexprinput": "nixexpr",
-	"nixexprpath": ".hydra/declarative-jobsets.nix",
-	"checkinterval": 60,
-	"schedulingshares": 100,
-	"enableemail": false,
-	"emailoverride": "",
-	"keepnr": 10,
-	"type": 0,
-	"inputs": {
-	  "nixexpr": {
-		"value": "https://git.sc07.company/marius851000/fediverse-canvas-atlas-2024.git main",
-		"type": "git",
-		"emailresponsible": false
-	  },
-	  "nixpkgs": {
-		"value": "https://github.com/NixOS/nixpkgs 0f920b05cbcdb8c0f3c5c4a8ea29f1f0065c7033 ",
-		"type": "git",
-		"emailresponsible": false
-	  },
-	  "pulls": {
-		"type": "gitlabpulls",
-		"value": "https://git.sc07.company 16",
-		"emailresponsible": false
-	  }
-	}
-  }
-  
\ No newline at end of file
diff --git a/build_atlas.sh b/build_atlas.sh
deleted file mode 100755
index 76002e668..000000000
--- a/build_atlas.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-python ./tools/merge_data.py ./entries ./web/atlas2024.json
-python ./tools/merge_data.py ./entries2025 ./web/atlas2025.json
diff --git a/flake.nix b/flake.nix
index 693a7071d..3b6eac0cd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,7 +19,8 @@
 					installPhase = ''
 						mkdir -p $out
 
-						bash build_atlas.sh
+						mkdir -p web/atlas
+						python3 ./tools/merge_data.py ./entries/${edition} ./web/atlas/${edition}.json
 						python3 tools/pre_process.py ${edition} ./web
 						mv web $out
 
-- 
GitLab