diff --git a/obelisk/dep/reflex-material/default.nix b/obelisk/dep/reflex-material/default.nix deleted file mode 100644 index 2b4d4ab11148e306f1f2f6acd94168ec417507e7..0000000000000000000000000000000000000000 --- a/obelisk/dep/reflex-material/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -# DO NOT HAND-EDIT THIS FILE -import (import ./thunk.nix) \ No newline at end of file diff --git a/obelisk/dep/reflex-material/github.json b/obelisk/dep/reflex-material/github.json deleted file mode 100644 index f47dd069c8b7ebbade903c6a85f561c35adb57bc..0000000000000000000000000000000000000000 --- a/obelisk/dep/reflex-material/github.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "owner": "rvl", - "repo": "reflex-material", - "private": false, - "rev": "b1c0364626eaec88e78e47fbb4cee1a984ccb361", - "sha256": "1r76mvglhw2yxvbaxj9fpazpdlh01li8ma5cvqialy1iq704sw1v" -} diff --git a/obelisk/dep/reflex-material/thunk.nix b/obelisk/dep/reflex-material/thunk.nix deleted file mode 100644 index 20f2d28c2197d35b7ec670899f978fa82e1ee23b..0000000000000000000000000000000000000000 --- a/obelisk/dep/reflex-material/thunk.nix +++ /dev/null @@ -1,12 +0,0 @@ -# DO NOT HAND-EDIT THIS FILE -let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }: - if !fetchSubmodules && !private then builtins.fetchTarball { - url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256; - } else (import (builtins.fetchTarball { - url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz"; - sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr"; -}) {}).fetchFromGitHub { - inherit owner repo rev sha256 fetchSubmodules private; - }; - json = builtins.fromJSON (builtins.readFile ./github.json); -in fetch json \ No newline at end of file diff --git a/obelisk/frontend/frontend.cabal b/obelisk/frontend/frontend.cabal index f2c266c17205d127c9f853fae3d5591facdcf2ee..50ed347035e7fb68ceb814650b7e6cbc920f07b6 100644 --- a/obelisk/frontend/frontend.cabal +++ b/obelisk/frontend/frontend.cabal @@ -24,7 +24,6 @@ library , tahoe-great-black-swamp , req , extra - , reflex-material , megaparsec , base32 , cereal diff --git a/obelisk/frontend/src/Pages/FileBrowser.hs b/obelisk/frontend/src/Pages/FileBrowser.hs index ebaa77cf4bf08378611c5e2229f93d026a2030d2..c5ef9fc3b563d220925a37455fde89619eaeb4a8 100644 --- a/obelisk/frontend/src/Pages/FileBrowser.hs +++ b/obelisk/frontend/src/Pages/FileBrowser.hs @@ -5,9 +5,6 @@ module Pages.FileBrowser (fileBrowser) where -import Reflex.Material.List -import Reflex.Material.Types - import Data.List.Extra import Data.Text import Reflex.Dom.Core @@ -87,7 +84,7 @@ fileBrowser entriesDyn = do elClass "main" "mdc-top-app-bar--fixed-adjust" $ do - list_ "ul" (mdcListTwoLine_ <> CssClass "mdc-list" <> CssClass "inline-demo-list") $ + elClass "ul" "mdc-list mdc-list--two-line inline-demo-list" $ dyn_ $ mapM_ fileBrowserEntryWidget <$> entriesDyn el "script" $ diff --git a/obelisk/frontend/src/Pages/MagicFolders.hs b/obelisk/frontend/src/Pages/MagicFolders.hs index 75f380072cd71708adc1130ba880d0f8332eb501..2faead7365a7da2dff9acaadcb3f2c9bd3feffab 100644 --- a/obelisk/frontend/src/Pages/MagicFolders.hs +++ b/obelisk/frontend/src/Pages/MagicFolders.hs @@ -4,8 +4,6 @@ module Pages.MagicFolders (magicFolders) where -import Reflex.Material.List -import Reflex.Material.Types import Reflex.Dom.Core import Obelisk.Route.Frontend @@ -33,7 +31,7 @@ magicFolders folders = do elClass "main" "magic-folder-page mdc-top-app-bar--fixed-adjust" $ do - list_ "ul" (mdcListTwoLine_ <> CssClass "mdc-list" <> CssClass "inline-demo-list") $ + elClass "ul" "mdc-list mdc-list--two-line inline-demo-list" $ dyn_ $ mapM_ folderWidget <$> folders elAttr "button" ("class" =: "mdc-fab" <> "aria-label" =: "Add") $ do diff --git a/obelisk/haskell-overrides.nix b/obelisk/haskell-overrides.nix index 6339a11b6fea78480e272554f397cd9fa59f8211..0b42fb88d05e446efe7a5ee3722c2cb8c1119681 100644 --- a/obelisk/haskell-overrides.nix +++ b/obelisk/haskell-overrides.nix @@ -22,12 +22,6 @@ with pkgs.haskell.lib; { sha256 = "04glpmwp50qi29h8cb5j0w1rz0ww30nw4xgj2a3l7zh1gprhwj89"; } {}; - # A handy library for generating Android Material Design styled GUIs. - reflex-material = self.callCabal2nix - "reflex-material" - (nix-thunk.thunkSource ./dep/reflex-material + "/reflex-material") - {}; - # The test suite uses >35GB of RAM. servant-docs = dontCheck super.servant-docs;