Rename package inputs. Allow dotnet 6.
This commit is contained in:
parent
2639b1a828
commit
26f031dea8
2 changed files with 26 additions and 52 deletions
51
flake.lock
generated
51
flake.lock
generated
|
@ -15,7 +15,7 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"feishin0_17": {
|
"feishin-0_17_0": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1751534869,
|
"lastModified": 1751534869,
|
||||||
"narHash": "sha256-kUYk/jPyX5Lnhv7vUUfNVSHUDA8k28xi2H5bt6a1EHg=",
|
"narHash": "sha256-kUYk/jPyX5Lnhv7vUUfNVSHUDA8k28xi2H5bt6a1EHg=",
|
||||||
|
@ -68,7 +68,7 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"fluffychat2": {
|
"fluffychat-2_0_0": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1751127166,
|
"lastModified": 1751127166,
|
||||||
"narHash": "sha256-dX9VUpl3YM9XexkU+QGj1UfptYy/jIOeB3tSMtJSRgE=",
|
"narHash": "sha256-dX9VUpl3YM9XexkU+QGj1UfptYy/jIOeB3tSMtJSRgE=",
|
||||||
|
@ -162,11 +162,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1751582995,
|
"lastModified": 1751741127,
|
||||||
"narHash": "sha256-u7ubvtxdTnFPpV27AHpgoKn7qHuE7sgWgza/1oj5nzA=",
|
"narHash": "sha256-t75Shs76NgxjZSgvvZZ9qOmz5zuBE8buUaYD28BMTxg=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "7a732ed41ca0dd64b4b71b563ab9805a80a7d693",
|
"rev": "29e290002bfff26af1db6f64d070698019460302",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -192,22 +192,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1751741127,
|
|
||||||
"narHash": "sha256-t75Shs76NgxjZSgvvZZ9qOmz5zuBE8buUaYD28BMTxg=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "29e290002bfff26af1db6f64d070698019460302",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixos-25.05",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"pre-commit-hooks-nix": {
|
"pre-commit-hooks-nix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": [
|
"flake-compat": [
|
||||||
|
@ -236,14 +220,13 @@
|
||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"feishin0_17": "feishin0_17",
|
"feishin-0_17_0": "feishin-0_17_0",
|
||||||
"fluffychat2": "fluffychat2",
|
"fluffychat-2_0_0": "fluffychat-2_0_0",
|
||||||
"lanzaboote": "lanzaboote",
|
"lanzaboote": "lanzaboote",
|
||||||
"nixos-hardware": "nixos-hardware",
|
"nixos-hardware": "nixos-hardware",
|
||||||
"nixpkgs": "nixpkgs_2",
|
"nixpkgs": "nixpkgs_2",
|
||||||
"secrets": "secrets",
|
"secrets": "secrets",
|
||||||
"sops-nix": "sops-nix",
|
"sops-nix": "sops-nix"
|
||||||
"webone": "webone"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"rust-overlay": {
|
"rust-overlay": {
|
||||||
|
@ -301,24 +284,6 @@
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"webone": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": "nixpkgs_4"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1752031448,
|
|
||||||
"narHash": "sha256-5cWr89OO+rt0saYETbLOIsKG0XYQqlgZ33xUMeQ1a1M=",
|
|
||||||
"owner": "firewalkwithm3",
|
|
||||||
"repo": "webone",
|
|
||||||
"rev": "04cbb02463e52fd917944ee3f7174218d6fa42a5",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "firewalkwithm3",
|
|
||||||
"repo": "webone",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": "root",
|
"root": "root",
|
||||||
|
|
27
flake.nix
27
flake.nix
|
@ -13,9 +13,8 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
# Packages.
|
# Packages.
|
||||||
fluffychat2.url = "github:NixOS/nixpkgs?ref=pull/419632/head"; # FluffyChat 2.0.0
|
fluffychat-2_0_0.url = "github:NixOS/nixpkgs?ref=pull/419632/head"; # FluffyChat 2.0.0
|
||||||
feishin0_17.url = "github:NixOS/nixpkgs?ref=pull/414929/head"; # Feishin 0.17.0
|
feishin-0_17_0.url = "github:NixOS/nixpkgs?ref=pull/414929/head"; # Feishin 0.17.0
|
||||||
webone.url = "github:firewalkwithm3/webone"; # WebOne HTTP proxy.
|
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs =
|
outputs =
|
||||||
|
@ -25,9 +24,8 @@
|
||||||
lanzaboote,
|
lanzaboote,
|
||||||
nixos-hardware,
|
nixos-hardware,
|
||||||
sops-nix,
|
sops-nix,
|
||||||
fluffychat2,
|
fluffychat-2_0_0,
|
||||||
feishin0_17,
|
feishin-0_17_0,
|
||||||
webone,
|
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
with nixpkgs.lib;
|
with nixpkgs.lib;
|
||||||
|
@ -43,6 +41,17 @@
|
||||||
nixosSystem rec {
|
nixosSystem rec {
|
||||||
system = platform;
|
system = platform;
|
||||||
|
|
||||||
|
pkgs = import nixpkgs {
|
||||||
|
inherit system;
|
||||||
|
config = {
|
||||||
|
allowUnfree = true;
|
||||||
|
permittedInsecurePackages = [
|
||||||
|
"dotnet-sdk-6.0.428"
|
||||||
|
"dotnet-runtime-6.0.36"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
specialArgs = {
|
specialArgs = {
|
||||||
inherit
|
inherit
|
||||||
hostname
|
hostname
|
||||||
|
@ -52,9 +61,9 @@
|
||||||
; # Inherit variables.
|
; # Inherit variables.
|
||||||
|
|
||||||
userPackages = {
|
userPackages = {
|
||||||
fluffychat = fluffychat2.legacyPackages.${system}.fluffychat;
|
fluffychat = fluffychat-2_0_0.legacyPackages.${system}.fluffychat;
|
||||||
feishin = feishin0_17.legacyPackages.${system}.feishin;
|
feishin = feishin-0_17_0.legacyPackages.${system}.feishin;
|
||||||
webone = webone.packages.${system}.default;
|
webone = pkgs.callPackage ./packages/webone { };
|
||||||
};
|
};
|
||||||
|
|
||||||
secrets = builtins.toString inputs.secrets; # Secrets directory.
|
secrets = builtins.toString inputs.secrets; # Secrets directory.
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue