From 63f2ed0272da92d31757f0d712e22c3b5da287bd Mon Sep 17 00:00:00 2001
From: Julien Malka <julien@malka.sh>
Date: Tue, 25 Jun 2024 15:24:50 +0200
Subject: [PATCH] chore: use nixpkgs's attic-client
---
deps/sources.json | 12 ------------
lib/mkmachine.nix | 2 --
machines/base.nix | 2 +-
modules/buildbot/default.nix | 2 +-
4 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/deps/sources.json b/deps/sources.json
index 7feab67..e935715 100644
--- a/deps/sources.json
+++ b/deps/sources.json
@@ -12,18 +12,6 @@
"url": "https://github.com/ryantm/agenix/archive/3a56735779db467538fb2e577eda28a9daacaca6.tar.gz",
"hash": "1h66zapc6im07k3kcgvhy3lhzahb70vd6m2ijhz4i0v6mn5l3fk9"
},
- "attic": {
- "type": "Git",
- "repository": {
- "type": "GitHub",
- "owner": "zhaofengli",
- "repo": "attic"
- },
- "branch": "main",
- "revision": "717cc95983cdc357bc347d70be20ced21f935843",
- "url": "https://github.com/zhaofengli/attic/archive/717cc95983cdc357bc347d70be20ced21f935843.tar.gz",
- "hash": "1fdj8jp9wxqix67ia6yb54nx1yyjp2n9w5k8p98fmi73wi2khzch"
- },
"buildbot-nix": {
"type": "Git",
"repository": {
diff --git a/lib/mkmachine.nix b/lib/mkmachine.nix
index ec0be24..455ac51 100644
--- a/lib/mkmachine.nix
+++ b/lib/mkmachine.nix
@@ -29,7 +29,6 @@ import "${nixpkgs}/nixos/lib/eval-config.nix" {
host-config
(import "${home-manager}/nixos")
(import "${inputs.nixos-mailserver}")
- (import "${inputs.attic}/nixos/atticd.nix")
(import "${inputs.disko}/module.nix")
(import "${inputs.buildbot-nix}/nix/master.nix")
(import "${inputs.buildbot-nix}/nix/worker.nix")
@@ -49,7 +48,6 @@ import "${nixpkgs}/nixos/lib/eval-config.nix" {
});
# Packages comming from other repositories
zotero = pkgs.wrapFirefox (pkgs.callPackage "${inputs.zotero-nix}/pkgs" { }) { };
- attic = pkgs.callPackage "${inputs.attic}/package.nix" { };
jackett = pkgs.callPackage ../packages/jackett { };
lila-build-hook = (import inputs.lila).packages.${system}.utils;
# My own packages
diff --git a/machines/base.nix b/machines/base.nix
index f4546f4..c729901 100644
--- a/machines/base.nix
+++ b/machines/base.nix
@@ -43,7 +43,7 @@
environment.systemPackages = with pkgs; [
neovim
- attic
+ attic-client
kitty
tailscale
step-cli
diff --git a/modules/buildbot/default.nix b/modules/buildbot/default.nix
index ce7e81c..89524b8 100644
--- a/modules/buildbot/default.nix
+++ b/modules/buildbot/default.nix
@@ -40,7 +40,7 @@ in
};
systemd.services.buildbot-worker.path = lib.mkForce [
- pkgs.attic
+ pkgs.attic-client
pkgs.git
pkgs.openssh
pkgs.gh