diff --git a/horizon.dhall b/horizon.dhall index 1887f0af8749209d9f81bd0d085d8a28d15b7c07..919ed1ad3564f7d4a7d34ba5bd0ff9e354042a20 100644 --- a/horizon.dhall +++ b/horizon.dhall @@ -2,13 +2,9 @@ let H = https://gitlab.horizon-haskell.net/dhall/horizon-spec/-/raw/0.10.0/horizon-spec/package.dhall let packages = - { BiobaseENA = H.callHackage "BiobaseENA" "0.0.0.2" - , BiobaseTypes = H.callHackage "BiobaseTypes" "0.2.1.0" - , DPutils = H.callHackage "DPutils" "0.1.1.0" + { DPutils = H.callHackage "DPutils" "0.1.1.0" , ForestStructures = H.callHackage "ForestStructures" "0.0.1.0" , Octree = H.callHackage "Octree" "0.6.0.1" - , OrderedBits = H.callHackage "OrderedBits" "0.0.2.0" - , PrimitiveArray = H.callHackage "PrimitiveArray" "0.9.0.0" , SciBaseTypes = H.callHackage "SciBaseTypes" "0.1.1.0" , bimaps = H.callHackage "bimaps" "0.1.0.2" , biocore = H.callHackage "biocore" "0.3.1" diff --git a/horizon.lock b/horizon.lock index 3e84946a74c38d3cc130c388d48b1d95626c8b9e..7d535ba0f4fd58553107c0cec69d918a83af23a8 100644 --- a/horizon.lock +++ b/horizon.lock @@ -1,12 +1,4 @@ -[ { mapKey = "BiobaseENA" - , mapValue = - "65c47bd828830627f3db2ce31e27ee724eec8b39a5ea3358f5ef454ee08a229a" - } -, { mapKey = "BiobaseTypes" - , mapValue = - "216930f2c0b7c207553cac00d936a1bb329553ebeed240c1fa2f3225d84c295f" - } -, { mapKey = "DPutils" +[ { mapKey = "DPutils" , mapValue = "183cfe93d04c6f18ac5bfcd81b16af4767eea035f47c9b01b77122d34817be80" } @@ -18,14 +10,6 @@ , mapValue = "0697a223d72245a0f0f0e7787c180ca81e01393fc8f621555a72036b98615c1e" } -, { mapKey = "OrderedBits" - , mapValue = - "78671553d8b003ae520d1a748f829a076209fc4a4bfde0ad971017e3db58cc51" - } -, { mapKey = "PrimitiveArray" - , mapValue = - "717b452b22d348308e44d5afc09bbe167d57da852e9da532e78d30f4886c45f5" - } , { mapKey = "SciBaseTypes" , mapValue = "1129c041a58ccca667314afc78db149fdb282cacf658512d015761b45b68f036" diff --git a/overlay.nix b/overlay.nix index 8de33d58afafda6663c3b417fad0337b12ed101c..7f25e6b048da017a7c224ba0dfcb8dbd7cb63fcd 100644 --- a/overlay.nix +++ b/overlay.nix @@ -2,20 +2,12 @@ { pkgs, f ? (final: prev: n: v: v), ... }: final: prev: with pkgs.haskell.lib; { - BiobaseENA = f final prev "BiobaseENA" (final.callPackage (./pkgs/BiobaseENA.nix) { }); - - BiobaseTypes = f final prev "BiobaseTypes" (final.callPackage (./pkgs/BiobaseTypes.nix) { }); - DPutils = f final prev "DPutils" (final.callPackage (./pkgs/DPutils.nix) { }); ForestStructures = f final prev "ForestStructures" (final.callPackage (./pkgs/ForestStructures.nix) { }); Octree = f final prev "Octree" (final.callPackage (./pkgs/Octree.nix) { }); - OrderedBits = f final prev "OrderedBits" (final.callPackage (./pkgs/OrderedBits.nix) { }); - - PrimitiveArray = f final prev "PrimitiveArray" (final.callPackage (./pkgs/PrimitiveArray.nix) { }); - SciBaseTypes = f final prev "SciBaseTypes" (final.callPackage (./pkgs/SciBaseTypes.nix) { }); bimaps = f final prev "bimaps" (final.callPackage (./pkgs/bimaps.nix) { }); diff --git a/pkgs/BiobaseENA.nix b/pkgs/BiobaseENA.nix deleted file mode 100644 index 74dad57a2c466163f00f9de3ddb724062d19644c..0000000000000000000000000000000000000000 --- a/pkgs/BiobaseENA.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ mkDerivation, BiobaseTypes, QuickCheck, base, bytestring -, containers, directory, file-embed, lens, lib, megaparsec, mtl -, tasty, tasty-quickcheck, tasty-th, text, vector, vector-th-unbox -}: -mkDerivation { - pname = "BiobaseENA"; - version = "0.0.0.2"; - sha256 = "cd1eee4d2ef03a89610a85a4dadf3deedf00b1b5e03fddf39a95c835744e296d"; - isLibrary = true; - isExecutable = false; - enableSeparateDataOutput = false; - libraryHaskellDepends = [ - base BiobaseTypes bytestring containers directory file-embed lens - megaparsec mtl text vector vector-th-unbox - ]; - testHaskellDepends = [ - base BiobaseTypes bytestring containers directory file-embed lens - megaparsec mtl QuickCheck tasty tasty-quickcheck tasty-th text - vector vector-th-unbox - ]; - enableLibraryProfiling = true; - enableExecutableProfiling = true; - doHaddock = true; - jailbreak = true; - doCheck = false; - doBenchmark = false; - hyperlinkSource = false; - homepage = "https://github.com/choener/BiobaseENA"; - description = "European Nucleotide Archive data"; - license = lib.licenses.bsd3; - broken = false; -} \ No newline at end of file diff --git a/pkgs/BiobaseTypes.nix b/pkgs/BiobaseTypes.nix deleted file mode 100644 index eaf77af41a8809310676dd6257ff0e2db3b41c78..0000000000000000000000000000000000000000 --- a/pkgs/BiobaseTypes.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ mkDerivation, DPutils, ForestStructures, PrimitiveArray -, QuickCheck, SciBaseTypes, aeson, attoparsec, base, bimaps, binary -, bytestring, cereal, cereal-text, cereal-vector, containers -, data-default, deepseq, hashable, intern, lens, lib, mtl -, primitive, streaming, string-conversions, tasty, tasty-hunit -, tasty-quickcheck, tasty-th, text, text-binary, utf8-string -, vector, vector-binary-instances, vector-th-unbox -}: -mkDerivation { - pname = "BiobaseTypes"; - version = "0.2.1.0"; - sha256 = "6af9224ffdd514314b5f7748460d4b1c85f0a9a8701b3448309caf8e20b5a53e"; - isLibrary = true; - isExecutable = false; - enableSeparateDataOutput = false; - libraryHaskellDepends = [ - aeson attoparsec base bimaps binary bytestring cereal cereal-text - cereal-vector containers data-default deepseq DPutils - ForestStructures hashable intern lens mtl primitive PrimitiveArray - QuickCheck SciBaseTypes streaming string-conversions text - text-binary utf8-string vector vector-binary-instances - vector-th-unbox - ]; - testHaskellDepends = [ - aeson attoparsec base bimaps binary bytestring cereal cereal-text - cereal-vector containers data-default deepseq DPutils - ForestStructures hashable intern lens mtl primitive PrimitiveArray - QuickCheck SciBaseTypes streaming string-conversions tasty - tasty-hunit tasty-quickcheck tasty-th text text-binary utf8-string - vector vector-binary-instances vector-th-unbox - ]; - enableLibraryProfiling = true; - enableExecutableProfiling = true; - doHaddock = true; - jailbreak = true; - doCheck = false; - doBenchmark = false; - hyperlinkSource = false; - homepage = "https://github.com/choener/BiobaseTypes"; - description = "Collection of types for bioinformatics"; - license = lib.licenses.bsd3; - broken = false; -} \ No newline at end of file diff --git a/pkgs/OrderedBits.nix b/pkgs/OrderedBits.nix deleted file mode 100644 index 9f40796ff60cd6f94097797b8e98abfea052ddef..0000000000000000000000000000000000000000 --- a/pkgs/OrderedBits.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ mkDerivation, QuickCheck, base, bits, criterion, lib, primitive -, tasty, tasty-quickcheck, tasty-th, vector, vector-algorithms -}: -mkDerivation { - pname = "OrderedBits"; - version = "0.0.2.0"; - sha256 = "0530dc8bb05ebdfdb179e3de5260d96393587c2632de89a40af6fdd5cb3fcbcd"; - isLibrary = true; - isExecutable = false; - enableSeparateDataOutput = false; - libraryHaskellDepends = [ - base bits primitive vector vector-algorithms - ]; - testHaskellDepends = [ - base QuickCheck tasty tasty-quickcheck tasty-th vector - ]; - benchmarkHaskellDepends = [ base criterion ]; - enableLibraryProfiling = true; - enableExecutableProfiling = true; - doHaddock = true; - jailbreak = true; - doCheck = false; - doBenchmark = false; - hyperlinkSource = false; - homepage = "https://github.com/choener/OrderedBits"; - description = "Efficient ordered (by popcount) enumeration of bits"; - license = lib.licenses.bsd3; - broken = false; -} \ No newline at end of file diff --git a/pkgs/PrimitiveArray.nix b/pkgs/PrimitiveArray.nix deleted file mode 100644 index d74468557473a025b5d97ec7739243789021fced..0000000000000000000000000000000000000000 --- a/pkgs/PrimitiveArray.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ mkDerivation, DPutils, OrderedBits, QuickCheck, aeson, base -, binary, bits, cereal, cereal-vector, containers, deepseq -, hashable, lens, lib, log-domain, mtl, primitive, smallcheck -, tasty, tasty-quickcheck, tasty-smallcheck, tasty-th, text, vector -, vector-binary-instances, vector-th-unbox -}: -mkDerivation { - pname = "PrimitiveArray"; - version = "0.9.0.0"; - sha256 = "7117ed12d35ca80d2cfc444ac2c5094d8dfed6523e48637089f4de26d9091b7e"; - isLibrary = true; - isExecutable = false; - enableSeparateDataOutput = false; - libraryHaskellDepends = [ - aeson base binary bits cereal cereal-vector deepseq DPutils - hashable lens log-domain mtl OrderedBits primitive QuickCheck - smallcheck text vector vector-binary-instances vector-th-unbox - ]; - testHaskellDepends = [ - base containers QuickCheck smallcheck tasty tasty-quickcheck - tasty-smallcheck tasty-th - ]; - enableLibraryProfiling = true; - enableExecutableProfiling = true; - doHaddock = true; - jailbreak = true; - doCheck = false; - doBenchmark = false; - hyperlinkSource = false; - homepage = "https://github.com/choener/PrimitiveArray"; - description = "Efficient multidimensional arrays"; - license = lib.licenses.bsd3; - broken = false; -} \ No newline at end of file