From 6522bfff17b01768df0a0fbb2f0ce405049fd906 Mon Sep 17 00:00:00 2001 From: oppiliappan Date: Thu, 19 Jun 2025 10:38:23 +0000 Subject: [PATCH] nix: use non-static builds for knot module Signed-off-by: oppiliappan --- flake.nix | 62 +++++++++++++++++++++++++++++++++++++------------------------- go.mod | 4 ++-- go.sum | 4 ++-- nix/pkgs/genjwks.nix | 1 + 4 file(s) changed, 42 insertion(s)(+), 29 deletion(s)(-) diff --git a/flake.nix b/flake.nix --- a/flake.nix +++ b/flake.nix @@ -54,39 +54,51 @@ inherit (gitignore.lib) gitignoreSource; in { overlays.default = final: prev: let - goModHash = "sha256-QPyeKKr7YMblwicQNemu3OamXwg7fVie6/IY10vQCl4="; + goModHash = "sha256-+OQfLBXd5OQuITHRPaxXQs49vPGfQfsNJzpcjJjeHKs="; appviewDeps = { inherit htmx-src lucide-src inter-fonts-src ibm-plex-mono-src goModHash gitignoreSource; }; knotDeps = { inherit goModHash gitignoreSource; }; - in { - lexgen = final.callPackage ./nix/pkgs/lexgen.nix {inherit indigo;}; - appview = final.pkgsStatic.callPackage ./nix/pkgs/appview.nix appviewDeps; - appview-cross = final.pkgsCross.gnu64.pkgsStatic.callPackage ./nix/pkgs/appview.nix appviewDeps; - knot = final.pkgsStatic.callPackage ./nix/pkgs/knot.nix {}; - knot-unwrapped = final.pkgsStatic.callPackage ./nix/pkgs/knot-unwrapped.nix knotDeps; - knot-cross = final.pkgsCross.gnu64.pkgsStatic.callPackage ./nix/pkgs/knot.nix knotDeps; - sqlite-lib = final.pkgsStatic.callPackage ./nix/pkgs/sqlite-lib.nix { - inherit (final.pkgsStatic) gcc; - inherit sqlite-lib-src; + mkPackageSet = pkgs: { + lexgen = pkgs.callPackage ./nix/pkgs/lexgen.nix {inherit indigo;}; + appview = pkgs.callPackage ./nix/pkgs/appview.nix appviewDeps; + # appview-static = final.pkgsStatic.callPackage ./nix/pkgs/appview.nix appviewDeps; + # appview-cross = final.pkgsCross.gnu64.pkgsStatic.callPackage ./nix/pkgs/appview.nix appviewDeps; + knot = pkgs.callPackage ./nix/pkgs/knot.nix {}; + # knot-static = final.pkgsStatic.callPackage ./nix/pkgs/knot.nix {}; + knot-unwrapped = pkgs.callPackage ./nix/pkgs/knot-unwrapped.nix knotDeps; + # knot-unwrapped-static = final.pkgsStatic.callPackage ./nix/pkgs/knot-unwrapped.nix knotDeps; + # knot-cross = final.pkgsCross.gnu64.pkgsStatic.callPackage ./nix/pkgs/knot.nix knotDeps; + sqlite-lib = pkgs.callPackage ./nix/pkgs/sqlite-lib.nix { + inherit (pkgs) gcc; + inherit sqlite-lib-src; + }; + genjwks = pkgs.callPackage ./nix/pkgs/genjwks.nix {inherit goModHash gitignoreSource;}; }; - genjwks = final.callPackage ./nix/pkgs/genjwks.nix {inherit goModHash gitignoreSource;}; - }; + in mkPackageSet final; - packages = forAllSystems (system: { - inherit - (nixpkgsFor."${system}") - lexgen - appview - appview-cross - knot - knot-cross - knot-unwrapped - genjwks - sqlite-lib - ; + packages = forAllSystems (system: let + pkgs = nixpkgsFor.${system}; + staticPkgs = pkgs.pkgsStatic; + crossPkgs = pkgs.pkgsCross.gnu64.pkgsStatic; + in { + appview = pkgs.appview; + lexgen = pkgs.lexgen; + knot = pkgs.knot; + knot-unwrapped = pkgs.knot-unwrapped; + genjwks = pkgs.genjwks; + sqlite-lib = pkgs.sqlite-lib; + + pkgsStatic-appview = staticPkgs.appview; + pkgsStatic-knot = staticPkgs.knot; + pkgsStatic-knot-unwrapped = staticPkgs.knot-unwrapped; + pkgsStatic-sqlite-lib = staticPkgs.sqlite-lib; + + pkgsCross-gnu64-pkgsStatic-appview = crossPkgs.appview; + pkgsCross-gnu64-pkgsStatic-knot = crossPkgs.knot; + pkgsCross-gnu64-pkgsStatic-knot-unwrapped = crossPkgs.knot-unwrapped; }); defaultPackage = forAllSystems (system: nixpkgsFor.${system}.appview); formatter = forAllSystems (system: nixpkgsFor."${system}".alejandra); diff --git a/go.mod b/go.mod --- a/go.mod +++ b/go.mod @@ -28,6 +28,7 @@ github.com/mattn/go-sqlite3 v1.14.24 github.com/microcosm-cc/bluemonday v1.0.27 github.com/posthog/posthog-go v1.5.5 + github.com/redis/go-redis/v9 v9.3.0 github.com/resend/resend-go/v2 v2.15.0 github.com/sethvargo/go-envconfig v1.1.0 github.com/stretchr/testify v1.10.0 @@ -35,7 +36,7 @@ github.com/whyrusleeping/cbor-gen v0.3.1 github.com/yuin/goldmark v1.4.13 golang.org/x/crypto v0.38.0 - golang.org/x/net v0.39.0 + golang.org/x/net v0.40.0 golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da gopkg.in/yaml.v3 v3.0.1 tangled.sh/icyphox.sh/atproto-oauth v0.0.0-20250526154904-3906c5336421 @@ -111,7 +112,6 @@ github.com/prometheus/client_model v0.6.2 // indirect github.com/prometheus/common v0.63.0 // indirect github.com/prometheus/procfs v0.16.1 // indirect - github.com/redis/go-redis/v9 v9.3.0 // indirect github.com/segmentio/asm v1.2.0 // indirect github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect diff --git a/go.sum b/go.sum --- a/go.sum +++ b/go.sum @@ -435,8 +435,8 @@ golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= -golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY= -golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E= +golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY= +golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= diff --git a/nix/pkgs/genjwks.nix b/nix/pkgs/genjwks.nix --- a/nix/pkgs/genjwks.nix +++ b/nix/pkgs/genjwks.nix @@ -9,5 +9,6 @@ src = gitignoreSource ../..; subPackages = ["cmd/genjwks"]; vendorHash = goModHash; + doCheck = false; env.CGO_ENABLED = 0; } -- tangled.sh