Skip to content

Commit

Permalink
Merge pull request #162 from NixOS/sereja/remove-webdemo
Browse files Browse the repository at this point in the history
Remove webdemo
  • Loading branch information
infinisil authored Mar 13, 2024
2 parents 5d72795 + 52295a3 commit 0c2fb12
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 365 deletions.
47 changes: 15 additions & 32 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 2 additions & 29 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.05";

flake-utils.url = "github:numtide/flake-utils";

Expand All @@ -22,7 +21,7 @@
};
};

outputs = { self, nixpkgs, nixpkgs-stable, flake-utils, serokell-nix, ... }:
outputs = { self, nixpkgs, flake-utils, serokell-nix, ... }:
flake-utils.lib.eachDefaultSystem (system:
let
overlay = self: super: {
Expand All @@ -38,26 +37,8 @@
overlays = [ overlay serokell-nix.overlay ];
};

pkgs-stable = import nixpkgs-stable {
inherit system;
overlays = [ overlay ];
};

inherit (pkgs) haskell lib;

ghcjsPackages = pkgs-stable.haskell.packages.ghcjs810.override (old: {
overrides = (self: super: {
QuickCheck = haskell.lib.dontCheck super.QuickCheck;
tasty-quickcheck = haskell.lib.dontCheck super.tasty-quickcheck;
scientific = haskell.lib.dontCheck super.scientific;
temporary = haskell.lib.dontCheck super.temporary;
time-compat = haskell.lib.dontCheck super.time-compat;
text-short = haskell.lib.dontCheck super.text-short;
vector = haskell.lib.dontCheck super.vector;
aeson = super.aeson_1_5_6_0;
});
});

regexes =
[ ".*.cabal$" "^src.*" "^main.*" "^Setup.hs$" "^js.*" "LICENSE" ];
src = builtins.path {
Expand All @@ -74,14 +55,6 @@
nixfmt = pkgs.haskellPackages.nixfmt;
nixfmt-static = haskell.lib.justStaticExecutables nixfmt;
nixfmt-deriver = nixfmt-static.cabal2nixDeriver;
nixfmt-js = ghcjsPackages.callCabal2nix "nixfmt" src { };
nixfmt-webdemo = pkgs.runCommandNoCC "nixfmt-webdemo" { } ''
mkdir $out
cp ${./js/index.html} $out/index.html
cp ${./js/404.html} $out/404.html
cp ${nixfmt-js}/bin/js-interface.jsexe/{rts,lib,out,runmain}.js $out
substituteInPlace $out/index.html --replace ../dist/build/js-interface/js-interface.jsexe/ ./
'';

nixfmt-shell = nixfmt.env.overrideAttrs (oldAttrs: {
buildInputs = oldAttrs.buildInputs ++ (with pkgs; [
Expand All @@ -91,7 +64,7 @@
]);
});

inherit (pkgs) awscli reuse;
inherit (pkgs) reuse;
};

apps.default = {
Expand Down
7 changes: 0 additions & 7 deletions js/404.html

This file was deleted.

37 changes: 0 additions & 37 deletions js/JSInterface.hs

This file was deleted.

Loading

0 comments on commit 0c2fb12

Please sign in to comment.