From 58c69adf8f1ac0d0b34fa2986b5d9290a8d17fd8 Mon Sep 17 00:00:00 2001 From: Daniel Firth <dan.firth@homotopic.tech> Date: Mon, 7 Nov 2022 18:24:15 +0000 Subject: [PATCH] direct-sqlite: init at 2.3.27 --- manifest.dhall | 1 + overlay.nix | 2 ++ pkgs/direct-sqlite.nix | 39 +++++++++++++++++++++++++++++++++++++++ pkgs/saltine.nix | 41 +++++++++++++++++++++++++++++++++-------- 4 files changed, 75 insertions(+), 8 deletions(-) create mode 100644 pkgs/direct-sqlite.nix diff --git a/manifest.dhall b/manifest.dhall index dfbdd71b..109e4141 100644 --- a/manifest.dhall +++ b/manifest.dhall @@ -224,6 +224,7 @@ in [ callHackage "Cabal" "3.8.1.0" , callHackage "dhall" "1.41.2" , callHackage "dhall-json" "1.7.11" , callHackage "dimensional" "1.5" + , callHackage "direct-sqlite" "2.3.27" , callCabal2nix "dirforest" "https://github.com/NorfairKing/dirforest" diff --git a/overlay.nix b/overlay.nix index 0cbbdfe5..ee36fcae 100644 --- a/overlay.nix +++ b/overlay.nix @@ -301,6 +301,8 @@ self: with pkgs.haskell.lib; { dimensional = self.callPackage (./pkgs/dimensional.nix) { }; + direct-sqlite = self.callPackage (./pkgs/direct-sqlite.nix) { }; + dirforest = self.callPackage (./pkgs/dirforest.nix) { }; distribution-nixpkgs = self.callPackage (./pkgs/distribution-nixpkgs.nix) { }; diff --git a/pkgs/direct-sqlite.nix b/pkgs/direct-sqlite.nix new file mode 100644 index 00000000..ed8afdf1 --- /dev/null +++ b/pkgs/direct-sqlite.nix @@ -0,0 +1,39 @@ +{ mkDerivation +, base +, base16-bytestring +, bytestring +, directory +, HUnit +, lib +, temporary +, text +}: +mkDerivation { + pname = "direct-sqlite"; + version = "2.3.27"; + sha256 = "0319dd780712859fcacf0b8f1401088f76af3b651c7ec366e0231c15e73bd82e"; + isLibrary = true; + isExecutable = false; + enableSeparateDataOutput = false; + libraryHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ + base + base16-bytestring + bytestring + directory + HUnit + temporary + text + ]; + enableLibraryProfiling = false; + enableExecutableProfiling = false; + doHaddock = false; + jailbreak = true; + doCheck = false; + doBenchmark = false; + hyperlinkSource = false; + homepage = "https://github.com/IreneKnapp/direct-sqlite"; + description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support."; + license = lib.licenses.bsd3; + broken = false; +} diff --git a/pkgs/saltine.nix b/pkgs/saltine.nix index f66679bb..76fe94a0 100644 --- a/pkgs/saltine.nix +++ b/pkgs/saltine.nix @@ -1,6 +1,17 @@ -{ mkDerivation, base, bytestring, criterion, deepseq, hashable, lib -, libsodium, profunctors, QuickCheck, semigroups, test-framework -, test-framework-quickcheck2, text +{ mkDerivation +, base +, bytestring +, criterion +, deepseq +, hashable +, lib +, libsodium +, profunctors +, QuickCheck +, semigroups +, test-framework +, test-framework-quickcheck2 +, text }: mkDerivation { pname = "saltine"; @@ -10,15 +21,29 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - base bytestring deepseq hashable profunctors text + base + bytestring + deepseq + hashable + profunctors + text ]; libraryPkgconfigDepends = [ libsodium ]; testHaskellDepends = [ - base bytestring QuickCheck semigroups test-framework - test-framework-quickcheck2 text + base + bytestring + QuickCheck + semigroups + test-framework + test-framework-quickcheck2 + text ]; benchmarkHaskellDepends = [ - base bytestring criterion deepseq text + base + bytestring + criterion + deepseq + text ]; benchmarkSystemDepends = [ libsodium ]; enableLibraryProfiling = false; @@ -31,4 +56,4 @@ mkDerivation { description = "Cryptography that's easy to digest (NaCl/libsodium bindings)"; license = lib.licenses.mit; broken = false; -} \ No newline at end of file +} -- GitLab