Skip to content

Commit

Permalink
GHCJS Cross Compilation
Browse files Browse the repository at this point in the history
  • Loading branch information
hamishmack committed Oct 26, 2021
1 parent c4e3d4a commit b706137
Show file tree
Hide file tree
Showing 447 changed files with 392,485 additions and 108 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Expand Up @@ -2,6 +2,7 @@
nix/pkgs/haskell/materialized*/**/*.nix linguist-generated=true
# linguist gets confused by PIR files, and thinks they make up a lot of our source!
*.pir linguist-detectable=false
contrib/** linguist-vendored=true
stubs/plutus-ghc-stub/** linguist-vendored=true
# Large HTML files inside 'notes' are dominating our repoistory language
# estimate.
Expand Down
4 changes: 3 additions & 1 deletion cabal.project
Expand Up @@ -10,7 +10,6 @@ packages: plutus-benchmark
plutus-tx-plugin
prettyprinter-configurable
word-array
stubs/plutus-ghc-stub

-- We never, ever, want this.
write-ghc-environment-files: never
Expand All @@ -22,6 +21,9 @@ benchmarks: true
-- The only sensible test display option
test-show-details: streaming

package ghci
flags: +ghci

allow-newer:
-- Pins to an old version of Template Haskell, unclear if/when it will be updated
size-based:template-haskell
Expand Down
3 changes: 2 additions & 1 deletion ci.nix
Expand Up @@ -13,7 +13,7 @@ let
systems = filterSystems supportedSystems;
crossSystems =
let pkgs = (import ./default.nix { }).pkgs;
in { inherit (pkgs.lib.systems.examples) mingwW64; };
in { inherit (pkgs.lib.systems.examples) ghcjs mingwW64; };

# Collects haskell derivations and builds an attrset:
#
Expand Down Expand Up @@ -61,6 +61,7 @@ let
platformString =
if crossSystem == null then system
else if crossSystem.config == "x86_64-w64-mingw32" then "x86_64-windows"
else if crossSystem.config == "js-unknown-ghcjs" then "js-ghcjs"
else crossSystem.config;
isBuildable = platformFilterGeneric pkgs platformString;
filterCross = x:
Expand Down
36 changes: 36 additions & 0 deletions contrib/beam-sqlite-0.5.0.0/ChangeLog.md
@@ -0,0 +1,36 @@
# 0.5.0.0

=======
## Interface changes

* Removed instances for machine-dependent ambiguous integer types `Int` and `Word`

## Added features

* Support for `in_` on row values
* Upsert support using `HasInsertOnConflict`
* Fix build on Android and OpenBSD

## Bug fixes

* Fix emitting and detection of `DECIMAL` and `DOUBLE PRECISION` types
* Fix `bitLength`, `charLength_`, and `octectLength_` by emulating with `CAST` and `LENGTH`
* Fix `runInsertReturningList` for when the database column order and beam column order disagree.

# 0.4.0.0

# 0.3.2.0

Add `Semigroup` instances to prepare for GHC 8.4 and Stackage nightly

# 0.3.1.0

Add `runBeamSqlite` and `runBeamSqliteDebug` functions

# 0.3.0.0

* Re-introduce backend parameter to `Database` class

# 0.2.0.0

First split of sqlite backend from main beam package
19 changes: 19 additions & 0 deletions contrib/beam-sqlite-0.5.0.0/Database/Beam/Sqlite.hs
@@ -0,0 +1,19 @@
module Database.Beam.Sqlite
( module Database.Beam.Sqlite.Connection
, module Database.Beam.Sqlite.Migrate

-- * SQLite syntaxes
, SqliteCommandSyntax(..), SqliteSyntax

, SqliteSelectSyntax, SqliteInsertSyntax
, SqliteUpdateSyntax, SqliteDeleteSyntax

, fromSqliteCommand, sqliteRenderSyntaxScript

, module Database.Beam.Sqlite.SqliteSpecific
) where

import Database.Beam.Sqlite.Syntax
import Database.Beam.Sqlite.SqliteSpecific
import Database.Beam.Sqlite.Connection
import Database.Beam.Sqlite.Migrate (sqliteText, sqliteBlob, sqliteBigInt)

0 comments on commit b706137

Please sign in to comment.