diff --git a/flake.lock b/flake.lock index b3a2c29..929b18d 100755 --- a/flake.lock +++ b/flake.lock @@ -15,7 +15,7 @@ "type": "github" } }, - "feishin-0_17_0": { + "feishin0_17": { "locked": { "lastModified": 1751534869, "narHash": "sha256-kUYk/jPyX5Lnhv7vUUfNVSHUDA8k28xi2H5bt6a1EHg=", @@ -68,7 +68,7 @@ "type": "github" } }, - "fluffychat-2_0_0": { + "fluffychat2": { "locked": { "lastModified": 1751127166, "narHash": "sha256-dX9VUpl3YM9XexkU+QGj1UfptYy/jIOeB3tSMtJSRgE=", @@ -162,11 +162,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1751741127, - "narHash": "sha256-t75Shs76NgxjZSgvvZZ9qOmz5zuBE8buUaYD28BMTxg=", + "lastModified": 1751582995, + "narHash": "sha256-u7ubvtxdTnFPpV27AHpgoKn7qHuE7sgWgza/1oj5nzA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "29e290002bfff26af1db6f64d070698019460302", + "rev": "7a732ed41ca0dd64b4b71b563ab9805a80a7d693", "type": "github" }, "original": { @@ -192,6 +192,22 @@ "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": [ @@ -220,13 +236,14 @@ }, "root": { "inputs": { - "feishin-0_17_0": "feishin-0_17_0", - "fluffychat-2_0_0": "fluffychat-2_0_0", + "feishin0_17": "feishin0_17", + "fluffychat2": "fluffychat2", "lanzaboote": "lanzaboote", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", "secrets": "secrets", - "sops-nix": "sops-nix" + "sops-nix": "sops-nix", + "webone": "webone" } }, "rust-overlay": { @@ -284,6 +301,24 @@ "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 5df0fa9..5f8283e 100755 --- a/flake.nix +++ b/flake.nix @@ -13,8 +13,9 @@ }; # Packages. - 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 + 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. }; outputs = @@ -24,8 +25,9 @@ lanzaboote, nixos-hardware, sops-nix, - fluffychat-2_0_0, - feishin-0_17_0, + fluffychat2, + feishin0_17, + webone, ... }: with nixpkgs.lib; @@ -41,17 +43,6 @@ 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 @@ -61,9 +52,9 @@ ; # Inherit variables. userPackages = { - fluffychat = fluffychat-2_0_0.legacyPackages.${system}.fluffychat; - feishin = feishin-0_17_0.legacyPackages.${system}.feishin; - webone = pkgs.callPackage ./packages/webone { }; + fluffychat = fluffychat2.legacyPackages.${system}.fluffychat; + feishin = feishin0_17.legacyPackages.${system}.feishin; + webone = webone.packages.${system}.default; }; secrets = builtins.toString inputs.secrets; # Secrets directory. diff --git a/packages/webone/default.nix b/packages/webone/default.nix deleted file mode 100644 index fc35a19..0000000 --- a/packages/webone/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - fetchFromGitHub, - buildDotnetModule, - dotnetCorePackages, - ... -}: - -buildDotnetModule rec { - pname = "webone"; - version = "0.17.5"; - - src = fetchFromGitHub { - owner = "atauenis"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-Dybm0Yl3f6Q7bjDRZHn7hCIYBryS93PtzFLC2V+LzXg="; - }; - - projectFile = "WebOne.csproj"; - nugetDeps = ./deps.nix; - - dotnet-sdk = dotnetCorePackages.sdk_6_0; - dotnet-runtime = dotnetCorePackages.runtime_6_0; - - meta = { - homepage = "https://github.com/atauenis/webone"; - description = "HTTP 1.x proxy that makes old web browsers usable again in the Web 2.0 world."; - }; -} diff --git a/packages/webone/deps.nix b/packages/webone/deps.nix deleted file mode 100644 index e63816d..0000000 --- a/packages/webone/deps.nix +++ /dev/null @@ -1,77 +0,0 @@ -# This file was automatically generated by passthru.fetch-deps. -# Please dont edit it manually, your changes might get overwritten! -# TODO: This format file is obsolete, consider migrating to JSON. - -{ fetchNuGet }: -[ - (fetchNuGet { - pname = "Microsoft.NETCore.Platforms"; - version = "3.1.0"; - hash = "sha256-cnygditsEaU86bnYtIthNMymAHqaT/sf9Gjykhzqgb0="; - }) - (fetchNuGet { - pname = "Microsoft.Win32.Registry"; - version = "4.7.0"; - hash = "sha256-+jWCwRqU/J/jLdQKDFm93WfIDrDMXMJ984UevaQMoi8="; - }) - (fetchNuGet { - pname = "Microsoft.Win32.SystemEvents"; - version = "4.7.0"; - hash = "sha256-GHxnD1Plb32GJWVWSv0Y51Kgtlb+cdKgOYVBYZSgVF4="; - }) - (fetchNuGet { - pname = "Packaging.Targets"; - version = "0.1.232"; - hash = "sha256-boiMjc7oglq472AMH23qnzyLsDkGuCr9n0ijZoH9zYE="; - }) - (fetchNuGet { - pname = "System.Buffers"; - version = "4.5.1"; - hash = "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="; - }) - (fetchNuGet { - pname = "System.Configuration.ConfigurationManager"; - version = "4.7.0"; - hash = "sha256-rYjp/UmagI4ZULU1ocia/AiXxLNL8uhMV8LBF4QFW10="; - }) - (fetchNuGet { - pname = "System.Diagnostics.PerformanceCounter"; - version = "4.7.0"; - hash = "sha256-gcanKBgh7EWUJxfa7h9f/HkfTtGRp0BLg9fVDIhjANQ="; - }) - (fetchNuGet { - pname = "System.Drawing.Common"; - version = "4.7.0"; - hash = "sha256-D3qG+xAe78lZHvlco9gHK2TEAM370k09c6+SQi873Hk="; - }) - (fetchNuGet { - pname = "System.Security.AccessControl"; - version = "4.7.0"; - hash = "sha256-/9ZCPIHLdhzq7OW4UKqTsR0O93jjHd6BRG1SRwgHE1g="; - }) - (fetchNuGet { - pname = "System.Security.Cryptography.ProtectedData"; - version = "4.7.0"; - hash = "sha256-dZfs5q3Ij1W1eJCfYjxI2o+41aSiFpaAugpoECaCOug="; - }) - (fetchNuGet { - pname = "System.Security.Permissions"; - version = "4.7.0"; - hash = "sha256-BGgXMLUi5rxVmmChjIhcXUxisJjvlNToXlyaIbUxw40="; - }) - (fetchNuGet { - pname = "System.Security.Principal.Windows"; - version = "4.7.0"; - hash = "sha256-rWBM2U8Kq3rEdaa1MPZSYOOkbtMGgWyB8iPrpIqmpqg="; - }) - (fetchNuGet { - pname = "System.Text.Encoding.CodePages"; - version = "4.7.0"; - hash = "sha256-/wLj3mcmScFAD/9cxmKyQnfdbaF9Mr/lpCuEsMarygM="; - }) - (fetchNuGet { - pname = "System.Windows.Extensions"; - version = "4.7.0"; - hash = "sha256-yW+GvQranReaqPw5ZFv+mSjByQ5y1pRLl05JIEf3tYU="; - }) -] diff --git a/suites/common.nix b/suites/common.nix index 9ecb45d..f53627b 100644 --- a/suites/common.nix +++ b/suites/common.nix @@ -16,6 +16,9 @@ with lib; "flakes" ]; + # Allow unfree packages. + nixpkgs.config.allowUnfree = true; + # Enable redistributable firmware. hardware.enableRedistributableFirmware = true;