From 0751712fbb0e6f6bb6075ab30c31bb809aea572c Mon Sep 17 00:00:00 2001
From: chayleaf <chayleaf-git@pavluk.org>
Date: Tue, 10 Dec 2024 20:25:31 +0700
Subject: [PATCH] dont push ideally/add ereader ci
---
flake.nix | 1 +
pkgs/nix-plugins-overlay.nix | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/flake.nix b/flake.nix
index b1fbac1..e3c12cb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -204,6 +204,7 @@
hydraJobs = {
server.${config.server.system} = self.nixosConfigurations.server.config.system.build.toplevel;
router.${config.router-emmc.system} = self.nixosConfigurations.router-emmc.config.system.build.toplevel;
+ ereader.${config.phone.system} = self.nixosConfigurations.ereader.config.system.build.toplevel;
phone.${config.phone.system} = self.nixosConfigurations.phone.config.system.build.toplevel;
phone-home.${config.phone.system} = self.homeConfigurations."user@phone".activation-script;
workstation.${config.nixmsi.system} = self.nixosConfigurations.nixmsi.config.system.build.toplevel;
diff --git a/pkgs/nix-plugins-overlay.nix b/pkgs/nix-plugins-overlay.nix
index 4628185..5130a71 100644
--- a/pkgs/nix-plugins-overlay.nix
+++ b/pkgs/nix-plugins-overlay.nix
@@ -1,7 +1,8 @@
{ pkgs, ... }:
let
- unpatchedNixForNixPlugins = pkgs.nixVersions.nix_2_24;
+ # TODO: remove after full update
+ unpatchedNixForNixPlugins = if pkgs?nixVersions.nix_2_25 then pkgs.nixVersions.nix_2_24 else pkgs.nixVersions.nix_2_18;
nixForNixPlugins = unpatchedNixForNixPlugins.overrideAttrs (old: {
patches = (old.patches or [ ]) ++ [ ./rename-nix-plugin-files.patch ];
# some tests fail on bcachefs due to insufficient permissions