diff options
author | Profpatsch <mail@profpatsch.de> | 2023-08-06T16·04+0200 |
---|---|---|
committer | clbot <clbot@tvl.fyi> | 2023-08-06T16·08+0000 |
commit | 3e5a2ea57f9a25533b0a59c80a43014653cdddd1 (patch) | |
tree | 21cd607e6e20dda0d45565783f7026fcbc8eab22 | |
parent | b41af857ae5357ecfd4b4dd15d297ce8ab5ae2ea (diff) |
chore(users/Profpatsch): Move Multipart2 into new webstuff package r/6466
Change-Id: I903f1b554beed1240d2a9cf14ff44d1f3cb41ec5 Reviewed-on: https://cl.tvl.fyi/c/depot/+/9013 Tested-by: BuildkiteCI Autosubmit: Profpatsch <mail@profpatsch.de> Reviewed-by: Profpatsch <mail@profpatsch.de>
-rw-r--r-- | users/Profpatsch/cabal.project | 1 | ||||
-rw-r--r-- | users/Profpatsch/hie.yaml | 2 | ||||
-rw-r--r-- | users/Profpatsch/my-webstuff/default.nix | 27 | ||||
-rw-r--r-- | users/Profpatsch/my-webstuff/my-webstuff.cabal | 72 | ||||
-rw-r--r-- | users/Profpatsch/my-webstuff/src/Multipart2.hs (renamed from users/Profpatsch/whatcd-resolver/src/Multipart2.hs) | 0 | ||||
-rw-r--r-- | users/Profpatsch/whatcd-resolver/default.nix | 2 | ||||
-rw-r--r-- | users/Profpatsch/whatcd-resolver/whatcd-resolver.cabal | 2 |
7 files changed, 104 insertions, 2 deletions
diff --git a/users/Profpatsch/cabal.project b/users/Profpatsch/cabal.project index ed34b2f2828a..9c9b1a515193 100644 --- a/users/Profpatsch/cabal.project +++ b/users/Profpatsch/cabal.project @@ -1,5 +1,6 @@ packages: ./my-prelude/my-prelude.cabal + ./my-webstuff/my-webstuff.cabal ./netencode/netencode.cabal ./arglib/arglib-netencode.cabal ./execline/exec-helpers.cabal diff --git a/users/Profpatsch/hie.yaml b/users/Profpatsch/hie.yaml index 308fa8fe918c..64e57b885dc7 100644 --- a/users/Profpatsch/hie.yaml +++ b/users/Profpatsch/hie.yaml @@ -2,6 +2,8 @@ cradle: cabal: - path: "./my-prelude" component: "lib:my-prelude" + - path: "./my-webstuff" + component: "lib:my-webstuff" - path: "./netencode" component: "lib:netencode" - path: "./arglib" diff --git a/users/Profpatsch/my-webstuff/default.nix b/users/Profpatsch/my-webstuff/default.nix new file mode 100644 index 000000000000..0067235be269 --- /dev/null +++ b/users/Profpatsch/my-webstuff/default.nix @@ -0,0 +1,27 @@ +{ depot, pkgs, lib, ... }: + +pkgs.haskellPackages.mkDerivation { + pname = "my-webstuff"; + version = "0.0.1-unreleased"; + + src = depot.users.Profpatsch.exactSource ./. [ + ./my-webstuff.cabal + ./src/Multipart2.hs + ]; + + isLibrary = true; + + libraryHaskellDepends = [ + depot.users.Profpatsch.my-prelude + pkgs.haskellPackages.dlist + pkgs.haskellPackages.monad-logger + pkgs.haskellPackages.pa-error-tree + pkgs.haskellPackages.pa-field-parser + pkgs.haskellPackages.pa-prelude + pkgs.haskellPackages.selective + pkgs.haskellPackages.wai-extra + ]; + + license = lib.licenses.mit; + +} diff --git a/users/Profpatsch/my-webstuff/my-webstuff.cabal b/users/Profpatsch/my-webstuff/my-webstuff.cabal new file mode 100644 index 000000000000..fb42d9f6a55d --- /dev/null +++ b/users/Profpatsch/my-webstuff/my-webstuff.cabal @@ -0,0 +1,72 @@ +cabal-version: 3.0 +name: my-webstuff +version: 0.0.1.0 +author: Profpatsch +maintainer: mail@profpatsch.de + +common common-options + ghc-options: + -Wall + -Wno-type-defaults + -Wunused-packages + -Wredundant-constraints + -fwarn-missing-deriving-strategies + + -- See https://downloads.haskell.org/ghc/latest/docs/users_guide/exts.html + -- for a description of all these extensions + default-extensions: + -- Infer Applicative instead of Monad where possible + ApplicativeDo + + -- Allow literal strings to be Text + OverloadedStrings + + -- Syntactic sugar improvements + LambdaCase + MultiWayIf + + -- Makes the (deprecated) usage of * instead of Data.Kind.Type an error + NoStarIsType + + -- Convenient and crucial to deal with ambiguous field names, commonly + -- known as RecordDotSyntax + OverloadedRecordDot + + -- does not export record fields as functions, use OverloadedRecordDot to access instead + NoFieldSelectors + + -- Record punning + RecordWildCards + + -- Improved Deriving + DerivingStrategies + DerivingVia + + -- Type-level strings + DataKinds + + -- to enable the `type` keyword in import lists (ormolu uses this automatically) + ExplicitNamespaces + + default-language: GHC2021 + + +library + import: common-options + hs-source-dirs: src + exposed-modules: + Multipart2 + + build-depends: + base >=4.15 && <5 + , my-prelude + , pa-prelude + , pa-label + , pa-error-tree + , pa-field-parser + , bytestring + , monad-logger + , dlist + , selective + , wai + , wai-extra diff --git a/users/Profpatsch/whatcd-resolver/src/Multipart2.hs b/users/Profpatsch/my-webstuff/src/Multipart2.hs index 17246546ab35..17246546ab35 100644 --- a/users/Profpatsch/whatcd-resolver/src/Multipart2.hs +++ b/users/Profpatsch/my-webstuff/src/Multipart2.hs diff --git a/users/Profpatsch/whatcd-resolver/default.nix b/users/Profpatsch/whatcd-resolver/default.nix index 2135ad7cbc1d..17200ffe937b 100644 --- a/users/Profpatsch/whatcd-resolver/default.nix +++ b/users/Profpatsch/whatcd-resolver/default.nix @@ -9,12 +9,12 @@ let src = depot.users.Profpatsch.exactSource ./. [ ./whatcd-resolver.cabal - ./src/Multipart2.hs ./src/WhatcdResolver.hs ]; libraryHaskellDepends = [ depot.users.Profpatsch.my-prelude + depot.users.Profpatsch.my-webstuff pkgs.haskellPackages.pa-prelude pkgs.haskellPackages.pa-label pkgs.haskellPackages.pa-json diff --git a/users/Profpatsch/whatcd-resolver/whatcd-resolver.cabal b/users/Profpatsch/whatcd-resolver/whatcd-resolver.cabal index 1c595eb2e2c4..d05182deb31e 100644 --- a/users/Profpatsch/whatcd-resolver/whatcd-resolver.cabal +++ b/users/Profpatsch/whatcd-resolver/whatcd-resolver.cabal @@ -58,12 +58,12 @@ library exposed-modules: WhatcdResolver - Multipart2 build-depends: base >=4.15 && <5, text, my-prelude, + my-webstuff, pa-prelude, pa-error-tree, pa-label, |