use callPackage instead

Author: TheJolman

flake.nix

@@ -14,16 +14,9 @@
     flake-utils.lib.eachDefaultSystem (
       system: let
         pkgs = nixpkgs.legacyPackages.${system};
-
-        packages = import ./nix/package.nix {
-          inherit pkgs;
-        };
-        devShells = import ./nix/devShell.nix {
-          inherit pkgs;
-        };
       in {
-        packages.default = packages.default;
-        devShells.default = devShells.default;
+        packages.default = pkgs.callPackage ./nix/package.nix {};
+        devShells.default = pkgs.callPackage ./nix/devShell.nix {};
       }
     );
 }

nix/devShell.nix

@@ -1,25 +1,39 @@
-{pkgs}: {
-  default = pkgs.mkShell {
-    packages = with pkgs; [
-      go
-      gotools
-      gopls # Go langauge server
-      nilaway # Go static analysis tool
-      delve # Go debugger
-      sqlc # compiles SQL queries to Go code
-      air # run dev server with hot reload
-      sqlfluff # SQL linter
-      gnumake
-      curl
-      xh
-      jq
-      go-swag
-    ];
+{
+  mkShell,
+  go,
+  gotools,
+  gopls,
+  nilaway,
+  delve,
+  sqlc,
+  air,
+  sqlfluff,
+  gnumake,
+  curl,
+  xh,
+  jq,
+  go-swag,
+}:
+mkShell {
+  packages = [
+    go
+    gotools
+    gopls # Go langauge server
+    nilaway # Go static analysis tool
+    delve # Go debugger
+    sqlc # compiles SQL queries to Go code
+    air # run dev server with hot reload
+    sqlfluff # SQL linter
+    gnumake
+    curl
+    xh
+    jq
+    go-swag
+  ];
 
-    shellHook = ''
-      export DATABASE_URL="file:dev.db?cache=shared&mode=rwc"
-      export CGO_ENABLED=0  # cgo compiler flags cause issues with delve when using Nix
-      echo "Loaded dev shell."
-    '';
-  };
+  shellHook = ''
+    export DATABASE_URL="file:dev.db?cache=shared&mode=rwc"
+    export CGO_ENABLED=0  # cgo compiler flags cause issues with delve when using Nix
+    echo "Loaded dev shell."
+  '';
 }

nix/package.nix

@@ -1,27 +1,21 @@
-{pkgs}: {
-  default = pkgs.buildGoModule {
-    name = "api-acmcsuf";
-    src = ../.;
-    vendorHash = "sha256-PbObU1GpSa18kwp1kQvYTR3j+Vuh6dNLphwDYXxOejc=";
+{
+  lib,
+  buildGoModule,
+}:
+buildGoModule {
+  name = "api-acmcsuf";
+  src = ../.;
+  vendorHash = "sha256-PbObU1GpSa18kwp1kQvYTR3j+Vuh6dNLphwDYXxOejc=";
 
-    nativeBuildInputs = with pkgs; [
-      sqlc
-    ];
+  postBuild = ''
+    mv $GOPATH/bin/api $GOPATH/bin/api-acmcsuf
+  '';
 
-    preBuild = ''
-      go generate ./...
-    '';
+  subPackages = ["cmd/api"];
 
-    postBuild = ''
-      mv $GOPATH/bin/api $GOPATH/bin/api-acmcsuf
-    '';
-
-    subPackages = ["cmd/api"];
-
-    meta = with pkgs.lib; {
-      description = "API created and used by CSUF's ACM chapter";
-      homepage = "https://github.com/acmcsufoss/api.acmcsuf.com";
-      license = licenses.mit;
-    };
+  meta = {
+    description = "API created and used by CSUF's ACM chapter";
+    homepage = "https://github.com/acmcsufoss/api.acmcsuf.com";
+    license = lib.licenses.mit;
   };
 }