Skip to content
Permalink
Browse files

plutus-tx: split out plutus-tx-plugin

Fixes #1790.

This pulls out the compiler plugin into its own package that just has
the stuff that depends on `ghc` in it (so: the compiler and the plugin
itself).

The dependencies on `plutus-tx-plugin` are gated by "not compiling with
GHCJS". This is important for cross-compilation: the plugin really needs
to be provided as a native dependency and won't work when
cross-compiled. So we need another mechanism for supplying it (which
Moritz has), and we need to *not* try and provide it the normal way.

All the stuff that doesn't depend on `ghc` is in `plutus-tx`, so `plutus-tx-plugin` also
depends on `plutus-tx`. As a nice side-effect, this means that many
things don't actually depend on the plugin, improving our build
parallelism a bit.

(Another bonus: now `plutus-tx` doesn't have an internal library any
more, which is what was causing the issue with the package occasionally
appearing as hidden in the playground interpreter. So we can delete a
FIXME.)
  • Loading branch information
michaelpj committed Jan 14, 2020
1 parent d3022c0 commit a41220b01c5982ca52c6516b741c4dd4a5bfac38
Showing with 335 additions and 157 deletions.
  1. +1 −0 cabal.project
  2. +1 −20 default.nix
  3. +1 −0 lib.nix
  4. +2 −2 nix/overlays/static-haskell.nix
  5. +60 −5 pkgs/default.nix
  6. +4 −1 plutus-contract-tasty/plutus-contract-tasty.cabal
  7. +3 −0 plutus-emulator/plutus-emulator.cabal
  8. +12 −0 plutus-playground-server/plutus-playground-server.cabal
  9. +0 −3 plutus-playground-server/src/Playground/Interpreter.hs
  10. +53 −0 plutus-tx-plugin/LICENSE
  11. +14 −0 plutus-tx-plugin/NOTICE
  12. +10 −0 plutus-tx-plugin/README.md
  13. +112 −0 plutus-tx-plugin/plutus-tx-plugin.cabal
  14. 0 {plutus-tx/compiler → plutus-tx-plugin/src}/Language/PlutusTx/Compiler/Binders.hs
  15. +6 −1 {plutus-tx/compiler → plutus-tx-plugin/src}/Language/PlutusTx/Compiler/Builtins.hs
  16. 0 {plutus-tx/compiler → plutus-tx-plugin/src}/Language/PlutusTx/Compiler/Error.hs
  17. 0 {plutus-tx/compiler → plutus-tx-plugin/src}/Language/PlutusTx/Compiler/Expr.hs
  18. 0 {plutus-tx/compiler → plutus-tx-plugin/src}/Language/PlutusTx/Compiler/Expr.hs-boot
  19. 0 {plutus-tx/compiler → plutus-tx-plugin/src}/Language/PlutusTx/Compiler/Kind.hs
  20. 0 {plutus-tx/compiler → plutus-tx-plugin/src}/Language/PlutusTx/Compiler/Laziness.hs
  21. 0 {plutus-tx/compiler → plutus-tx-plugin/src}/Language/PlutusTx/Compiler/Names.hs
  22. 0 {plutus-tx/compiler → plutus-tx-plugin/src}/Language/PlutusTx/Compiler/Primitives.hs
  23. 0 {plutus-tx/compiler → plutus-tx-plugin/src}/Language/PlutusTx/Compiler/Type.hs
  24. 0 {plutus-tx/compiler → plutus-tx-plugin/src}/Language/PlutusTx/Compiler/Type.hs-boot
  25. 0 {plutus-tx/compiler → plutus-tx-plugin/src}/Language/PlutusTx/Compiler/Types.hs
  26. 0 {plutus-tx/compiler → plutus-tx-plugin/src}/Language/PlutusTx/Compiler/Utils.hs
  27. 0 {plutus-tx/compiler → plutus-tx-plugin/src}/Language/PlutusTx/Compiler/ValueRestriction.hs
  28. 0 {plutus-tx/compiler → plutus-tx-plugin/src}/Language/PlutusTx/PIRTypes.hs
  29. 0 {plutus-tx/compiler → plutus-tx-plugin/src}/Language/PlutusTx/PLCTypes.hs
  30. +1 −10 {plutus-tx/compiler → plutus-tx-plugin/src}/Language/PlutusTx/Plugin.hs
  31. 0 {plutus-tx → plutus-tx-plugin}/test/Lift/Spec.hs
  32. 0 {plutus-tx → plutus-tx-plugin}/test/Lift/boolInterop.plc.golden
  33. 0 {plutus-tx → plutus-tx-plugin}/test/Lift/bytestring.plc.golden
  34. 0 {plutus-tx → plutus-tx-plugin}/test/Lift/int.plc.golden
  35. 0 {plutus-tx → plutus-tx-plugin}/test/Lift/liftPlc.plc.golden
  36. 0 {plutus-tx → plutus-tx-plugin}/test/Lift/list.plc.golden
  37. 0 {plutus-tx → plutus-tx-plugin}/test/Lift/listInterop.plc.golden
  38. 0 {plutus-tx → plutus-tx-plugin}/test/Lift/mono.plc.golden
  39. 0 {plutus-tx → plutus-tx-plugin}/test/Lift/monoInterop.plc.golden
  40. 0 {plutus-tx → plutus-tx-plugin}/test/Lift/nested.plc.golden
  41. 0 {plutus-tx → plutus-tx-plugin}/test/Lift/newtypeInt.plc.golden
  42. 0 {plutus-tx → plutus-tx-plugin}/test/Lift/newtypeInt2.plc.golden
  43. 0 {plutus-tx → plutus-tx-plugin}/test/Lift/newtypeInt3.plc.golden
  44. 0 {plutus-tx → plutus-tx-plugin}/test/Lift/poly.plc.golden
  45. 0 {plutus-tx → plutus-tx-plugin}/test/Lift/polyInterop.plc.golden
  46. 0 {plutus-tx → plutus-tx-plugin}/test/Lift/record.plc.golden
  47. 0 {plutus-tx → plutus-tx-plugin}/test/Lift/syn.plc.golden
  48. 0 {plutus-tx → plutus-tx-plugin}/test/Lift/tuple.plc.golden
  49. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Basic/Spec.hs
  50. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Basic/letFun.plc.golden
  51. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Basic/monoId.plc.golden
  52. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Basic/monoK.plc.golden
  53. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/Spec.hs
  54. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/families/associated.plc.golden
  55. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/families/associatedParam.plc.golden
  56. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/families/basicClosed.plc.golden
  57. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/families/basicData.plc.golden
  58. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/families/basicOpen.plc.golden
  59. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/families/irreducible.plc.golden
  60. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/monomorphic/atPattern.plc.golden
  61. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/monomorphic/defaultCase.plc.golden
  62. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/monomorphic/enum.plc.golden
  63. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/monomorphic/irrefutableMatch.plc.golden
  64. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/monomorphic/monoCase.plc.golden
  65. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/monomorphic/monoConstDest.plc.golden
  66. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/monomorphic/monoConstDestDefault.plc.golden
  67. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/monomorphic/monoConstructed.plc.golden
  68. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/monomorphic/monoConstructor.plc.golden
  69. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/monomorphic/monoDataType.plc.golden
  70. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/monomorphic/monoRecord.plc.golden
  71. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/monomorphic/nonValueCase.plc.golden
  72. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/monomorphic/recordNewtype.plc.golden
  73. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/monomorphic/recordSelector.plc.golden
  74. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/monomorphic/strictPattern.plc.golden
  75. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/monomorphic/synonym.plc.golden
  76. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/newtypes/basicNewtype.plc.golden
  77. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/newtypes/nestedNewtypeMatch.plc.golden
  78. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/newtypes/newtypeCreatDest.plc.golden
  79. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/newtypes/newtypeCreate.plc.golden
  80. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/newtypes/newtypeCreate2.plc.golden
  81. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/newtypes/newtypeId.plc.golden
  82. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/newtypes/newtypeMatch.plc.golden
  83. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/newtypes/paramNewtype.plc.golden
  84. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/polymorphic/defaultCasePoly.plc.golden
  85. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/polymorphic/polyConstructed.plc.golden
  86. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/polymorphic/polyDataType.plc.golden
  87. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/recursive/listConstDest.plc.golden
  88. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/recursive/listConstDest2.plc.golden
  89. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/recursive/listConstruct.plc.golden
  90. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/recursive/listConstruct2.plc.golden
  91. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/recursive/listConstruct3.plc.golden
  92. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/recursive/listMatch.plc.golden
  93. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/recursive/polyRecEval.plc.golden
  94. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/recursive/ptreeConstDest.plc.golden
  95. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/recursive/ptreeConstruct.plc.golden
  96. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/recursive/ptreeFirstEval.plc.golden
  97. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/recursive/ptreeMatch.plc.golden
  98. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/recursive/sameEmptyRose.plc.golden
  99. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Data/recursive/sameEmptyRoseEval.plc.golden
  100. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Errors/Spec.hs
  101. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Errors/caseInt.plc.golden
  102. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Errors/literalCaseBs.plc.golden
  103. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Errors/literalCaseInt.plc.golden
  104. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Errors/literalCaseOther.plc.golden
  105. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Errors/machInt.plc.golden
  106. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Errors/mutualRecursionUnfoldingsLocal.plc.golden
  107. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Errors/negativeInt.plc.golden
  108. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Errors/recursiveNewtype.plc.golden
  109. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Errors/valueRestriction.plc.golden
  110. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Functions/Spec.hs
  111. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Functions/recursive/even.plc.golden
  112. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Functions/recursive/even3.plc.golden
  113. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Functions/recursive/even4.plc.golden
  114. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Functions/recursive/fib.plc.golden
  115. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Functions/recursive/fib4.plc.golden
  116. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Functions/recursive/sum.plc.golden
  117. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Functions/recursive/sumList.plc.golden
  118. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Functions/unfoldings/allDirect.plc.golden
  119. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Functions/unfoldings/andDirect.plc.golden
  120. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Functions/unfoldings/andExternal.plc.golden
  121. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Functions/unfoldings/applicationFunction.plc.golden
  122. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Functions/unfoldings/mutualRecursionUnfoldings.plc.golden
  123. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Functions/unfoldings/nandDirect.plc.golden
  124. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Functions/unfoldings/polyMap.plc.golden
  125. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Functions/unfoldings/recordSelector.plc.golden
  126. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Functions/unfoldings/recordSelectorExternal.plc.golden
  127. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Laziness/Spec.hs
  128. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Laziness/joinError.plc.golden
  129. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Laziness/joinErrorEval.plc.golden
  130. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Laziness/lazyDepUnit.plc.golden
  131. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Lib.hs
  132. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Primitives/Spec.hs
  133. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Primitives/and.plc.golden
  134. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Primitives/andApply.plc.golden
  135. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Primitives/bool.plc.golden
  136. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Primitives/bytestring.plc.golden
  137. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Primitives/bytestringApply.plc.golden
  138. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Primitives/emptyByteString.plc.golden
  139. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Primitives/emptyByteStringApply.plc.golden
  140. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Primitives/equalsByteString.plc.golden
  141. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Primitives/error.plc.golden
  142. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Primitives/ifThenElse.plc.golden
  143. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Primitives/ifThenElseApply.plc.golden
  144. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Primitives/int.plc.golden
  145. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Primitives/int2.plc.golden
  146. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Primitives/intCompare.plc.golden
  147. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Primitives/intDiv.plc.golden
  148. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Primitives/intEq.plc.golden
  149. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Primitives/intEqApply.plc.golden
  150. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Primitives/intPlus.plc.golden
  151. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Primitives/intPlusApply.plc.golden
  152. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Primitives/ltByteString.plc.golden
  153. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Primitives/sha2_256.plc.golden
  154. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Primitives/string.plc.golden
  155. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Primitives/trace.plc.golden
  156. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Primitives/tuple.plc.golden
  157. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Primitives/tupleConstDest.plc.golden
  158. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Primitives/tupleMatch.plc.golden
  159. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Primitives/verify.plc.golden
  160. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Primitives/void.plc.golden
  161. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/ReadValue/Spec.hs
  162. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Spec.hs
  163. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Typeclasses/Lib.hs
  164. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Typeclasses/Spec.hs
  165. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Typeclasses/compareTest.plc.golden
  166. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Typeclasses/defaultMethods.plc.golden
  167. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Typeclasses/multiFunction.plc.golden
  168. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Typeclasses/partialApplication.plc.golden
  169. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Typeclasses/sequenceTest.plc.golden
  170. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Typeclasses/sizedBasic.plc.golden
  171. 0 {plutus-tx → plutus-tx-plugin}/test/Plugin/Typeclasses/sizedPair.plc.golden
  172. 0 {plutus-tx → plutus-tx-plugin}/test/Spec.hs
  173. 0 {plutus-tx → plutus-tx-plugin}/test/StdLib/Spec.hs
  174. 0 {plutus-tx → plutus-tx-plugin}/test/StdLib/ratioInterop.plc.golden
  175. 0 {plutus-tx → plutus-tx-plugin}/test/TH/Spec.hs
  176. 0 {plutus-tx → plutus-tx-plugin}/test/TH/TestTH.hs
  177. 0 {plutus-tx → plutus-tx-plugin}/test/TH/all.plc.golden
  178. 0 {plutus-tx → plutus-tx-plugin}/test/TH/and.plc.golden
  179. 0 {plutus-tx → plutus-tx-plugin}/test/TH/convertString.plc.golden
  180. 0 {plutus-tx → plutus-tx-plugin}/test/TH/power.plc.golden
  181. 0 {plutus-tx → plutus-tx-plugin}/test/TH/simple.plc.golden
  182. 0 {plutus-tx → plutus-tx-plugin}/test/TH/someData.plc.golden
  183. 0 {plutus-tx → plutus-tx-plugin}/test/TH/traceDirect.plc.golden
  184. 0 {plutus-tx → plutus-tx-plugin}/test/TH/tracePrelude.plc.golden
  185. 0 {plutus-tx → plutus-tx-plugin}/test/TH/traceRepeatedly.plc.golden
  186. +4 −1 plutus-tx/README.md
  187. +0 −16 plutus-tx/compiler/Language/PlutusTx/Utils.hs
  188. +16 −91 plutus-tx/plutus-tx.cabal
  189. 0 plutus-tx/{compiler → src}/Language/PlutusTx/Builtins.hs
  190. 0 plutus-tx/{compiler → src}/Language/PlutusTx/Code.hs
  191. 0 plutus-tx/{compiler → src}/Language/PlutusTx/Data.hs
  192. 0 plutus-tx/{compiler → src}/Language/PlutusTx/Lift.hs
  193. 0 plutus-tx/{compiler → src}/Language/PlutusTx/Lift/Class.hs
  194. 0 plutus-tx/{compiler → src}/Language/PlutusTx/Lift/Instances.hs
  195. 0 plutus-tx/{compiler → src}/Language/PlutusTx/Lift/THUtils.hs
  196. +19 −0 plutus-tx/src/Language/PlutusTx/Plugin/Utils.hs
  197. +3 −3 plutus-tx/src/Language/PlutusTx/TH.hs
  198. +4 −0 plutus-tx/src/Language/PlutusTx/Utils.hs
  199. +7 −3 plutus-use-cases/plutus-use-cases.cabal
  200. +1 −1 plutus-wallet-api/plutus-wallet-api.cabal
  201. +1 −0 stack.yaml
@@ -4,6 +4,7 @@ packages: language-plutus-core
plutus-exe
plutus-wallet-api
plutus-tx
plutus-tx-plugin
plutus-use-cases
plutus-ir
plutus-playground-server
@@ -101,10 +101,6 @@ let
filter = localLib.isPlutus;
};
customOverlays = optional forceError errorOverlay;
# Filter down to local packages, except those named in the given list
localButNot = nope:
let okay = builtins.filter (name: !(builtins.elem name nope)) localLib.plutusPkgList;
in name: builtins.elem name okay;
# We can pass an evaluated version of our packages into
# iohk-nix, and then we can also get out the compiler
# so we make sure it uses the same one.
@@ -119,22 +115,6 @@ let
enableSplitCheck = false;

filter = localLib.isPlutus;
filterOverrides = {
splitCheck = localButNot [
# Broken for things with test tool dependencies
"plutus-wallet-api"
"plutus-tx"
"plutus-tutorial"
# Broken for things which pick up other files at test runtime
"plutus-playground-server"
"marlowe-playground-server"
];
haddock = localButNot [
# Haddock is broken for things with internal libraries
"plutus-tx"

];
};
requiredOverlay = ./nix/overlays/haskell-overrides.nix;
};

@@ -304,6 +284,7 @@ let
haskellPackages.plutus-emulator
haskellPackages.plutus-wallet-api
haskellPackages.plutus-tx
haskellPackages.plutus-tx-plugin
haskellPackages.plutus-use-cases
haskellPackages.plutus-ir
haskellPackages.plutus-contract
@@ -22,6 +22,7 @@ let
"plutus-exe"
"plutus-ir"
"plutus-tx"
"plutus-tx-plugin"
"plutus-wallet-api"
"plutus-emulator"
"iots-export"
@@ -1,7 +1,7 @@
{ pkgs }:
with pkgs.haskell.lib;
self: super: {
# Plugins don't work with static compilation. We can stil use the plutus-tx package,
# Plugins don't work with static compilation. We can stil use the plutus-tx-plugin package,
# we just can't run the tests.
plutus-tx = dontCheck super.plutus-tx;
plutus-tx-plugin = dontCheck super.plutus-tx-plugin;
}

Some generated files are not rendered by default. Learn more.

@@ -84,4 +84,7 @@ test-suite plutus-contract-tasty-test
plutus-wallet-api -any,
plutus-tx -any,
plutus-contract-tasty -any,
aeson -any
aeson -any

if !(impl(ghcjs) || os(ghcjs))
build-depends: plutus-tx-plugin -any
@@ -109,3 +109,6 @@ test-suite plutus-emulator-test
bytestring -any,
freer-simple -any,
aeson -any

if !(impl(ghcjs) || os(ghcjs))
build-depends: plutus-tx-plugin -any
@@ -97,6 +97,9 @@ library
time-units -any,
transformers -any

if !(impl(ghcjs) || os(ghcjs))
build-depends: plutus-tx-plugin -any

library plutus-playground-usecases
hs-source-dirs: usecases
other-modules:
@@ -140,6 +143,9 @@ library plutus-playground-usecases
time-units -any,
transformers -any

if !(impl(ghcjs) || os(ghcjs))
build-depends: plutus-tx-plugin -any

if flag(defer-plugin-errors)
ghc-options: -fplugin-opt Language.PlutusTx.Plugin:defer-errors

@@ -209,6 +215,9 @@ executable plutus-playground-server
warp -any,
yaml -any

if !(impl(ghcjs) || os(ghcjs))
build-depends: plutus-tx-plugin -any

test-suite plutus-playground-server-test
type: exitcode-stdio-1.0
main-is: Spec.hs
@@ -246,3 +255,6 @@ test-suite plutus-playground-server-test
time-units -any,
transformers -any,
plutus-wallet-api -any

if !(impl(ghcjs) || os(ghcjs))
build-depends: plutus-tx-plugin -any
@@ -207,9 +207,6 @@ runghcOpts =
-- runghc is interpreting our code
, "-fno-ignore-interface-pragmas"
, "-fobject-code"
-- FIXME: stupid GHC bug still
, "-package plutus-tx"
, "-package plutus-wallet-api"
]

mkExpr :: (MonadError PlaygroundError m, MonadIO m) => Evaluation -> m String
@@ -0,0 +1,53 @@
Apache License

Version 2.0, January 2004

http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.

"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:

You must give any other recipients of the Work or Derivative Works a copy of this License; and
You must cause any modified files to carry prominent notices stating that You changed the files; and
You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.

You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS
@@ -0,0 +1,14 @@
Copyright 2019 Input Output (Hong Kong) Ltd.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

@@ -0,0 +1,10 @@
# plutus-tx-plugin: Plutus Tx compiler plugin

This contains the Plutus Tx compiler plugin itself. This should
be added as a dependency, but used via the functions in the
`plutus-tx` package.

This is in a separate package because it depends on `ghc`. Packages
which need to be cross-compiled should depend on this conditional on
`!(impl(ghcjs) || os(ghcjs))`, since when cross-compiling this plugin
needs to be provided as a "native" dependency instead.

0 comments on commit a41220b

Please sign in to comment.
You can’t perform that action at this time.