diff --git a/pkgs/JuicyPixels.nix b/pkgs/JuicyPixels.nix
deleted file mode 100644
index b9bf1298399c9b83c774d8e18c9a34a2a0e67c24..0000000000000000000000000000000000000000
--- a/pkgs/JuicyPixels.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ mkDerivation, base, binary, bytestring, containers, deepseq, lib
-, mtl, primitive, transformers, vector, zlib
-}:
-mkDerivation {
-  pname = "JuicyPixels";
-  version = "3.3.8";
-  sha256 = "d3a0f6ca3515a1b3d526cbf79f2e0b0aab57f208ab216f9c26437bbcd86fb63e";
-  revision = "1";
-  editedCabalFile = "1gbmls58qdlip8nsysy1qsnf7wrw8cgss7i7vmbxxnf9ni0iawn9";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base binary bytestring containers deepseq mtl primitive
-    transformers vector zlib
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/Twinside/Juicy.Pixels";
-  description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/Only.nix b/pkgs/Only.nix
deleted file mode 100644
index af852c2d99f0c90dee85e8dd91cff3f542e86a0b..0000000000000000000000000000000000000000
--- a/pkgs/Only.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ mkDerivation, base, deepseq, lib }:
-mkDerivation {
-  pname = "Only";
-  version = "0.1";
-  sha256 = "ab7aa193e8c257d3bda6b0b3c1cbcf74cdaa85ab08cb20c2dd62ba248c1ab265";
-  revision = "2";
-  editedCabalFile = "01rvhsm4gyvjpgakrj7nzlfb1bjhkkx87xj3hng2x00g3qc3s0y6";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base deepseq ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "The 1-tuple type or single-value \"collection\"";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/binary-orphans.nix b/pkgs/binary-orphans.nix
deleted file mode 100644
index 8d3af216788fca560209d22fa166dcb1a636ad4a..0000000000000000000000000000000000000000
--- a/pkgs/binary-orphans.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ mkDerivation, OneTuple, QuickCheck, base, binary, lib
-, quickcheck-instances, tagged, tasty, tasty-quickcheck
-, transformers
-}:
-mkDerivation {
-  pname = "binary-orphans";
-  version = "1.0.4.1";
-  sha256 = "5f5b789bc86d25bbd054b86b2d9a6a03f4ac0dd480f283564b6d6465cfa2f0d2";
-  revision = "3";
-  editedCabalFile = "085flwx82nvvyb479jma9j62q8i9sbz65rarsqhasgz4vczxqawx";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base binary transformers ];
-  testHaskellDepends = [
-    base binary OneTuple QuickCheck quickcheck-instances tagged tasty
-    tasty-quickcheck
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Compatibility package for binary; provides instances";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/brick.nix b/pkgs/brick.nix
deleted file mode 100644
index e0391de13ec4832ca63bc3fd25bdefa01ab920a1..0000000000000000000000000000000000000000
--- a/pkgs/brick.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ mkDerivation, QuickCheck, base, bimap, bytestring, config-ini
-, containers, data-clist, deepseq, directory, exceptions, filepath
-, lib, microlens, microlens-mtl, microlens-th, mtl, stm
-, template-haskell, text, text-zipper, unix-compat, vector, vty
-, vty-crossplatform, vty-unix, word-wrap
-}:
-mkDerivation {
-  pname = "brick";
-  version = "2.1.1";
-  sha256 = "30280d6f7130eb3e6cbf5a55465a06a825169cb536d3b2e91883aec23532b31e";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base bimap bytestring config-ini containers data-clist deepseq
-    directory exceptions filepath microlens microlens-mtl microlens-th
-    mtl stm template-haskell text text-zipper unix-compat vector vty
-    vty-crossplatform word-wrap
-  ];
-  testHaskellDepends = [
-    base containers microlens QuickCheck vector vty vty-unix
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/jtdaugherty/brick/";
-  description = "A declarative terminal user interface library";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/bytes.nix b/pkgs/bytes.nix
deleted file mode 100644
index f78ebe4f599ec4e5233885dee21fe2ae6da9e274..0000000000000000000000000000000000000000
--- a/pkgs/bytes.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ mkDerivation, base, binary, binary-orphans, bytestring, cereal
-, containers, hashable, lib, scientific, text, time, transformers
-, transformers-compat, unordered-containers, void
-}:
-mkDerivation {
-  pname = "bytes";
-  version = "0.17.3";
-  sha256 = "d10acf05802d4df9646d7aed1b4ebcee13fb38f243f1525caaef1f2e1fd929c7";
-  revision = "1";
-  editedCabalFile = "1jj5fk23wvvvlbkxcpvgp69gglbf719ard5g795irbcx11zkhjd2";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base binary binary-orphans bytestring cereal containers hashable
-    scientific text time transformers transformers-compat
-    unordered-containers void
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/ekmett/bytes";
-  description = "Sharing code for serialization between binary and cereal";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/chell-quickcheck.nix b/pkgs/chell-quickcheck.nix
deleted file mode 100644
index ce8d2c4ea40e8cd32b7f59359500223dc6860407..0000000000000000000000000000000000000000
--- a/pkgs/chell-quickcheck.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, QuickCheck, base, chell, lib, random }:
-mkDerivation {
-  pname = "chell-quickcheck";
-  version = "0.2.5.4";
-  sha256 = "91543124f73b32f314ba67c7f39f7cb70563097f021dc394ce36e9629cd1cc10";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base chell QuickCheck random ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/typeclasses/chell";
-  description = "QuickCheck support for Chell";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/chell.nix b/pkgs/chell.nix
deleted file mode 100644
index 5183c529d339876900622fe2e01843bf83a01ddb..0000000000000000000000000000000000000000
--- a/pkgs/chell.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, ansi-terminal, base, bytestring, lib, options
-, patience, random, template-haskell, text, transformers
-}:
-mkDerivation {
-  pname = "chell";
-  version = "0.5.0.2";
-  sha256 = "bbbb035b800ee924e5d14f6598fc16512b5065773b1d57a8fe08f8626fe9c1c7";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    ansi-terminal base bytestring options patience random
-    template-haskell text transformers
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/typeclasses/chell";
-  description = "A simple and intuitive library for automated testing";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/composite-base.nix b/pkgs/composite-base.nix
deleted file mode 100644
index afae5578587805d87e69abdfac5c703e720ea8ce..0000000000000000000000000000000000000000
--- a/pkgs/composite-base.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ mkDerivation, QuickCheck, base, deepseq, exceptions, hspec, lens
-, lib, monad-control, mtl, profunctors, template-haskell, text
-, transformers, transformers-base, unliftio-core, vinyl
-}:
-mkDerivation {
-  pname = "composite-base";
-  version = "0.8.2.1";
-  sha256 = "31b7fe24885d2db164524a4477058157592ae06a75da5259f0eafc5760555544";
-  revision = "1";
-  editedCabalFile = "1fww7f7z583vp7kfrf6xi6y0plpm4jsh3j72xbgarprlz25j1aip";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base deepseq exceptions lens monad-control mtl profunctors
-    template-haskell text transformers transformers-base unliftio-core
-    vinyl
-  ];
-  testHaskellDepends = [
-    base deepseq exceptions hspec lens monad-control mtl profunctors
-    QuickCheck template-haskell text transformers transformers-base
-    unliftio-core vinyl
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/composite-hs/composite-base#readme";
-  description = "Shared utilities for composite-* packages";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/constraints-extras.nix b/pkgs/constraints-extras.nix
deleted file mode 100644
index d90da0a26ed4bc6f7123f87181c8c9d05ac7b401..0000000000000000000000000000000000000000
--- a/pkgs/constraints-extras.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ mkDerivation, aeson, base, constraints, lib, template-haskell }:
-mkDerivation {
-  pname = "constraints-extras";
-  version = "0.4.0.0";
-  sha256 = "f639594f340986e7647616194dec57a85490ca60e3b0f5197d011675da242ec7";
-  revision = "2";
-  editedCabalFile = "0q7kackfb5g9rin3lhccwsf33588f58a61zw7kbisfh6ygfpk6ww";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base constraints template-haskell ];
-  executableHaskellDepends = [ aeson base constraints ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/obsidiansystems/constraints-extras";
-  description = "Utility package for constraints";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/cryptohash-md5.nix b/pkgs/cryptohash-md5.nix
deleted file mode 100644
index 0adadd0d675a756c296d7180f4ed696f1ea48fea..0000000000000000000000000000000000000000
--- a/pkgs/cryptohash-md5.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ mkDerivation, base, base16-bytestring, bytestring, criterion, lib
-, pureMD5, tasty, tasty-hunit, tasty-quickcheck
-}:
-mkDerivation {
-  pname = "cryptohash-md5";
-  version = "0.11.101.0";
-  sha256 = "3b08db0ae39df2b44e83053ad30d7546a4c6200a852c22a240a7e03ae1080f05";
-  revision = "3";
-  editedCabalFile = "1v7gv0xa9yfkxq3g9j79ppzn6hjf467aajzb4x5882yflibfi9ki";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base bytestring ];
-  testHaskellDepends = [
-    base base16-bytestring bytestring pureMD5 tasty tasty-hunit
-    tasty-quickcheck
-  ];
-  benchmarkHaskellDepends = [ base bytestring criterion ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/haskell-hvr/cryptohash-md5";
-  description = "Fast, pure and practical MD5 implementation";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/css-text.nix b/pkgs/css-text.nix
deleted file mode 100644
index 8f20c36908c6eb7f2fb777693f9f828ed32ec2c3..0000000000000000000000000000000000000000
--- a/pkgs/css-text.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ mkDerivation, QuickCheck, attoparsec, base, hspec, lib, text }:
-mkDerivation {
-  pname = "css-text";
-  version = "0.1.3.0";
-  sha256 = "5ff507bf3863219f41e7f2d215e5511fe15ee13d1e28bd3ee64e0b0b894bcd7a";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ attoparsec base text ];
-  testHaskellDepends = [ attoparsec base hspec QuickCheck text ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/yesodweb/css-text.git#readme";
-  description = "CSS parser and renderer";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/data-binary-ieee754.nix b/pkgs/data-binary-ieee754.nix
deleted file mode 100644
index e7f9832a84e994cb39cc6de78f8c9c377afd3313..0000000000000000000000000000000000000000
--- a/pkgs/data-binary-ieee754.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, base, binary, lib }:
-mkDerivation {
-  pname = "data-binary-ieee754";
-  version = "0.4.4";
-  sha256 = "59975abed8f4caa602f0780c10a9b2493479e6feb71ad189bb10c3ac5678df0a";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base binary ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://john-millikin.com/software/data-binary-ieee754/";
-  description = "Parser/Serialiser for IEEE-754 floating-point values";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/deepseq-generics.nix b/pkgs/deepseq-generics.nix
deleted file mode 100644
index e842982c00c7feb641446f622c08748c5b2b3065..0000000000000000000000000000000000000000
--- a/pkgs/deepseq-generics.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ mkDerivation, HUnit, base, deepseq, ghc-prim, lib, test-framework
-, test-framework-hunit
-}:
-mkDerivation {
-  pname = "deepseq-generics";
-  version = "0.2.0.0";
-  sha256 = "b0b3ef5546c0768ef9194519a90c629f8f2ba0348487e620bb89d512187c7c9d";
-  revision = "10";
-  editedCabalFile = "1pms44620yw0i08zbaf1v9wi36ai43sd3s762jcx5cap1shjl4qv";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base deepseq ghc-prim ];
-  testHaskellDepends = [
-    base deepseq ghc-prim HUnit test-framework test-framework-hunit
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/haskell-hvr/deepseq-generics";
-  description = "GHC.Generics-based Control.DeepSeq.rnf implementation";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/dense-linear-algebra.nix b/pkgs/dense-linear-algebra.nix
deleted file mode 100644
index 7d850e60d93f125885cb2c3d252bf2c923ffe2c9..0000000000000000000000000000000000000000
--- a/pkgs/dense-linear-algebra.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, QuickCheck, base, deepseq, hspec, lib
-, math-functions, primitive, vector, vector-algorithms
-, vector-binary-instances, vector-th-unbox
-}:
-mkDerivation {
-  pname = "dense-linear-algebra";
-  version = "0.1.0.0";
-  sha256 = "f7777a7931b40332ebbc716f64abb63697cbab0128e5c1228d47760c5597f2d4";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base deepseq math-functions primitive vector vector-algorithms
-    vector-binary-instances vector-th-unbox
-  ];
-  testHaskellDepends = [ base hspec QuickCheck ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Simple and incomplete pure haskell implementation of linear algebra";
-  license = lib.licenses.bsd2;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/dependent-map.nix b/pkgs/dependent-map.nix
deleted file mode 100644
index 4a1181a50c629e7c982ef85794cfb01db425fc05..0000000000000000000000000000000000000000
--- a/pkgs/dependent-map.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, base, constraints-extras, containers, dependent-sum
-, lib
-}:
-mkDerivation {
-  pname = "dependent-map";
-  version = "0.4.0.0";
-  sha256 = "53ce0b52d8be1b85fc6489fb27656f16d837bee4fbe0ddf39c844e3ea8871f2c";
-  revision = "1";
-  editedCabalFile = "160p9crvlx1sn60inkwxa6mv1h2d4fgqnpsb2km67zrkpdfyd2s2";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base constraints-extras containers dependent-sum
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/obsidiansystems/dependent-map";
-  description = "Dependent finite maps (partial dependent products)";
-  license = "unknown";
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/dependent-sum-template.nix b/pkgs/dependent-sum-template.nix
deleted file mode 100644
index 0d4ca03f37aa51829ccb2d893e0a4e6b4cc00366..0000000000000000000000000000000000000000
--- a/pkgs/dependent-sum-template.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ mkDerivation, base, constraints-extras, containers, lib, mtl
-, some, template-haskell, th-abstraction
-}:
-mkDerivation {
-  pname = "dependent-sum-template";
-  version = "0.2.0.0";
-  sha256 = "c9632d831c33a81863cb2102943cee58ffa0287c1777facc577da0aab93f5a81";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base containers mtl some template-haskell th-abstraction
-  ];
-  testHaskellDepends = [
-    base constraints-extras some template-haskell th-abstraction
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/obsidiansystems/dependent-sum-template";
-  description = "Template Haskell code to generate instances of classes in some package";
-  license = lib.licenses.publicDomain;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/dependent-sum.nix b/pkgs/dependent-sum.nix
deleted file mode 100644
index 623f7b837fb93fd5ef5618be4b7de7130c05ece0..0000000000000000000000000000000000000000
--- a/pkgs/dependent-sum.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ mkDerivation, base, constraints-extras, lib, some }:
-mkDerivation {
-  pname = "dependent-sum";
-  version = "0.7.2.0";
-  sha256 = "826561ecf285abc857bde043e5aac50cb7a7157aaf24fd1aee26a25d4c2a3cbb";
-  revision = "2";
-  editedCabalFile = "09648zwf1wg42yk5ykbv1wvgz2bibjrwvcx6wpm4jscv8d2h61pi";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base constraints-extras some ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/obsidiansystems/dependent-sum";
-  description = "Dependent sum type";
-  license = lib.licenses.publicDomain;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/deriving-compat.nix b/pkgs/deriving-compat.nix
deleted file mode 100644
index 73a36888e97358a2670a1bd4e0229c36c1cd267b..0000000000000000000000000000000000000000
--- a/pkgs/deriving-compat.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ mkDerivation, QuickCheck, base, base-compat, base-orphans
-, containers, ghc-boot-th, ghc-prim, hspec, hspec-discover, lib
-, tagged, template-haskell, th-abstraction, transformers
-, transformers-compat, void
-}:
-mkDerivation {
-  pname = "deriving-compat";
-  version = "0.6.5";
-  sha256 = "47412ecf53461a43d4cc2b705cbc9bb4a958bff7b9008a2582c26b73df5532f3";
-  revision = "1";
-  editedCabalFile = "093kv76593jr1af12c5idqr97mbkf9vs93zbhrw7kcqwiydpsi91";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base containers ghc-boot-th ghc-prim template-haskell
-    th-abstraction transformers transformers-compat
-  ];
-  testHaskellDepends = [
-    base base-compat base-orphans hspec QuickCheck tagged
-    template-haskell transformers transformers-compat void
-  ];
-  testToolDepends = [ hspec-discover ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/haskell-compat/deriving-compat";
-  description = "Backports of GHC deriving extensions";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/dhall-docs.nix b/pkgs/dhall-docs.nix
index 7fc096ca6a4810dcf7b3422210901b31c8e5c403..b835ab7da90b907576482a4b063435f4545e7763 100644
--- a/pkgs/dhall-docs.nix
+++ b/pkgs/dhall-docs.nix
@@ -8,6 +8,8 @@ mkDerivation {
   pname = "dhall-docs";
   version = "1.0.11";
   sha256 = "984aa37da15a393b7009c17bf0c9f55819446dc2f82e5b0faf654f71c5ff2c45";
+  revision = "1";
+  editedCabalFile = "04i3v73hgyq57a6010wkd7xhmafy8xxc5vsl9km2r3wqy7505fj9";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = true;
diff --git a/pkgs/digest.nix b/pkgs/digest.nix
deleted file mode 100644
index e97bbc32c79fde06cccc407d44accf0f4efda169..0000000000000000000000000000000000000000
--- a/pkgs/digest.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ mkDerivation, base, bytestring, lib, zlib }:
-mkDerivation {
-  pname = "digest";
-  version = "0.0.1.7";
-  sha256 = "b23d6c804e6fed0ac9bb0d35b7aed5785330d63efebe296cf0073dab17e05f0a";
-  revision = "1";
-  editedCabalFile = "0wh34kyag2vhwvsdwv8qmvm13gy32nc94yfyqfdnl67nyc2sx8wl";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base bytestring ];
-  libraryPkgconfigDepends = [ zlib ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Various hashes for bytestrings; CRC32 and Adler32 for now";
-  license = lib.licenses.bsd2;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/doctest.nix b/pkgs/doctest.nix
deleted file mode 100644
index e110551b397a787a5c9845edffc2de40cd67a7ae..0000000000000000000000000000000000000000
--- a/pkgs/doctest.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ mkDerivation, HUnit, QuickCheck, base, code-page, deepseq
-, directory, exceptions, filepath, ghc, ghc-paths, hspec
-, hspec-core, hspec-discover, lib, mockery, process, setenv
-, silently, stringbuilder, syb, transformers
-}:
-mkDerivation {
-  pname = "doctest";
-  version = "0.22.2";
-  sha256 = "afb839c14019c17e3ec7900871a9fc104226028858c724932d53225ae382c6e5";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base code-page deepseq directory exceptions filepath ghc ghc-paths
-    process syb transformers
-  ];
-  executableHaskellDepends = [
-    base code-page deepseq directory exceptions filepath ghc ghc-paths
-    process syb transformers
-  ];
-  testHaskellDepends = [
-    base code-page deepseq directory exceptions filepath ghc ghc-paths
-    hspec hspec-core HUnit mockery process QuickCheck setenv silently
-    stringbuilder syb transformers
-  ];
-  testToolDepends = [ hspec-discover ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/sol/doctest#readme";
-  description = "Test interactive Haskell examples";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/effectful-th.nix b/pkgs/effectful-th.nix
index 520dab07e58918993f3fd24a28fb73a07b081ffb..6deff63b5bb18036305bf62a39162f3e9e86b801 100644
--- a/pkgs/effectful-th.nix
+++ b/pkgs/effectful-th.nix
@@ -5,8 +5,8 @@ mkDerivation {
   pname = "effectful-th";
   version = "1.0.0.1";
   sha256 = "4ee3882a61a876aa3ca1ab3174347d8442688323f20f30a2d48f54fab4dbaba7";
-  revision = "3";
-  editedCabalFile = "1v0p0rs241xqvqzvcqk3dyx68zyqbdqvfyprc0s4nhxzry8a9ka5";
+  revision = "4";
+  editedCabalFile = "0dawn69x2zf1wm6zj3vkv1s0naq8820nfi191v1ix5z9ai7nq5kz";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/email-validate.nix b/pkgs/email-validate.nix
deleted file mode 100644
index 8b1a0a1e4df5e1deaedb332554ebe56e66bad12c..0000000000000000000000000000000000000000
--- a/pkgs/email-validate.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, QuickCheck, attoparsec, base, bytestring, hspec
-, lib, template-haskell
-}:
-mkDerivation {
-  pname = "email-validate";
-  version = "2.3.2.19";
-  sha256 = "c864ac949b3f2cb72ad6f1309c1315e4c85c6eb455fcadc297281d54ea2fa360";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    attoparsec base bytestring template-haskell
-  ];
-  testHaskellDepends = [ base bytestring hspec QuickCheck ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/Porges/email-validate-hs";
-  description = "Email address validation";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/errors.nix b/pkgs/errors.nix
deleted file mode 100644
index 1c830db6aa37fb230aaa8e84cfb1951de38782ae..0000000000000000000000000000000000000000
--- a/pkgs/errors.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, base, exceptions, lib, safe, text, transformers
-, transformers-compat
-}:
-mkDerivation {
-  pname = "errors";
-  version = "2.3.0";
-  sha256 = "6772e5689f07e82077ffe3339bc672934d83d83a97a7d4f1349de1302cb71f75";
-  revision = "5";
-  editedCabalFile = "0ljfsadhqbqjivrr08x11zazpl115902ikvyhxq6nmg6zp54w7al";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base exceptions safe text transformers transformers-compat
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Simplified error-handling";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/extensible-effects.nix b/pkgs/extensible-effects.nix
deleted file mode 100644
index f0ce324650fda269a702806b871676f6fd80a2a1..0000000000000000000000000000000000000000
--- a/pkgs/extensible-effects.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ mkDerivation, HUnit, QuickCheck, base, criterion, doctest, lib
-, monad-control, mtl, silently, test-framework
-, test-framework-hunit, test-framework-quickcheck2
-, test-framework-th, transformers-base
-}:
-mkDerivation {
-  pname = "extensible-effects";
-  version = "5.0.0.1";
-  sha256 = "c3b3165893d3738c5ec7ffd0d8c46a7af855b7d3087e159d6da516e78880c039";
-  revision = "1";
-  editedCabalFile = "1ihcxj58a3ca80zfyxgbzjzgps9izy96vnj7h4sk9wwb9khbxl1f";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base monad-control transformers-base ];
-  testHaskellDepends = [
-    base doctest HUnit monad-control mtl QuickCheck silently
-    test-framework test-framework-hunit test-framework-quickcheck2
-    test-framework-th
-  ];
-  benchmarkHaskellDepends = [
-    base criterion HUnit mtl test-framework test-framework-hunit
-    test-framework-quickcheck2 test-framework-th
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/suhailshergill/extensible-effects";
-  description = "An Alternative to Monad Transformers";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/file-embed.nix b/pkgs/file-embed.nix
deleted file mode 100644
index c5717eecce57252492447e8f88ebbafa002731c3..0000000000000000000000000000000000000000
--- a/pkgs/file-embed.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, base, bytestring, directory, filepath, lib
-, template-haskell
-}:
-mkDerivation {
-  pname = "file-embed";
-  version = "0.0.15.0";
-  sha256 = "f066b85d537a20252faa59489f6a854e4e8f39080f08730c9e195e418cec5bdd";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base bytestring directory filepath template-haskell
-  ];
-  testHaskellDepends = [ base bytestring filepath ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/snoyberg/file-embed";
-  description = "Use Template Haskell to embed file contents directly";
-  license = lib.licenses.bsd2;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/generic-monoid.nix b/pkgs/generic-monoid.nix
deleted file mode 100644
index 04bff0b2de778ec308ea6ee84ee1a418fcd4d46f..0000000000000000000000000000000000000000
--- a/pkgs/generic-monoid.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ mkDerivation, base, lib }:
-mkDerivation {
-  pname = "generic-monoid";
-  version = "0.1.0.1";
-  sha256 = "cfd072ad70af41c1b94ac24e42e2635f37ed2a54e8f4be871be78b18b66b2adf";
-  revision = "3";
-  editedCabalFile = "0pyf3yr4haja32nkm3vb28dhdh47cf6h5vqkqih2l6zmbdc2f0lq";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Derive monoid instances for product types";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/generics-sop.nix b/pkgs/generics-sop.nix
deleted file mode 100644
index b3ba7f1d23cf4468d193dff4e9244f1fe5ec032f..0000000000000000000000000000000000000000
--- a/pkgs/generics-sop.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ mkDerivation, base, criterion, deepseq, ghc-prim, lib, sop-core
-, template-haskell, th-abstraction
-}:
-mkDerivation {
-  pname = "generics-sop";
-  version = "0.5.1.4";
-  sha256 = "616a1c2176097469f9514e76d979fffdbc12d569f44fd01deb14377c7888797e";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base ghc-prim sop-core template-haskell th-abstraction
-  ];
-  testHaskellDepends = [ base ];
-  benchmarkHaskellDepends = [
-    base criterion deepseq template-haskell
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Generic Programming using True Sums of Products";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/ghc-tcplugins-extra.nix b/pkgs/ghc-tcplugins-extra.nix
deleted file mode 100644
index 7e3559d0493cb2dca9f6a225c5e2b2d795fc2de4..0000000000000000000000000000000000000000
--- a/pkgs/ghc-tcplugins-extra.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, base, ghc, lib }:
-mkDerivation {
-  pname = "ghc-tcplugins-extra";
-  version = "0.4.5";
-  sha256 = "0b6831620bae37d090139a89635d31c83b37a29ee89c26f0a586452b94ae10c3";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ghc ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/clash-lang/ghc-tcplugins-extra#readme";
-  description = "Utilities for writing GHC type-checker plugins";
-  license = lib.licenses.bsd2;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/gridtables.nix b/pkgs/gridtables.nix
index a077a113cbe3fd01897558db9b74f00a54ae9459..7c87e8fce6a28e2981c0438bc2ce202192a8d683 100644
--- a/pkgs/gridtables.nix
+++ b/pkgs/gridtables.nix
@@ -5,6 +5,8 @@ mkDerivation {
   pname = "gridtables";
   version = "0.1.0.0";
   sha256 = "d6ac341bc7997d39a3b1f6cd811f70ab69689d9c3117ce3bc44bfb2ec55ab0ea";
+  revision = "1";
+  editedCabalFile = "0ay4ywi8w5kk4blf8jqxhivzprp1ivpdlw6racr1692psyizmxi0";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/hedgehog-extras.nix b/pkgs/hedgehog-extras.nix
index c7df2834b72cb4825a571dd72a19310c8be24b9a..988370e94b71d8bc2e69a652dc575d38317f97ea 100644
--- a/pkgs/hedgehog-extras.nix
+++ b/pkgs/hedgehog-extras.nix
@@ -7,6 +7,8 @@ mkDerivation {
   pname = "hedgehog-extras";
   version = "0.5.0.0";
   sha256 = "03e87bcbad70c8694c15dc5701e8af9bd18e18fcda8d67cb8dced99bebbb221e";
+  revision = "1";
+  editedCabalFile = "1dqw5wfl83gs43b7wnqzys1izrr5nqg5k8cj28ppl4qylhvqdar0";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/hint.nix b/pkgs/hint.nix
deleted file mode 100644
index 4eeaaf0c2f43732ca34885119cb1ff6a57f0cbf7..0000000000000000000000000000000000000000
--- a/pkgs/hint.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ mkDerivation, HUnit, base, bytestring, containers, directory
-, exceptions, fetchgit, filepath, ghc, ghc-boot, ghc-paths, lib
-, random, stm, temporary, text, transformers, typed-process, unix
-}:
-mkDerivation {
-  pname = "hint";
-  version = "0.9.0.6";
-  src = fetchgit {
-    url = "https://github.com/haskell-hint/hint";
-    sha256 = "0q18j3axi166k5k8mbcvdqy27cdvmxbhyb9rkjb3k31i5apaqnv4";
-    rev = "7803c34c8ae1d83c0f7c13fe6b30fcb3abd0ac51";
-    fetchSubmodules = true;
-  };
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base containers directory exceptions filepath ghc ghc-boot
-    ghc-paths random temporary transformers unix
-  ];
-  testHaskellDepends = [
-    base bytestring containers directory exceptions filepath HUnit stm
-    text typed-process unix
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/haskell-hint/hint";
-  description = "A Haskell interpreter built on top of the GHC API";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/hspec-expectations-lifted.nix b/pkgs/hspec-expectations-lifted.nix
deleted file mode 100644
index b25e50d806401e165f30635843b4e7a5a234d33f..0000000000000000000000000000000000000000
--- a/pkgs/hspec-expectations-lifted.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ mkDerivation, base, hspec-expectations, lib, transformers }:
-mkDerivation {
-  pname = "hspec-expectations-lifted";
-  version = "0.10.0";
-  sha256 = "22cdf1509b396fea2f53a0bb88dec3552f540d58cc60962a82970264c1e73828";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base hspec-expectations transformers ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "A version of hspec-expectations generalized to MonadIO";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/hspec-wai.nix b/pkgs/hspec-wai.nix
deleted file mode 100644
index 4546e752ba84828ad4e1bac539c98931bc5a4623..0000000000000000000000000000000000000000
--- a/pkgs/hspec-wai.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ mkDerivation, QuickCheck, base, base-compat, bytestring
-, case-insensitive, hspec, hspec-core, hspec-expectations
-, http-types, lib, text, transformers, wai, wai-extra
-}:
-mkDerivation {
-  pname = "hspec-wai";
-  version = "0.11.1";
-  sha256 = "32a86bf44ff70345718102f013f6dded35a96ceeda1aa4cc132af9c2a29e910f";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base base-compat bytestring case-insensitive hspec-core
-    hspec-expectations http-types QuickCheck text transformers wai
-    wai-extra
-  ];
-  testHaskellDepends = [
-    base base-compat bytestring case-insensitive hspec hspec-core
-    hspec-expectations http-types QuickCheck text transformers wai
-    wai-extra
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/hspec/hspec-wai#readme";
-  description = "Experimental Hspec support for testing WAI applications";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/http-api-data.nix b/pkgs/http-api-data.nix
deleted file mode 100644
index e1b9d340a1b5837dedfa1729204bdc33b31a0d56..0000000000000000000000000000000000000000
--- a/pkgs/http-api-data.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ mkDerivation, HUnit, QuickCheck, base, bytestring, containers
-, cookie, hashable, hspec, hspec-discover, http-types, lib
-, quickcheck-instances, tagged, text, text-iso8601, time-compat
-, transformers, unordered-containers, uuid-types
-}:
-mkDerivation {
-  pname = "http-api-data";
-  version = "0.6";
-  sha256 = "74904382dfd0774a34fef881d895afafdb856bd57f162db275cfe550a1dc1346";
-  revision = "1";
-  editedCabalFile = "0vjxs10hv9xhnahzcqb4dlygfzj5rcybgzw2z7qb2mi6sjsllwpv";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base bytestring containers cookie hashable http-types tagged text
-    text-iso8601 time-compat transformers unordered-containers
-    uuid-types
-  ];
-  testHaskellDepends = [
-    base bytestring cookie hspec HUnit QuickCheck quickcheck-instances
-    text time-compat unordered-containers uuid-types
-  ];
-  testToolDepends = [ hspec-discover ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/fizruk/http-api-data";
-  description = "Converting to/from HTTP API data like URL pieces, headers and query parameters";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/http-media.nix b/pkgs/http-media.nix
deleted file mode 100644
index 02593c62643142019f16c8b4265dd7d068ff0211..0000000000000000000000000000000000000000
--- a/pkgs/http-media.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ mkDerivation, QuickCheck, base, bytestring, case-insensitive
-, containers, lib, tasty, tasty-quickcheck, utf8-string
-}:
-mkDerivation {
-  pname = "http-media";
-  version = "0.8.1.1";
-  sha256 = "1920adf31b15d167f60374fbfd0a53a1fbe7820fd7fd459beacf6eb00d03f183";
-  revision = "1";
-  editedCabalFile = "0vlaxmh1qqli981bwn3hw0hqfy6spkijdywycnhxi0z1qg5837fk";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base bytestring case-insensitive containers utf8-string
-  ];
-  testHaskellDepends = [
-    base bytestring case-insensitive containers QuickCheck tasty
-    tasty-quickcheck utf8-string
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/zmthy/http-media";
-  description = "Processing HTTP Content-Type and Accept headers";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/hw-aeson.nix b/pkgs/hw-aeson.nix
deleted file mode 100644
index b93d4de3bf8a03bd1b725dcffc4841447f473701..0000000000000000000000000000000000000000
--- a/pkgs/hw-aeson.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ mkDerivation, aeson, base, bytestring, containers, doctest
-, doctest-discover, hashable, hedgehog, hspec, hspec-discover, lib
-, text, text-short, unordered-containers
-}:
-mkDerivation {
-  pname = "hw-aeson";
-  version = "0.1.8.0";
-  sha256 = "a20a8e21a2bf49fb33cefd09ab0fd521757280ab15603e837d9b5188df6d07f4";
-  revision = "2";
-  editedCabalFile = "04vjq54xc354scgzgf863px9fadvw4dr6kgli9rp4plw3sh4k3qg";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    aeson base bytestring containers hashable text text-short
-    unordered-containers
-  ];
-  testHaskellDepends = [
-    aeson base doctest doctest-discover hedgehog hspec
-  ];
-  testToolDepends = [ doctest-discover hspec-discover ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/haskell-works/hw-aeson#readme";
-  description = "Convenience functions for Aeson";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/hxt-charproperties.nix b/pkgs/hxt-charproperties.nix
deleted file mode 100644
index cfe7a2206cc9930d60bf4a378b0adfec9c51d327..0000000000000000000000000000000000000000
--- a/pkgs/hxt-charproperties.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, base, lib }:
-mkDerivation {
-  pname = "hxt-charproperties";
-  version = "9.5.0.0";
-  sha256 = "28836949512a2aedb63b2a02e0b05a4f519dc3511cfd259804a6e9d59a44a94a";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/UweSchmidt/hxt";
-  description = "Character properties and classes for XML and Unicode";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/hxt-regex-xmlschema.nix b/pkgs/hxt-regex-xmlschema.nix
deleted file mode 100644
index e386f1aff75db9eff851a303eeb51765dff1ec5f..0000000000000000000000000000000000000000
--- a/pkgs/hxt-regex-xmlschema.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ mkDerivation, HUnit, base, bytestring, criterion, deepseq
-, hxt-charproperties, lib, parsec, text
-}:
-mkDerivation {
-  pname = "hxt-regex-xmlschema";
-  version = "9.2.0.7";
-  sha256 = "b9b6bcfc7d8c5e9a0be87dc56b13a237a51ca2c19c6665a51378a9538b71d97a";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base bytestring hxt-charproperties parsec text
-  ];
-  testHaskellDepends = [ base bytestring HUnit parsec text ];
-  benchmarkHaskellDepends = [
-    base bytestring criterion deepseq parsec text
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema";
-  description = "A regular expression library for W3C XML Schema regular expressions";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/hxt-unicode.nix b/pkgs/hxt-unicode.nix
deleted file mode 100644
index a98d138df15b3704be49a2eb84516a1a58d7eb0a..0000000000000000000000000000000000000000
--- a/pkgs/hxt-unicode.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, base, hxt-charproperties, lib }:
-mkDerivation {
-  pname = "hxt-unicode";
-  version = "9.0.2.4";
-  sha256 = "7b5823f3bd94b57022d9d84ab3555303653c5121eaaef2ee1fd4918f3c434466";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base hxt-charproperties ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/UweSchmidt/hxt";
-  description = "Unicode en-/decoding functions for utf8, iso-latin-* and other encodings";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/hxt.nix b/pkgs/hxt.nix
deleted file mode 100644
index d4d539a6000d33be30a148c4143048fe8d4eda64..0000000000000000000000000000000000000000
--- a/pkgs/hxt.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ mkDerivation, base, binary, bytestring, containers, deepseq
-, directory, filepath, hxt-charproperties, hxt-regex-xmlschema
-, hxt-unicode, lib, mtl, network-uri, parsec
-}:
-mkDerivation {
-  pname = "hxt";
-  version = "9.3.1.22";
-  sha256 = "ef602fe674225527750574dd555dbdf402ab77d054af75d41ca21b42dbb23ad9";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base binary bytestring containers deepseq directory filepath
-    hxt-charproperties hxt-regex-xmlschema hxt-unicode mtl network-uri
-    parsec
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/UweSchmidt/hxt";
-  description = "A collection of tools for processing XML with Haskell";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/incipit-base.nix b/pkgs/incipit-base.nix
index 552f97be5bbc8ec9e74ac2fefaf50a9122f22b65..f6851cefec31e7c5017e90513db3926b77988852 100644
--- a/pkgs/incipit-base.nix
+++ b/pkgs/incipit-base.nix
@@ -5,6 +5,8 @@ mkDerivation {
   pname = "incipit-base";
   version = "0.5.1.0";
   sha256 = "de6a23c15c1549a9e3a7da1c453946b5f6bc60dcd11343a334188e205376b62e";
+  revision = "1";
+  editedCabalFile = "1ysxxv2lf1gybic66xgznz2q7f9y2mrnf3m7zn0a1mxxa6c329jc";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/incipit-core.nix b/pkgs/incipit-core.nix
index f2f9396aa0e8e3e59707085af2a11b1d4b63f583..e0b1f3ede91a9030a000038cd7fa4d793389178e 100644
--- a/pkgs/incipit-core.nix
+++ b/pkgs/incipit-core.nix
@@ -3,6 +3,8 @@ mkDerivation {
   pname = "incipit-core";
   version = "0.5.1.0";
   sha256 = "de6c0f072bc850ff2624127312e0bd9222d95470daf16312ae07db0bfd0597b3";
+  revision = "1";
+  editedCabalFile = "05xz4jqh89s397scxm5fhzyq1d7qgsrac4hsflvh762ijhxgghx6";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/indexed-profunctors.nix b/pkgs/indexed-profunctors.nix
deleted file mode 100644
index 6e368a3303b88e758f1319fd0bf4c8e44cd2269f..0000000000000000000000000000000000000000
--- a/pkgs/indexed-profunctors.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ mkDerivation, base, lib }:
-mkDerivation {
-  pname = "indexed-profunctors";
-  version = "0.1.1.1";
-  sha256 = "2e69bb2900bb7e562efffff7bcf3f72daf79f013232ce603263a57595412c398";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Utilities for indexed profunctors";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/insert-ordered-containers.nix b/pkgs/insert-ordered-containers.nix
deleted file mode 100644
index 7a084b1ecba00adfda2e337074490f05fb14e9c3..0000000000000000000000000000000000000000
--- a/pkgs/insert-ordered-containers.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ mkDerivation, QuickCheck, aeson, base, base-compat, deepseq
-, hashable, indexed-traversable, lens, lib, optics-core
-, optics-extra, semigroupoids, tasty, tasty-quickcheck, text
-, transformers, unordered-containers
-}:
-mkDerivation {
-  pname = "insert-ordered-containers";
-  version = "0.2.5.3";
-  sha256 = "f04f6e59795d8e362d15422a62d7c7c48312c2d97d2bc4372002a8a9b9a2436c";
-  revision = "1";
-  editedCabalFile = "12fkswr70fw2av11yy45v189r6cb8fcg0l1r7mayvwha3gls0j3n";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    aeson base deepseq hashable indexed-traversable lens optics-core
-    optics-extra semigroupoids text transformers unordered-containers
-  ];
-  testHaskellDepends = [
-    aeson base base-compat hashable lens QuickCheck semigroupoids tasty
-    tasty-quickcheck text unordered-containers
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/phadej/insert-ordered-containers#readme";
-  description = "Associative containers retaining insertion order for traversals";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/jira-wiki-markup.nix b/pkgs/jira-wiki-markup.nix
index 6210ae34b75b7bd2008a3dc5c6b6fd3decbc9a3e..1d52dfba0efafbefe79c6cb76f8326b668010ccf 100644
--- a/pkgs/jira-wiki-markup.nix
+++ b/pkgs/jira-wiki-markup.nix
@@ -3,6 +3,8 @@ mkDerivation {
   pname = "jira-wiki-markup";
   version = "1.5.1";
   sha256 = "9ca23d369c3ccf1b3ffb209dda8e6288a5f5901fb8235113825fa48d3ae8e520";
+  revision = "1";
+  editedCabalFile = "19lkrzzhqjy5rjg7xcdwsrkna7nygjs0ayq7sm3114b1kbs8hahl";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
diff --git a/pkgs/js-chart.nix b/pkgs/js-chart.nix
deleted file mode 100644
index b54f110315300f5ec548c7753ccf00a4faf1a811..0000000000000000000000000000000000000000
--- a/pkgs/js-chart.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ mkDerivation, base, lib }:
-mkDerivation {
-  pname = "js-chart";
-  version = "2.9.4.1";
-  sha256 = "0a08efdd35bd1b8f293f9163f59305f31835304b74c3e3a1a840fc94bbc9bd0e";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = true;
-  libraryHaskellDepends = [ base ];
-  testHaskellDepends = [ base ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/jonascarpay/js-chart#readme";
-  description = "Obtain minified chart.js code";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/lens-family-th.nix b/pkgs/lens-family-th.nix
deleted file mode 100644
index 883709beb5d62606a87fd530c7e0ce662305a3fe..0000000000000000000000000000000000000000
--- a/pkgs/lens-family-th.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ mkDerivation, base, hspec, lib, template-haskell, transformers }:
-mkDerivation {
-  pname = "lens-family-th";
-  version = "0.5.2.1";
-  sha256 = "b01d6bb9325fa1729325ebc94b70ccf7957bbe71cb11367b3acd791a143213f1";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base template-haskell ];
-  testHaskellDepends = [ base hspec template-haskell transformers ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/DanBurton/lens-family-th#readme";
-  description = "Generate lens-family style lenses";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/lens-family.nix b/pkgs/lens-family.nix
deleted file mode 100644
index 83234e151000d0dcaf12fd8619cbca98bdb12c37..0000000000000000000000000000000000000000
--- a/pkgs/lens-family.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ mkDerivation, base, containers, lens-family-core, lib, mtl
-, transformers
-}:
-mkDerivation {
-  pname = "lens-family";
-  version = "2.1.2";
-  sha256 = "2b60afc3afc03b6e328fc96e291e21bb0a63b563657cabe7ba5febd471283648";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base containers lens-family-core mtl transformers
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Lens Families";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/lift-type.nix b/pkgs/lift-type.nix
deleted file mode 100644
index 58c49521fd2f3989ac626747df6271eb207066ab..0000000000000000000000000000000000000000
--- a/pkgs/lift-type.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ mkDerivation, base, lib, template-haskell }:
-mkDerivation {
-  pname = "lift-type";
-  version = "0.1.1.1";
-  sha256 = "10d81032a69175a9c0c6f97358962ac8e5663b1b9a798fc96c7ec227aad7370d";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base template-haskell ];
-  testHaskellDepends = [ base template-haskell ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/parsonsmatt/lift-type#readme";
-  description = "Lift a type from a Typeable constraint to a Template Haskell type";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/linear.nix b/pkgs/linear.nix
deleted file mode 100644
index 0013be748e74e9c845e30ab2d83ec423d64e0dd9..0000000000000000000000000000000000000000
--- a/pkgs/linear.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ mkDerivation, HUnit, adjunctions, base, base-orphans, binary
-, bytes, bytestring, cereal, containers, deepseq, distributive
-, ghc-prim, hashable, indexed-traversable, lens, lib, random
-, reflection, semigroupoids, simple-reflect, tagged
-, template-haskell, test-framework, test-framework-hunit
-, transformers, transformers-compat, unordered-containers, vector
-, void
-}:
-mkDerivation {
-  pname = "linear";
-  version = "1.22";
-  sha256 = "cfe43e392d0e9b2fd5647bde962b0678681de580260ad30e5f29ae490a03b9b5";
-  revision = "3";
-  editedCabalFile = "1fmq4i3qimccjsn7859q1rk7adpcy9d3zvybl0n7kljn04ag00k4";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    adjunctions base base-orphans binary bytes cereal containers
-    deepseq distributive ghc-prim hashable indexed-traversable lens
-    random reflection semigroupoids tagged template-haskell
-    transformers transformers-compat unordered-containers vector void
-  ];
-  testHaskellDepends = [
-    base binary bytestring deepseq HUnit reflection simple-reflect
-    test-framework test-framework-hunit vector
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/ekmett/linear/";
-  description = "Linear Algebra";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/monads-tf.nix b/pkgs/monads-tf.nix
deleted file mode 100644
index 5335e09411073b1cf6142a162e91bb183536b917..0000000000000000000000000000000000000000
--- a/pkgs/monads-tf.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, base, lib, transformers }:
-mkDerivation {
-  pname = "monads-tf";
-  version = "0.3.0.1";
-  sha256 = "21bcd293bf663b6cf993600a3357da724e09c088bdb0ba792f7afc8b69fa5f02";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base transformers ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/typeclasses/monads-tf";
-  description = "Monad classes, using type families";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/mtl-compat.nix b/pkgs/mtl-compat.nix
deleted file mode 100644
index 4fd885bdb490fcc8bc13c17596f8f48571c3f8ad..0000000000000000000000000000000000000000
--- a/pkgs/mtl-compat.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, base, lib, mtl }:
-mkDerivation {
-  pname = "mtl-compat";
-  version = "0.2.2";
-  sha256 = "1955398fe2115674f47f553b2caaf928c6aa3424271a5cd13bc191e54bfe3a9e";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base mtl ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/haskell-compat/mtl-compat";
-  description = "Backported Control.Monad.Except module from mtl";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/network-info.nix b/pkgs/network-info.nix
deleted file mode 100644
index e7235543a0928eff15e2475de66df4354f539f53..0000000000000000000000000000000000000000
--- a/pkgs/network-info.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, base, lib }:
-mkDerivation {
-  pname = "network-info";
-  version = "0.2.1";
-  sha256 = "9b2d88312fc8280351d5003200cc07decbb865f85d3aa7b1094b238bd6a8b404";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/jacobstanley/network-info";
-  description = "Access the local computer's basic network configuration";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/newtype.nix b/pkgs/newtype.nix
deleted file mode 100644
index bab3233f88b9753544b224491367b65abbb91746..0000000000000000000000000000000000000000
--- a/pkgs/newtype.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ mkDerivation, base, lib }:
-mkDerivation {
-  pname = "newtype";
-  version = "0.2.2.0";
-  sha256 = "3a00ffd1bb48a81e09f8be6510fa4c642ba1482b2f8d4777af1b5dd06c55ebac";
-  revision = "3";
-  editedCabalFile = "0yll88ydchd2gqcvdk28fchf2vygpd42ky2bigg4ga08jan2nacx";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "A typeclass and set of functions for working with newtypes";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/numeric-prelude.nix b/pkgs/numeric-prelude.nix
index 65d80efbca1cda74d1251ffc1b94f4855f12ceb6..5cc44a13b93e7d398539db75989543cc22c23f36 100644
--- a/pkgs/numeric-prelude.nix
+++ b/pkgs/numeric-prelude.nix
@@ -6,8 +6,8 @@ mkDerivation {
   pname = "numeric-prelude";
   version = "0.4.4";
   sha256 = "5a32f6b4dab913c68db30acc2e70e41e4b8f9fb00d25407ed4b0e4ae85cfa613";
-  revision = "1";
-  editedCabalFile = "0w5an2w06vpi75qj9972qbsiz4n72mr6mkib4ivlrrirndsyda79";
+  revision = "2";
+  editedCabalFile = "0cfhgpll0fg6d3m27f9fkhrv1l6v0dbbp9srkmg981kdh02pkjx2";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
diff --git a/pkgs/optics-core.nix b/pkgs/optics-core.nix
deleted file mode 100644
index 9cb17a7eed137a6bbba9fa825e9854f0df7e2778..0000000000000000000000000000000000000000
--- a/pkgs/optics-core.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ mkDerivation, array, base, containers, indexed-profunctors
-, indexed-traversable, lib, transformers
-}:
-mkDerivation {
-  pname = "optics-core";
-  version = "0.4.1.1";
-  sha256 = "3e817e3c66a0120ac4b4b6d790e659b75f8c0fb27c5f65f3974f4c697b7bb3fb";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    array base containers indexed-profunctors indexed-traversable
-    transformers
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Optics as an abstract interface: core definitions";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/optics-extra.nix b/pkgs/optics-extra.nix
deleted file mode 100644
index d7006db1e4cf70d93f4f66911e99c711c14d3b64..0000000000000000000000000000000000000000
--- a/pkgs/optics-extra.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ mkDerivation, array, base, bytestring, containers, hashable
-, indexed-profunctors, indexed-traversable-instances, lib, mtl
-, optics-core, text, transformers, unordered-containers, vector
-}:
-mkDerivation {
-  pname = "optics-extra";
-  version = "0.4.2.1";
-  sha256 = "7e23a7a325e3448354614d3d958279c9ac2fdd0831ceee2808830e7a962fca41";
-  revision = "2";
-  editedCabalFile = "0w7am7pvwg4mx0nrksxgr2rvnk99nhqfpj80ig21m9xbpxsh22x4";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    array base bytestring containers hashable indexed-profunctors
-    indexed-traversable-instances mtl optics-core text transformers
-    unordered-containers vector
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Extra utilities and instances for optics-core";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/optics-th.nix b/pkgs/optics-th.nix
deleted file mode 100644
index 12c7203faeb308d3e33ca16f517880f2e8da0ace..0000000000000000000000000000000000000000
--- a/pkgs/optics-th.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ mkDerivation, base, containers, lib, mtl, optics-core, tagged
-, template-haskell, th-abstraction, transformers
-}:
-mkDerivation {
-  pname = "optics-th";
-  version = "0.4.1";
-  sha256 = "d73857b79dcd8f7c7e70fa4727f134145b62902e8d3e448f8b25c38a9da4fd17";
-  revision = "6";
-  editedCabalFile = "03qm6q7gw97qlcgnqp097dyvqkqpq4ph95y5ra6k6da218rbl1nk";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base containers mtl optics-core template-haskell th-abstraction
-    transformers
-  ];
-  testHaskellDepends = [ base optics-core tagged ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Optics construction using TemplateHaskell";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/optics.nix b/pkgs/optics.nix
deleted file mode 100644
index 449fb744f96151d1ea3bf9fc028be8096b431f23..0000000000000000000000000000000000000000
--- a/pkgs/optics.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ mkDerivation, QuickCheck, array, base, bytestring, containers
-, indexed-profunctors, inspection-testing, lens, lib, mtl
-, optics-core, optics-extra, optics-th, random, tasty, tasty-bench
-, tasty-hunit, tasty-quickcheck, template-haskell, transformers
-, unordered-containers, vector
-}:
-mkDerivation {
-  pname = "optics";
-  version = "0.4.2.1";
-  sha256 = "e653d86aba75454fac21ab2f4220e895ad7f6e06889bc08d3f6522de4f7c5f6b";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    array base containers mtl optics-core optics-extra optics-th
-    transformers
-  ];
-  testHaskellDepends = [
-    base containers indexed-profunctors inspection-testing mtl
-    optics-core QuickCheck random tasty tasty-hunit tasty-quickcheck
-    template-haskell
-  ];
-  benchmarkHaskellDepends = [
-    base bytestring containers lens tasty-bench transformers
-    unordered-containers vector
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Optics as an abstract interface";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/options.nix b/pkgs/options.nix
deleted file mode 100644
index 33bc53065505eadd9fb5bf6529342e7c040fafb7..0000000000000000000000000000000000000000
--- a/pkgs/options.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ mkDerivation, base, containers, hspec, lib, monads-tf, patience
-}:
-mkDerivation {
-  pname = "options";
-  version = "1.2.1.2";
-  sha256 = "6e4d8fa177713d00f95cb43d21359a7d2908ce1e04f703be5b59679ccc3a5f4a";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base containers monads-tf ];
-  testHaskellDepends = [ base containers hspec monads-tf patience ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/typeclasses/options/";
-  description = "Powerful and easy command-line option parser";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/path-pieces.nix b/pkgs/path-pieces.nix
deleted file mode 100644
index f11bf43e45170fa3adec2fe6ad899c5bb1f58e24..0000000000000000000000000000000000000000
--- a/pkgs/path-pieces.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ mkDerivation, HUnit, QuickCheck, base, hspec, lib, text, time }:
-mkDerivation {
-  pname = "path-pieces";
-  version = "0.2.1";
-  sha256 = "080bd49f53e20597ca3e5962e0c279a3422345f5b088840a30a751cd76d4a36f";
-  revision = "1";
-  editedCabalFile = "0p7wsphh513s8l5d62lzgbhk2l1h6kj5y7bc27qqjsry9g8ah4y7";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base text time ];
-  testHaskellDepends = [ base hspec HUnit QuickCheck text ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Components of paths";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/persistent-postgresql.nix b/pkgs/persistent-postgresql.nix
deleted file mode 100644
index 22904e603453c634ad512d5c50246c3f199f8992..0000000000000000000000000000000000000000
--- a/pkgs/persistent-postgresql.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ mkDerivation, HUnit, QuickCheck, aeson, attoparsec, base
-, blaze-builder, bytestring, conduit, containers, fast-logger
-, hspec, hspec-expectations, hspec-expectations-lifted
-, http-api-data, lib, monad-logger, mtl, path-pieces, persistent
-, persistent-qq, persistent-test, postgresql-libpq
-, postgresql-simple, quickcheck-instances, resource-pool, resourcet
-, string-conversions, text, time, transformers, unliftio
-, unliftio-core, unordered-containers, vault, vector
-}:
-mkDerivation {
-  pname = "persistent-postgresql";
-  version = "2.13.6.1";
-  sha256 = "901af60342bedeecbf9b9c6053818e0e7b483bef9807ad4c4a645896b1506757";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    aeson attoparsec base blaze-builder bytestring conduit containers
-    monad-logger mtl persistent postgresql-libpq postgresql-simple
-    resource-pool resourcet string-conversions text time transformers
-    unliftio-core vault
-  ];
-  testHaskellDepends = [
-    aeson base bytestring containers fast-logger hspec
-    hspec-expectations hspec-expectations-lifted http-api-data HUnit
-    monad-logger path-pieces persistent persistent-qq persistent-test
-    QuickCheck quickcheck-instances resourcet text time transformers
-    unliftio unliftio-core unordered-containers vector
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://www.yesodweb.com/book/persistent";
-  description = "Backend for the persistent library using postgresql";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/persistent-qq.nix b/pkgs/persistent-qq.nix
deleted file mode 100644
index fdf4c6e94d0421bade4ef47e6b16c4cc9decf9b0..0000000000000000000000000000000000000000
--- a/pkgs/persistent-qq.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ mkDerivation, HUnit, aeson, base, bytestring, fast-logger
-, haskell-src-meta, hspec, lib, monad-logger, mtl, persistent
-, persistent-sqlite, resourcet, template-haskell, text, unliftio
-}:
-mkDerivation {
-  pname = "persistent-qq";
-  version = "2.12.0.6";
-  sha256 = "8d7386b94d883713ef41edc4cb30c99c7ad4c54aed7019feba76e07a563f01fc";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base haskell-src-meta mtl persistent template-haskell text
-  ];
-  testHaskellDepends = [
-    aeson base bytestring fast-logger haskell-src-meta hspec HUnit
-    monad-logger mtl persistent persistent-sqlite resourcet
-    template-haskell text unliftio
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/yesodweb/persistent#readme";
-  description = "Provides a quasi-quoter for raw SQL for persistent";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/persistent-sqlite.nix b/pkgs/persistent-sqlite.nix
deleted file mode 100644
index 8000ae83e25b435d287cc0beebf7f740e11de914..0000000000000000000000000000000000000000
--- a/pkgs/persistent-sqlite.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ mkDerivation, HUnit, QuickCheck, aeson, base, bytestring, conduit
-, containers, exceptions, fast-logger, hspec, lib, microlens
-, microlens-th, monad-logger, mtl, persistent, persistent-test
-, resource-pool, resourcet, sqlite, system-fileio, system-filepath
-, temporary, text, time, transformers, unliftio-core
-, unordered-containers
-}:
-mkDerivation {
-  pname = "persistent-sqlite";
-  version = "2.13.2.0";
-  sha256 = "0761de234c2cc5a63b96dc35e9261e719fdbaccd7995b45778611952ab3704ed";
-  configureFlags = [ "-fsystemlib" ];
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    aeson base bytestring conduit containers microlens-th monad-logger
-    mtl persistent resource-pool resourcet text time transformers
-    unliftio-core unordered-containers
-  ];
-  librarySystemDepends = [ sqlite ];
-  testHaskellDepends = [
-    base bytestring conduit containers exceptions fast-logger hspec
-    HUnit microlens monad-logger mtl persistent persistent-test
-    QuickCheck resourcet system-fileio system-filepath temporary text
-    time transformers unliftio-core
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://www.yesodweb.com/book/persistent";
-  description = "Backend for the persistent library using sqlite3";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/persistent-template.nix b/pkgs/persistent-template.nix
deleted file mode 100644
index bf30342e7263e6db49a48c21d3c07ba9c7f358e6..0000000000000000000000000000000000000000
--- a/pkgs/persistent-template.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, base, lib }:
-mkDerivation {
-  pname = "persistent-template";
-  version = "2.12.0.0";
-  sha256 = "dc488b567d373ebfbf5f3df8bba240e6203d1b13556872648d5f0d228fd02c31";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://www.yesodweb.com/book/persistent";
-  description = "Type-safe, non-relational, multi-backend persistence";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/persistent-test.nix b/pkgs/persistent-test.nix
deleted file mode 100644
index 5372a49fa7b04e6e1d8454c99838c514e785da48..0000000000000000000000000000000000000000
--- a/pkgs/persistent-test.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ mkDerivation, HUnit, QuickCheck, aeson, base, blaze-html
-, bytestring, conduit, containers, exceptions, hspec
-, hspec-expectations, http-api-data, lib, monad-control
-, monad-logger, mtl, path-pieces, persistent, quickcheck-instances
-, random, resourcet, text, time, transformers, transformers-base
-, unliftio, unliftio-core, unordered-containers
-}:
-mkDerivation {
-  pname = "persistent-test";
-  version = "2.13.1.3";
-  sha256 = "b465189ea0935ce35ad58065205f750da9403c98a8cd3920e9ce5e4c2d001b63";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    aeson base blaze-html bytestring conduit containers exceptions
-    hspec hspec-expectations http-api-data HUnit monad-control
-    monad-logger mtl path-pieces persistent QuickCheck
-    quickcheck-instances random resourcet text time transformers
-    transformers-base unliftio unliftio-core unordered-containers
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://www.yesodweb.com/book/persistent";
-  description = "Tests for Persistent";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/persistent.nix b/pkgs/persistent.nix
deleted file mode 100644
index f566889df01393edad0630f8da816ddb5c65d0d9..0000000000000000000000000000000000000000
--- a/pkgs/persistent.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ mkDerivation, QuickCheck, aeson, attoparsec, attoparsec-aeson
-, base, base64-bytestring, blaze-html, bytestring, conduit
-, containers, criterion, deepseq, fast-logger, file-embed, hspec
-, http-api-data, lib, lift-type, monad-logger, mtl, path-pieces
-, quickcheck-instances, resource-pool, resourcet, scientific
-, shakespeare, silently, template-haskell, text, th-lift-instances
-, time, transformers, unliftio, unliftio-core, unordered-containers
-, vault, vector
-}:
-mkDerivation {
-  pname = "persistent";
-  version = "2.14.6.0";
-  sha256 = "6e2b300797060e091624ebd4d1d5b0b3dad200acf7b9bf2bccfb1c538db6e53b";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    aeson attoparsec attoparsec-aeson base base64-bytestring blaze-html
-    bytestring conduit containers deepseq fast-logger http-api-data
-    lift-type monad-logger mtl path-pieces resource-pool resourcet
-    scientific silently template-haskell text th-lift-instances time
-    transformers unliftio unliftio-core unordered-containers vault
-    vector
-  ];
-  testHaskellDepends = [
-    aeson attoparsec base base64-bytestring blaze-html bytestring
-    conduit containers deepseq fast-logger hspec http-api-data
-    monad-logger mtl path-pieces QuickCheck quickcheck-instances
-    resource-pool resourcet scientific shakespeare silently
-    template-haskell text th-lift-instances time transformers unliftio
-    unliftio-core unordered-containers vector
-  ];
-  benchmarkHaskellDepends = [
-    base criterion deepseq file-embed template-haskell text
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://www.yesodweb.com/book/persistent";
-  description = "Type-safe, multi-backend data serialization";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/polyparse.nix b/pkgs/polyparse.nix
deleted file mode 100644
index 930e3d8e0204832193df3b657d31d7306aca65fb..0000000000000000000000000000000000000000
--- a/pkgs/polyparse.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ mkDerivation, base, bytestring, lib, text }:
-mkDerivation {
-  pname = "polyparse";
-  version = "1.13";
-  sha256 = "1c4c72980e1e5a4f07fea65ca08b2399581d2a6aa21eb1078f7ad286c279707b";
-  revision = "9";
-  editedCabalFile = "0abzqic0askffn6nmh1f08d9rd9fykdlcdd9gj1c7p1ykp9zlq29";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base bytestring text ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://code.haskell.org/~malcolm/polyparse/";
-  description = "A variety of alternative parser combinator libraries";
-  license = "LGPL";
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/polysemy-plugin.nix b/pkgs/polysemy-plugin.nix
deleted file mode 100644
index a37f04e2ba9dfb61da49e23e17efcd394f729aef..0000000000000000000000000000000000000000
--- a/pkgs/polysemy-plugin.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ mkDerivation, Cabal, base, cabal-doctest, containers, doctest
-, ghc, ghc-tcplugins-extra, hspec, hspec-discover
-, inspection-testing, lib, polysemy, should-not-typecheck, syb
-, transformers
-}:
-mkDerivation {
-  pname = "polysemy-plugin";
-  version = "0.4.5.1";
-  sha256 = "d7ac12b678daff450bd8ffd5e4ac2a9872775be8b5fa325f9a7da49a127fcf18";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  setupHaskellDepends = [ base Cabal cabal-doctest ];
-  libraryHaskellDepends = [
-    base containers ghc ghc-tcplugins-extra polysemy syb transformers
-  ];
-  testHaskellDepends = [
-    base containers doctest ghc ghc-tcplugins-extra hspec
-    hspec-discover inspection-testing polysemy should-not-typecheck syb
-    transformers
-  ];
-  testToolDepends = [ hspec-discover ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/polysemy-research/polysemy#readme";
-  description = "Disambiguate obvious uses of effects";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/polysemy.nix b/pkgs/polysemy.nix
deleted file mode 100644
index 84a5dad06bafc2fbfcf176885998727aa9b9756a..0000000000000000000000000000000000000000
--- a/pkgs/polysemy.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ mkDerivation, Cabal, async, base, cabal-doctest, containers
-, doctest, first-class-families, hspec, hspec-discover
-, inspection-testing, lib, mtl, stm, syb, template-haskell
-, th-abstraction, transformers, type-errors, unagi-chan
-}:
-mkDerivation {
-  pname = "polysemy";
-  version = "1.9.1.3";
-  sha256 = "68d1d8bbd4ce7be633ae486793268051b6eb24d22a76372ea759f815c6694557";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  setupHaskellDepends = [ base Cabal cabal-doctest ];
-  libraryHaskellDepends = [
-    async base containers first-class-families mtl stm syb
-    template-haskell th-abstraction transformers type-errors unagi-chan
-  ];
-  testHaskellDepends = [
-    async base containers doctest first-class-families hspec
-    hspec-discover inspection-testing mtl stm syb template-haskell
-    th-abstraction transformers type-errors unagi-chan
-  ];
-  testToolDepends = [ hspec-discover ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/polysemy-research/polysemy#readme";
-  description = "Higher-order, low-boilerplate free monads";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/port-utils.nix b/pkgs/port-utils.nix
deleted file mode 100644
index 4218b510372a0337cafd01895d1f346d365a159e..0000000000000000000000000000000000000000
--- a/pkgs/port-utils.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ mkDerivation, async, base, hspec, lib, network, stm, transformers
-}:
-mkDerivation {
-  pname = "port-utils";
-  version = "0.2.1.0";
-  sha256 = "b6f830946a9daa829bb14dc7f105f28ae2cfa2ee8540af8550e3c975ac7117de";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base network ];
-  testHaskellDepends = [ async base hspec network stm transformers ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/jfischoff/port-utils#readme";
-  description = "Utilities for creating and waiting on ports";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/postgres-options.nix b/pkgs/postgres-options.nix
deleted file mode 100644
index 0e4025feb20cfee909d27e6803ab4d2be3ae48cf..0000000000000000000000000000000000000000
--- a/pkgs/postgres-options.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, base, bytestring, generic-monoid, hspec, lib, split
-, uri-bytestring
-}:
-mkDerivation {
-  pname = "postgres-options";
-  version = "0.2.1.0";
-  sha256 = "0ab2acf4447abec49ca0ffa71de5732d40b04ed0f791e7f7f6c7672f3644936d";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base bytestring generic-monoid split uri-bytestring
-  ];
-  testHaskellDepends = [ base hspec ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/jfischoff/postgres-options#readme";
-  description = "An Options type representing options for postgres connections";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/postgresql-libpq.nix b/pkgs/postgresql-libpq.nix
deleted file mode 100644
index 6ee788428435499f92fb44c62054c4bdda5026e9..0000000000000000000000000000000000000000
--- a/pkgs/postgresql-libpq.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, Cabal, base, bytestring, lib, postgresql, unix }:
-mkDerivation {
-  pname = "postgresql-libpq";
-  version = "0.10.0.0";
-  sha256 = "54bca8926fafea05870437732a4d4a200558053b36f9f0867fd3689e035bdf62";
-  revision = "1";
-  editedCabalFile = "1xqf1mqbsq75iay8hv4d8ac5psaay6v106w0nqv00p1y5vfay72w";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  setupHaskellDepends = [ base Cabal ];
-  libraryHaskellDepends = [ base bytestring unix ];
-  librarySystemDepends = [ postgresql ];
-  testHaskellDepends = [ base bytestring ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/haskellari/postgresql-libpq";
-  description = "low-level binding to libpq";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/postgresql-simple.nix b/pkgs/postgresql-simple.nix
deleted file mode 100644
index 9b4172ef3202f6e1e8911ccf660fdd88d0b9fd2a..0000000000000000000000000000000000000000
--- a/pkgs/postgresql-simple.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ mkDerivation, HUnit, Only, aeson, attoparsec, base
-, base16-bytestring, bytestring, case-insensitive, containers
-, cryptohash-md5, filepath, hashable, inspection-testing, lib
-, postgresql-libpq, scientific, tasty, tasty-golden, tasty-hunit
-, template-haskell, text, time-compat, transformers, uuid-types
-, vector
-}:
-mkDerivation {
-  pname = "postgresql-simple";
-  version = "0.7.0.0";
-  sha256 = "8cb81bb55100715e590d3215d0f0eb6f6c39cc070c070ab621b00cfcc5e4a13e";
-  revision = "1";
-  editedCabalFile = "0yhggx06wbg57psqa8sswf85qfzy8ndssv13vwmxj0gc1ca1zv4l";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    aeson attoparsec base bytestring case-insensitive containers
-    hashable Only postgresql-libpq scientific template-haskell text
-    time-compat transformers uuid-types vector
-  ];
-  testHaskellDepends = [
-    aeson base base16-bytestring bytestring case-insensitive containers
-    cryptohash-md5 filepath HUnit inspection-testing postgresql-libpq
-    tasty tasty-golden tasty-hunit text time-compat vector
-  ];
-  benchmarkHaskellDepends = [ base vector ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Mid-Level PostgreSQL client library";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/protolude.nix b/pkgs/protolude.nix
deleted file mode 100644
index 6b2219591bcde28635074f129783e4ee5e2cd8e5..0000000000000000000000000000000000000000
--- a/pkgs/protolude.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ mkDerivation, array, async, base, bytestring, containers, deepseq
-, ghc-prim, hashable, lib, mtl, mtl-compat, stm, text, transformers
-, transformers-compat
-}:
-mkDerivation {
-  pname = "protolude";
-  version = "0.3.3";
-  sha256 = "6c39ded2c7e9f7b1a508e4400f0151cb325f4d80e35010c1d5afa58b48971a46";
-  revision = "2";
-  editedCabalFile = "0f949f93wml7h7na9d1n9lvignwphxr2r18jwmpy33g0dxgn21h1";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    array async base bytestring containers deepseq ghc-prim hashable
-    mtl mtl-compat stm text transformers transformers-compat
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/sdiehl/protolude";
-  description = "A small prelude";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/quiet.nix b/pkgs/quiet.nix
deleted file mode 100644
index 7213b252f89d27ee548d1827b8cc3c1c496339a2..0000000000000000000000000000000000000000
--- a/pkgs/quiet.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ mkDerivation, base, lib }:
-mkDerivation {
-  pname = "quiet";
-  version = "0.2";
-  sha256 = "118bf67379dce4737619998380e399acba306dc8a086a069d4a01d5694325e4c";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
-  testHaskellDepends = [ base ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/jacobstanley/quiet#readme";
-  description = "Generic deriving of Read/Show with no record labels";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/recursion-schemes.nix b/pkgs/recursion-schemes.nix
deleted file mode 100644
index b5a09f030be693dcab93c405f487bf2e04318610..0000000000000000000000000000000000000000
--- a/pkgs/recursion-schemes.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, HUnit, base, comonad, containers, data-fix, free
-, lib, template-haskell, th-abstraction, transformers
-}:
-mkDerivation {
-  pname = "recursion-schemes";
-  version = "5.2.2.5";
-  sha256 = "5cb79bd5d6dd5a0adf61ccc37a93c4fcfaeb6077f60a975c895feb32744d97ec";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base comonad containers data-fix free template-haskell
-    th-abstraction transformers
-  ];
-  testHaskellDepends = [ base HUnit template-haskell transformers ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/ekmett/recursion-schemes/";
-  description = "Representing common recursion patterns as higher-order functions";
-  license = lib.licenses.bsd2;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/regex-compat.nix b/pkgs/regex-compat.nix
deleted file mode 100644
index 459d1fc82976c528cf405aa3690c788538a492ba..0000000000000000000000000000000000000000
--- a/pkgs/regex-compat.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ mkDerivation, array, base, lib, regex-base, regex-posix }:
-mkDerivation {
-  pname = "regex-compat";
-  version = "0.95.2.1";
-  sha256 = "8f7b386c72fd605a292edfb809b8620245b4a3ab7af192ad79e36778596e7947";
-  revision = "2";
-  editedCabalFile = "0ldqpdxikm17ydrkfmichflkdqdrkspv4r0qy3zbdgqf5033pj4n";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ array base regex-base regex-posix ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://wiki.haskell.org/Regular_expressions";
-  description = "Replaces/enhances \"Text.Regex\"";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/resource-pool.nix b/pkgs/resource-pool.nix
deleted file mode 100644
index 82544a86245c5a71448a0c82bebbe03b95bb3367..0000000000000000000000000000000000000000
--- a/pkgs/resource-pool.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ mkDerivation, base, hashable, lib, primitive, time }:
-mkDerivation {
-  pname = "resource-pool";
-  version = "0.4.0.0";
-  sha256 = "8c0d783e3e75788d65f79157309132999f1bbb70684bacc2ea5dd18f904ae9b1";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base hashable primitive time ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "A high-performance striped resource pooling implementation";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/sdl2-gfx.nix b/pkgs/sdl2-gfx.nix
deleted file mode 100644
index 34b12c6cd9f0b0bbcead31fb720d28de44e2aee5..0000000000000000000000000000000000000000
--- a/pkgs/sdl2-gfx.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ mkDerivation, SDL2, SDL2_gfx, base, lib, lifted-base
-, monad-control, sdl2, template-haskell, vector
-}:
-mkDerivation {
-  pname = "sdl2-gfx";
-  version = "0.3.0.0";
-  sha256 = "bcab7e1f8f7a60dec2db07c6680eb3f16e88511829a6ef9cd82ddce91c293565";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base lifted-base monad-control sdl2 template-haskell vector
-  ];
-  librarySystemDepends = [ SDL2_gfx ];
-  libraryPkgconfigDepends = [ SDL2 SDL2_gfx ];
-  executableHaskellDepends = [ base sdl2 vector ];
-  executableSystemDepends = [ SDL2_gfx ];
-  executablePkgconfigDepends = [ SDL2 SDL2_gfx ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Haskell bindings to SDL2_gfx";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/sdl2-image.nix b/pkgs/sdl2-image.nix
deleted file mode 100644
index 759f3f14ad63a327457713c35eb6fe721ef6debe..0000000000000000000000000000000000000000
--- a/pkgs/sdl2-image.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ mkDerivation, SDL2, SDL2_image, base, bytestring, lib, sdl2
-, template-haskell, text
-}:
-mkDerivation {
-  pname = "sdl2-image";
-  version = "2.1.0.0";
-  sha256 = "d22403d966e0f18ecc33fadda8e611e2e90bc718e8d6647177f5118264a5920d";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base bytestring sdl2 template-haskell text
-  ];
-  librarySystemDepends = [ SDL2_image ];
-  libraryPkgconfigDepends = [ SDL2 SDL2_image ];
-  executableHaskellDepends = [ base sdl2 text ];
-  executableSystemDepends = [ SDL2_image ];
-  executablePkgconfigDepends = [ SDL2 SDL2_image ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Haskell bindings to SDL2_image";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/sdl2-mixer.nix b/pkgs/sdl2-mixer.nix
deleted file mode 100644
index fdece280e39bea63f7fbfa6fc9939330e836d8fa..0000000000000000000000000000000000000000
--- a/pkgs/sdl2-mixer.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ mkDerivation, SDL2_mixer, base, bytestring, data-default-class
-, lib, lifted-base, monad-control, sdl2, template-haskell, vector
-}:
-mkDerivation {
-  pname = "sdl2-mixer";
-  version = "1.2.0.0";
-  sha256 = "58141826af5d491794a74484fda770859e2271b0ede44cc75f2e562b70b7cf99";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base bytestring data-default-class lifted-base monad-control sdl2
-    template-haskell vector
-  ];
-  librarySystemDepends = [ SDL2_mixer ];
-  libraryPkgconfigDepends = [ SDL2_mixer ];
-  executableHaskellDepends = [ base data-default-class sdl2 vector ];
-  executableSystemDepends = [ SDL2_mixer ];
-  executablePkgconfigDepends = [ SDL2_mixer ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Haskell bindings to SDL2_mixer";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/sdl2-ttf.nix b/pkgs/sdl2-ttf.nix
deleted file mode 100644
index 00079742297bb02b5e1fd20c1a71d6a475104e23..0000000000000000000000000000000000000000
--- a/pkgs/sdl2-ttf.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, SDL2, SDL2_ttf, base, bytestring, lib, sdl2
-, template-haskell, text, th-abstraction, transformers
-}:
-mkDerivation {
-  pname = "sdl2-ttf";
-  version = "2.1.3";
-  sha256 = "b60219fe8144c5d61b140b4607432b24fb93e947c504a8e2f89517175ba6a56a";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base bytestring sdl2 template-haskell text th-abstraction
-    transformers
-  ];
-  libraryPkgconfigDepends = [ SDL2 SDL2_ttf ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Bindings to SDL2_ttf";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/sdl2.nix b/pkgs/sdl2.nix
deleted file mode 100644
index 119d1b5628ad9d374d286638d627609b4bcea977..0000000000000000000000000000000000000000
--- a/pkgs/sdl2.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, SDL2, StateVar, base, bytestring, deepseq
-, exceptions, lib, linear, text, transformers, vector, weigh
-}:
-mkDerivation {
-  pname = "sdl2";
-  version = "2.5.5.0";
-  sha256 = "23fdaa896e528620f31afeb763422d0c27d758e587215ff0c1387d6e6b3551cd";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = true;
-  libraryHaskellDepends = [
-    base bytestring exceptions linear StateVar text transformers vector
-  ];
-  librarySystemDepends = [ SDL2 ];
-  libraryPkgconfigDepends = [ SDL2 ];
-  testHaskellDepends = [ base deepseq linear vector weigh ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Both high- and low-level bindings to the SDL library (version 2.0.6+).";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/servant-client-core.nix b/pkgs/servant-client-core.nix
deleted file mode 100644
index 4a89d2cd2206201619f3de7f4d7a8f2f35cbbebb..0000000000000000000000000000000000000000
--- a/pkgs/servant-client-core.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ mkDerivation, QuickCheck, aeson, base, base-compat
-, base64-bytestring, bytestring, constraints, containers, deepseq
-, exceptions, free, hspec, hspec-discover, http-media, http-types
-, lib, network-uri, safe, servant, sop-core, template-haskell, text
-, transformers
-}:
-mkDerivation {
-  pname = "servant-client-core";
-  version = "0.20";
-  sha256 = "a6744916079ec769c248ff5f7a2cc62d7eb03abb445be6c1fa7811c2866b4b04";
-  revision = "3";
-  editedCabalFile = "02q7fvmqvc1n5h0bh4q28vaphhnms34lr6ckxbxrmc5wwcz8qkgv";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    aeson base base-compat base64-bytestring bytestring constraints
-    containers deepseq exceptions free http-media http-types
-    network-uri safe servant sop-core template-haskell text
-    transformers
-  ];
-  testHaskellDepends = [ base base-compat deepseq hspec QuickCheck ];
-  testToolDepends = [ hspec-discover ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://docs.servant.dev/";
-  description = "Core functionality and class for client function generation for servant APIs";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/servant-client.nix b/pkgs/servant-client.nix
deleted file mode 100644
index a551221d57b8d9cb41c47a34c7c16b1cabf08875..0000000000000000000000000000000000000000
--- a/pkgs/servant-client.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ mkDerivation, HUnit, QuickCheck, aeson, base, base-compat
-, bytestring, containers, deepseq, entropy, exceptions, hspec
-, hspec-discover, http-api-data, http-client, http-media
-, http-types, kan-extensions, lib, markdown-unlit, monad-control
-, mtl, network, semigroupoids, servant, servant-client-core
-, servant-server, sop-core, stm, text, time, transformers
-, transformers-base, transformers-compat, wai, warp
-}:
-mkDerivation {
-  pname = "servant-client";
-  version = "0.20";
-  sha256 = "765d30f3579b74bebfe79f59a4aacfd9dec0c02c7d355f389caa604f0ac3b276";
-  revision = "3";
-  editedCabalFile = "0awk9s22228mm4ff3bc165djvykihbkk6vqvfak0mz1m7dypi7fq";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base base-compat bytestring containers deepseq exceptions
-    http-client http-media http-types kan-extensions monad-control mtl
-    semigroupoids servant servant-client-core stm text time
-    transformers transformers-base transformers-compat
-  ];
-  testHaskellDepends = [
-    aeson base base-compat bytestring entropy hspec http-api-data
-    http-client http-types HUnit kan-extensions markdown-unlit mtl
-    network QuickCheck servant servant-client-core servant-server
-    sop-core stm text transformers transformers-compat wai warp
-  ];
-  testToolDepends = [ hspec-discover markdown-unlit ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://docs.servant.dev/";
-  description = "Automatic derivation of querying functions for servant";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/servant-docs.nix b/pkgs/servant-docs.nix
deleted file mode 100644
index 5369dafac876dd6024961691d6786dd7d86a86fd..0000000000000000000000000000000000000000
--- a/pkgs/servant-docs.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
-, case-insensitive, hashable, http-media, http-types, lens, lib
-, servant, string-conversions, tasty, tasty-golden, tasty-hunit
-, text, transformers, universe-base, unordered-containers
-}:
-mkDerivation {
-  pname = "servant-docs";
-  version = "0.13";
-  sha256 = "c75ce9536f7568606a8c67a7920c476fb91fba77140b379904d6b26590af2145";
-  revision = "2";
-  editedCabalFile = "1awdlcvi24rqjzx01qff4an4srzqbyrcihxvazha0ypr2w94wz15";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    aeson aeson-pretty base base-compat bytestring case-insensitive
-    hashable http-media http-types lens servant string-conversions text
-    universe-base unordered-containers
-  ];
-  executableHaskellDepends = [
-    aeson base lens servant string-conversions text
-  ];
-  testHaskellDepends = [
-    aeson base base-compat lens servant string-conversions tasty
-    tasty-golden tasty-hunit transformers
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://docs.servant.dev/";
-  description = "generate API docs for your servant webservice";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/servant-foreign.nix b/pkgs/servant-foreign.nix
deleted file mode 100644
index 19d046147deb663cdeb94dee17f3df01e77efc26..0000000000000000000000000000000000000000
--- a/pkgs/servant-foreign.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ mkDerivation, base, base-compat, hspec, hspec-discover
-, http-types, lens, lib, servant, text
-}:
-mkDerivation {
-  pname = "servant-foreign";
-  version = "0.16";
-  sha256 = "bbaeb1e42a335fa5f65e837deee782db77b61f068093170eafd2b3763ac8f196";
-  revision = "2";
-  editedCabalFile = "1mvp8r90kj0hnl95hzwdf5pja69h44vlwjypygzgjxn1j0lmrj2f";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base base-compat http-types lens servant text
-  ];
-  testHaskellDepends = [ base hspec servant ];
-  testToolDepends = [ hspec-discover ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://docs.servant.dev/";
-  description = "Helpers for generating clients for servant APIs in any programming language";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/servant-multipart-api.nix b/pkgs/servant-multipart-api.nix
deleted file mode 100644
index 448b7aea928fc96b4cb680f9696904589352c4e1..0000000000000000000000000000000000000000
--- a/pkgs/servant-multipart-api.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, base, bytestring, lib, servant, text, transformers
-}:
-mkDerivation {
-  pname = "servant-multipart-api";
-  version = "0.12.1";
-  sha256 = "92d5c3b1ccbcde7abcff6eb639d7dbb836222452a965e73ebd40bf775e522ebe";
-  revision = "5";
-  editedCabalFile = "05243nl7sbc7p5rvqssiqha1qv38a0qp0ppb227pg0x748xh7ai4";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base bytestring servant text transformers
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/haskell-servant/servant-multipart#readme";
-  description = "multipart/form-data (e.g file upload) support for servant";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/servant-multipart.nix b/pkgs/servant-multipart.nix
deleted file mode 100644
index d427f2319f17c5aa68f81a82de67f91f71296619..0000000000000000000000000000000000000000
--- a/pkgs/servant-multipart.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ mkDerivation, base, bytestring, directory, http-types, lens, lib
-, resourcet, servant, servant-docs, servant-foreign
-, servant-multipart-api, servant-server, string-conversions, tasty
-, tasty-wai, text, wai, wai-extra
-}:
-mkDerivation {
-  pname = "servant-multipart";
-  version = "0.12.1";
-  sha256 = "c5236fa4922a869947988d52ab9f5b0a19abf57bb0467e2eb34560f8c79aa5dc";
-  revision = "5";
-  editedCabalFile = "0pf761m9l6jnqhljjj4i6zr9il8r9ajpqfxzqjgjsnbsg6872ykg";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base bytestring directory lens resourcet servant servant-docs
-    servant-foreign servant-multipart-api servant-server
-    string-conversions text wai wai-extra
-  ];
-  testHaskellDepends = [
-    base bytestring http-types servant-server string-conversions tasty
-    tasty-wai text
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/haskell-servant/servant-multipart#readme";
-  description = "multipart/form-data (e.g file upload) support for servant";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/servant-server.nix b/pkgs/servant-server.nix
deleted file mode 100644
index d03412704ed0fbc8eb27635377febb9d727bee85..0000000000000000000000000000000000000000
--- a/pkgs/servant-server.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ mkDerivation, QuickCheck, aeson, base, base-compat
-, base64-bytestring, bytestring, constraints, containers, directory
-, exceptions, filepath, hspec, hspec-discover, hspec-wai
-, http-api-data, http-media, http-types, lib, monad-control, mtl
-, network, network-uri, resourcet, safe, servant
-, should-not-typecheck, sop-core, string-conversions, tagged
-, temporary, text, transformers, transformers-base
-, transformers-compat, wai, wai-app-static, wai-extra, warp, word8
-}:
-mkDerivation {
-  pname = "servant-server";
-  version = "0.20";
-  sha256 = "13b2fe785be1aae07e15d139fa1f94c7c5db6c8d36d0fc7789576b31a9bee8be";
-  revision = "4";
-  editedCabalFile = "1y1pilkixlm116cr4q7rsawfxkwv7iahq9cqq4nidc4py482ccbg";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base base-compat base64-bytestring bytestring constraints
-    containers exceptions filepath http-api-data http-media http-types
-    monad-control mtl network network-uri resourcet servant sop-core
-    string-conversions tagged text transformers transformers-base wai
-    wai-app-static word8
-  ];
-  executableHaskellDepends = [
-    aeson base base-compat servant text wai warp
-  ];
-  testHaskellDepends = [
-    aeson base base-compat base64-bytestring bytestring directory hspec
-    hspec-wai http-types mtl QuickCheck resourcet safe servant
-    should-not-typecheck sop-core string-conversions temporary text
-    transformers transformers-compat wai wai-extra
-  ];
-  testToolDepends = [ hspec-discover ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://docs.servant.dev/";
-  description = "A family of combinators for defining webservices APIs and serving them";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/servant.nix b/pkgs/servant.nix
deleted file mode 100644
index 27ed50f658b24f8895356f2cb852512a0659b9b5..0000000000000000000000000000000000000000
--- a/pkgs/servant.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ mkDerivation, QuickCheck, aeson, attoparsec, base, base-compat
-, bifunctors, bytestring, case-insensitive, constraints, deepseq
-, hspec, hspec-discover, http-api-data, http-media, http-types, lib
-, mmorph, mtl, network-uri, quickcheck-instances, singleton-bool
-, sop-core, string-conversions, tagged, text, transformers, vault
-}:
-mkDerivation {
-  pname = "servant";
-  version = "0.20.1";
-  sha256 = "94f773f9bdff67eb2d7aec9c67f80e8af79d531ba6f52fad2e142d8ce4551be9";
-  revision = "2";
-  editedCabalFile = "137yfr7mxfx2r3pkdfwsxv7xxch5l20yirj82186djyg36q5021z";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    aeson attoparsec base base-compat bifunctors bytestring
-    case-insensitive constraints deepseq http-api-data http-media
-    http-types mmorph mtl network-uri QuickCheck singleton-bool
-    sop-core string-conversions tagged text transformers vault
-  ];
-  testHaskellDepends = [
-    aeson base base-compat bytestring hspec http-media mtl QuickCheck
-    quickcheck-instances string-conversions text transformers
-  ];
-  testToolDepends = [ hspec-discover ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://docs.servant.dev/";
-  description = "A family of combinators for defining webservices APIs";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/sop-core.nix b/pkgs/sop-core.nix
deleted file mode 100644
index 7a7e30a3083b2c2b88a39286cc8fdf2df6d2fbf3..0000000000000000000000000000000000000000
--- a/pkgs/sop-core.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ mkDerivation, base, deepseq, lib }:
-mkDerivation {
-  pname = "sop-core";
-  version = "0.5.0.2";
-  sha256 = "87bffd2254b98ded822d449fcd1c33dbd74d2ce96bf35e7a6714abc5a2297265";
-  revision = "3";
-  editedCabalFile = "0rlrf4whfkqf200916d02r0s4zqlimb3d4z6gd3f5czayncp31cx";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base deepseq ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "True Sums of Products";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/statistics.nix b/pkgs/statistics.nix
deleted file mode 100644
index a8c17e41942c3cd79dc944e7e29abcfb56ae9886..0000000000000000000000000000000000000000
--- a/pkgs/statistics.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ mkDerivation, QuickCheck, aeson, async, base, binary
-, data-default-class, deepseq, dense-linear-algebra, erf, ieee754
-, lib, math-functions, mwc-random, parallel, primitive, random
-, tasty, tasty-expected-failure, tasty-hunit, tasty-quickcheck
-, vector, vector-algorithms, vector-binary-instances
-, vector-th-unbox
-}:
-mkDerivation {
-  pname = "statistics";
-  version = "0.16.2.1";
-  sha256 = "a7c0c068a0d1f784d865163748a40fbbdda48febe3b905063a22ce7a32e05ce4";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    aeson async base binary data-default-class deepseq
-    dense-linear-algebra math-functions mwc-random parallel primitive
-    random vector vector-algorithms vector-binary-instances
-    vector-th-unbox
-  ];
-  testHaskellDepends = [
-    aeson base binary dense-linear-algebra erf ieee754 math-functions
-    primitive QuickCheck tasty tasty-expected-failure tasty-hunit
-    tasty-quickcheck vector vector-algorithms
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/haskell/statistics";
-  description = "A library of statistical types, data, and functions";
-  license = lib.licenses.bsd2;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/streamly-core.nix b/pkgs/streamly-core.nix
index 99a79f7848ce8077998196316b42887096782d61..7f57b08fc5e6aedd91865f313a359619f5f0da7b 100644
--- a/pkgs/streamly-core.nix
+++ b/pkgs/streamly-core.nix
@@ -6,6 +6,8 @@ mkDerivation {
   pname = "streamly-core";
   version = "0.2.0";
   sha256 = "9fe280b777b7b38138d9bede92c792dc7b7c23458978305663808337d7332424";
+  revision = "1";
+  editedCabalFile = "1kvbr7rc3xlsj0nbpkjz56g7vcp8a3ds5znhri2hz2j2m3zj2ai1";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/streamly.nix b/pkgs/streamly.nix
index 23da795712c3f4f0477136f308a1cb8568742116..372d62f077e37f368c2dd6066ec6f63829a839ea 100644
--- a/pkgs/streamly.nix
+++ b/pkgs/streamly.nix
@@ -7,6 +7,8 @@ mkDerivation {
   pname = "streamly";
   version = "0.10.0";
   sha256 = "cfe4643d354fba1c7ad781f80c6d89db61c6895d4f5cdde2cf7875f2ef88ef56";
+  revision = "1";
+  editedCabalFile = "0jas47x44iiylfzrx1wvmnf0w9nnr95h1gdn5bnswjr50xcyg01d";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/system-fileio.nix b/pkgs/system-fileio.nix
deleted file mode 100644
index d0d90250b9dd2d7e1577aaee3683b4b796abdbb4..0000000000000000000000000000000000000000
--- a/pkgs/system-fileio.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ mkDerivation, base, bytestring, chell, lib, system-filepath
-, temporary, text, time, transformers, unix
-}:
-mkDerivation {
-  pname = "system-fileio";
-  version = "0.3.16.4";
-  sha256 = "34e58b88a19a69ff1a559e211af6edb596e33ee1b1d5f44490febf325c78c6c7";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base bytestring system-filepath text time unix
-  ];
-  testHaskellDepends = [
-    base bytestring chell system-filepath temporary text time
-    transformers unix
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/fpco/haskell-filesystem";
-  description = "Consistent filesystem interaction across GHC versions (deprecated)";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/system-filepath.nix b/pkgs/system-filepath.nix
deleted file mode 100644
index 90b709efc55b009fab72ae70e7114377e32ce238..0000000000000000000000000000000000000000
--- a/pkgs/system-filepath.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ mkDerivation, Cabal, QuickCheck, base, bytestring, chell
-, chell-quickcheck, deepseq, lib, text
-}:
-mkDerivation {
-  pname = "system-filepath";
-  version = "0.4.14";
-  sha256 = "1656ce3c0d585650784ceb3f794748286e19fb635f557e7b29b0897f8956d993";
-  revision = "2";
-  editedCabalFile = "0731bm8msw4gdaxy0dmya55w91yh9nk952ysf82n32c0nib1hdr4";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  setupHaskellDepends = [ base Cabal ];
-  libraryHaskellDepends = [ base bytestring deepseq text ];
-  testHaskellDepends = [
-    base bytestring chell chell-quickcheck QuickCheck text
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/fpco/haskell-filesystem";
-  description = "High-level, byte-based file and directory path manipulations (deprecated)";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/tagsoup.nix b/pkgs/tagsoup.nix
deleted file mode 100644
index 75ebe330e20f68a9e5b87663946186641ac15ab9..0000000000000000000000000000000000000000
--- a/pkgs/tagsoup.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, QuickCheck, base, bytestring, containers, deepseq
-, directory, lib, process, text, time
-}:
-mkDerivation {
-  pname = "tagsoup";
-  version = "0.14.8";
-  sha256 = "ba7e5500d853d29f0675b90655b7fdd032a4a7eee82a56e7ee3ef9949fe93ad5";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base bytestring containers text ];
-  testHaskellDepends = [
-    base bytestring deepseq directory process QuickCheck time
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/ndmitchell/tagsoup#readme";
-  description = "Parsing and extracting information from (possibly malformed) HTML/XML documents";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/th-extras.nix b/pkgs/th-extras.nix
deleted file mode 100644
index 86e18b294205521ee5423bbf63f418d421f3db5d..0000000000000000000000000000000000000000
--- a/pkgs/th-extras.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, base, containers, lib, syb, template-haskell
-, th-abstraction
-}:
-mkDerivation {
-  pname = "th-extras";
-  version = "0.0.0.6";
-  sha256 = "02bf23940c0233a6ef6f61868e827ebd4554afe8d71cef2a1eb8e286a7f07c4a";
-  revision = "1";
-  editedCabalFile = "0v81vfgaky4bb3rh18mnb7ampwm43dba3vsngv9mb1f3z975f0ix";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base containers syb template-haskell th-abstraction
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/mokus0/th-extras";
-  description = "A grab bag of functions for use with Template Haskell";
-  license = lib.licenses.publicDomain;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/tidal.nix b/pkgs/tidal.nix
index e58e08707166c8c8d6e173776eab9da7047fdd36..5f517c377c9e1cd55aa43dec63a453cfb55a30d6 100644
--- a/pkgs/tidal.nix
+++ b/pkgs/tidal.nix
@@ -7,8 +7,8 @@ mkDerivation {
   pname = "tidal";
   version = "1.9.4";
   sha256 = "61dbc51935327c79d2714ab334a7abb1e81c1b3a0363d8de0018618a6901d788";
-  revision = "2";
-  editedCabalFile = "12v805xy9nqfyn9ryqxlslqiffb6havpixi23xkmk0annbxcf8k2";
+  revision = "3";
+  editedCabalFile = "0sxx6cnlhjmiccmfpjkfrisxxbghbacip0q372i66a32wwkg9i0h";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = true;
diff --git a/pkgs/tmp-postgres.nix b/pkgs/tmp-postgres.nix
deleted file mode 100644
index 5f12865c6974e4819f21276c87b0a3e8d89b5314..0000000000000000000000000000000000000000
--- a/pkgs/tmp-postgres.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ mkDerivation, async, base, base64-bytestring, bytestring
-, containers, criterion, cryptohash-sha1, deepseq, directory
-, fetchgit, generic-monoid, hspec, lib, mtl, network, port-utils
-, postgres-options, postgresql-simple, prettyprinter, process, stm
-, temporary, transformers, unix
-}:
-mkDerivation {
-  pname = "tmp-postgres";
-  version = "1.35.0.0";
-  src = fetchgit {
-    url = "https://github.com/jfischoff/tmp-postgres";
-    sha256 = "0l1gdx5s8ximgawd3yzfy47pv5pgwqmjqp8hx5rbrq68vr04wkbl";
-    rev = "7f2467a6d6d5f6db7eed59919a6773fe006cf22b";
-    fetchSubmodules = true;
-  };
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    async base base64-bytestring bytestring containers cryptohash-sha1
-    deepseq directory generic-monoid port-utils postgres-options
-    postgresql-simple prettyprinter process stm temporary transformers
-    unix
-  ];
-  executableHaskellDepends = [
-    async base directory postgres-options postgresql-simple process
-    temporary
-  ];
-  testHaskellDepends = [
-    async base containers directory generic-monoid hspec mtl network
-    port-utils postgres-options postgresql-simple process temporary
-    unix
-  ];
-  benchmarkHaskellDepends = [
-    base criterion deepseq postgres-options postgresql-simple temporary
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/jfischoff/tmp-postgres#readme";
-  description = "Start and stop a temporary postgres";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/type-errors.nix b/pkgs/type-errors.nix
deleted file mode 100644
index 5bce175cbc26662111925314ef46960a5bb3c264..0000000000000000000000000000000000000000
--- a/pkgs/type-errors.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ mkDerivation, base, doctest, first-class-families, lib, syb
-, template-haskell, th-abstraction
-}:
-mkDerivation {
-  pname = "type-errors";
-  version = "0.2.0.2";
-  sha256 = "697cffdd1ec573d6b8d1539976673f93bb562ee97b644077e2305bfefc897c83";
-  revision = "1";
-  editedCabalFile = "1ayzhw2dqswka0r8xwdjr2vbaf1angaj7zaqxa80lww2nlxv7mmg";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base first-class-families syb template-haskell th-abstraction
-  ];
-  testHaskellDepends = [
-    base doctest first-class-families syb template-haskell
-    th-abstraction
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/isovector/type-errors#readme";
-  description = "Tools for writing better type errors";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/typst-symbols.nix b/pkgs/typst-symbols.nix
index d06decd384fa6e4f6926e22ac83345349eedccbb..d58253ecdc6d48fbb3d566239fdd2a50639f0a07 100644
--- a/pkgs/typst-symbols.nix
+++ b/pkgs/typst-symbols.nix
@@ -3,6 +3,8 @@ mkDerivation {
   pname = "typst-symbols";
   version = "0.1.5";
   sha256 = "20951e9457ba68b7ecaf06814e0bc0ff35af4018353ad88c5541e2710143fccd";
+  revision = "1";
+  editedCabalFile = "0fw1b5k32qvbdcb8ys089y4dnf30qdbbkyhnzwg7z2vjnsp1nb20";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/unagi-chan.nix b/pkgs/unagi-chan.nix
deleted file mode 100644
index fd65ffd6a4d91c1b779a20e64c990a36d9664778..0000000000000000000000000000000000000000
--- a/pkgs/unagi-chan.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, async, atomic-primops, base, containers, criterion
-, ghc-prim, lib, primitive
-}:
-mkDerivation {
-  pname = "unagi-chan";
-  version = "0.4.1.4";
-  sha256 = "d9d6f4ab07def8e84a942bb23791830a61faf89166cb7185a3b2f97cb45128b5";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ atomic-primops base ghc-prim primitive ];
-  testHaskellDepends = [
-    atomic-primops base containers ghc-prim primitive
-  ];
-  benchmarkHaskellDepends = [ async base criterion ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Fast concurrent queues with a Chan-like API, and more";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/uri-bytestring.nix b/pkgs/uri-bytestring.nix
deleted file mode 100644
index ad1f545be9123f7053848cdbc12153ab13505763..0000000000000000000000000000000000000000
--- a/pkgs/uri-bytestring.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ mkDerivation, HUnit, attoparsec, base, base-compat, blaze-builder
-, bytestring, containers, criterion, deepseq, deepseq-generics
-, hedgehog, lib, network-uri, safe, tasty, tasty-hedgehog
-, tasty-hunit, template-haskell, th-lift-instances, transformers
-}:
-mkDerivation {
-  pname = "uri-bytestring";
-  version = "0.3.3.1";
-  sha256 = "f3e7a0ac26111c426727fed11624efe9ce36ee2e74ca79570ec0985eb6111368";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    attoparsec base blaze-builder bytestring containers
-    template-haskell th-lift-instances
-  ];
-  testHaskellDepends = [
-    attoparsec base base-compat blaze-builder bytestring containers
-    hedgehog HUnit safe tasty tasty-hedgehog tasty-hunit transformers
-  ];
-  benchmarkHaskellDepends = [
-    base blaze-builder bytestring criterion deepseq deepseq-generics
-    network-uri
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/Soostone/uri-bytestring";
-  description = "Haskell URI parsing as ByteStrings";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/uuid.nix b/pkgs/uuid.nix
deleted file mode 100644
index ba3c8bdff7215d24a5c3bf9313eb391e49970bde..0000000000000000000000000000000000000000
--- a/pkgs/uuid.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ mkDerivation, QuickCheck, base, binary, bytestring
-, cryptohash-md5, cryptohash-sha1, entropy, lib, network-info
-, random, tasty, tasty-hunit, tasty-quickcheck, text, time
-, uuid-types
-}:
-mkDerivation {
-  pname = "uuid";
-  version = "1.3.15";
-  sha256 = "f885958d8934930b7c0f9b91f980722f7f992c9383fc98f075cf9df64c800564";
-  revision = "3";
-  editedCabalFile = "089q2i4rmw8iqzjn2fif4yarnbb7gsnsa4c4zhl24l2hlyakymbx";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base binary bytestring cryptohash-md5 cryptohash-sha1 entropy
-    network-info random text time uuid-types
-  ];
-  testHaskellDepends = [
-    base bytestring QuickCheck random tasty tasty-hunit
-    tasty-quickcheck
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/haskell-hvr/uuid";
-  description = "For creating, comparing, parsing and printing Universally Unique Identifiers";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/version-natural-dhall-instance.nix b/pkgs/version-natural-dhall-instance.nix
deleted file mode 100644
index 6e5080fcab4eff50ef5e18fff5f7dcfe9bbc7015..0000000000000000000000000000000000000000
--- a/pkgs/version-natural-dhall-instance.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ mkDerivation, base, dhall, lib, version-natural }:
-mkDerivation {
-  pname = "version-natural-dhall-instance";
-  version = "0.2.0.0";
-  sha256 = "0627906a6ca6d1fc8bae4909db6b3fe87daf564805ea3696b7a3e91dbeb5a85a";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base dhall version-natural ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "FromDhall and ToDhall instances for version-natural";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/version-natural.nix b/pkgs/version-natural.nix
deleted file mode 100644
index 017fa8d60907cf0728d12d54e41582dc3832623b..0000000000000000000000000000000000000000
--- a/pkgs/version-natural.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ mkDerivation, base, lib, text }:
-mkDerivation {
-  pname = "version-natural";
-  version = "0.1.0.0";
-  sha256 = "280676cb3369eb66c078c52005ca6d498b805c9495cb3fd0d56c830e4abe9933";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base text ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "A simple version type";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/vinyl.nix b/pkgs/vinyl.nix
deleted file mode 100644
index 3bad9fbf6416c5596a501a5041ce04b49a2f7d9a..0000000000000000000000000000000000000000
--- a/pkgs/vinyl.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ mkDerivation, aeson, array, base, criterion, deepseq, ghc-prim
-, hspec, lens, lens-aeson, lib, linear, microlens, mtl, mwc-random
-, primitive, should-not-typecheck, tagged, text
-, unordered-containers, vector
-}:
-mkDerivation {
-  pname = "vinyl";
-  version = "0.14.3";
-  sha256 = "e6789cbf9d3db493065cc85251e1a4596e4ab561c857d2757ae2593dd53ce6d2";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ array base deepseq ghc-prim ];
-  testHaskellDepends = [
-    aeson base hspec lens lens-aeson microlens mtl should-not-typecheck
-    text unordered-containers vector
-  ];
-  benchmarkHaskellDepends = [
-    base criterion linear microlens mwc-random primitive tagged vector
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Extensible Records";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/wai-app-static.nix b/pkgs/wai-app-static.nix
deleted file mode 100644
index 5baada8d18febfbb4ceb1828b9a40134fcb85d7a..0000000000000000000000000000000000000000
--- a/pkgs/wai-app-static.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ mkDerivation, base, blaze-html, blaze-markup, bytestring
-, containers, crypton, directory, file-embed, filepath, hspec
-, http-date, http-types, lib, memory, mime-types, mockery
-, old-locale, optparse-applicative, template-haskell, temporary
-, text, time, transformers, unix-compat, unordered-containers, wai
-, wai-extra, warp, zlib
-}:
-mkDerivation {
-  pname = "wai-app-static";
-  version = "3.1.8";
-  sha256 = "1a7081096bd425533d87fc40eca7a0f3ed3e3eb08c3a7ef93eecc6f1cf012f02";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base blaze-html blaze-markup bytestring containers crypton
-    directory file-embed filepath http-date http-types memory
-    mime-types old-locale optparse-applicative template-haskell text
-    time transformers unix-compat unordered-containers wai wai-extra
-    warp zlib
-  ];
-  executableHaskellDepends = [ base ];
-  testHaskellDepends = [
-    base bytestring filepath hspec http-date http-types mime-types
-    mockery temporary text transformers unix-compat wai wai-extra zlib
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://www.yesodweb.com/book/web-application-interface";
-  description = "WAI application for static serving";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/xml-conduit.nix b/pkgs/xml-conduit.nix
deleted file mode 100644
index a90ee9ec2168fc1a342c66ff297d41abd955c870..0000000000000000000000000000000000000000
--- a/pkgs/xml-conduit.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ mkDerivation, Cabal, HUnit, attoparsec, base, blaze-html
-, blaze-markup, bytestring, cabal-doctest, conduit, conduit-extra
-, containers, data-default-class, deepseq, doctest, hspec, lib
-, resourcet, text, transformers, xml-types
-}:
-mkDerivation {
-  pname = "xml-conduit";
-  version = "1.9.1.3";
-  sha256 = "d8e9169562c71c9e6bc616f15832f521a68c362aa4fc03682748a809755f1bf4";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  setupHaskellDepends = [ base Cabal cabal-doctest ];
-  libraryHaskellDepends = [
-    attoparsec base blaze-html blaze-markup bytestring conduit
-    conduit-extra containers data-default-class deepseq resourcet text
-    transformers xml-types
-  ];
-  testHaskellDepends = [
-    base blaze-markup bytestring conduit conduit-extra containers
-    doctest hspec HUnit resourcet text transformers xml-types
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/snoyberg/xml";
-  description = "Pure-Haskell utilities for dealing with XML with the conduit package";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/xml-types.nix b/pkgs/xml-types.nix
deleted file mode 100644
index b1007b57fa7cff6f16f7549d78241a69275677a0..0000000000000000000000000000000000000000
--- a/pkgs/xml-types.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, base, deepseq, lib, text }:
-mkDerivation {
-  pname = "xml-types";
-  version = "0.3.8";
-  sha256 = "dad5e4ce602b7d1f4be37c0cfd99a261a4573746bfd80d917dc955b72da84c80";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base deepseq text ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://git.singpolyma.net/xml-types-haskell";
-  description = "Basic types for representing XML";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/xmlgen.nix b/pkgs/xmlgen.nix
deleted file mode 100644
index 16bd487f50a3a55d7e258d4c034a4f56b06ca19e..0000000000000000000000000000000000000000
--- a/pkgs/xmlgen.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ mkDerivation, HUnit, QuickCheck, base, blaze-builder, bytestring
-, containers, criterion, filepath, hxt, lib, mtl, process, text
-, unix
-}:
-mkDerivation {
-  pname = "xmlgen";
-  version = "0.6.2.2";
-  sha256 = "926fa98c77525f5046274758fcebd190e86de3f53a4583179e8ce328f25a34d6";
-  revision = "1";
-  editedCabalFile = "0vwnqd0lsw81llsn0psga5r6pw7jh69vfbj3rnz7c2fpkc0gjh3j";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base blaze-builder bytestring containers mtl text
-  ];
-  testHaskellDepends = [
-    base bytestring containers filepath HUnit hxt process QuickCheck
-    text unix
-  ];
-  benchmarkHaskellDepends = [ base bytestring criterion text ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Fast XML generation library";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/zip-archive.nix b/pkgs/zip-archive.nix
deleted file mode 100644
index 30a0b2d865f6c7c55ea1998bc078e7c6d4dae4ce..0000000000000000000000000000000000000000
--- a/pkgs/zip-archive.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ mkDerivation, HUnit, array, base, binary, bytestring, containers
-, digest, directory, filepath, lib, mtl, pretty, process, temporary
-, text, time, unix, which, zlib
-}:
-mkDerivation {
-  pname = "zip-archive";
-  version = "0.4.3";
-  sha256 = "68050fa0f139848db0ea422ea9af1a65b652abf5168db7dafaf1bded5b045d05";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    array base binary bytestring containers digest directory filepath
-    mtl pretty text time unix zlib
-  ];
-  testHaskellDepends = [
-    base bytestring directory filepath HUnit process temporary time
-    unix
-  ];
-  testToolDepends = [ which ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/jgm/zip-archive";
-  description = "Library for creating and modifying zip archives";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file