fujin/nixarr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

flake update

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
flake.lock
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": {
flake.nix
+37 -18
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,13 +10,15 @@
website-builder.inputs.nixpkgs.follows = "nixpkgs"; website-builder.inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = { outputs =
{
nixpkgs, nixpkgs,
vpnconfinement, vpnconfinement,
website-builder, website-builder,
self, self,
... ...
} @ inputs: let }@inputs:
let
# Systems supported # Systems supported
supportedSystems = [ supportedSystems = [
"x86_64-linux" # 64-bit Intel/AMD Linux "x86_64-linux" # 64-bit Intel/AMD Linux
@@ -26,21 +28,30 @@
]; ];
# Helper to provide system-specific attributes # Helper to provide system-specific attributes
forAllSystems = f: forAllSystems =
nixpkgs.lib.genAttrs supportedSystems (system: f:
nixpkgs.lib.genAttrs supportedSystems (
system:
f { f {
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
}; };
}); }
in { );
nixosModules.default.imports = [./nixarr vpnconfinement.nixosModules.default]; in
{
nixosModules.default.imports = [
./nixarr
vpnconfinement.nixosModules.default
];
# Add tests attribute to the flake outputs # Add tests attribute to the flake outputs
# To run interactively run: # To run interactively run:
# > nix build .#checks.x86_64-linux.monitoring-test.driver -L # > nix build .#checks.x86_64-linux.monitoring-test.driver -L
checks = forAllSystems ({pkgs}: { checks = forAllSystems (
{ pkgs }:
{
permissions-test = pkgs.callPackage ./tests/permissions-test.nix { permissions-test = pkgs.callPackage ./tests/permissions-test.nix {
inherit (self) nixosModules; inherit (self) nixosModules;
}; };
@@ -50,18 +61,24 @@
# vpn-confinement-test = pkgs.callPackage ./tests/vpn-confinement-test.nix { # vpn-confinement-test = pkgs.callPackage ./tests/vpn-confinement-test.nix {
# inherit (self) nixosModules; # inherit (self) nixosModules;
# }; # };
}); }
);
devShells = forAllSystems ({pkgs}: { devShells = forAllSystems (
{ pkgs }:
{
default = pkgs.mkShell { default = pkgs.mkShell {
packages = with pkgs; [ packages = with pkgs; [
alejandra alejandra
nixd nixd
]; ];
}; };
}); }
);
packages = forAllSystems ({pkgs}: let packages = forAllSystems (
{ pkgs }:
let
website = website-builder.lib { website = website-builder.lib {
pkgs = pkgs; pkgs = pkgs;
src = "${self}"; src = "${self}";
@@ -74,8 +91,8 @@
outputFile = "index.html"; outputFile = "index.html";
} }
]; ];
includedDirs = ["docs"]; includedDirs = [ "docs" ];
articleDirs = ["docs/wiki"]; articleDirs = [ "docs/wiki" ];
navbar = [ navbar = [
{ {
title = "Home"; title = "Home";
@@ -108,11 +125,13 @@
}; };
nixosModules = ./nixarr; nixosModules = ./nixarr;
}; };
in { in
{
default = website.package; default = website.package;
debug = website.loop; debug = website.loop;
}); }
);
formatter = forAllSystems ({pkgs}: pkgs.alejandra); formatter = forAllSystems ({ pkgs }: pkgs.alejandra);
}; };
} }