diff --git a/hercules-ci-agent/pkg.nix b/hercules-ci-agent/pkg.nix
deleted file mode 100644
index 4afeedd1..00000000
--- a/hercules-ci-agent/pkg.nix
+++ /dev/null
@@ -1,200 +0,0 @@
-{ mkDerivation
-, aeson
-, async
-, attoparsec
-, base
-, base64-bytestring
-, bdw-gc
-, binary
-, binary-conduit
-, boost
-, bytestring
-, cachix
-, cachix-api
-, conduit
-, conduit-extra
-, containers
-, directory
-, dlist
-, exceptions
-, filepath
-, hercules-ci-api-agent
-, hercules-ci-api-core
-, hostname
-, hspec
-, http-client
-, http-client-tls
-, http-conduit
-, inline-c
-, inline-c-cpp
-, katip
-, lens
-, lens-aeson
-, lifted-async
-, lifted-base
-, monad-control
-, mtl
-, network
-, network-uri
-, nix
-, optparse-applicative
-, process
-, protolude
-, safe-exceptions
-, servant
-, servant-auth-client
-, servant-client
-, servant-client-core
-, stdenv
-, stm
-, temporary
-, text
-, time
-, tomland
-, transformers
-, transformers-base
-, unbounded-delays
-, unix
-, unliftio
-, unliftio-core
-, unordered-containers
-, uuid
-, vector
-, websockets
-, wuss
-}:
-mkDerivation {
-  pname = "hercules-ci-agent";
-  version = "0.7.0";
-  src = ./hercules-ci-agent;
-  isLibrary = true;
-  isExecutable = true;
-  libraryHaskellDepends = [
-    aeson
-    async
-    base
-    binary
-    binary-conduit
-    bytestring
-    cachix
-    conduit
-    containers
-    dlist
-    exceptions
-    hercules-ci-api-agent
-    inline-c
-    inline-c-cpp
-    katip
-    lifted-async
-    lifted-base
-    monad-control
-    mtl
-    network-uri
-    optparse-applicative
-    process
-    protolude
-    safe-exceptions
-    stm
-    text
-    transformers-base
-    unbounded-delays
-    unliftio
-    unliftio-core
-    uuid
-    websockets
-    wuss
-  ];
-  librarySystemDepends = [ boost ];
-  libraryPkgconfigDepends = [ bdw-gc nix ];
-  executableHaskellDepends = [
-    aeson
-    async
-    attoparsec
-    base
-    base64-bytestring
-    binary
-    binary-conduit
-    bytestring
-    cachix
-    cachix-api
-    conduit
-    conduit-extra
-    containers
-    directory
-    dlist
-    exceptions
-    filepath
-    hercules-ci-api-agent
-    hercules-ci-api-core
-    hostname
-    http-client
-    http-client-tls
-    http-conduit
-    inline-c
-    inline-c-cpp
-    katip
-    lens
-    lens-aeson
-    lifted-async
-    lifted-base
-    monad-control
-    mtl
-    network
-    network-uri
-    optparse-applicative
-    process
-    protolude
-    safe-exceptions
-    servant
-    servant-auth-client
-    servant-client
-    servant-client-core
-    stm
-    temporary
-    text
-    time
-    tomland
-    transformers
-    transformers-base
-    unix
-    unliftio
-    unliftio-core
-    unordered-containers
-    uuid
-    vector
-    websockets
-    wuss
-  ];
-  executableSystemDepends = [ boost ];
-  executablePkgconfigDepends = [ bdw-gc nix ];
-  testHaskellDepends = [
-    aeson
-    async
-    attoparsec
-    base
-    binary
-    binary-conduit
-    bytestring
-    conduit
-    containers
-    exceptions
-    filepath
-    hercules-ci-api-agent
-    hercules-ci-api-core
-    hspec
-    katip
-    lifted-async
-    lifted-base
-    monad-control
-    optparse-applicative
-    process
-    protolude
-    safe-exceptions
-    text
-    transformers-base
-    unliftio-core
-  ];
-  doHaddock = false;
-  homepage = "https://docs.hercules-ci.com";
-  license = stdenv.lib.licenses.asl20;
-}
diff --git a/hercules-ci-api-agent/pkg.nix b/hercules-ci-api-agent/pkg.nix
deleted file mode 100644
index 547fcd06..00000000
--- a/hercules-ci-api-agent/pkg.nix
+++ /dev/null
@@ -1,93 +0,0 @@
-{ mkDerivation
-, aeson
-, base
-, base64-bytestring-type
-, bytestring
-, containers
-, cookie
-, exceptions
-, hashable
-, hercules-ci-api-core
-, hspec
-, http-api-data
-, http-media
-, lens
-, lens-aeson
-, memory
-, network-uri
-, profunctors
-, QuickCheck
-, servant
-, servant-auth
-, servant-auth-swagger
-, servant-swagger
-, servant-swagger-ui-core
-, stdenv
-, string-conv
-, swagger2
-, text
-, time
-, uuid
-, vector
-}:
-mkDerivation {
-  pname = "hercules-ci-api-agent";
-  version = "0.2.0.0";
-  src = ./hercules-ci-api-agent;
-  libraryHaskellDepends = [
-    aeson
-    base
-    base64-bytestring-type
-    bytestring
-    containers
-    cookie
-    exceptions
-    hashable
-    hercules-ci-api-core
-    http-api-data
-    http-media
-    lens
-    lens-aeson
-    memory
-    servant
-    servant-auth
-    servant-auth-swagger
-    servant-swagger
-    servant-swagger-ui-core
-    string-conv
-    swagger2
-    text
-    time
-    uuid
-    vector
-  ];
-  testHaskellDepends = [
-    aeson
-    base
-    bytestring
-    containers
-    cookie
-    exceptions
-    hashable
-    hspec
-    http-api-data
-    http-media
-    lens
-    memory
-    network-uri
-    profunctors
-    QuickCheck
-    servant
-    servant-auth
-    servant-auth-swagger
-    servant-swagger
-    servant-swagger-ui-core
-    string-conv
-    swagger2
-    text
-    time
-    uuid
-  ];
-  homepage = "https://github.com/hercules-ci/hercules-ci-agent#readme";
-  license = stdenv.lib.licenses.asl20;
-}
diff --git a/hercules-ci-api-core/pkg.nix b/hercules-ci-api-core/pkg.nix
deleted file mode 100644
index a70d8257..00000000
--- a/hercules-ci-api-core/pkg.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{ mkDerivation
-, aeson
-, base
-, bytestring
-, containers
-, cookie
-, exceptions
-, hashable
-, http-api-data
-, http-media
-, katip
-, lens
-, lifted-base
-, memory
-, monad-control
-, safe-exceptions
-, servant
-, servant-auth
-, servant-auth-swagger
-, servant-swagger
-, servant-swagger-ui-core
-, stdenv
-, string-conv
-, swagger2
-, text
-, time
-, uuid
-}:
-mkDerivation {
-  pname = "hercules-ci-api-core";
-  version = "0.1.1.0";
-  src = ./hercules-ci-api-core;
-  libraryHaskellDepends = [
-    aeson
-    base
-    bytestring
-    containers
-    cookie
-    exceptions
-    hashable
-    http-api-data
-    http-media
-    katip
-    lens
-    lifted-base
-    memory
-    monad-control
-    safe-exceptions
-    servant
-    servant-auth
-    servant-auth-swagger
-    servant-swagger
-    servant-swagger-ui-core
-    string-conv
-    swagger2
-    text
-    time
-    uuid
-  ];
-  homepage = "https://github.com/hercules-ci/hercules-ci-agent#readme";
-  license = stdenv.lib.licenses.asl20;
-}
diff --git a/hercules-ci-api/pkg.nix b/hercules-ci-api/pkg.nix
deleted file mode 100644
index c94ed40b..00000000
--- a/hercules-ci-api/pkg.nix
+++ /dev/null
@@ -1,89 +0,0 @@
-{ mkDerivation
-, aeson
-, base
-, bytestring
-, containers
-, cookie
-, exceptions
-, hashable
-, hercules-ci-api-core
-, http-api-data
-, http-media
-, lens
-, lens-aeson
-, memory
-, network-uri
-, profunctors
-, servant
-, servant-auth
-, servant-auth-swagger
-, servant-swagger
-, servant-swagger-ui-core
-, stdenv
-, string-conv
-, swagger2
-, text
-, time
-, uuid
-}:
-mkDerivation {
-  pname = "hercules-ci-api";
-  version = "0.5.0.0";
-  src = ./hercules-ci-api;
-  isLibrary = true;
-  isExecutable = true;
-  libraryHaskellDepends = [
-    aeson
-    base
-    bytestring
-    containers
-    cookie
-    exceptions
-    hashable
-    hercules-ci-api-core
-    http-api-data
-    http-media
-    lens
-    lens-aeson
-    memory
-    network-uri
-    profunctors
-    servant
-    servant-auth
-    servant-auth-swagger
-    servant-swagger
-    servant-swagger-ui-core
-    string-conv
-    swagger2
-    text
-    time
-    uuid
-  ];
-  executableHaskellDepends = [
-    aeson
-    base
-    bytestring
-    containers
-    cookie
-    exceptions
-    hashable
-    http-api-data
-    http-media
-    lens
-    memory
-    network-uri
-    profunctors
-    servant
-    servant-auth
-    servant-auth-swagger
-    servant-swagger
-    servant-swagger-ui-core
-    string-conv
-    swagger2
-    text
-    time
-    uuid
-  ];
-  homepage = "https://github.com/hercules-ci/hercules-ci-agent#readme";
-  license = stdenv.lib.licenses.asl20;
-}
diff --git a/nix/packages.nix b/nix/packages.nix
index 67b88bc6..c315a2fd 100644
--- a/nix/packages.nix
+++ b/nix/packages.nix
@@ -11,7 +11,7 @@ let
   inherit (pkgs.lib) cleanSource makeBinPath optionalAttrs;
   inherit (haskell.lib) overrideSrc addBuildDepends overrideCabal buildFromSdist doJailbreak disableLibraryProfiling addBuildTool;
   inherit (import sources.gitignore { inherit lib; }) gitignoreSource;
-  callPkg = super: name: srcPath: args: overrideSrc (super.callPackage (srcPath + "/pkg.nix") args) { src = gitignoreSource srcPath; };
+  callPkg = super: name: srcPath: args: overrideSrc (super.callCabal2nix name srcPath args) { src = gitignoreSource srcPath; };
 
   sources = import ./sources.nix;
 
diff --git a/scripts/generate-nix b/scripts/generate-nix
index 0ec0eafe..82e706a2 100755
--- a/scripts/generate-nix
+++ b/scripts/generate-nix
@@ -12,11 +12,6 @@ owner="$(jq -r '.cachix.owner' nix/sources.json)"
 repo="$(jq -r '.cachix.repo' nix/sources.json)"
 rev="$(jq -r '.cachix.rev' nix/sources.json)"
 
-cabal2nix hercules-ci-api/ > hercules-ci-api/pkg.nix
-cabal2nix hercules-ci-api-core/ > hercules-ci-api-core/pkg.nix
-cabal2nix hercules-ci-api-agent/ > hercules-ci-api-agent/pkg.nix
-cabal2nix tests/agent-test  > tests/agent-test/pkg.nix
-cabal2nix hercules-ci-agent/ > hercules-ci-agent/pkg.nix
 cabal2nix cabal://cachix-0.3.7 > nix/cachix.nix
 cabal2nix cabal://cachix-api-0.4.0 > nix/cachix-api.nix
 cabal2nix cabal://inline-c-0.9.0.0 > nix/haskell-inline-c.nix
@@ -25,11 +20,6 @@ cabal2nix cabal://servant-websockets-2.0.0 > nix/servant-websockets.nix
 cabal2nix cabal://websockets-0.12.6.1 > nix/websockets.nix
 
 pre-commit run --files \
-  hercules-ci-api/pkg.nix \
-  hercules-ci-api-core/pkg.nix \
-  hercules-ci-api-agent/pkg.nix \
-  tests/agent-test/pkg.nix \
-  hercules-ci-agent/pkg.nix \
   nix/cachix.nix \
   nix/cachix-api.nix \
   nix/websockets.nix \
diff --git a/tests/agent-test/pkg.nix b/tests/agent-test/pkg.nix
deleted file mode 100644
index 60be928a..00000000
--- a/tests/agent-test/pkg.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{ mkDerivation
-, aeson
-, async
-, base
-, bytestring
-, conduit
-, conduit-extra
-, containers
-, cookie
-, directory
-, filepath
-, hercules-ci-api-agent
-, hercules-ci-api-core
-, hspec
-, http-api-data
-, mmorph
-, protolude
-, random
-, safe-exceptions
-, servant
-, servant-auth-server
-, servant-conduit
-, servant-server
-, servant-websockets
-, stdenv
-, stm
-, tar-conduit
-, text
-, uuid
-, warp
-, websockets
-}:
-mkDerivation {
-  pname = "hercules-ci-agent-test";
-  version = "0.1.0.0";
-  src = tests/agent-test;
-  isLibrary = false;
-  isExecutable = true;
-  executableHaskellDepends = [
-    aeson
-    async
-    base
-    bytestring
-    conduit
-    conduit-extra
-    containers
-    cookie
-    directory
-    filepath
-    hercules-ci-api-agent
-    hercules-ci-api-core
-    hspec
-    http-api-data
-    mmorph
-    protolude
-    random
-    safe-exceptions
-    servant
-    servant-auth-server
-    servant-conduit
-    servant-server
-    servant-websockets
-    stm
-    tar-conduit
-    text
-    uuid
-    warp
-    websockets
-  ];
-  homepage = "https://github.com/hercules-ci/hercules-ci#readme";
-  license = stdenv.lib.licenses.asl20;
-}