flake update

This commit is contained in:
Alexandra Østermark
2025-12-14 16:03:20 +01:00
parent 3ea7ad8a1c
commit b4b30f6c78
2 changed files with 127 additions and 108 deletions
Generated
+7 -7
View File
@@ -2,16 +2,16 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1761016216, "lastModified": 1765608474,
"narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=", "narHash": "sha256-9Wx53UK0z8Di5iesJID0tS1dRKwGxI4i7tsSanOHhF0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "481cf557888e05d3128a76f14c76397b7d7cc869", "rev": "28bb483c11a1214a73f9fd2d9928a6e2ea86ec71",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-25.05", "ref": "nixos-25.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@@ -25,11 +25,11 @@
}, },
"vpnconfinement": { "vpnconfinement": {
"locked": { "locked": {
"lastModified": 1759956062, "lastModified": 1765634578,
"narHash": "sha256-NUZu0Rb0fwUjfdp51zMm0xM3lcK8Kw4c97LLog7+JjA=", "narHash": "sha256-Fujb9sn1cj+u/bzfo2RbQkcAvJ7Ch1pimJzFie4ptb4=",
"owner": "Maroka-chan", "owner": "Maroka-chan",
"repo": "VPN-Confinement", "repo": "VPN-Confinement",
"rev": "fabe7247b720b5eb4c3c053e24a2b3b70e64c52b", "rev": "f2989e1e3cb06c7185939e9ddc368f88b998616a",
"type": "github" "type": "github"
}, },
"original": { "original": {
+120 -101
View File
@@ -2,7 +2,7 @@
description = "The Nixarr Media Server Nixos Module"; description = "The Nixarr Media Server Nixos Module";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
vpnconfinement.url = "github:Maroka-chan/VPN-Confinement"; vpnconfinement.url = "github:Maroka-chan/VPN-Confinement";
@@ -10,109 +10,128 @@
website-builder.inputs.nixpkgs.follows = "nixpkgs"; website-builder.inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = { outputs =
nixpkgs, {
vpnconfinement, nixpkgs,
website-builder, vpnconfinement,
self, website-builder,
... self,
} @ inputs: let ...
# Systems supported }@inputs:
supportedSystems = [ let
"x86_64-linux" # 64-bit Intel/AMD Linux # Systems supported
"aarch64-linux" # 64-bit ARM Linux supportedSystems = [
"x86_64-darwin" # 64-bit Intel macOS "x86_64-linux" # 64-bit Intel/AMD Linux
"aarch64-darwin" # 64-bit ARM macOS "aarch64-linux" # 64-bit ARM Linux
]; "x86_64-darwin" # 64-bit Intel macOS
"aarch64-darwin" # 64-bit ARM macOS
];
# Helper to provide system-specific attributes # Helper to provide system-specific attributes
forAllSystems = f: forAllSystems =
nixpkgs.lib.genAttrs supportedSystems (system: f:
f { nixpkgs.lib.genAttrs supportedSystems (
pkgs = import nixpkgs { system:
inherit system; f {
config.allowUnfree = true; pkgs = import nixpkgs {
inherit system;
config.allowUnfree = true;
};
}
);
in
{
nixosModules.default.imports = [
./nixarr
vpnconfinement.nixosModules.default
];
# Add tests attribute to the flake outputs
# To run interactively run:
# > nix build .#checks.x86_64-linux.monitoring-test.driver -L
checks = forAllSystems (
{ pkgs }:
{
permissions-test = pkgs.callPackage ./tests/permissions-test.nix {
inherit (self) nixosModules;
}; };
}); simple-test = pkgs.callPackage ./tests/simple-test.nix {
in { inherit (self) nixosModules;
nixosModules.default.imports = [./nixarr vpnconfinement.nixosModules.default]; };
# vpn-confinement-test = pkgs.callPackage ./tests/vpn-confinement-test.nix {
# inherit (self) nixosModules;
# };
}
);
# Add tests attribute to the flake outputs devShells = forAllSystems (
# To run interactively run: { pkgs }:
# > nix build .#checks.x86_64-linux.monitoring-test.driver -L {
checks = forAllSystems ({pkgs}: { default = pkgs.mkShell {
permissions-test = pkgs.callPackage ./tests/permissions-test.nix { packages = with pkgs; [
inherit (self) nixosModules; alejandra
}; nixd
simple-test = pkgs.callPackage ./tests/simple-test.nix { ];
inherit (self) nixosModules; };
}; }
# vpn-confinement-test = pkgs.callPackage ./tests/vpn-confinement-test.nix { );
# inherit (self) nixosModules;
# };
});
devShells = forAllSystems ({pkgs}: { packages = forAllSystems (
default = pkgs.mkShell { { pkgs }:
packages = with pkgs; [ let
alejandra website = website-builder.lib {
nixd pkgs = pkgs;
]; src = "${self}";
}; timestamp = self.lastModified;
}); headerTitle = "Nixarr";
standalonePages = [
{
title = "Nixarr - Media Server Nixos Module";
inputFile = ./README.md;
outputFile = "index.html";
}
];
includedDirs = [ "docs" ];
articleDirs = [ "docs/wiki" ];
navbar = [
{
title = "Home";
location = "/";
}
{
title = "Options";
location = "/nixos-options";
}
{
title = "Wiki";
location = "/wiki";
}
{
title = "Github";
location = "https://github.com/rasmus-kirk/nixarr";
}
];
favicons = {
# For all browsers
"16x16" = "/docs/img/favicons/16x16.png";
"32x32" = "/docs/img/favicons/32x32.png";
# For Google and Android
"48x48" = "/docs/img/favicons/48x48.png";
"192x192" = "/docs/img/favicons/192x192.png";
# For iPad
"167x167" = "/docs/img/favicons/167x167.png";
# For iPhone
"180x180" = "/docs/img/favicons/180x180.png";
};
nixosModules = ./nixarr;
};
in
{
default = website.package;
debug = website.loop;
}
);
packages = forAllSystems ({pkgs}: let formatter = forAllSystems ({ pkgs }: pkgs.alejandra);
website = website-builder.lib { };
pkgs = pkgs;
src = "${self}";
timestamp = self.lastModified;
headerTitle = "Nixarr";
standalonePages = [
{
title = "Nixarr - Media Server Nixos Module";
inputFile = ./README.md;
outputFile = "index.html";
}
];
includedDirs = ["docs"];
articleDirs = ["docs/wiki"];
navbar = [
{
title = "Home";
location = "/";
}
{
title = "Options";
location = "/nixos-options";
}
{
title = "Wiki";
location = "/wiki";
}
{
title = "Github";
location = "https://github.com/rasmus-kirk/nixarr";
}
];
favicons = {
# For all browsers
"16x16" = "/docs/img/favicons/16x16.png";
"32x32" = "/docs/img/favicons/32x32.png";
# For Google and Android
"48x48" = "/docs/img/favicons/48x48.png";
"192x192" = "/docs/img/favicons/192x192.png";
# For iPad
"167x167" = "/docs/img/favicons/167x167.png";
# For iPhone
"180x180" = "/docs/img/favicons/180x180.png";
};
nixosModules = ./nixarr;
};
in {
default = website.package;
debug = website.loop;
});
formatter = forAllSystems ({pkgs}: pkgs.alejandra);
};
} }