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

Updated submerge dependency

Browse Source
This commit is contained in:
rasmus-kirk
2024-09-20 17:45:17 +02:00
parent c93ecf892e
commit a3fad60dd2
3 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.lock
Generated
+8 -8
View File
@@ -98,7 +98,7 @@
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"flake-root": "flake-root", "flake-root": "flake-root",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"sub-merge": "sub-merge", "submerger": "submerger",
"treefmt-nix": "treefmt-nix", "treefmt-nix": "treefmt-nix",
"vpnconfinement": "vpnconfinement" "vpnconfinement": "vpnconfinement"
} }
@@ -106,7 +106,7 @@
"rust-overlay": { "rust-overlay": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"sub-merge", "submerger",
"nixpkgs" "nixpkgs"
] ]
}, },
@@ -124,7 +124,7 @@
"type": "github" "type": "github"
} }
}, },
"sub-merge": { "submerger": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
@@ -132,16 +132,16 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1726777757, "lastModified": 1726842908,
"narHash": "sha256-erzx+U/itU8MmIj1lhYoKHElCWaHJetsUihTlfW2OrQ=", "narHash": "sha256-sn3oWKcdXmy42wsBg1yCFBHHRCKVkQ+D8YnlLY/RX3A=",
"owner": "rasmus-kirk", "owner": "rasmus-kirk",
"repo": "sub-merge", "repo": "submerger",
"rev": "01e8d59a07a6841a2ac17f5cf73f077e47bf2ec4", "rev": "6ffa3b28017d9d67c48a2f9de98788da05aa5ba2",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "rasmus-kirk", "owner": "rasmus-kirk",
"repo": "sub-merge", "repo": "submerger",
"type": "github" "type": "github"
} }
}, },
flake.nix
+4 -5
View File
@@ -12,8 +12,8 @@
vpnconfinement.url = "github:Maroka-chan/VPN-Confinement"; vpnconfinement.url = "github:Maroka-chan/VPN-Confinement";
vpnconfinement.inputs.nixpkgs.follows = "nixpkgs"; vpnconfinement.inputs.nixpkgs.follows = "nixpkgs";
sub-merge.url = "github:rasmus-kirk/sub-merge"; submerger.url = "github:rasmus-kirk/submerger";
sub-merge.inputs.nixpkgs.follows = "nixpkgs"; submerger.inputs.nixpkgs.follows = "nixpkgs";
# Flake stuff # Flake stuff
flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.url = "github:hercules-ci/flake-parts";
@@ -31,7 +31,7 @@
outputs = { outputs = {
flake-parts, flake-parts,
vpnconfinement, vpnconfinement,
sub-merge, submerger,
... ...
} @ inputs: } @ inputs:
flake-parts.lib.mkFlake { flake-parts.lib.mkFlake {
@@ -48,9 +48,8 @@
flake = { flake = {
nixosModules = rec { nixosModules = rec {
nixarr = import ./nixarr sub-merge vpnconfinement; nixarr = import ./nixarr submerger vpnconfinement;
imports = [ vpnconfinement.nixosModules.default ]; imports = [ vpnconfinement.nixosModules.default ];
#specialArgs = { inherit sub-merge; };
default = nixarr; default = nixarr;
}; };
}; };
nixarr/default.nix
+2 -2
View File
@@ -1,8 +1,8 @@
sub-merge: vpnconfinement: { pkgs, ... }: { submerger: vpnconfinement: { pkgs, ... }: {
imports = [ imports = [
vpnconfinement.nixosModules.default vpnconfinement.nixosModules.default
./nixarr.nix ./nixarr.nix
]; ];
config.environment.systemPackages = [ sub-merge.packages."${pkgs.system}".default ]; config.environment.systemPackages = [ submerger.packages."${pkgs.system}".default ];
} }