Compare commits

...
2 Commits
Author SHA1 Message Date
Sovran Systems a68130625e Fix btcpayserver.nix to use pkgs.stable overlay
Replace all pkgs-stable references with pkgs.stable (from overlay-stable in flake.nix):
- Remove pkgs-stable from function arguments
- Use pkgs.stable.nbxplorer (2.6.10 from nixos-26.05)
- Use pkgs.stable.btcpayserver (2.4.2 from nixos-26.05)
2026-08-10 11:16:26 -05:00
Sovran Systems 7b04adbbe6 Restore original flake.nix with nixosModules.Sovran_SystemsOS export
Restores the complete original flake.nix that includes:
- nixosModules.Sovran_SystemsOS (required by deployed machines)
- overlay-stable for accessing pkgs.stable packages
- nixosConfigurations.nixos for direct builds
- nixosConfigurations.sovran_systemsos-iso for ISO builds
- nixosTests and checks
2026-08-10 11:12:21 -05:00
2 changed files with 70 additions and 34 deletions

No files matched your search

+64 -28
View File
@@ -1,32 +1,68 @@
{ {
description = "Sovran Systems OS - A secure, self-hosted server OS"; description = "The Ultimate Sovran_SystemsOS Configuration from Sovran Systems";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-26.05"; nixvim.url = "github:nix-community/nixvim";
nixvim.url = "github:nix-community/nixvim"; btc-clients.url = "github:emmanuelrosa/btc-clients-nix";
btc-clients.url = "github:emmanuelrosa/btc-clients-nix"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-26.05";
}; };
outputs = { self, nixpkgs, nixpkgs-stable, nixvim, btc-clients }: outputs = { self, nixpkgs, nixvim, btc-clients, nixpkgs-stable, ... }:
let
system = "x86_64-linux"; let
pkgs = nixpkgs.legacyPackages.${system}; overlay-stable = final: prev: {
pkgs-stable = import nixpkgs-stable { stable = import nixpkgs-stable {
inherit system; system = prev.stdenv.hostPlatform.system;
config.allowUnfree = true; config.allowUnfree = true;
}; };
in };
{ in
nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { {
inherit system; nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
specialArgs = { inherit pkgs-stable; }; modules = [
modules = [ { nixpkgs.hostPlatform = "x86_64-linux"; nixpkgs.overlays = [ overlay-stable ]; }
./configuration.nix self.nixosModules.Sovran_SystemsOS
./modules ./hardware-configuration.nix
btc-clients.nixosModules.bitcoin ./role-state.nix
nixvim.nixosModules.nixvim ./custom.nix
]; ];
}; };
};
nixosConfigurations.sovran_systemsos-iso = nixpkgs.lib.nixosSystem {
modules = [
{ nixpkgs.hostPlatform = "x86_64-linux"; nixpkgs.overlays = [ overlay-stable ]; }
./iso/common.nix
./modules/bitcoin
nixvim.nixosModules.nixvim
];
};
nixosModules.Sovran_SystemsOS = { pkgs, lib, config, ... }: {
imports = [
({ config, pkgs, ... }: {
nixpkgs.overlays = [ overlay-stable ];
})
./configuration.nix
./modules/bitcoin
nixvim.nixosModules.nixvim
];
config = {
environment.systemPackages = with pkgs; [
btc-clients.packages.${pkgs.system}.bisq
btc-clients.packages.${pkgs.system}.bisq2
btc-clients.packages.${pkgs.system}.sparrow
];
};
};
nixosTests.nwc-wallets-port-collision =
import ./nix/tests/nwc-wallets-port-collision.nix {
inherit nixpkgs;
system = "x86_64-linux";
};
checks.x86_64-linux.nwc-wallets-port-collision =
self.nixosTests.nwc-wallets-port-collision;
};
} }
+6 -6
View File
@@ -1,4 +1,4 @@
{ config, lib, pkgs, pkgs-stable, ... }: { config, lib, pkgs, ... }:
with lib; with lib;
let let
@@ -26,8 +26,8 @@ let
}; };
package = mkOption { package = mkOption {
type = types.package; type = types.package;
default = pkgs-stable.nbxplorer; default = pkgs.stable.nbxplorer;
defaultText = "pkgs-stable.nbxplorer"; defaultText = "pkgs.stable.nbxplorer";
description = "The package providing nbxplorer binaries."; description = "The package providing nbxplorer binaries.";
}; };
dataDir = mkOption { dataDir = mkOption {
@@ -47,7 +47,7 @@ let
# be nix-bitcoin <=0.0.91) # be nix-bitcoin <=0.0.91)
addNetworkSymlink = mkOption { addNetworkSymlink = mkOption {
readOnly = true; readOnly = true;
default = pkgs-stable.nbxplorer != cfg.nbxplorer.package; default = pkgs.stable.nbxplorer != cfg.nbxplorer.package;
description = '' description = ''
Whether to add a compatibility symlink (like `${cfg.nbxplorer.dataDir}/Main`) Whether to add a compatibility symlink (like `${cfg.nbxplorer.dataDir}/Main`)
to the dataDir. to the dataDir.
@@ -83,8 +83,8 @@ let
}; };
package = mkOption { package = mkOption {
type = types.package; type = types.package;
default = pkgs-stable.btcpayserver; default = pkgs.stable.btcpayserver;
defaultText = "pkgs-stable.btcpayserver"; defaultText = "pkgs.stable.btcpayserver";
description = "The package providing BTCPay Server binaries."; description = "The package providing BTCPay Server binaries.";
}; };
address = mkOption { address = mkOption {