diff --git a/flake.lock b/flake.lock index 929b18d..b3a2c29 100755 --- a/flake.lock +++ b/flake.lock @@ -15,7 +15,7 @@ "type": "github" } }, - "feishin0_17": { + "feishin-0_17_0": { "locked": { "lastModified": 1751534869, "narHash": "sha256-kUYk/jPyX5Lnhv7vUUfNVSHUDA8k28xi2H5bt6a1EHg=", @@ -68,7 +68,7 @@ "type": "github" } }, - "fluffychat2": { + "fluffychat-2_0_0": { "locked": { "lastModified": 1751127166, "narHash": "sha256-dX9VUpl3YM9XexkU+QGj1UfptYy/jIOeB3tSMtJSRgE=", @@ -162,11 +162,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1751582995, - "narHash": "sha256-u7ubvtxdTnFPpV27AHpgoKn7qHuE7sgWgza/1oj5nzA=", + "lastModified": 1751741127, + "narHash": "sha256-t75Shs76NgxjZSgvvZZ9qOmz5zuBE8buUaYD28BMTxg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7a732ed41ca0dd64b4b71b563ab9805a80a7d693", + "rev": "29e290002bfff26af1db6f64d070698019460302", "type": "github" }, "original": { @@ -192,22 +192,6 @@ "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": { "inputs": { "flake-compat": [ @@ -236,14 +220,13 @@ }, "root": { "inputs": { - "feishin0_17": "feishin0_17", - "fluffychat2": "fluffychat2", + "feishin-0_17_0": "feishin-0_17_0", + "fluffychat-2_0_0": "fluffychat-2_0_0", "lanzaboote": "lanzaboote", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", "secrets": "secrets", - "sops-nix": "sops-nix", - "webone": "webone" + "sops-nix": "sops-nix" } }, "rust-overlay": { @@ -301,24 +284,6 @@ "repo": "sops-nix", "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", diff --git a/flake.nix b/flake.nix index 5f8283e..5df0fa9 100755 --- a/flake.nix +++ b/flake.nix @@ -13,9 +13,8 @@ }; # Packages. - fluffychat2.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 - webone.url = "github:firewalkwithm3/webone"; # WebOne HTTP proxy. + fluffychat-2_0_0.url = "github:NixOS/nixpkgs?ref=pull/419632/head"; # FluffyChat 2.0.0 + feishin-0_17_0.url = "github:NixOS/nixpkgs?ref=pull/414929/head"; # Feishin 0.17.0 }; outputs = @@ -25,9 +24,8 @@ lanzaboote, nixos-hardware, sops-nix, - fluffychat2, - feishin0_17, - webone, + fluffychat-2_0_0, + feishin-0_17_0, ... }: with nixpkgs.lib; @@ -43,6 +41,17 @@ nixosSystem rec { system = platform; + pkgs = import nixpkgs { + inherit system; + config = { + allowUnfree = true; + permittedInsecurePackages = [ + "dotnet-sdk-6.0.428" + "dotnet-runtime-6.0.36" + ]; + }; + }; + specialArgs = { inherit hostname @@ -52,9 +61,9 @@ ; # Inherit variables. userPackages = { - fluffychat = fluffychat2.legacyPackages.${system}.fluffychat; - feishin = feishin0_17.legacyPackages.${system}.feishin; - webone = webone.packages.${system}.default; + fluffychat = fluffychat-2_0_0.legacyPackages.${system}.fluffychat; + feishin = feishin-0_17_0.legacyPackages.${system}.feishin; + webone = pkgs.callPackage ./packages/webone { }; }; secrets = builtins.toString inputs.secrets; # Secrets directory.