From 10afdaf0581a2607ac58e17e5709e8f340bee006 Mon Sep 17 00:00:00 2001 From: Daniel Firth <dan.firth@homotopic.tech> Date: Tue, 8 Nov 2022 14:38:27 +0000 Subject: [PATCH] hiedb: move to broken --- broken.dhall | 51 +++++++++++++++++++++++++++++++++++ manifest.dhall | 1 - overlay.nix | 2 -- pkgs/hiedb.nix | 73 -------------------------------------------------- 4 files changed, 51 insertions(+), 76 deletions(-) create mode 100644 broken.dhall delete mode 100644 pkgs/hiedb.nix diff --git a/broken.dhall b/broken.dhall new file mode 100644 index 00000000..892cd5ef --- /dev/null +++ b/broken.dhall @@ -0,0 +1,51 @@ +let HsSrc = + < FromHackage : { name : Text, version : Text } + | FromGit : + { url : Text, revision : Optional Text, subdir : Optional Text } + > + +let Modifiers = + { Type = { doJailbreak : Bool, doCheck : Bool } + , default = { doJailbreak = True, doCheck = False } + } + +let Attr = λ(a : Type) → { mapKey : Text, mapValue : a } + +let HsPkg = + { Type = { source : HsSrc, modifiers : Modifiers.Type } + , default.modifiers = Modifiers.default + } + +let callHackage + : ∀(name : Text) → ∀(version : Text) → Attr HsPkg.Type + = λ(name : Text) → + λ(version : Text) → + { mapKey = name + , mapValue = HsPkg::{ source = HsSrc.FromHackage { name, version } } + } + +let callCabal2nix + : ∀(name : Text) → + ∀(url : Text) → + ∀(revision : Optional Text) → + ∀(subdir : Optional Text) → + Attr HsPkg.Type + = λ(name : Text) → + λ(url : Text) → + λ(revision : Optional Text) → + λ(subdir : Optional Text) → + { mapKey = name + , mapValue = HsPkg::{ source = HsSrc.FromGit { url, revision, subdir } } + } + +let callHorizonAdopted + : ∀(name : Text) → ∀(revision : Text) → Attr HsPkg.Type + = λ(name : Text) → + λ(revision : Text) → + callCabal2nix + name + ("https://gitlab.homotopic.tech/horizon/adopted/" ++ name) + (Some revision) + (None Text) + +in [ callHackage "hiedb" "0.4.2.0" ] diff --git a/manifest.dhall b/manifest.dhall index 4b5f7461..003313f0 100644 --- a/manifest.dhall +++ b/manifest.dhall @@ -393,7 +393,6 @@ in [ callHackage "Cabal" "3.8.1.0" , callHackage "hedgehog" "1.2" , callHackage "hie-bios" "0.11.0" , callHackage "hie-compat" "0.3.0.0" - , callHackage "hiedb" "0.4.2.0" , callHackage "hinotify" "0.4.1" , callHackage "hledger-lib" "1.27.1" , callHackage "hledger" "1.27.1" diff --git a/overlay.nix b/overlay.nix index c7e459f9..63715af4 100644 --- a/overlay.nix +++ b/overlay.nix @@ -565,8 +565,6 @@ self: with pkgs.haskell.lib; { hie-compat = self.callPackage (./pkgs/hie-compat.nix) { }; - hiedb = self.callPackage (./pkgs/hiedb.nix) { }; - hinotify = self.callPackage (./pkgs/hinotify.nix) { }; hledger = self.callPackage (./pkgs/hledger.nix) { }; diff --git a/pkgs/hiedb.nix b/pkgs/hiedb.nix deleted file mode 100644 index 32eee468..00000000 --- a/pkgs/hiedb.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ mkDerivation -, algebraic-graphs -, ansi-terminal -, array -, base -, bytestring -, containers -, directory -, extra -, filepath -, ghc -, ghc-paths -, hie-compat -, hspec -, lib -, lucid -, mtl -, optparse-applicative -, process -, sqlite-simple -, temporary -, terminal-size -, text -}: -mkDerivation { - pname = "hiedb"; - version = "0.4.2.0"; - sha256 = "9cca518eaa6a5d747c32ca7f50c7ba3c7454fb96239796bbbd6d2cc7cb61b908"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = false; - libraryHaskellDepends = [ - algebraic-graphs - ansi-terminal - array - base - bytestring - containers - directory - extra - filepath - ghc - hie-compat - lucid - mtl - optparse-applicative - sqlite-simple - terminal-size - text - ]; - executableHaskellDepends = [ base ghc-paths ]; - testHaskellDepends = [ - base - directory - filepath - ghc - ghc-paths - hspec - process - temporary - ]; - enableLibraryProfiling = false; - enableExecutableProfiling = false; - doHaddock = false; - jailbreak = true; - doCheck = false; - doBenchmark = false; - hyperlinkSource = false; - description = "Generates a references DB from .hie files"; - license = lib.licenses.bsd3; - mainProgram = "hiedb"; - broken = false; -} -- GitLab