Merge pull request #158 from mlabs-haskell/bladyjoker/update-haskell

Updating GHC, Hackage, CTL etc.

Author: bladyjoker

README.md

@@ -20,7 +20,7 @@ competitors if your project requires:
  1. _Parameterized Data Types_ (aka. type functions): Unlike ProtoBuffers or
     JSON Schema, LambdaBuffers allows users to define algebraic data types which
     take type variable arguments. If your project's domain is most accurately
-    represented by parameterized data types, LamdaBuffers may be a good choice
+    represented by parameterized data types, LambdaBuffers may be a good choice
     for your needs.
 
  2. _Opaque Types_: Almost every competing schema language provides users a
@@ -41,7 +41,7 @@ competitors if your project requires:
     productively make use of the generated types. While LambdaBuffers is still a
     work-in-progress, we expect that, upon completion, an extensive test suite
     will provide a high degree of assurance that the instances/methods generated
-    by the LamdaBuffers code generator behave identically.
+    by the LambdaBuffers code generator behave identically.
 
 ## Documentation
 

api/build.nix

@@ -1,56 +1,41 @@
 { inputs, ... }:
 {
-  perSystem = { pkgs, system, config, ... }:
+  perSystem = { pkgs, system, config, inputs', ... }:
     let
-      pbnix-lib = inputs.protobufs-nix.lib.${system};
+      proto-nix = inputs.proto-nix.lib.${system};
     in
     rec {
 
       devShells.dev-api = pkgs.mkShell {
         name = "protos-env";
-        buildInputs = [
-          pkgs.protobuf
-          pkgs.haskellPackages.proto-lens-protoc
-          pkgs.protoc-gen-doc
-        ] ++ config.settings.shell.tools;
-
+        inputsFrom = [ inputs'.proto-nix.devShells.dev-proto-nix ];
         shellHook = config.settings.shell.hook;
       };
 
       packages = {
-        lambda-buffers-lang-hs-pb = pbnix-lib.haskellProto {
-          inherit pkgs;
+        lambda-buffers-lang-hs-pb = proto-nix.haskellProto {
           src = ./.;
-          proto = "lang.proto";
+          protos = [ "lang.proto" ];
           cabalPackageName = "lambda-buffers-lang-pb";
         };
 
-        lambda-buffers-compiler-hs-pb = pbnix-lib.haskellProto {
-          inherit pkgs;
+        lambda-buffers-compiler-hs-pb = proto-nix.haskellProto {
           src = ./.;
-          proto = "compiler.proto";
+          protos = [ "compiler.proto" ];
           cabalBuildDepends = [ packages.lambda-buffers-lang-hs-pb ];
           cabalPackageName = "lambda-buffers-compiler-pb";
         };
 
-        lambda-buffers-codegen-hs-pb = pbnix-lib.haskellProto {
-          inherit pkgs;
+        lambda-buffers-codegen-hs-pb = proto-nix.haskellProto {
           src = ./.;
-          proto = "codegen.proto";
+          protos = [ "codegen.proto" ];
           cabalBuildDepends = [ packages.lambda-buffers-lang-hs-pb ];
           cabalPackageName = "lambda-buffers-codegen-pb";
         };
 
-        lambda-buffers-api-docs = pkgs.stdenv.mkDerivation {
+        lambda-buffers-api-docs = proto-nix.docProto {
           src = ./.;
-          name = "lambdabuffers-api-docs";
-          buildInputs = [
-            pkgs.protobuf
-          ];
-          buildPhase = ''
-            mkdir $out;
-            protoc --plugin=${pkgs.protoc-gen-doc}/bin/protoc-gen-doc lang.proto compiler.proto codegen.proto --doc_out=$out --doc_opt=markdown,api.md;
-          '';
+          protos = [ "lang.proto" "compiler.proto" "codegen.proto" ];
         };
       };
     };

api/lang.proto

@@ -27,7 +27,7 @@ message SourcePosition {
 
 /* Type term
 
-A type term that ocurrs in bodies of type definitions (message TyDef):
+A type term that occurs in bodies of type definitions (message TyDef):
 
 ```lbf
 sum Maybe a = Just a | Nothing
@@ -146,7 +146,7 @@ message TyName {
 
 /* Module name */
 message ModuleName {
-  // Parts of the module name denoting a hierarchichal namespace.
+  // Parts of the module name denoting a hierarchical namespace.
   repeated ModuleNamePart parts = 1;
   // Source information.
   SourceInfo source_info = 2;

docs/feedback/interview-notes.md

@@ -46,7 +46,7 @@
         1. R. would like it to be seamless. R. mentions:
             1. Auto generate modules
             2. pre-commit hooks
-            3. itterate quickly
+            3. iterate quickly
             4. Nix integration is very important
             5. Not running commands.
             6. Watch function for the compiler.

docs/haskell.md

@@ -108,7 +108,7 @@ $ ghc autogen/LambdaBuffers/Document.hs
 
 ## Sum types
 
-The types `Author`, `Reviewer`, and `RichContent` have been declared as sum types in the LamdaBuffers schema using the `sum` keyword.
+The types `Author`, `Reviewer`, and `RichContent` have been declared as sum types in the LambdaBuffers schema using the `sum` keyword.
 
 As we can see, nothing too surprising here, all the `sum` types become `data`
 in Haskell.
@@ -119,7 +119,7 @@ quote) to the defined constructor names as to make sure they are unique.
 ## Product types
 
 The type `RichDocument` have been declared as a product type in the
-LamdaBuffers schema using the `prod` keyword.
+LambdaBuffers schema using the `prod` keyword.
 
 They become Haskell `newtype` if they have a single type in their body, otherwise they are `data`.
 
@@ -128,7 +128,7 @@ Note that the constructor has the same name as the type.
 ## Record types
 
 The types `Document` and `Chapter` have been declared as record types in the
-LamdaBuffers schema using the `record` keyword.
+LambdaBuffers schema using the `record` keyword.
 
 Like with product types, they become Haskell `newtype` if they have a single
 type in their body, otherwise they are `data`.

docs/introduction.md

@@ -18,7 +18,7 @@ competitors if your project requires:
  1. _Parameterized Data Types_ (aka. type functions): Unlike ProtoBuffers or
     JSON Schema, LambdaBuffers allows users to define algebraic data types which
     take type variable arguments. If your project's domain is most accurately
-    represented by parameterized data types, LamdaBuffers may be a good choice
+    represented by parameterized data types, LambdaBuffers may be a good choice
     for your needs.
 
  2. _Opaque Types_: Almost every competing schema language provides users a
@@ -39,4 +39,4 @@ competitors if your project requires:
     productively make use of the generated types. While LambdaBuffers is still a
     work-in-progress, we expect that, upon completion, an extensive test suite
     will provide a high degree of assurance that the instances/methods generated
-    by the LamdaBuffers code generator behave identically.
+    by the LambdaBuffers code generator behave identically.

docs/plutarch/plutarch-example.cabal

@@ -20,7 +20,6 @@ common common-language
     ghc-options: -Werror
 
   default-extensions:
-    NoStarIsType
     BangPatterns
     BinaryLiterals
     ConstrainedClassMethods
@@ -57,6 +56,7 @@ common common-language
     MultiParamTypeClasses
     NamedFieldPuns
     NamedWildCards
+    NoStarIsType
     NumericUnderscores
     OverloadedLabels
     OverloadedStrings

docs/purescript.md

@@ -123,7 +123,7 @@ instance Data.Show.Show RichDocument where
 
 ## Sum types
 
-The types `Author`, `Reviewer`, and `RichContent` have been declared as sum types in the LamdaBuffers schema using the `sum` keyword.
+The types `Author`, `Reviewer`, and `RichContent` have been declared as sum types in the LambdaBuffers schema using the `sum` keyword.
 
 As we can see, nothing too surprising here, all the `sum` types become `data`
 in Purescript.
@@ -134,7 +134,7 @@ quote) to the defined constructor names as to make sure they are unique.
 ## Product types
 
 The type `RichDocument` have been declared as a product type in the
-LamdaBuffers schema using the `prod` keyword.
+LambdaBuffers schema using the `prod` keyword.
 
 They become Purescript `newtype` if they have a single type in their body, otherwise they are `data`.
 
@@ -143,7 +143,7 @@ Note that the constructor has the same name as the type.
 ## Record types
 
 The types `Document` and `Chapter` have been declared as record types in the
-LamdaBuffers schema using the `record` keyword.
+LambdaBuffers schema using the `record` keyword.
 
 They always become Purescript `newtype`, and wrapped within is a Purescript
 record type with the fields named exactly like they are named in the

experimental/build.nix

@@ -1,27 +1,28 @@
 _: {
-  perSystem = { pkgs, config, ... }:
+  perSystem = { pkgs, config, inputs', ... }:
     {
 
       devShells.dev-experimental = pkgs.mkShell {
         name = "experimental-env";
         buildInputs = [
           pkgs.dhall
-          pkgs.dhall-lsp-server
+          # TODO(bladyjoker): error: Package ‘dhall-lsp-server-1.1.3’ in /nix/store/p7iz0r8gs6ppkhj83zjmwyd21k8b7v3y-source/pkgs/development/haskell-modules/hackage-packages.nix:84957 is marked as broken, refusing to evaluate.
+          # pkgs.dhall-lsp-server
           pkgs.dhall-json
 
-          (pkgs.haskellPackages.ghcWithPackages (pkgs: [
-            pkgs.text
-            pkgs.unification-fd
-            pkgs.HUnit
+          (pkgs.haskellPackages.ghcWithPackages (hsPkgs: [
+            hsPkgs.text
+            hsPkgs.unification-fd
+            hsPkgs.HUnit
           ]))
-          pkgs.haskell-language-server
 
           pkgs.protobuf
-          pkgs.haskellPackages.proto-lens-protoc
+          pkgs.haskellPackages.haskell-language-server
           pkgs.swiPrologWithGui
         ] ++ config.settings.shell.tools;
 
         shellHook = config.settings.shell.hook;
+        inputsFrom = [ inputs'.proto-nix.devShells.dev-proto-nix ];
       };
 
     };

extras/build.nix

@@ -21,7 +21,7 @@
 
     # Makes a per system `lbf-nix` option.
     perSystem = flake-parts-lib.mkPerSystemOption
-      ({ pkgs, config, ... }: {
+      ({ pkgs, system, config, ... }: {
 
         options.lbf-nix = lib.mkOption {
           type = lib.types.anything;
@@ -32,7 +32,22 @@
         config = {
           lbf-nix = {
             # NOTE(bladyjoker): If you need to add a function the export externally and use internally via config.lbf-nix, add it here.
-            purescriptFlake = import ./flake-purescript.nix pkgs;
+
+            purescriptFlake =
+              let
+                pkgs' = import inputs.ctl-nixpkgs {
+                  inherit system;
+                  inherit (inputs.haskell-nix) config;
+                  overlays = [
+                    inputs.haskell-nix.overlay
+                    inputs.iohk-nix.overlays.crypto
+                    inputs.ctl.overlays.purescript
+                    inputs.ctl.overlays.spago
+                  ];
+                };
+              in
+              import ./flake-purescript.nix pkgs'; # TODO(bladyjoker): If we use recent nixpkgs we get: `error: nodejs_14 has been removed as it is EOL`. That's why we use CTL's old nixpkgs.
+
             rustFlake = import ./flake-rust.nix pkgs;
             haskellData = import ./haskell-data.nix pkgs;
             haskellFlake = import ./flake-haskell.nix pkgs;