Compare commits

...

3 commits

Author SHA1 Message Date
faeb8963e7 Move unfree config to flake. 2025-07-09 18:35:54 +08:00
90fe03e7c8 Add webone package 2025-07-09 18:35:45 +08:00
26f031dea8 Rename package inputs. Allow dotnet 6. 2025-07-09 18:35:36 +08:00
5 changed files with 132 additions and 55 deletions

51
flake.lock generated
View file

@ -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",

View file

@ -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.

View file

@ -0,0 +1,29 @@
{
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.";
};
}

77
packages/webone/deps.nix Normal file
View file

@ -0,0 +1,77 @@
# 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=";
})
]

View file

@ -16,9 +16,6 @@ with lib;
"flakes" "flakes"
]; ];
# Allow unfree packages.
nixpkgs.config.allowUnfree = true;
# Enable redistributable firmware. # Enable redistributable firmware.
hardware.enableRedistributableFirmware = true; hardware.enableRedistributableFirmware = true;