Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
*~
*~
/result
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ $ nix-build
```haskell
module Main where

import Language.Javascript.JSaddle (run)
import Language.Javascript.JSaddle.Run (run)

main :: IO ()
main = run code
Expand Down
16 changes: 10 additions & 6 deletions default.nix
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
with (builtins.fromJSON (builtins.readFile ./nixpkgs.json));

{ nixpkgs ? builtins.fetchTarball {
url = "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz";
inherit sha256;
}
}:
{}:

let
nixpkgs = builtins.fetchTarball {
url = "https://github.com/alexfmpe/nixpkgs/archive/${rev}.tar.gz";
inherit sha256;
};
pkgs = import nixpkgs {};
source = {
jsaddle = pkgs.fetchFromGitHub {
Expand All @@ -25,10 +25,14 @@ let
self.callCabal2nix "jsaddle" "${source.jsaddle}/jsaddle" {};
jsaddle-warp =
dontCheck (self.callCabal2nix "jsaddle-warp" "${source.jsaddle}/jsaddle-warp" {});

/* cruft */
crypton = dontCheck super.crypton;

};

hPkgs =
pkgs.haskellPackages.override { inherit overrides; };
pkgs.haskell.packages.ghc9122.override { inherit overrides; };

in

Expand Down
2 changes: 1 addition & 1 deletion jsaddle-run.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ common jsaddle
jsaddle-wasm >= 0.1.2 && < 0.2

library
imports:
import:
cpp, jsaddle
exposed-modules:
Language.Javascript.JSaddle.Run
Expand Down