Monorepo for Tangled tangled.org

nix: use non-static builds for knot module

Signed-off-by: oppiliappan <me@oppi.li>

oppi.li 9bea45fe dc7f387d

verified
Changed files
+35 -26
nix
+33 -25
flake.nix
··· 54 inherit (gitignore.lib) gitignoreSource; 55 in { 56 overlays.default = final: prev: let 57 - goModHash = "sha256-PJd2UvQJ7HVp2+s+QZPwL2FcdbSsRDxQZHV9hGotB2Y="; 58 appviewDeps = { 59 inherit htmx-src lucide-src inter-fonts-src ibm-plex-mono-src goModHash gitignoreSource; 60 }; 61 knotDeps = { 62 inherit goModHash gitignoreSource; 63 }; 64 - in { 65 - lexgen = final.callPackage ./nix/pkgs/lexgen.nix {inherit indigo;}; 66 - appview = final.pkgsStatic.callPackage ./nix/pkgs/appview.nix appviewDeps; 67 - appview-cross = final.pkgsCross.gnu64.pkgsStatic.callPackage ./nix/pkgs/appview.nix appviewDeps; 68 - knot = final.pkgsStatic.callPackage ./nix/pkgs/knot.nix {}; 69 - knot-unwrapped = final.pkgsStatic.callPackage ./nix/pkgs/knot-unwrapped.nix knotDeps; 70 - knot-cross = final.pkgsCross.gnu64.pkgsStatic.callPackage ./nix/pkgs/knot.nix knotDeps; 71 - sqlite-lib = final.pkgsStatic.callPackage ./nix/pkgs/sqlite-lib.nix { 72 - inherit (final.pkgsStatic) gcc; 73 - inherit sqlite-lib-src; 74 }; 75 - genjwks = final.callPackage ./nix/pkgs/genjwks.nix {inherit goModHash gitignoreSource;}; 76 - }; 77 78 - packages = forAllSystems (system: { 79 - inherit 80 - (nixpkgsFor."${system}") 81 - lexgen 82 - appview 83 - appview-cross 84 - knot 85 - knot-cross 86 - knot-unwrapped 87 - genjwks 88 - sqlite-lib 89 - ; 90 }); 91 defaultPackage = forAllSystems (system: nixpkgsFor.${system}.appview); 92 formatter = forAllSystems (system: nixpkgsFor."${system}".alejandra);
··· 54 inherit (gitignore.lib) gitignoreSource; 55 in { 56 overlays.default = final: prev: let 57 + goModHash = "sha256-G+59ZwQwBbnO9ZjAB5zMEmWZbeG4k7ko/lPz+ceqYKs="; 58 appviewDeps = { 59 inherit htmx-src lucide-src inter-fonts-src ibm-plex-mono-src goModHash gitignoreSource; 60 }; 61 knotDeps = { 62 inherit goModHash gitignoreSource; 63 }; 64 + mkPackageSet = pkgs: { 65 + lexgen = pkgs.callPackage ./nix/pkgs/lexgen.nix {inherit indigo;}; 66 + appview = pkgs.callPackage ./nix/pkgs/appview.nix appviewDeps; 67 + knot = pkgs.callPackage ./nix/pkgs/knot.nix {}; 68 + knot-unwrapped = pkgs.callPackage ./nix/pkgs/knot-unwrapped.nix knotDeps; 69 + sqlite-lib = pkgs.callPackage ./nix/pkgs/sqlite-lib.nix { 70 + inherit (pkgs) gcc; 71 + inherit sqlite-lib-src; 72 + }; 73 + genjwks = pkgs.callPackage ./nix/pkgs/genjwks.nix {inherit goModHash gitignoreSource;}; 74 }; 75 + in 76 + mkPackageSet final; 77 78 + packages = forAllSystems (system: let 79 + pkgs = nixpkgsFor.${system}; 80 + staticPkgs = pkgs.pkgsStatic; 81 + crossPkgs = pkgs.pkgsCross.gnu64.pkgsStatic; 82 + in { 83 + appview = pkgs.appview; 84 + lexgen = pkgs.lexgen; 85 + knot = pkgs.knot; 86 + knot-unwrapped = pkgs.knot-unwrapped; 87 + genjwks = pkgs.genjwks; 88 + sqlite-lib = pkgs.sqlite-lib; 89 + 90 + pkgsStatic-appview = staticPkgs.appview; 91 + pkgsStatic-knot = staticPkgs.knot; 92 + pkgsStatic-knot-unwrapped = staticPkgs.knot-unwrapped; 93 + pkgsStatic-sqlite-lib = staticPkgs.sqlite-lib; 94 + 95 + pkgsCross-gnu64-pkgsStatic-appview = crossPkgs.appview; 96 + pkgsCross-gnu64-pkgsStatic-knot = crossPkgs.knot; 97 + pkgsCross-gnu64-pkgsStatic-knot-unwrapped = crossPkgs.knot-unwrapped; 98 }); 99 defaultPackage = forAllSystems (system: nixpkgsFor.${system}.appview); 100 formatter = forAllSystems (system: nixpkgsFor."${system}".alejandra);
+1 -1
go.mod
··· 38 github.com/yuin/goldmark v1.4.13 39 golang.org/x/crypto v0.38.0 40 golang.org/x/net v0.40.0 41 - golang.org/x/sync v0.14.0 42 golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da 43 gopkg.in/yaml.v3 v3.0.1 44 tangled.sh/icyphox.sh/atproto-oauth v0.0.0-20250526154904-3906c5336421 ··· 144 go.uber.org/multierr v1.11.0 // indirect 145 go.uber.org/zap v1.27.0 // indirect 146 golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect 147 golang.org/x/sys v0.33.0 // indirect 148 golang.org/x/time v0.8.0 // indirect 149 google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237 // indirect
··· 38 github.com/yuin/goldmark v1.4.13 39 golang.org/x/crypto v0.38.0 40 golang.org/x/net v0.40.0 41 golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da 42 gopkg.in/yaml.v3 v3.0.1 43 tangled.sh/icyphox.sh/atproto-oauth v0.0.0-20250526154904-3906c5336421 ··· 143 go.uber.org/multierr v1.11.0 // indirect 144 go.uber.org/zap v1.27.0 // indirect 145 golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect 146 + golang.org/x/sync v0.14.0 // indirect 147 golang.org/x/sys v0.33.0 // indirect 148 golang.org/x/time v0.8.0 // indirect 149 google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237 // indirect
+1
nix/pkgs/genjwks.nix
··· 9 src = gitignoreSource ../..; 10 subPackages = ["cmd/genjwks"]; 11 vendorHash = goModHash; 12 env.CGO_ENABLED = 0; 13 }
··· 9 src = gitignoreSource ../..; 10 subPackages = ["cmd/genjwks"]; 11 vendorHash = goModHash; 12 + doCheck = false; 13 env.CGO_ENABLED = 0; 14 }