diff --git a/flake.lock b/flake.lock index 42881265e108241207462d88937bba847b65bba9..9c61f90fff29642ed1f2dc1a0d6a83b407ef93c7 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1706830856, - "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", + "lastModified": 1715865404, + "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", + "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", "type": "github" }, "original": { @@ -54,6 +54,36 @@ "type": "github" } }, + "horizon-advance": { + "inputs": { + "flake-parts": [ + "horizon-advance", + "horizon-core", + "flake-parts" + ], + "horizon-core": "horizon-core", + "horizon-hoogle": "horizon-hoogle_2", + "nixpkgs": [ + "horizon-advance", + "horizon-core", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709387133, + "narHash": "sha256-TjfyTD5ENuAx1rqkGq+wok/ClKkDaJRhevZT0v7WnqU=", + "ref": "lts/ghc-9.8.x", + "rev": "1bf583e4ee413dfdea53ff3a7aa7a0868bfc8a4b", + "revCount": 197, + "type": "git", + "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-advance" + }, + "original": { + "ref": "lts/ghc-9.8.x", + "type": "git", + "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-advance" + } + }, "horizon-build-packages": { "inputs": { "flake-parts": "flake-parts_2", @@ -78,6 +108,7 @@ "horizon-core": { "inputs": { "flake-parts": [ + "horizon-advance", "horizon-core", "horizon-build-packages", "flake-parts" @@ -85,6 +116,7 @@ "horizon-build-packages": "horizon-build-packages", "horizon-hoogle": "horizon-hoogle", "nixpkgs": [ + "horizon-advance", "horizon-core", "horizon-build-packages", "nixpkgs" @@ -155,6 +187,21 @@ "url": "https://gitlab.horizon-haskell.net/nix/horizon-hoogle" } }, + "horizon-hoogle_3": { + "locked": { + "lastModified": 1701521742, + "narHash": "sha256-huf/95jYL7mY0AHSziJYXx4m/sP+G+YAbJb+Q5Ph/Jg=", + "ref": "refs/heads/master", + "rev": "ddf3b08c6458c1a9e0d881f968c050bc828b9b8e", + "revCount": 2, + "type": "git", + "url": "https://gitlab.horizon-haskell.net/nix/horizon-hoogle" + }, + "original": { + "type": "git", + "url": "https://gitlab.horizon-haskell.net/nix/horizon-hoogle" + } + }, "nixpkgs": { "locked": { "lastModified": 1707956935, @@ -173,20 +220,14 @@ }, "nixpkgs-lib": { "locked": { - "dir": "lib", - "lastModified": 1706550542, - "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", - "type": "github" + "lastModified": 1714640452, + "narHash": "sha256-QBx10+k6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz" }, "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz" } }, "nixpkgs-lib_2": { @@ -243,11 +284,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1708093448, - "narHash": "sha256-gohEm3/NVyu7WINFhRf83yJH8UM2ie/KY9Iw3VN6fiE=", + "lastModified": 1716914467, + "narHash": "sha256-KkT6YM/yNQqirtYj/frn6RRakliB8RDvGqVGGaNhdcU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c7763249f02b7786b4ca36e13a4d7365cfba162f", + "rev": "4a3fc4cf736b7d2d288d7a8bf775ac8d4c0920b4", "type": "github" }, "original": { @@ -260,8 +301,8 @@ "root": { "inputs": { "flake-parts": "flake-parts", - "horizon-core": "horizon-core", - "horizon-hoogle": "horizon-hoogle_2", + "horizon-advance": "horizon-advance", + "horizon-hoogle": "horizon-hoogle_3", "nixpkgs": "nixpkgs_3" } } diff --git a/flake.nix b/flake.nix index 71579c77ee4a22fa8d505dae400543e8108dad55..51de3c2a3ed085c71b5224cf9250ec1a94254913 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,7 @@ inputs = { flake-parts.url = "github:hercules-ci/flake-parts"; - horizon-core.url = "git+https://gitlab.horizon-haskell.net/package-sets/horizon-core?ref=lts/ghc-9.8.x"; + horizon-advance.url = "git+https://gitlab.horizon-haskell.net/package-sets/horizon-advance?ref=lts/ghc-9.8.x"; horizon-hoogle.url = "git+https://gitlab.horizon-haskell.net/nix/horizon-hoogle"; nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; }; @@ -18,7 +18,7 @@ inputs@ { self , flake-parts - , horizon-core + , horizon-advance , nixpkgs , ... }: @@ -43,7 +43,7 @@ (import (./configuration + "/${system}.nix") { inherit pkgs haskellLib; }) ]; - legacyPackages = horizon-core.legacyPackages.${system}.extend overrides; + legacyPackages = horizon-advance.legacyPackages.${system}.extend overrides; packages = filterAttrs (_: isDerivation) legacyPackages; diff --git a/horizon.dhall b/horizon.dhall index 59fa8d2b2e24e9497c38377727338bf1d1d7344c..ed82426b4aa094a8921edeb57a7b83e42d35f06e 100644 --- a/horizon.dhall +++ b/horizon.dhall @@ -8,36 +8,26 @@ let packages = , HList = H.callHackage "HList" "0.5.3.0" , HTF = H.callHackage "HTF" "0.15.0.1" , HaTeX = H.callHackage "HaTeX" "3.22.4.1" - , JuicyPixels = H.callHackage "JuicyPixels" "3.3.8" , MemoTrie = H.callHackage "MemoTrie" "0.6.11" , MonadPrompt = H.callHackage "MonadPrompt" "1.0.0.5" , NumInstances = H.callHackage "NumInstances" "1.4" - , Only = H.callHackage "Only" "0.1" , Rlang-QQ = H.callHackage "Rlang-QQ" "0.3.1.0" , active = H.callHackage "active" "0.2.1" , apply-refact = H.callHackage "apply-refact" "0.14.0.0" , base-prelude = H.callHackage "base-prelude" "1.6.1.1" , bibtex = H.callHackage "bibtex" "0.1.0.7" - , binary-orphans = H.callHackage "binary-orphans" "1.0.4.1" , blaze-textual = H.callHackage "blaze-textual" "0.2.3.1" - , bytes = H.callHackage "bytes" "0.17.3" , cairo = H.callHackage "cairo" "0.13.10.0" , circle-packing = H.callHackage "circle-packing" "0.1.0.6" , co-log-core = H.callHackage "co-log-core" "0.3.2.1" , commutative-semigroups = H.callHackage "commutative-semigroups" "0.1.0.2" , conduit-parse = H.callHackage "conduit-parse" "0.2.1.1" - , constraints-extras = H.callHackage "constraints-extras" "0.4.0.0" - , cpphs = H.callHackage "cpphs" "1.20.9.1" - , cryptohash-md5 = H.callHackage "cryptohash-md5" "0.11.101.0" , cubicbezier = H.callHackage "cubicbezier" "0.6.0.7" , data-accessor = H.callHackage "data-accessor" "0.2.3.1" , data-accessor-transformers = H.callHackage "data-accessor-transformers" "0.2.1.8" - , data-binary-ieee754 = H.callHackage "data-binary-ieee754" "0.4.4" , deferred-folds = H.callHackage "deferred-folds" "0.9.18.6" - , dependent-map = H.callHackage "dependent-map" "0.4.0.0" - , dependent-sum = H.callHackage "dependent-sum" "0.7.2.0" , deriving-aeson = H.callHackage "deriving-aeson" "0.2.9" , diagrams = H.callHackage "diagrams" "1.4.1" , diagrams-cairo = H.callHackage "diagrams-cairo" "1.4.2.1" @@ -48,7 +38,6 @@ let packages = , diagrams-svg = H.callHackage "diagrams-svg" "1.4.3.1" , dictionary-sharing = H.callHackage "dictionary-sharing" "0.1.0.0" , direct-sqlite = H.callHackage "direct-sqlite" "2.3.28" - , doctest = H.callHackage "doctest" "0.22.2" , doctest-discover = H.callHackage "doctest-discover" "0.2.0.0" , dual-tree = H.callHackage "dual-tree" "0.2.3.1" , enclosed-exceptions = H.callHackage "enclosed-exceptions" "1.0.3" @@ -94,7 +83,6 @@ let packages = , H.CabalFlag.Disable "stan" , H.CabalFlag.Disable "floskell" ] - , haskell-src = H.callHackage "haskell-src" "1.0.4" , here = H.callHackage "here" "1.2.14" , hie-bios = H.callHackage "hie-bios" "0.13.1" , hie-compat = H.callHackage "hie-compat" "0.3.1.2" @@ -151,10 +139,6 @@ let packages = , hw-fingertree = H.callHackage "hw-fingertree" "0.1.2.1" , hw-hspec-hedgehog = H.callHackage "hw-hspec-hedgehog" "0.1.1.1" , hw-prim = H.callHackage "hw-prim" "0.6.3.2" - , hxt = H.callHackage "hxt" "9.3.1.22" - , hxt-charproperties = H.callHackage "hxt-charproperties" "9.5.0.0" - , hxt-regex-xmlschema = H.callHackage "hxt-regex-xmlschema" "9.2.0.7" - , hxt-unicode = H.callHackage "hxt-unicode" "9.0.2.4" , ihaskell = H.callHackage "ihaskell" "0.11.0.0" , ihaskell-aeson = H.callHackage "ihaskell-aeson" "0.3.0.1" , ihaskell-blaze = H.callHackage "ihaskell-blaze" "0.3.0.1" @@ -172,7 +156,6 @@ let packages = , intervals = H.callHackage "intervals" "0.9.2" , ipython-kernel = H.callHackage "ipython-kernel" "0.11.0.0" , latex = H.callHackage "latex" "0.1.0.4" - , linear = H.callHackage "linear" "1.22" , list-t = H.callHackage "list-t" "1.0.5.7" , loop = H.callHackage "loop" "0.3.0" , lsp = H.callHackage "lsp" "2.3.0.0" @@ -183,12 +166,9 @@ let packages = , matrix = H.callHackage "matrix" "0.3.6.3" , mfsolve = H.callHackage "mfsolve" "0.3.2.2" , mod = H.callHackage "mod" "0.2.0.1" - , monad-loops = H.callHackage "monad-loops" "0.4.3" , monoid-extras = H.callHackage "monoid-extras" "0.6.2" , monoid-subclasses = H.callHackage "monoid-subclasses" "1.2.4.1" - , mtl-compat = H.callHackage "mtl-compat" "0.2.2" , mtl-prelude = H.callHackage "mtl-prelude" "2.0.3.2" - , network-info = H.callHackage "network-info" "0.2.1" , newtype-generics = H.callHackage "newtype-generics" "0.6.2" , numeric-extras = H.callHackage "numeric-extras" "0.1" , opentelemetry = H.callHackage "opentelemetry" "0.8.0" @@ -202,7 +182,6 @@ let packages = "https://github.com/codedownio/haskell-plot" "dfa26022b5815bcd6a5dd6c818fcd2c4d25c6d44" (None H.Subdir) - , polyparse = H.callHackage "polyparse" "1.13" , primes = H.callHackage "primes" "0.2.1.0" , primitive-extras = H.callHackage "primitive-extras" "0.10.1.10" , primitive-unlifted = H.callHackage "primitive-unlifted" "2.1.0.0" @@ -210,14 +189,12 @@ let packages = , refact = H.callHackage "refact" "0.3.0.2" , regex = H.callHackage "regex" "1.1.0.2" , regex-applicative = H.callHackage "regex-applicative" "0.3.4" - , regex-compat = H.callHackage "regex-compat" "0.95.2.1" , regex-pcre-builtin = H.callHackage "regex-pcre-builtin" "0.95.2.3.8.44" , repa = H.callHackage "repa" "3.4.1.5" , retrie = H.callHackage "retrie" "1.2.3" , row-types = H.callHackage "row-types" "1.0.1.2" , rvar = H.callHackage "rvar" "0.3.0.2" , shelly = H.callHackage "shelly" "1.12.1" - , should-not-typecheck = H.callHackage "should-not-typecheck" "2.1.0" , singletons = H.callHackage "singletons" "3.0.2" , singletons-base = H.callHackage "singletons-base" "3.3" , singletons-th = H.callHackage "singletons-th" "3.3" @@ -234,12 +211,8 @@ let packages = H.callHackage "testing-type-modifiers" "0.1.0.1" , text-rope = H.callHackage "text-rope" "0.2" , th-desugar = H.callHackage "th-desugar" "1.16" - , time-locale-compat = H.callHackage "time-locale-compat" "0.1.1.5" - , uuid = H.callHackage "uuid" "1.3.15" , vector-space = H.callHackage "vector-space" "0.16" - , vinyl = H.callHackage "vinyl" "0.14.3" , xformat = H.callHackage "xformat" "0.1.2.1" - , xmlgen = H.callHackage "xmlgen" "0.6.2.2" , zeromq4-haskell = H.callHackage "zeromq4-haskell" "0.8.0" } diff --git a/horizon.lock b/horizon.lock index b374bd1dc9aa34880578d2b5f3ec8409562f640c..a209d84dda71ec1003a9747dcab4c1341fe009f8 100644 --- a/horizon.lock +++ b/horizon.lock @@ -22,10 +22,6 @@ , mapValue = "5969c6ba429c7fdf09232317cd1fe56b04fdf090ada1a19bd3f818ca4813b663" } -, { mapKey = "JuicyPixels" - , mapValue = - "fab52c1a1dc352946724e58f2c38faa175973558796cf5950903983d7ce42224" - } , { mapKey = "MemoTrie" , mapValue = "7e541095aa46ba981e790af32c2c55c5f4a572ed4397a53064c51f9d58020bc9" @@ -38,10 +34,6 @@ , mapValue = "a6cb2c1bf178a6450afcaa4c68f52def7e40fee281cc0adfd4feaea45680f3d6" } -, { mapKey = "Only" - , mapValue = - "4e0765080d8c7e2634ba6ac89761a0343a811968fd09c5127568786beca3a68b" - } , { mapKey = "Rlang-QQ" , mapValue = "d113c8dc3b810c5321bbd55317290b21defd00e4d41e83ac6052defffb432b3f" @@ -62,18 +54,10 @@ , mapValue = "5cd5586f5133c5e3c19989eb9f8ccdc40e027eecc2668c7aced74881276d5be6" } -, { mapKey = "binary-orphans" - , mapValue = - "0e790b03a7bcad35da3a6d7debe06ca20569e1eeb0ebf1207460c4282002e1cb" - } , { mapKey = "blaze-textual" , mapValue = "b83032f5103b3ac8fd9d1cec87ecda6467969b62ae947b25b3c633f6d5a9c8ef" } -, { mapKey = "bytes" - , mapValue = - "02326bebe8eea78745bcb608607adc19e504f34f47bf78fdb9818b3f8fde9c2b" - } , { mapKey = "cairo" , mapValue = "fe83dfa092741b554e651e5b43d14d275450942c3047e92ec578a755fc9d3c0f" @@ -94,18 +78,6 @@ , mapValue = "6742b84c24043c6c23af8570ab00fe79c612ad02ebe508a3b6dd5b370870db7e" } -, { mapKey = "constraints-extras" - , mapValue = - "219f45626f32dd916bc70cf28e3efc15cbbd04ecc47e68104ee541d90b533a12" - } -, { mapKey = "cpphs" - , mapValue = - "e1336bc104d19f08728e1ae4a1543cc97cff948dc39fe11fc6d75a290c4f6767" - } -, { mapKey = "cryptohash-md5" - , mapValue = - "c1284ad5555b4d49c2d4a0441ca2d9411774796bb27537a9306d488999fc5fdb" - } , { mapKey = "cubicbezier" , mapValue = "7dcdc6266fc84b48460c6d0463b0cd30c518f39ea8c9d0f10db7bdb561e9b504" @@ -118,22 +90,10 @@ , mapValue = "5a103616e8974470e504508917186239ba40eb6bea764d3417bf132020046afa" } -, { mapKey = "data-binary-ieee754" - , mapValue = - "4f47ea5ed0135495678a770b62277340925d493fdbfec71880aebb87331f84a6" - } , { mapKey = "deferred-folds" , mapValue = "e56759552a34a5ed09223b5af7cbcd8e110fc52995556dd3af53cebcafb26743" } -, { mapKey = "dependent-map" - , mapValue = - "45d6c8ecc4e64a88f0bef9f8a08001750e5883078ac14fb0d4b3e503cb84fff8" - } -, { mapKey = "dependent-sum" - , mapValue = - "ed897cca1b78ef2d1901135f617097d9803146931fc5132903751c8520195108" - } , { mapKey = "deriving-aeson" , mapValue = "d1cd3dd05df053e0fcc40de6a6f155c8e6157136fd0d31dff52e68a7e54bd5ce" @@ -174,10 +134,6 @@ , mapValue = "544b47af502e431d71514ea4ad34d83b9dddd2543f20faf6302556b6a6da6f84" } -, { mapKey = "doctest" - , mapValue = - "aa3d0ba9693893bd932591671682e4e4b961b7b00715e855866c79c885071a9c" - } , { mapKey = "doctest-discover" , mapValue = "42263f611e31f2931f7e925fe252bfaf060874a9403d944a8fa7edaf6de265c9" @@ -310,10 +266,6 @@ , mapValue = "2fc5585a25c0315a2f4ea173d0493e3abda4a5d6691cae2d2ce4c498e32da678" } -, { mapKey = "haskell-src" - , mapValue = - "36d7a57da42a36cad9b7441637f69d715f80c9a1cf553d7269aa88c6f8148253" - } , { mapKey = "here" , mapValue = "01e2f7420ed96dab112825c9507a465d3eb5a72ed7f3819cc22343695dae08a3" @@ -466,22 +418,6 @@ , mapValue = "c45402de191df72544b6a52c3368e40e949b0e02340431ef252c8cb94cab3170" } -, { mapKey = "hxt" - , mapValue = - "f9bfc42fdacd114abf0aa90010689db6eaf13690f078fa87cfd62d77a0f7f1d0" - } -, { mapKey = "hxt-charproperties" - , mapValue = - "4d895bf8cd6c4aad2643d2ed29a2bd96b2c94390a7655036673c74f0d79ad2d1" - } -, { mapKey = "hxt-regex-xmlschema" - , mapValue = - "e497006381a9237acadc3aa5cacb57745a65137a3b79bfe06eefd1ef5b43a18f" - } -, { mapKey = "hxt-unicode" - , mapValue = - "3534b66f32776372067bf9260d2e25ede64be6f142f5df05deb448c085ddca24" - } , { mapKey = "ihaskell" , mapValue = "1c2dd4359f56a257ce23d45f4d2d31f753f3a43243a1698797b04fe14df8d1e9" @@ -550,10 +486,6 @@ , mapValue = "e38269e4eebc243d1fbe9579454fc5c47b7bf72036f632f715386fc676e16217" } -, { mapKey = "linear" - , mapValue = - "386b2d390f08545fc758ce6297186a2354c696d693ed1f61d7c9df047e5f0838" - } , { mapKey = "list-t" , mapValue = "95da0c735dac79d5d8320e66aea24e5ed1bde8e081daffe353eacd0324d0f991" @@ -594,10 +526,6 @@ , mapValue = "1459b375fab14f2195896b4720a9c75a9fc0cd21ddcdecacf07e5f19a5cd0435" } -, { mapKey = "monad-loops" - , mapValue = - "9e892959f9567cf0b78abc681b45f77423c75997ccdc223f4e08504edb16ab5c" - } , { mapKey = "monoid-extras" , mapValue = "a6177db1e1084f8535f5eb3a16437590673bd7341d679121b04261fe232241e5" @@ -606,18 +534,10 @@ , mapValue = "17af1f5c9e30a28860a8fb9837141a36e044092f263b590d758c60dc3e8089ab" } -, { mapKey = "mtl-compat" - , mapValue = - "57b6159b3d1f785819c1c8133e9311bc6d3a2fc0873ec62d210936377a376660" - } , { mapKey = "mtl-prelude" , mapValue = "638e6d6a8159700da9f73243a30c376687d27b657a6532ec289199e1be926473" } -, { mapKey = "network-info" - , mapValue = - "89924b85b7905e4ab0223729139d80caa3c6c5d1b7f4db0a0f03c606060f3876" - } , { mapKey = "newtype-generics" , mapValue = "8a81caf0085c3b19df937a549a9cf0a4ad24a9cc1960d077217c6d2c8682b2c3" @@ -654,10 +574,6 @@ , mapValue = "de46622f85be2c0b13996de414c6af0a2ad1849de516e24f774288910fc69419" } -, { mapKey = "polyparse" - , mapValue = - "f57be66a4045988d90930c51cf2eb15e6c9da8969a29d92e3e52be4f68e28354" - } , { mapKey = "primes" , mapValue = "0e3dbe30a8838b6b0b35bed0a523457a97a75d9da3d8ee467a95ff75f63684b6" @@ -686,10 +602,6 @@ , mapValue = "e50e26de94b3ea3c80aa705310e2236ee6d6b446a2f622f02f5eff7e5bb42bf4" } -, { mapKey = "regex-compat" - , mapValue = - "8ff8dc705121f5cfde4cb20bb42d178f0f265d849f600b4b84b5d7e7e6b6b7d6" - } , { mapKey = "regex-pcre-builtin" , mapValue = "ca92c950bb13540ffff121d5e9b3cd6f4c76baa7a4cc1409a5644e8896dc386c" @@ -714,10 +626,6 @@ , mapValue = "08577740c05fe2d59f5c17adbf90582cac19f1616ff1810f643d2257085f6b44" } -, { mapKey = "should-not-typecheck" - , mapValue = - "1717d7c0f31b0967e52cc37c1fc46009c742a5a2afadcbca474e848049827ee1" - } , { mapKey = "singletons" , mapValue = "3d63bbbea8e6925eb96538e59bd01125d5a862ff1a04af0dd9298dd7f942a961" @@ -778,30 +686,14 @@ , mapValue = "f8e1b66fe2c1c687dd6020f71999ac39860c0cc32108df632f9ed661df0d01d0" } -, { mapKey = "time-locale-compat" - , mapValue = - "67518c7ca215c1849c0904262f4f449b41437d78d5460c6bd980b5376173ad4e" - } -, { mapKey = "uuid" - , mapValue = - "3c29a457a620291da7cff7a39baf60a2edc4a9c83d9ada516a64890f9cbba6b9" - } , { mapKey = "vector-space" , mapValue = "6a6a960311bc07995f2a4902b86fbf3e4d8f781dc5717b9254bffb6e1a0ca7e6" } -, { mapKey = "vinyl" - , mapValue = - "6b9155d117ca5f5f16b0f81d9903bb91d4b6c7a8eae2efe400597ec470f160d0" - } , { mapKey = "xformat" , mapValue = "1d68f67f584364fd7f922b7205c5faafd0aea25683065f546dc37de862af6993" } -, { mapKey = "xmlgen" - , mapValue = - "a4866db1f5b790cb90cac6f01b49c4adacfa7b7476ba9d1937411fee351389ec" - } , { mapKey = "zeromq4-haskell" , mapValue = "6b87d121f4ddbc9cac29d1d1f032aec8f5e0dd89e20fec6f1109bacc173fcf5e" diff --git a/overlay.nix b/overlay.nix index 34f60bed3e1ee30ae57edb4ff3abbbee0ceb94a9..8b38df5d1f0f3642c017e6f123730ce0569cc2fb 100644 --- a/overlay.nix +++ b/overlay.nix @@ -14,16 +14,12 @@ final: prev: with pkgs.haskell.lib; { HaTeX = f final prev "HaTeX" (final.callPackage (./pkgs/HaTeX.nix) { }); - JuicyPixels = f final prev "JuicyPixels" (final.callPackage (./pkgs/JuicyPixels.nix) { }); - MemoTrie = f final prev "MemoTrie" (final.callPackage (./pkgs/MemoTrie.nix) { }); MonadPrompt = f final prev "MonadPrompt" (final.callPackage (./pkgs/MonadPrompt.nix) { }); NumInstances = f final prev "NumInstances" (final.callPackage (./pkgs/NumInstances.nix) { }); - Only = f final prev "Only" (final.callPackage (./pkgs/Only.nix) { }); - Rlang-QQ = f final prev "Rlang-QQ" (final.callPackage (./pkgs/Rlang-QQ.nix) { }); active = f final prev "active" (final.callPackage (./pkgs/active.nix) { }); @@ -34,12 +30,8 @@ final: prev: with pkgs.haskell.lib; { bibtex = f final prev "bibtex" (final.callPackage (./pkgs/bibtex.nix) { }); - binary-orphans = f final prev "binary-orphans" (final.callPackage (./pkgs/binary-orphans.nix) { }); - blaze-textual = f final prev "blaze-textual" (final.callPackage (./pkgs/blaze-textual.nix) { }); - bytes = f final prev "bytes" (final.callPackage (./pkgs/bytes.nix) { }); - cairo = f final prev "cairo" (final.callPackage (./pkgs/cairo.nix) { }); circle-packing = f final prev "circle-packing" (final.callPackage (./pkgs/circle-packing.nix) { }); @@ -50,26 +42,14 @@ final: prev: with pkgs.haskell.lib; { conduit-parse = f final prev "conduit-parse" (final.callPackage (./pkgs/conduit-parse.nix) { }); - constraints-extras = f final prev "constraints-extras" (final.callPackage (./pkgs/constraints-extras.nix) { }); - - cpphs = f final prev "cpphs" (final.callPackage (./pkgs/cpphs.nix) { }); - - cryptohash-md5 = f final prev "cryptohash-md5" (final.callPackage (./pkgs/cryptohash-md5.nix) { }); - cubicbezier = f final prev "cubicbezier" (final.callPackage (./pkgs/cubicbezier.nix) { }); data-accessor = f final prev "data-accessor" (final.callPackage (./pkgs/data-accessor.nix) { }); data-accessor-transformers = f final prev "data-accessor-transformers" (final.callPackage (./pkgs/data-accessor-transformers.nix) { }); - data-binary-ieee754 = f final prev "data-binary-ieee754" (final.callPackage (./pkgs/data-binary-ieee754.nix) { }); - deferred-folds = f final prev "deferred-folds" (final.callPackage (./pkgs/deferred-folds.nix) { }); - dependent-map = f final prev "dependent-map" (final.callPackage (./pkgs/dependent-map.nix) { }); - - dependent-sum = f final prev "dependent-sum" (final.callPackage (./pkgs/dependent-sum.nix) { }); - deriving-aeson = f final prev "deriving-aeson" (final.callPackage (./pkgs/deriving-aeson.nix) { }); diagrams = f final prev "diagrams" (final.callPackage (./pkgs/diagrams.nix) { }); @@ -90,8 +70,6 @@ final: prev: with pkgs.haskell.lib; { direct-sqlite = f final prev "direct-sqlite" (final.callPackage (./pkgs/direct-sqlite.nix) { }); - doctest = f final prev "doctest" (final.callPackage (./pkgs/doctest.nix) { }); - doctest-discover = f final prev "doctest-discover" (final.callPackage (./pkgs/doctest-discover.nix) { }); dual-tree = f final prev "dual-tree" (final.callPackage (./pkgs/dual-tree.nix) { }); @@ -158,8 +136,6 @@ final: prev: with pkgs.haskell.lib; { haskell-language-server = f final prev "haskell-language-server" (final.callPackage (./pkgs/haskell-language-server.nix) { }); - haskell-src = f final prev "haskell-src" (final.callPackage (./pkgs/haskell-src.nix) { }); - here = f final prev "here" (final.callPackage (./pkgs/here.nix) { }); hfsevents = f final prev "hfsevents" (final.callPackage (./pkgs/hfsevents.nix) { }); @@ -236,14 +212,6 @@ final: prev: with pkgs.haskell.lib; { hw-prim = f final prev "hw-prim" (final.callPackage (./pkgs/hw-prim.nix) { }); - hxt = f final prev "hxt" (final.callPackage (./pkgs/hxt.nix) { }); - - hxt-charproperties = f final prev "hxt-charproperties" (final.callPackage (./pkgs/hxt-charproperties.nix) { }); - - hxt-regex-xmlschema = f final prev "hxt-regex-xmlschema" (final.callPackage (./pkgs/hxt-regex-xmlschema.nix) { }); - - hxt-unicode = f final prev "hxt-unicode" (final.callPackage (./pkgs/hxt-unicode.nix) { }); - ihaskell = f final prev "ihaskell" (final.callPackage (./pkgs/ihaskell.nix) { }); ihaskell-aeson = f final prev "ihaskell-aeson" (final.callPackage (./pkgs/ihaskell-aeson.nix) { }); @@ -278,8 +246,6 @@ final: prev: with pkgs.haskell.lib; { latex = f final prev "latex" (final.callPackage (./pkgs/latex.nix) { }); - linear = f final prev "linear" (final.callPackage (./pkgs/linear.nix) { }); - list-t = f final prev "list-t" (final.callPackage (./pkgs/list-t.nix) { }); loop = f final prev "loop" (final.callPackage (./pkgs/loop.nix) { }); @@ -300,18 +266,12 @@ final: prev: with pkgs.haskell.lib; { mod = f final prev "mod" (final.callPackage (./pkgs/mod.nix) { }); - monad-loops = f final prev "monad-loops" (final.callPackage (./pkgs/monad-loops.nix) { }); - monoid-extras = f final prev "monoid-extras" (final.callPackage (./pkgs/monoid-extras.nix) { }); monoid-subclasses = f final prev "monoid-subclasses" (final.callPackage (./pkgs/monoid-subclasses.nix) { }); - mtl-compat = f final prev "mtl-compat" (final.callPackage (./pkgs/mtl-compat.nix) { }); - mtl-prelude = f final prev "mtl-prelude" (final.callPackage (./pkgs/mtl-prelude.nix) { }); - network-info = f final prev "network-info" (final.callPackage (./pkgs/network-info.nix) { }); - newtype-generics = f final prev "newtype-generics" (final.callPackage (./pkgs/newtype-generics.nix) { }); numeric-extras = f final prev "numeric-extras" (final.callPackage (./pkgs/numeric-extras.nix) { }); @@ -330,8 +290,6 @@ final: prev: with pkgs.haskell.lib; { plot = f final prev "plot" (final.callPackage (./pkgs/plot.nix) { }); - polyparse = f final prev "polyparse" (final.callPackage (./pkgs/polyparse.nix) { }); - primes = f final prev "primes" (final.callPackage (./pkgs/primes.nix) { }); primitive-extras = f final prev "primitive-extras" (final.callPackage (./pkgs/primitive-extras.nix) { }); @@ -346,8 +304,6 @@ final: prev: with pkgs.haskell.lib; { regex-applicative = f final prev "regex-applicative" (final.callPackage (./pkgs/regex-applicative.nix) { }); - regex-compat = f final prev "regex-compat" (final.callPackage (./pkgs/regex-compat.nix) { }); - regex-pcre-builtin = f final prev "regex-pcre-builtin" (final.callPackage (./pkgs/regex-pcre-builtin.nix) { }); repa = f final prev "repa" (final.callPackage (./pkgs/repa.nix) { }); @@ -360,8 +316,6 @@ final: prev: with pkgs.haskell.lib; { shelly = f final prev "shelly" (final.callPackage (./pkgs/shelly.nix) { }); - should-not-typecheck = f final prev "should-not-typecheck" (final.callPackage (./pkgs/should-not-typecheck.nix) { }); - singletons = f final prev "singletons" (final.callPackage (./pkgs/singletons.nix) { }); singletons-base = f final prev "singletons-base" (final.callPackage (./pkgs/singletons-base.nix) { }); @@ -392,18 +346,10 @@ final: prev: with pkgs.haskell.lib; { th-desugar = f final prev "th-desugar" (final.callPackage (./pkgs/th-desugar.nix) { }); - time-locale-compat = f final prev "time-locale-compat" (final.callPackage (./pkgs/time-locale-compat.nix) { }); - - uuid = f final prev "uuid" (final.callPackage (./pkgs/uuid.nix) { }); - vector-space = f final prev "vector-space" (final.callPackage (./pkgs/vector-space.nix) { }); - vinyl = f final prev "vinyl" (final.callPackage (./pkgs/vinyl.nix) { }); - xformat = f final prev "xformat" (final.callPackage (./pkgs/xformat.nix) { }); - xmlgen = f final prev "xmlgen" (final.callPackage (./pkgs/xmlgen.nix) { }); - zeromq4-haskell = f final prev "zeromq4-haskell" (final.callPackage (./pkgs/zeromq4-haskell.nix) { }); } 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/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/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/cpphs.nix b/pkgs/cpphs.nix deleted file mode 100644 index 5522f545c1fe6b701ec5c0a5f4acf3b16157c7ec..0000000000000000000000000000000000000000 --- a/pkgs/cpphs.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ mkDerivation, base, directory, lib, polyparse, time }: -mkDerivation { - pname = "cpphs"; - version = "1.20.9.1"; - sha256 = "7f59b10bc3374004cee3c04fa4ee4a1b90d0dca84a3d0e436d5861a1aa3b919f"; - revision = "1"; - editedCabalFile = "1f8jzs8zdh4wwbcq8fy6qqxkv75ypnvsm4yzw49wpr3b9vpnzlha"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = false; - libraryHaskellDepends = [ base directory polyparse time ]; - executableHaskellDepends = [ base directory polyparse time ]; - enableLibraryProfiling = true; - enableExecutableProfiling = true; - doHaddock = true; - jailbreak = true; - doCheck = false; - doBenchmark = false; - hyperlinkSource = false; - homepage = "http://projects.haskell.org/cpphs/"; - description = "A liberalised re-implementation of cpp, the C pre-processor"; - license = "LGPL"; - 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/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/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.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/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/haskell-src.nix b/pkgs/haskell-src.nix deleted file mode 100644 index ad389573a0fa4e0b09fcf4453a5449b22959b9e9..0000000000000000000000000000000000000000 --- a/pkgs/haskell-src.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ mkDerivation, array, base, happy, lib, pretty, syb }: -mkDerivation { - pname = "haskell-src"; - version = "1.0.4"; - sha256 = "8bc77695f9cc113933048409d2ed3bf2a3b947e18312a23b0dbb7838d086f3ea"; - revision = "1"; - editedCabalFile = "0dfjzq0sxxcalqxygp2svx4890qx8b4amad0xldwy1f4xrp3lsnb"; - isLibrary = true; - isExecutable = false; - enableSeparateDataOutput = false; - libraryHaskellDepends = [ array base pretty syb ]; - libraryToolDepends = [ happy ]; - enableLibraryProfiling = true; - enableExecutableProfiling = true; - doHaddock = true; - jailbreak = true; - doCheck = false; - doBenchmark = false; - hyperlinkSource = false; - description = "Support for manipulating Haskell source code"; - 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/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/monad-loops.nix b/pkgs/monad-loops.nix deleted file mode 100644 index 7c88bdf82763347833e89a5ece4b6c7c8686cf5b..0000000000000000000000000000000000000000 --- a/pkgs/monad-loops.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ mkDerivation, base, lib, tasty, tasty-hunit }: -mkDerivation { - pname = "monad-loops"; - version = "0.4.3"; - sha256 = "7eaaaf6bc43661e9e86e310ff8c56fbea16eb6bf13c31a2e28103138ac164c18"; - isLibrary = true; - isExecutable = false; - enableSeparateDataOutput = false; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base tasty tasty-hunit ]; - enableLibraryProfiling = true; - enableExecutableProfiling = true; - doHaddock = true; - jailbreak = true; - doCheck = false; - doBenchmark = false; - hyperlinkSource = false; - homepage = "https://github.com/mokus0/monad-loops"; - description = "Monadic loops"; - license = lib.licenses.publicDomain; - 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/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/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/should-not-typecheck.nix b/pkgs/should-not-typecheck.nix deleted file mode 100644 index 01856bf333c3eb1eea2eb9c800f9677a614dfa12..0000000000000000000000000000000000000000 --- a/pkgs/should-not-typecheck.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ mkDerivation, HUnit, base, deepseq, hspec, hspec-expectations -, lib -}: -mkDerivation { - pname = "should-not-typecheck"; - version = "2.1.0"; - sha256 = "f538ac70ce07679bc2e6c1651db82a86866664ab995665fdc78e6cb12bd8d591"; - isLibrary = true; - isExecutable = false; - enableSeparateDataOutput = false; - libraryHaskellDepends = [ base deepseq HUnit ]; - testHaskellDepends = [ - base deepseq hspec hspec-expectations HUnit - ]; - enableLibraryProfiling = true; - enableExecutableProfiling = true; - doHaddock = true; - jailbreak = true; - doCheck = false; - doBenchmark = false; - hyperlinkSource = false; - homepage = "http://github.com/CRogers/should-not-typecheck"; - description = "A HUnit/hspec assertion library to verify that an expression does not typecheck"; - license = lib.licenses.bsd3; - broken = false; -} \ No newline at end of file diff --git a/pkgs/time-locale-compat.nix b/pkgs/time-locale-compat.nix deleted file mode 100644 index ab864a2e39315aa14853d208204616d1504c3733..0000000000000000000000000000000000000000 --- a/pkgs/time-locale-compat.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ mkDerivation, base, lib, old-locale, time }: -mkDerivation { - pname = "time-locale-compat"; - version = "0.1.1.5"; - sha256 = "07ff1566de7d851423a843b2de385442319348c621d4f779b3d365ce91ac502c"; - isLibrary = true; - isExecutable = false; - enableSeparateDataOutput = false; - libraryHaskellDepends = [ base old-locale time ]; - enableLibraryProfiling = true; - enableExecutableProfiling = true; - doHaddock = true; - jailbreak = true; - doCheck = false; - doBenchmark = false; - hyperlinkSource = false; - homepage = "https://github.com/khibino/haskell-time-locale-compat"; - description = "Compatibile module for time-format locale"; - 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/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/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