From 6a15e8e71ab318b47e4c62d90f8e541b45df7fd4 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sun, 28 May 2023 17:20:48 +0200 Subject: chore(users/Profpatsch): replace Label with pa-label We upstreamed some of these modules to hackage, so I can get rid of it here. Change-Id: I70e1e864a81029cadbbd96cc019a768728431cff Reviewed-on: https://cl.tvl.fyi/c/depot/+/8659 Reviewed-by: Profpatsch Tested-by: BuildkiteCI Autosubmit: Profpatsch Reviewed-by: sterni --- third_party/overlays/haskell/default.nix | 5 +++ .../haskell/extra-pkgs/pa-error-tree-0.1.0.0.nix | 10 ++++++ .../haskell/extra-pkgs/pa-field-parser-0.1.0.1.nix | 35 ++++++++++++++++++++ .../haskell/extra-pkgs/pa-label-0.1.0.1.nix | 10 ++++++ .../haskell/extra-pkgs/pa-prelude-0.1.0.0.nix | 37 ++++++++++++++++++++++ 5 files changed, 97 insertions(+) create mode 100644 third_party/overlays/haskell/extra-pkgs/pa-error-tree-0.1.0.0.nix create mode 100644 third_party/overlays/haskell/extra-pkgs/pa-field-parser-0.1.0.1.nix create mode 100644 third_party/overlays/haskell/extra-pkgs/pa-label-0.1.0.1.nix create mode 100644 third_party/overlays/haskell/extra-pkgs/pa-prelude-0.1.0.0.nix (limited to 'third_party/overlays') diff --git a/third_party/overlays/haskell/default.nix b/third_party/overlays/haskell/default.nix index 8c4871fb08..ca3a1d2983 100644 --- a/third_party/overlays/haskell/default.nix +++ b/third_party/overlays/haskell/default.nix @@ -29,6 +29,11 @@ in # TODO: this is to fix a bug in dhall-nix dhall = dhall-source "dhall" hsSuper.dhall; dhall-nix = dhall-source "dhall-nix" hsSuper.dhall-nix; + + pa-prelude = hsSelf.callPackage ./extra-pkgs/pa-prelude-0.1.0.0.nix { }; + pa-error-tree = hsSelf.callPackage ./extra-pkgs/pa-error-tree-0.1.0.0.nix { }; + pa-field-parser = hsSelf.callPackage ./extra-pkgs/pa-field-parser-0.1.0.1.nix { }; + pa-label = hsSelf.callPackage ./extra-pkgs/pa-label-0.1.0.1.nix { }; }; }; diff --git a/third_party/overlays/haskell/extra-pkgs/pa-error-tree-0.1.0.0.nix b/third_party/overlays/haskell/extra-pkgs/pa-error-tree-0.1.0.0.nix new file mode 100644 index 0000000000..a38cd4efaa --- /dev/null +++ b/third_party/overlays/haskell/extra-pkgs/pa-error-tree-0.1.0.0.nix @@ -0,0 +1,10 @@ +{ mkDerivation, base, containers, lib, pa-prelude }: +mkDerivation { + pname = "pa-error-tree"; + version = "0.1.0.0"; + sha256 = "f82d3d905e8d9f0d31c81f31c424b9a95c65a8925517ccac92134f410cf8d639"; + libraryHaskellDepends = [ base containers pa-prelude ]; + homepage = "https://github.com/possehl-analytics/pa-hackage"; + description = "Collect a tree of errors and pretty-print"; + license = lib.licenses.bsd3; +} diff --git a/third_party/overlays/haskell/extra-pkgs/pa-field-parser-0.1.0.1.nix b/third_party/overlays/haskell/extra-pkgs/pa-field-parser-0.1.0.1.nix new file mode 100644 index 0000000000..b327340d34 --- /dev/null +++ b/third_party/overlays/haskell/extra-pkgs/pa-field-parser-0.1.0.1.nix @@ -0,0 +1,35 @@ +{ mkDerivation +, aeson +, aeson-better-errors +, attoparsec +, base +, case-insensitive +, containers +, lib +, pa-error-tree +, pa-prelude +, scientific +, semigroupoids +, text +}: +mkDerivation { + pname = "pa-field-parser"; + version = "0.1.0.1"; + sha256 = "e7fd0369898b6993e6e2aaab43e7cc84d173dc2d21eadca1884d2e7a780ad71f"; + libraryHaskellDepends = [ + aeson + aeson-better-errors + attoparsec + base + case-insensitive + containers + pa-error-tree + pa-prelude + scientific + semigroupoids + text + ]; + homepage = "https://github.com/possehl-analytics/pa-hackage"; + description = "“Vertical” parsing of values"; + license = lib.licenses.bsd3; +} diff --git a/third_party/overlays/haskell/extra-pkgs/pa-label-0.1.0.1.nix b/third_party/overlays/haskell/extra-pkgs/pa-label-0.1.0.1.nix new file mode 100644 index 0000000000..1da78260cc --- /dev/null +++ b/third_party/overlays/haskell/extra-pkgs/pa-label-0.1.0.1.nix @@ -0,0 +1,10 @@ +{ mkDerivation, base, lib }: +mkDerivation { + pname = "pa-label"; + version = "0.1.0.1"; + sha256 = "0131ab7718d910a94cd8cc881e51b7371a060dadfeabc8fd78513a7f27ee8d35"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/possehl-analytics/pa-hackage"; + description = "Labels, and labelled tuples and enums (GHC >9.2)"; + license = lib.licenses.bsd3; +} diff --git a/third_party/overlays/haskell/extra-pkgs/pa-prelude-0.1.0.0.nix b/third_party/overlays/haskell/extra-pkgs/pa-prelude-0.1.0.0.nix new file mode 100644 index 0000000000..765ed31ba6 --- /dev/null +++ b/third_party/overlays/haskell/extra-pkgs/pa-prelude-0.1.0.0.nix @@ -0,0 +1,37 @@ +{ mkDerivation +, base +, bytestring +, containers +, error +, exceptions +, lib +, mtl +, profunctors +, PyF +, semigroupoids +, text +, these +, validation-selective +}: +mkDerivation { + pname = "pa-prelude"; + version = "0.1.0.0"; + sha256 = "554556e3acbf7154131ed05209d803a19d6aa1c7d675fcb10501de50869c49ab"; + libraryHaskellDepends = [ + base + bytestring + containers + error + exceptions + mtl + profunctors + PyF + semigroupoids + text + these + validation-selective + ]; + homepage = "https://github.com/possehl-analytics/pa-hackage"; + description = "The Possehl Analytics Prelude"; + license = lib.licenses.bsd3; +} -- cgit 1.4.1