back round 0 view raw
flake.nix: refactor creating the package set using makeScope #302

merged
opened by
ptr.pet 5 months ago targeting master from ptr.pet/core: reduce-spurious-recompiles
Change-Id: lonyknzlzukqqowkslrmzkszszuktyzy
options
unified split
Changed files
+21 -19
flake.nix
+21 -19
flake.nix
···

       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: nixpkgs.legacyPackages.${system});

     

       57
       57
       -
           inherit (gitignore.lib) gitignoreSource;

     

       58
       58
       -
           mkPackageSet = pkgs: let

     

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

     

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

     

       61
       61
       -
               inherit (pkgs) gcc;

     

       62
       62
       -
               inherit sqlite-lib-src;

     

       63
       63
       -
             };

     

       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;

     

       68
       68
       -
             };

     

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

     

       57
       57
       +
       

     

       58
       58
       +
           mkPackageSet = pkgs:

     

       59
       59
       +
             pkgs.lib.makeScope pkgs.newScope (self: {

     

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

     

       61
       61
       +
               inherit (gitignore.lib) gitignoreSource;

     

       62
       62
       +
               sqlite-lib = self.callPackage ./nix/pkgs/sqlite-lib.nix {

     

       63
       63
       +
                 inherit (pkgs) gcc;

     

       64
       64
       +
                 inherit sqlite-lib-src;

     

       65
       65
       +
               };

     

       66
       66
       +
               genjwks = self.callPackage ./nix/pkgs/genjwks.nix {};

     

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

     

       68
       68
       +
               appview = self.callPackage ./nix/pkgs/appview.nix {

     

       69
       69
       +
                 inherit htmx-src htmx-ws-src lucide-src inter-fonts-src ibm-plex-mono-src;

     

       70
       70
       +
               };

     

       71
       71
       +
               spindle = self.callPackage ./nix/pkgs/spindle.nix {};

     

       72
       72
       +
               knot-unwrapped = self.callPackage ./nix/pkgs/knot-unwrapped.nix {};

     

       73
       73
       +
               knot = self.callPackage ./nix/pkgs/knot.nix {};

     

       74
       74
       +
             });

     

       75
       75
        
         in {

     

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

     

       76
       76
       +
           overlays.default = final: prev: {

     

       77
       77
       +
             inherit (mkPackageSet final) lexgen sqlite-lib genjwks spindle knot-unwrapped knot appview;

     

       78
       78
       +
           };

     

       77
       79
        
       

     

       78
       80
        
           packages = forAllSystems (system: let

     

       79
       81
        
             pkgs = nixpkgsFor.${system};