commit 9bea45fe3697e398a3dd9f563e1569d99485cdc3 · julien.rbrt.fr/tangled-core

+33 -25

flake.nix

···

       54
       54
        
           inherit (gitignore.lib) gitignoreSource;

     

       55
       55
        
         in {

     

       56
       56
        
           overlays.default = final: prev: let

     

       57
       57
       -
             goModHash = "sha256-PJd2UvQJ7HVp2+s+QZPwL2FcdbSsRDxQZHV9hGotB2Y=";

     

       57
       57
       +
             goModHash = "sha256-G+59ZwQwBbnO9ZjAB5zMEmWZbeG4k7ko/lPz+ceqYKs=";

     

       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
       +
               knot = pkgs.callPackage ./nix/pkgs/knot.nix {};

     

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

     

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

     

       70
       70
       +
                 inherit (pkgs) gcc;

     

       71
       71
       +
                 inherit sqlite-lib-src;

     

       72
       72
       +
               };

     

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

     

       74
       74
        
             };

     

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

     

       76
       76
       -
           };

     

       75
       75
       +
           in

     

       76
       76
       +
             mkPackageSet final;

     

       77
       77
        
       

     

       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
       -
               ;

     

       78
       78
       +
           packages = forAllSystems (system: let

     

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

     

       80
       80
       +
             staticPkgs = pkgs.pkgsStatic;

     

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

     

       82
       82
       +
           in {

     

       83
       83
       +
             appview = pkgs.appview;

     

       84
       84
       +
             lexgen = pkgs.lexgen;

     

       85
       85
       +
             knot = pkgs.knot;

     

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

     

       87
       87
       +
             genjwks = pkgs.genjwks;

     

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

     

       89
       89
       +
       

     

       90
       90
       +
             pkgsStatic-appview = staticPkgs.appview;

     

       91
       91
       +
             pkgsStatic-knot = staticPkgs.knot;

     

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

     

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

     

       94
       94
       +
       

     

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

     

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

     

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

     

       90
       98
        
           });

     

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

     

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

+1 -1

go.mod

···

       38
       38
        
       	github.com/yuin/goldmark v1.4.13

     

       39
       39
        
       	golang.org/x/crypto v0.38.0

     

       40
       40
        
       	golang.org/x/net v0.40.0

     

       41
       41
       -
       	golang.org/x/sync v0.14.0

     

       42
       41
        
       	golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da

     

       43
       42
        
       	gopkg.in/yaml.v3 v3.0.1

     

       44
       43
        
       	tangled.sh/icyphox.sh/atproto-oauth v0.0.0-20250526154904-3906c5336421

     
···

       144
       143
        
       	go.uber.org/multierr v1.11.0 // indirect

     

       145
       144
        
       	go.uber.org/zap v1.27.0 // indirect

     

       146
       145
        
       	golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect

     

       146
       146
       +
       	golang.org/x/sync v0.14.0 // indirect

     

       147
       147
        
       	golang.org/x/sys v0.33.0 // indirect

     

       148
       148
        
       	golang.org/x/time v0.8.0 // indirect

     

       149
       149
        
       	google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237 // indirect

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
        
       }