Updated submerge dependency
This commit is contained in:
Generated
+8
-8
@@ -98,7 +98,7 @@
|
||||
"flake-parts": "flake-parts",
|
||||
"flake-root": "flake-root",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"sub-merge": "sub-merge",
|
||||
"submerger": "submerger",
|
||||
"treefmt-nix": "treefmt-nix",
|
||||
"vpnconfinement": "vpnconfinement"
|
||||
}
|
||||
@@ -106,7 +106,7 @@
|
||||
"rust-overlay": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"sub-merge",
|
||||
"submerger",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
@@ -124,7 +124,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"sub-merge": {
|
||||
"submerger": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
@@ -132,16 +132,16 @@
|
||||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726777757,
|
||||
"narHash": "sha256-erzx+U/itU8MmIj1lhYoKHElCWaHJetsUihTlfW2OrQ=",
|
||||
"lastModified": 1726842908,
|
||||
"narHash": "sha256-sn3oWKcdXmy42wsBg1yCFBHHRCKVkQ+D8YnlLY/RX3A=",
|
||||
"owner": "rasmus-kirk",
|
||||
"repo": "sub-merge",
|
||||
"rev": "01e8d59a07a6841a2ac17f5cf73f077e47bf2ec4",
|
||||
"repo": "submerger",
|
||||
"rev": "6ffa3b28017d9d67c48a2f9de98788da05aa5ba2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "rasmus-kirk",
|
||||
"repo": "sub-merge",
|
||||
"repo": "submerger",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
|
||||
@@ -12,8 +12,8 @@
|
||||
vpnconfinement.url = "github:Maroka-chan/VPN-Confinement";
|
||||
vpnconfinement.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
sub-merge.url = "github:rasmus-kirk/sub-merge";
|
||||
sub-merge.inputs.nixpkgs.follows = "nixpkgs";
|
||||
submerger.url = "github:rasmus-kirk/submerger";
|
||||
submerger.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
# Flake stuff
|
||||
flake-parts.url = "github:hercules-ci/flake-parts";
|
||||
@@ -31,7 +31,7 @@
|
||||
outputs = {
|
||||
flake-parts,
|
||||
vpnconfinement,
|
||||
sub-merge,
|
||||
submerger,
|
||||
...
|
||||
} @ inputs:
|
||||
flake-parts.lib.mkFlake {
|
||||
@@ -48,9 +48,8 @@
|
||||
|
||||
flake = {
|
||||
nixosModules = rec {
|
||||
nixarr = import ./nixarr sub-merge vpnconfinement;
|
||||
nixarr = import ./nixarr submerger vpnconfinement;
|
||||
imports = [ vpnconfinement.nixosModules.default ];
|
||||
#specialArgs = { inherit sub-merge; };
|
||||
default = nixarr;
|
||||
};
|
||||
};
|
||||
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
sub-merge: vpnconfinement: { pkgs, ... }: {
|
||||
submerger: vpnconfinement: { pkgs, ... }: {
|
||||
imports = [
|
||||
vpnconfinement.nixosModules.default
|
||||
./nixarr.nix
|
||||
];
|
||||
|
||||
config.environment.systemPackages = [ sub-merge.packages."${pkgs.system}".default ];
|
||||
config.environment.systemPackages = [ submerger.packages."${pkgs.system}".default ];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user