From d472b07cffa5d70f912f2d3de8e06fb6aa6a8469 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Mon, 30 Sep 2024 23:45:26 +0800 Subject: [PATCH] fixup --- hosts/dust/default.nix | 2 +- hosts/vultr/sin0/anti-feature.nix | 10 +++++++++- hosts/vultr/sin0/default.nix | 1 + overlays/default.nix | 4 ++-- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/hosts/dust/default.nix b/hosts/dust/default.nix index b304861..274fb01 100644 --- a/hosts/dust/default.nix +++ b/hosts/dust/default.nix @@ -149,7 +149,7 @@ "Noto Color Emoji" ]; }; - # GitHub perfers Noto Sans... + # GitHub prefers Noto Sans... localConf = '' diff --git a/hosts/vultr/sin0/anti-feature.nix b/hosts/vultr/sin0/anti-feature.nix index 7d0b179..11ce82d 100644 --- a/hosts/vultr/sin0/anti-feature.nix +++ b/hosts/vultr/sin0/anti-feature.nix @@ -2,7 +2,15 @@ { nixpkgs.config = { allowNonSource = false; - allowNonSourcePredicate = pkg: lib.elem (lib.getName pkg) [ ]; + allowNonSourcePredicate = + pkg: + lib.elem (lib.getName pkg) [ + "cargo-bootstrap" + "go" + "rustc-bootstrap" + "rustc-bootstrap-wrapper" + "sof-firmware" + ]; allowUnfree = false; allowUnfreePredicate = pkg: lib.elem (lib.getName pkg) [ ]; diff --git a/hosts/vultr/sin0/default.nix b/hosts/vultr/sin0/default.nix index 458ff3b..5f761fb 100644 --- a/hosts/vultr/sin0/default.nix +++ b/hosts/vultr/sin0/default.nix @@ -1,6 +1,7 @@ { ... }: { imports = [ + ./anti-feature.nix ./ports.nix ./services/redlib.nix diff --git a/overlays/default.nix b/overlays/default.nix index c9fceb6..5f044f2 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -23,7 +23,7 @@ _final: prev: { }; # https://www.v2ex.com/t/1076579 - sing-box = prev.sing-box.overrideAttrs (rec { + sing-box = prev.sing-box.overrideAttrs rec { version = "1.10.0-beta.11"; src = prev.fetchFromGitHub { @@ -34,7 +34,7 @@ _final: prev: { }; vendorHash = "sha256-rsgrcVkIMUIobuGFBlDDQM05sljZXShsa1+10xxzmlA="; - }); + }; qt6Packages = prev.qt6Packages.overrideScope ( _final': prev': {