commit 6522bfff17b01768df0a0fbb2f0ce405049fd906 · julien.rbrt.fr/tangled-core

+37 -25

flake.nix

···

       54
       54
        
           inherit (gitignore.lib) gitignoreSource;

     

       55
       55
        
         in {

     

       56
       56
        
           overlays.default = final: prev: let

     

       57
       57
       -
             goModHash = "sha256-QPyeKKr7YMblwicQNemu3OamXwg7fVie6/IY10vQCl4=";

     

       57
       57
       +
             goModHash = "sha256-+OQfLBXd5OQuITHRPaxXQs49vPGfQfsNJzpcjJjeHKs=";

     

       58
       58
        
             appviewDeps = {

     

       59
       59
        
               inherit htmx-src lucide-src inter-fonts-src ibm-plex-mono-src goModHash gitignoreSource;

     

       60
       60
        
             };

     

       61
       61
        
             knotDeps = {

     

       62
       62
        
               inherit goModHash gitignoreSource;

     

       63
       63
        
             };

     

       64
       64
       -
           in {

     

       65
       65
       -
             lexgen = final.callPackage ./nix/pkgs/lexgen.nix {inherit indigo;};

     

       66
       66
       -
             appview = final.pkgsStatic.callPackage ./nix/pkgs/appview.nix appviewDeps;

     

       67
       67
       -
             appview-cross = final.pkgsCross.gnu64.pkgsStatic.callPackage ./nix/pkgs/appview.nix appviewDeps;

     

       68
       68
       -
             knot = final.pkgsStatic.callPackage ./nix/pkgs/knot.nix {};

     

       69
       69
       -
             knot-unwrapped = final.pkgsStatic.callPackage ./nix/pkgs/knot-unwrapped.nix knotDeps;

     

       70
       70
       -
             knot-cross = final.pkgsCross.gnu64.pkgsStatic.callPackage ./nix/pkgs/knot.nix knotDeps;

     

       71
       71
       -
             sqlite-lib = final.pkgsStatic.callPackage ./nix/pkgs/sqlite-lib.nix {

     

       72
       72
       -
               inherit (final.pkgsStatic) gcc;

     

       73
       73
       -
               inherit sqlite-lib-src;

     

       64
       64
       +
             mkPackageSet = pkgs: {

     

       65
       65
       +
                 lexgen = pkgs.callPackage ./nix/pkgs/lexgen.nix {inherit indigo;};

     

       66
       66
       +
                 appview = pkgs.callPackage ./nix/pkgs/appview.nix appviewDeps;

     

       67
       67
       +
                 # appview-static = final.pkgsStatic.callPackage ./nix/pkgs/appview.nix appviewDeps;

     

       68
       68
       +
                 # appview-cross = final.pkgsCross.gnu64.pkgsStatic.callPackage ./nix/pkgs/appview.nix appviewDeps;

     

       69
       69
       +
                 knot = pkgs.callPackage ./nix/pkgs/knot.nix {};

     

       70
       70
       +
                 # knot-static = final.pkgsStatic.callPackage ./nix/pkgs/knot.nix {};

     

       71
       71
       +
                 knot-unwrapped = pkgs.callPackage ./nix/pkgs/knot-unwrapped.nix knotDeps;

     

       72
       72
       +
                 # knot-unwrapped-static = final.pkgsStatic.callPackage ./nix/pkgs/knot-unwrapped.nix knotDeps;

     

       73
       73
       +
                 # knot-cross = final.pkgsCross.gnu64.pkgsStatic.callPackage ./nix/pkgs/knot.nix knotDeps;

     

       74
       74
       +
                 sqlite-lib = pkgs.callPackage ./nix/pkgs/sqlite-lib.nix {

     

       75
       75
       +
                     inherit (pkgs) gcc;

     

       76
       76
       +
                     inherit sqlite-lib-src; 

     

       77
       77
       +
                 };

     

       78
       78
       +
                 genjwks = pkgs.callPackage ./nix/pkgs/genjwks.nix {inherit goModHash gitignoreSource;};

     

       74
       79
        
             };

     

       75
       75
       -
             genjwks = final.callPackage ./nix/pkgs/genjwks.nix {inherit goModHash gitignoreSource;};

     

       76
       76
       -
           };

     

       80
       80
       +
           in mkPackageSet final;

     

       77
       81
        
       

     

       78
       78
       -
           packages = forAllSystems (system: {

     

       79
       79
       -
             inherit

     

       80
       80
       -
               (nixpkgsFor."${system}")

     

       81
       81
       -
               lexgen

     

       82
       82
       -
               appview

     

       83
       83
       -
               appview-cross

     

       84
       84
       -
               knot

     

       85
       85
       -
               knot-cross

     

       86
       86
       -
               knot-unwrapped

     

       87
       87
       -
               genjwks

     

       88
       88
       -
               sqlite-lib

     

       89
       89
       -
               ;

     

       82
       82
       +
           packages = forAllSystems (system: let

     

       83
       83
       +
               pkgs = nixpkgsFor.${system};

     

       84
       84
       +
               staticPkgs = pkgs.pkgsStatic;

     

       85
       85
       +
               crossPkgs = pkgs.pkgsCross.gnu64.pkgsStatic;

     

       86
       86
       +
           in {

     

       87
       87
       +
               appview = pkgs.appview;

     

       88
       88
       +
               lexgen = pkgs.lexgen;

     

       89
       89
       +
               knot = pkgs.knot;

     

       90
       90
       +
               knot-unwrapped = pkgs.knot-unwrapped;

     

       91
       91
       +
               genjwks = pkgs.genjwks;

     

       92
       92
       +
               sqlite-lib = pkgs.sqlite-lib;

     

       93
       93
       +
       

     

       94
       94
       +
               pkgsStatic-appview = staticPkgs.appview;

     

       95
       95
       +
               pkgsStatic-knot = staticPkgs.knot;

     

       96
       96
       +
               pkgsStatic-knot-unwrapped = staticPkgs.knot-unwrapped;

     

       97
       97
       +
               pkgsStatic-sqlite-lib = staticPkgs.sqlite-lib;

     

       98
       98
       +
       

     

       99
       99
       +
               pkgsCross-gnu64-pkgsStatic-appview = crossPkgs.appview;

     

       100
       100
       +
               pkgsCross-gnu64-pkgsStatic-knot = crossPkgs.knot;

     

       101
       101
       +
               pkgsCross-gnu64-pkgsStatic-knot-unwrapped = crossPkgs.knot-unwrapped;

     

       90
       102
        
           });

     

       91
       103
        
           defaultPackage = forAllSystems (system: nixpkgsFor.${system}.appview);

     

       92
       104
        
           formatter = forAllSystems (system: nixpkgsFor."${system}".alejandra);

+2 -2

go.mod

···

       28
       28
        
       	github.com/mattn/go-sqlite3 v1.14.24

     

       29
       29
        
       	github.com/microcosm-cc/bluemonday v1.0.27

     

       30
       30
        
       	github.com/posthog/posthog-go v1.5.5

     

       31
       31
       +
       	github.com/redis/go-redis/v9 v9.3.0

     

       31
       32
        
       	github.com/resend/resend-go/v2 v2.15.0

     

       32
       33
        
       	github.com/sethvargo/go-envconfig v1.1.0

     

       33
       34
        
       	github.com/stretchr/testify v1.10.0

     
···

       35
       36
        
       	github.com/whyrusleeping/cbor-gen v0.3.1

     

       36
       37
        
       	github.com/yuin/goldmark v1.4.13

     

       37
       38
        
       	golang.org/x/crypto v0.38.0

     

       38
       38
       -
       	golang.org/x/net v0.39.0

     

       39
       39
       +
       	golang.org/x/net v0.40.0

     

       39
       40
        
       	golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da

     

       40
       41
        
       	gopkg.in/yaml.v3 v3.0.1

     

       41
       42
        
       	tangled.sh/icyphox.sh/atproto-oauth v0.0.0-20250526154904-3906c5336421

     
···

       111
       112
        
       	github.com/prometheus/client_model v0.6.2 // indirect

     

       112
       113
        
       	github.com/prometheus/common v0.63.0 // indirect

     

       113
       114
        
       	github.com/prometheus/procfs v0.16.1 // indirect

     

       114
       114
       -
       	github.com/redis/go-redis/v9 v9.3.0 // indirect

     

       115
       115
        
       	github.com/segmentio/asm v1.2.0 // indirect

     

       116
       116
        
       	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect

     

       117
       117
        
       	github.com/spaolacci/murmur3 v1.1.0 // indirect

+2 -2

go.sum

···

       435
       435
        
       golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=

     

       436
       436
        
       golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=

     

       437
       437
        
       golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=

     

       438
       438
       -
       golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=

     

       439
       439
       -
       golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=

     

       438
       438
       +
       golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=

     

       439
       439
       +
       golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=

     

       440
       440
        
       golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

     

       441
       441
        
       golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

     

       442
       442
        
       golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

nix/pkgs/genjwks.nix

···

       9
       9
        
         src = gitignoreSource ../..;

     

       10
       10
        
         subPackages = ["cmd/genjwks"];

     

       11
       11
        
         vendorHash = goModHash;

     

       12
       12
       +
         doCheck = false;

     

       12
       13
        
         env.CGO_ENABLED = 0;

     

       13
       14
        
       }