back round 1 view raw
flake.nix: refactor to not use a new nixpkgs instance to save time on eval #289

merged
opened by
ptr.pet 5 months ago targeting master from ptr.pet/core: dont-use-new-nixpkgs-instance
see https://zimbatm.com/notes/1000-instances-of-nixpkgs
options
unified split
Changed files
+41 -50
flake.nix
+41 -50
flake.nix
···

       53
       53
        
         }: let

     

       54
       54
        
           supportedSystems = ["x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"];

     

       55
       55
        
           forAllSystems = nixpkgs.lib.genAttrs supportedSystems;

     

       56
       56
       -
           nixpkgsFor = forAllSystems (system:

     

       57
       57
       -
             import nixpkgs {

     

       58
       58
       -
               inherit system;

     

       59
       59
       -
               overlays = [self.overlays.default];

     

       60
       60
       -
             });

     

       56
       56
       +
           nixpkgsFor = forAllSystems (system: nixpkgs.legacyPackages.${system});

     

       61
       57
        
           inherit (gitignore.lib) gitignoreSource;

     

       62
       62
       -
         in {

     

       63
       63
       -
           overlays.default = final: prev: let

     

       58
       58
       +
           mkPackageSet = pkgs: let

     

       64
       59
        
             goModHash = "sha256-SLi+nALwCd/Lzn3aljwPqCo2UaM9hl/4OAjcHQLt2Bk=";

     

       65
       65
       -
             appviewDeps = {

     

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

     

       67
       67
       -
             };

     

       68
       68
       -
             knotDeps = {

     

       69
       69
       -
               inherit goModHash gitignoreSource;

     

       70
       70
       -
             };

     

       71
       71
       -
             spindleDeps = {

     

       72
       72
       -
               inherit goModHash gitignoreSource;

     

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

     

       61
       61
       +
               inherit (pkgs) gcc;

     

       62
       62
       +
               inherit sqlite-lib-src;

     

       73
       63
        
             };

     

       74
       74
       -
             mkPackageSet = pkgs: {

     

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

     

       76
       76
       -
               appview = pkgs.callPackage ./nix/pkgs/appview.nix appviewDeps;

     

       77
       77
       -
               knot = pkgs.callPackage ./nix/pkgs/knot.nix {};

     

       78
       78
       -
               spindle = pkgs.callPackage ./nix/pkgs/spindle.nix spindleDeps;

     

       79
       79
       -
               knot-unwrapped = pkgs.callPackage ./nix/pkgs/knot-unwrapped.nix knotDeps;

     

       80
       80
       -
               sqlite-lib = pkgs.callPackage ./nix/pkgs/sqlite-lib.nix {

     

       81
       81
       -
                 inherit (pkgs) gcc;

     

       82
       82
       -
                 inherit sqlite-lib-src;

     

       83
       83
       -
               };

     

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

     

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

     

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

     

       66
       66
       +
             appview = pkgs.callPackage ./nix/pkgs/appview.nix {

     

       67
       67
       +
               inherit sqlite-lib htmx-src htmx-ws-src lucide-src inter-fonts-src ibm-plex-mono-src goModHash gitignoreSource;

     

       85
       68
        
             };

     

       86
       86
       -
           in

     

       87
       87
       -
             mkPackageSet final;

     

       69
       69
       +
             spindle = pkgs.callPackage ./nix/pkgs/spindle.nix {inherit sqlite-lib goModHash gitignoreSource;};

     

       70
       70
       +
             knot-unwrapped = pkgs.callPackage ./nix/pkgs/knot-unwrapped.nix {inherit sqlite-lib goModHash gitignoreSource;};

     

       71
       71
       +
             knot = pkgs.callPackage ./nix/pkgs/knot.nix {inherit knot-unwrapped;};

     

       72
       72
       +
           in {

     

       73
       73
       +
             inherit lexgen appview spindle knot-unwrapped knot sqlite-lib genjwks;

     

       74
       74
       +
           };

     

       75
       75
       +
         in {

     

       76
       76
       +
           overlays.default = final: prev: mkPackageSet final;

     

       88
       77
        
       

     

       89
       78
        
           packages = forAllSystems (system: let

     

       90
       79
        
             pkgs = nixpkgsFor.${system};

     

       91
       91
       -
             staticPkgs = pkgs.pkgsStatic;

     

       92
       92
       -
             crossPkgs = pkgs.pkgsCross.gnu64.pkgsStatic;

     

       80
       80
       +
             packages = mkPackageSet pkgs;

     

       81
       81
       +
             staticPackages = mkPackageSet pkgs.pkgsStatic;

     

       82
       82
       +
             crossPackages = mkPackageSet pkgs.pkgsCross.gnu64.pkgsStatic;

     

       93
       83
        
           in {

     

       94
       94
       -
             appview = pkgs.appview;

     

       95
       95
       -
             lexgen = pkgs.lexgen;

     

       96
       96
       -
             knot = pkgs.knot;

     

       97
       97
       -
             knot-unwrapped = pkgs.knot-unwrapped;

     

       98
       98
       -
             spindle = pkgs.spindle;

     

       99
       99
       -
             genjwks = pkgs.genjwks;

     

       100
       100
       -
             sqlite-lib = pkgs.sqlite-lib;

     

       84
       84
       +
             appview = packages.appview;

     

       85
       85
       +
             lexgen = packages.lexgen;

     

       86
       86
       +
             knot = packages.knot;

     

       87
       87
       +
             knot-unwrapped = packages.knot-unwrapped;

     

       88
       88
       +
             spindle = packages.spindle;

     

       89
       89
       +
             genjwks = packages.genjwks;

     

       90
       90
       +
             sqlite-lib = packages.sqlite-lib;

     

       101
       91
        
       

     

       102
       102
       -
             pkgsStatic-appview = staticPkgs.appview;

     

       103
       103
       -
             pkgsStatic-knot = staticPkgs.knot;

     

       104
       104
       -
             pkgsStatic-knot-unwrapped = staticPkgs.knot-unwrapped;

     

       105
       105
       -
             pkgsStatic-spindle = staticPkgs.spindle;

     

       106
       106
       -
             pkgsStatic-sqlite-lib = staticPkgs.sqlite-lib;

     

       92
       92
       +
             pkgsStatic-appview = staticPackages.appview;

     

       93
       93
       +
             pkgsStatic-knot = staticPackages.knot;

     

       94
       94
       +
             pkgsStatic-knot-unwrapped = staticPackages.knot-unwrapped;

     

       95
       95
       +
             pkgsStatic-spindle = staticPackages.spindle;

     

       96
       96
       +
             pkgsStatic-sqlite-lib = staticPackages.sqlite-lib;

     

       107
       97
        
       

     

       108
       108
       -
             pkgsCross-gnu64-pkgsStatic-appview = crossPkgs.appview;

     

       109
       109
       -
             pkgsCross-gnu64-pkgsStatic-knot = crossPkgs.knot;

     

       110
       110
       -
             pkgsCross-gnu64-pkgsStatic-knot-unwrapped = crossPkgs.knot-unwrapped;

     

       111
       111
       -
             pkgsCross-gnu64-pkgsStatic-spindle = crossPkgs.spindle;

     

       98
       98
       +
             pkgsCross-gnu64-pkgsStatic-appview = crossPackages.appview;

     

       99
       99
       +
             pkgsCross-gnu64-pkgsStatic-knot = crossPackages.knot;

     

       100
       100
       +
             pkgsCross-gnu64-pkgsStatic-knot-unwrapped = crossPackages.knot-unwrapped;

     

       101
       101
       +
             pkgsCross-gnu64-pkgsStatic-spindle = crossPackages.spindle;

     

       112
       102
        
           });

     

       113
       113
       -
           defaultPackage = forAllSystems (system: nixpkgsFor.${system}.appview);

     

       114
       114
       -
           formatter = forAllSystems (system: nixpkgsFor."${system}".alejandra);

     

       103
       103
       +
           defaultPackage = forAllSystems (system: self.packages.${system}.appview);

     

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

     

       115
       105
        
           devShells = forAllSystems (system: let

     

       116
       106
        
             pkgs = nixpkgsFor.${system};

     

       107
       107
       +
             packages' = self.packages.${system};

     

       117
       108
        
             staticShell = pkgs.mkShell.override {

     

       118
       109
        
               stdenv = pkgs.pkgsStatic.stdenv;

     

       119
       110
        
             };

     
···

       124
       115
        
                 pkgs.air

     

       125
       116
        
                 pkgs.gopls

     

       126
       117
        
                 pkgs.httpie

     

       127
       127
       -
                 pkgs.lexgen

     

       128
       118
        
                 pkgs.litecli

     

       129
       119
        
                 pkgs.websocat

     

       130
       120
        
                 pkgs.tailwindcss

     

       131
       121
        
                 pkgs.nixos-shell

     

       132
       122
        
                 pkgs.redis

     

       123
       123
       +
                 packages'.lexgen

     

       133
       124
        
               ];

     

       134
       125
        
               shellHook = ''

     

       135
       126
        
                 mkdir -p appview/pages/static/{fonts,icons}

     
···

       139
       130
        
                 cp -f ${inter-fonts-src}/web/InterVariable*.woff2 appview/pages/static/fonts/

     

       140
       131
        
                 cp -f ${inter-fonts-src}/web/InterDisplay*.woff2 appview/pages/static/fonts/

     

       141
       132
        
                 cp -f ${ibm-plex-mono-src}/fonts/complete/woff2/IBMPlexMono-Regular.woff2 appview/pages/static/fonts/

     

       142
       142
       -
                 export TANGLED_OAUTH_JWKS="$(${pkgs.genjwks}/bin/genjwks)"

     

       133
       133
       +
                 export TANGLED_OAUTH_JWKS="$(${packages'.genjwks}/bin/genjwks)"

     

       143
       134
        
               '';

     

       144
       135
        
               env.CGO_ENABLED = 1;

     

       145
       136
        
             };