aboutsummaryrefslogtreecommitdiffstats
path: root/flake.nix
diff options
context:
space:
mode:
authorBenedikt Peetz <benedikt.peetz@b-peetz.de>2026-07-18 22:51:37 +0200
committerBenedikt Peetz <benedikt.peetz@b-peetz.de>2026-07-18 22:53:09 +0200
commitb245a874bb6ece335f4bc7b2eac8376c55a3f463 (patch)
tree86582c545e89023fe06b5afb65036caa23e2c8d6 /flake.nix
parentscripts/check.sh: Improve UX (diff)
downloadnixos-server-b245a874bb6ece335f4bc7b2eac8376c55a3f463.zip
{flake.nix,hosts/}: Remove deploy-rs
It's not used (besides the deploy-tests, which didn't really do much), and they have broken string escapes, which emit warnings. That they have these warnings for over a month shows that upstream is not that responsive, not a good sign.
Diffstat (limited to '')
-rw-r--r--flake.nix40
1 files changed, 6 insertions, 34 deletions
diff --git a/flake.nix b/flake.nix
index 3be3113..7211c98 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,14 +19,6 @@
nixpkgs.follows = "nixpkgs";
};
};
- deploy-rs = {
- url = "github:serokell/deploy-rs";
- inputs = {
- flake-compat.follows = "flake-compat";
- nixpkgs.follows = "nixpkgs";
- utils.follows = "flake-utils";
- };
- };
# inputs for following
systems = {
@@ -105,7 +97,6 @@
nixpkgs-unstable,
library,
treefmt-nix,
- deploy-rs,
# modules
agenix,
turtle,
@@ -119,20 +110,6 @@
nixos-lib = import (nixpkgs + "/nixos/lib") {};
pkgs = nixpkgs.legacyPackages.${system};
pkgsUnstable = nixpkgs-unstable.legacyPackages.${system};
- deployPackage =
- (import nixpkgs {
- inherit system;
- overlays = [
- deploy-rs.overlays.default
- (self: super: {
- deploy-rs = {
- inherit (pkgs) deploy-rs;
- inherit (super.deploy-rs) lib;
- };
- })
- ];
- })
- .deploy-rs;
specialArgs =
attrs
@@ -160,18 +137,15 @@
tests = import ./tests {inherit pkgs specialArgs nixLib;};
vhackPackages = import ./pkgs {inherit pkgs nixLib pkgsUnstable;};
- hosts = import ./hosts {inherit pkgs nixLib nixpkgs specialArgs extraModules deployPackage;};
+ hosts = import ./hosts {inherit pkgs nixLib nixpkgs specialArgs extraModules;};
inherit (library) nixLib;
treefmtEval = import ./treefmt.nix {inherit treefmt-nix pkgs;};
in {
- checks."${system}" =
- nixLib.warnMerge (nixLib.warnMerge tests {
- formatting =
- treefmtEval.config.build.check self;
- } "the flake checks and formatting")
- (deployPackage.lib.deployChecks self.deploy)
- "the flake checks and deploy-rs";
+ checks."${system}" = nixLib.warnMerge tests {
+ formatting =
+ treefmtEval.config.build.check self;
+ } "the flake checks and formatting";
packages."${system}" = vhackPackages;
formatter."${system}" = treefmtEval.config.build.wrapper;
@@ -179,8 +153,6 @@
devShells."${system}" = {
default = pkgs.mkShell {
packages = [
- pkgs.deploy-rs
-
pkgs.git-bug
# Used to update the stalwart-mail spamfilter
@@ -192,6 +164,6 @@
};
};
- inherit (hosts) nixosConfigurations deploy;
+ inherit (hosts) nixosConfigurations;
};
}