From 6a450b93b9873ea4bd05b85b97aa9ac78419ca7c Mon Sep 17 00:00:00 2001 From: Benjamin Summers Date: Thu, 23 Jan 2020 21:20:43 -0800 Subject: [PATCH 1/3] king: Rename `king` package to `urbit-king`. --- pkg/hs/proto/package.yaml | 2 +- pkg/hs/stack.yaml | 15 ++++----------- pkg/hs/{king => urbit-king}/.gitignore | 0 pkg/hs/{king => urbit-king}/LICENSE | 0 pkg/hs/{king => urbit-king}/app/Main.hs | 0 pkg/hs/{king => urbit-king}/lib/Data/RAcquire.hs | 0 pkg/hs/{king => urbit-king}/lib/Ur/Arvo.hs | 0 pkg/hs/{king => urbit-king}/lib/Ur/Arvo/Common.hs | 0 pkg/hs/{king => urbit-king}/lib/Ur/Arvo/Effect.hs | 0 pkg/hs/{king => urbit-king}/lib/Ur/Arvo/Event.hs | 0 pkg/hs/{king => urbit-king}/lib/Ur/King/API.hs | 0 pkg/hs/{king => urbit-king}/lib/Ur/King/App.hs | 0 pkg/hs/{king => urbit-king}/lib/Ur/King/CLI.hs | 4 ++-- pkg/hs/{king => urbit-king}/lib/Ur/King/Config.hs | 0 .../lib/Ur/King/EventBrowser.hs | 0 pkg/hs/{king => urbit-king}/lib/Ur/King/Main.hs | 0 .../lib/Ur/King/TryJamPill.hs | 0 pkg/hs/{king => urbit-king}/lib/Ur/Noun.hs | 0 .../lib/Ur/Noun/Conversions.hs | 0 .../{king => urbit-king}/lib/Ur/Noun/Convert.hs | 0 pkg/hs/{king => urbit-king}/lib/Ur/Noun/Core.hs | 0 pkg/hs/{king => urbit-king}/lib/Ur/Noun/Cue.hs | 0 pkg/hs/{king => urbit-king}/lib/Ur/Noun/Jam.hs | 0 pkg/hs/{king => urbit-king}/lib/Ur/Noun/TH.hs | 0 pkg/hs/{king => urbit-king}/lib/Ur/Noun/Tank.hs | 0 pkg/hs/{king => urbit-king}/lib/Ur/Noun/Tree.hs | 0 pkg/hs/{king => urbit-king}/lib/Ur/Prelude.hs | 0 pkg/hs/{king => urbit-king}/lib/Ur/Time.hs | 0 pkg/hs/{king => urbit-king}/lib/Ur/Timer.hs | 0 pkg/hs/{king => urbit-king}/lib/Ur/Vere/Ames.hs | 0 pkg/hs/{king => urbit-king}/lib/Ur/Vere/Behn.hs | 0 pkg/hs/{king => urbit-king}/lib/Ur/Vere/Clay.hs | 0 pkg/hs/{king => urbit-king}/lib/Ur/Vere/Dawn.hs | 0 pkg/hs/{king => urbit-king}/lib/Ur/Vere/Http.hs | 0 .../lib/Ur/Vere/Http/Client.hs | 0 .../lib/Ur/Vere/Http/Server.hs | 0 pkg/hs/{king => urbit-king}/lib/Ur/Vere/LMDB.hs | 0 .../{king => urbit-king}/lib/Ur/Vere/LockFile.hs | 0 pkg/hs/{king => urbit-king}/lib/Ur/Vere/Log.hs | 0 .../{king => urbit-king}/lib/Ur/Vere/NounServ.hs | 0 pkg/hs/{king => urbit-king}/lib/Ur/Vere/Pier.hs | 0 .../lib/Ur/Vere/Pier/Types.hs | 0 pkg/hs/{king => urbit-king}/lib/Ur/Vere/Serf.hs | 0 pkg/hs/{king => urbit-king}/lib/Ur/Vere/Term.hs | 0 .../{king => urbit-king}/lib/Ur/Vere/Term/API.hs | 0 .../lib/Ur/Vere/Term/Demux.hs | 0 .../lib/Ur/Vere/Term/Logic.hs | 0 pkg/hs/{king => urbit-king}/package.yaml | 11 ++++++----- pkg/hs/{king => urbit-king}/test/AmesTests.hs | 0 pkg/hs/{king => urbit-king}/test/ArvoTests.hs | 0 pkg/hs/{king => urbit-king}/test/BehnTests.hs | 0 pkg/hs/{king => urbit-king}/test/ClayTests.hs | 0 pkg/hs/{king => urbit-king}/test/DawnTests.hs | 0 .../{king => urbit-king}/test/DeriveNounTests.hs | 0 .../{king => urbit-king}/test/HoonMapSetTests.hs | 2 +- pkg/hs/{king => urbit-king}/test/JamTests.hs | 0 pkg/hs/{king => urbit-king}/test/LogTests.hs | 0 pkg/hs/{king => urbit-king}/test/Main.hs | 0 .../test/NounConversionTests.hs | 0 .../{king => urbit-king}/test/gold/hoontree.gold | 0 .../{king => urbit-king}/test/gold/hoontree.pill | 0 61 files changed, 14 insertions(+), 20 deletions(-) rename pkg/hs/{king => urbit-king}/.gitignore (100%) rename pkg/hs/{king => urbit-king}/LICENSE (100%) rename pkg/hs/{king => urbit-king}/app/Main.hs (100%) rename pkg/hs/{king => urbit-king}/lib/Data/RAcquire.hs (100%) rename pkg/hs/{king => urbit-king}/lib/Ur/Arvo.hs (100%) rename pkg/hs/{king => urbit-king}/lib/Ur/Arvo/Common.hs (100%) rename pkg/hs/{king => urbit-king}/lib/Ur/Arvo/Effect.hs (100%) rename pkg/hs/{king => urbit-king}/lib/Ur/Arvo/Event.hs (100%) rename pkg/hs/{king => urbit-king}/lib/Ur/King/API.hs (100%) rename pkg/hs/{king => urbit-king}/lib/Ur/King/App.hs (100%) rename pkg/hs/{king => urbit-king}/lib/Ur/King/CLI.hs (99%) rename pkg/hs/{king => urbit-king}/lib/Ur/King/Config.hs (100%) rename pkg/hs/{king => urbit-king}/lib/Ur/King/EventBrowser.hs (100%) rename pkg/hs/{king => urbit-king}/lib/Ur/King/Main.hs (100%) rename pkg/hs/{king => urbit-king}/lib/Ur/King/TryJamPill.hs (100%) rename pkg/hs/{king => urbit-king}/lib/Ur/Noun.hs (100%) rename pkg/hs/{king => urbit-king}/lib/Ur/Noun/Conversions.hs (100%) rename pkg/hs/{king => urbit-king}/lib/Ur/Noun/Convert.hs (100%) rename pkg/hs/{king => urbit-king}/lib/Ur/Noun/Core.hs (100%) rename pkg/hs/{king => urbit-king}/lib/Ur/Noun/Cue.hs (100%) rename pkg/hs/{king => urbit-king}/lib/Ur/Noun/Jam.hs (100%) rename pkg/hs/{king => urbit-king}/lib/Ur/Noun/TH.hs (100%) rename pkg/hs/{king => urbit-king}/lib/Ur/Noun/Tank.hs (100%) rename pkg/hs/{king => urbit-king}/lib/Ur/Noun/Tree.hs (100%) rename pkg/hs/{king => urbit-king}/lib/Ur/Prelude.hs (100%) rename pkg/hs/{king => urbit-king}/lib/Ur/Time.hs (100%) rename pkg/hs/{king => urbit-king}/lib/Ur/Timer.hs (100%) rename pkg/hs/{king => urbit-king}/lib/Ur/Vere/Ames.hs (100%) rename pkg/hs/{king => urbit-king}/lib/Ur/Vere/Behn.hs (100%) rename pkg/hs/{king => urbit-king}/lib/Ur/Vere/Clay.hs (100%) rename pkg/hs/{king => urbit-king}/lib/Ur/Vere/Dawn.hs (100%) rename pkg/hs/{king => urbit-king}/lib/Ur/Vere/Http.hs (100%) rename pkg/hs/{king => urbit-king}/lib/Ur/Vere/Http/Client.hs (100%) rename pkg/hs/{king => urbit-king}/lib/Ur/Vere/Http/Server.hs (100%) rename pkg/hs/{king => urbit-king}/lib/Ur/Vere/LMDB.hs (100%) rename pkg/hs/{king => urbit-king}/lib/Ur/Vere/LockFile.hs (100%) rename pkg/hs/{king => urbit-king}/lib/Ur/Vere/Log.hs (100%) rename pkg/hs/{king => urbit-king}/lib/Ur/Vere/NounServ.hs (100%) rename pkg/hs/{king => urbit-king}/lib/Ur/Vere/Pier.hs (100%) rename pkg/hs/{king => urbit-king}/lib/Ur/Vere/Pier/Types.hs (100%) rename pkg/hs/{king => urbit-king}/lib/Ur/Vere/Serf.hs (100%) rename pkg/hs/{king => urbit-king}/lib/Ur/Vere/Term.hs (100%) rename pkg/hs/{king => urbit-king}/lib/Ur/Vere/Term/API.hs (100%) rename pkg/hs/{king => urbit-king}/lib/Ur/Vere/Term/Demux.hs (100%) rename pkg/hs/{king => urbit-king}/lib/Ur/Vere/Term/Logic.hs (100%) rename pkg/hs/{king => urbit-king}/package.yaml (96%) rename pkg/hs/{king => urbit-king}/test/AmesTests.hs (100%) rename pkg/hs/{king => urbit-king}/test/ArvoTests.hs (100%) rename pkg/hs/{king => urbit-king}/test/BehnTests.hs (100%) rename pkg/hs/{king => urbit-king}/test/ClayTests.hs (100%) rename pkg/hs/{king => urbit-king}/test/DawnTests.hs (100%) rename pkg/hs/{king => urbit-king}/test/DeriveNounTests.hs (100%) rename pkg/hs/{king => urbit-king}/test/HoonMapSetTests.hs (97%) rename pkg/hs/{king => urbit-king}/test/JamTests.hs (100%) rename pkg/hs/{king => urbit-king}/test/LogTests.hs (100%) rename pkg/hs/{king => urbit-king}/test/Main.hs (100%) rename pkg/hs/{king => urbit-king}/test/NounConversionTests.hs (100%) rename pkg/hs/{king => urbit-king}/test/gold/hoontree.gold (100%) rename pkg/hs/{king => urbit-king}/test/gold/hoontree.pill (100%) diff --git a/pkg/hs/proto/package.yaml b/pkg/hs/proto/package.yaml index 42ec20289..046177079 100644 --- a/pkg/hs/proto/package.yaml +++ b/pkg/hs/proto/package.yaml @@ -19,7 +19,7 @@ dependencies: - transformers - transformers-compat - unordered-containers - - king + - urbit-king default-extensions: - ApplicativeDo diff --git a/pkg/hs/stack.yaml b/pkg/hs/stack.yaml index 85939effe..c18632ee3 100644 --- a/pkg/hs/stack.yaml +++ b/pkg/hs/stack.yaml @@ -1,12 +1,12 @@ resolver: lts-14.21 packages: - - king - lmdb-static - proto - terminal-progress-bar - urbit-atom - urbit-azimuth + - urbit-king extra-deps: - flat-0.3.4@sha256:002a0e0ae656ea8cc02a772d0bcb6ea7dbd7f2e79070959cc748ad1e7138eb38 @@ -15,19 +15,12 @@ extra-deps: - urbit-hob-0.3.1@sha256:afbdc7ad071eefc6ca85f5b598b6c62ed49079d15d1840dac27438a3b3150303 - para-1.1@sha256:a90eebb063ad70271e6e2a7f00a93e8e8f8b77273f100f39852fbf8301926f81 +# This allows building on NixOS. nix: packages: - pkgconfig - zlib -flags: - king: - Release: false - +# TODO: Why is this here? ghc-options: - king: '-optP-Wno-nonportable-include-path' - -# build: -# executable-profiling: true -# executable-stripping: false -# library-profiling: true + urbit-king: '-optP-Wno-nonportable-include-path' diff --git a/pkg/hs/king/.gitignore b/pkg/hs/urbit-king/.gitignore similarity index 100% rename from pkg/hs/king/.gitignore rename to pkg/hs/urbit-king/.gitignore diff --git a/pkg/hs/king/LICENSE b/pkg/hs/urbit-king/LICENSE similarity index 100% rename from pkg/hs/king/LICENSE rename to pkg/hs/urbit-king/LICENSE diff --git a/pkg/hs/king/app/Main.hs b/pkg/hs/urbit-king/app/Main.hs similarity index 100% rename from pkg/hs/king/app/Main.hs rename to pkg/hs/urbit-king/app/Main.hs diff --git a/pkg/hs/king/lib/Data/RAcquire.hs b/pkg/hs/urbit-king/lib/Data/RAcquire.hs similarity index 100% rename from pkg/hs/king/lib/Data/RAcquire.hs rename to pkg/hs/urbit-king/lib/Data/RAcquire.hs diff --git a/pkg/hs/king/lib/Ur/Arvo.hs b/pkg/hs/urbit-king/lib/Ur/Arvo.hs similarity index 100% rename from pkg/hs/king/lib/Ur/Arvo.hs rename to pkg/hs/urbit-king/lib/Ur/Arvo.hs diff --git a/pkg/hs/king/lib/Ur/Arvo/Common.hs b/pkg/hs/urbit-king/lib/Ur/Arvo/Common.hs similarity index 100% rename from pkg/hs/king/lib/Ur/Arvo/Common.hs rename to pkg/hs/urbit-king/lib/Ur/Arvo/Common.hs diff --git a/pkg/hs/king/lib/Ur/Arvo/Effect.hs b/pkg/hs/urbit-king/lib/Ur/Arvo/Effect.hs similarity index 100% rename from pkg/hs/king/lib/Ur/Arvo/Effect.hs rename to pkg/hs/urbit-king/lib/Ur/Arvo/Effect.hs diff --git a/pkg/hs/king/lib/Ur/Arvo/Event.hs b/pkg/hs/urbit-king/lib/Ur/Arvo/Event.hs similarity index 100% rename from pkg/hs/king/lib/Ur/Arvo/Event.hs rename to pkg/hs/urbit-king/lib/Ur/Arvo/Event.hs diff --git a/pkg/hs/king/lib/Ur/King/API.hs b/pkg/hs/urbit-king/lib/Ur/King/API.hs similarity index 100% rename from pkg/hs/king/lib/Ur/King/API.hs rename to pkg/hs/urbit-king/lib/Ur/King/API.hs diff --git a/pkg/hs/king/lib/Ur/King/App.hs b/pkg/hs/urbit-king/lib/Ur/King/App.hs similarity index 100% rename from pkg/hs/king/lib/Ur/King/App.hs rename to pkg/hs/urbit-king/lib/Ur/King/App.hs diff --git a/pkg/hs/king/lib/Ur/King/CLI.hs b/pkg/hs/urbit-king/lib/Ur/King/CLI.hs similarity index 99% rename from pkg/hs/king/lib/Ur/King/CLI.hs rename to pkg/hs/urbit-king/lib/Ur/King/CLI.hs index 77db4c75e..06b12367f 100644 --- a/pkg/hs/king/lib/Ur/King/CLI.hs +++ b/pkg/hs/urbit-king/lib/Ur/King/CLI.hs @@ -96,7 +96,7 @@ headNote :: String -> Doc headNote _version = string $ intercalate "\n" [ "Urbit: a personal server operating function" , "https://urbit.org" - , "Version " <> VERSION_king + , "Version " <> VERSION_urbit_king ] -- | TODO This needs to be updated. @@ -138,7 +138,7 @@ parseArgs = do defaultPillURL :: String defaultPillURL = "https://bootstrap.urbit.org/urbit-v" <> ver <> ".pill" where - ver = VERSION_king + ver = VERSION_urbit_king -------------------------------------------------------------------------------- diff --git a/pkg/hs/king/lib/Ur/King/Config.hs b/pkg/hs/urbit-king/lib/Ur/King/Config.hs similarity index 100% rename from pkg/hs/king/lib/Ur/King/Config.hs rename to pkg/hs/urbit-king/lib/Ur/King/Config.hs diff --git a/pkg/hs/king/lib/Ur/King/EventBrowser.hs b/pkg/hs/urbit-king/lib/Ur/King/EventBrowser.hs similarity index 100% rename from pkg/hs/king/lib/Ur/King/EventBrowser.hs rename to pkg/hs/urbit-king/lib/Ur/King/EventBrowser.hs diff --git a/pkg/hs/king/lib/Ur/King/Main.hs b/pkg/hs/urbit-king/lib/Ur/King/Main.hs similarity index 100% rename from pkg/hs/king/lib/Ur/King/Main.hs rename to pkg/hs/urbit-king/lib/Ur/King/Main.hs diff --git a/pkg/hs/king/lib/Ur/King/TryJamPill.hs b/pkg/hs/urbit-king/lib/Ur/King/TryJamPill.hs similarity index 100% rename from pkg/hs/king/lib/Ur/King/TryJamPill.hs rename to pkg/hs/urbit-king/lib/Ur/King/TryJamPill.hs diff --git a/pkg/hs/king/lib/Ur/Noun.hs b/pkg/hs/urbit-king/lib/Ur/Noun.hs similarity index 100% rename from pkg/hs/king/lib/Ur/Noun.hs rename to pkg/hs/urbit-king/lib/Ur/Noun.hs diff --git a/pkg/hs/king/lib/Ur/Noun/Conversions.hs b/pkg/hs/urbit-king/lib/Ur/Noun/Conversions.hs similarity index 100% rename from pkg/hs/king/lib/Ur/Noun/Conversions.hs rename to pkg/hs/urbit-king/lib/Ur/Noun/Conversions.hs diff --git a/pkg/hs/king/lib/Ur/Noun/Convert.hs b/pkg/hs/urbit-king/lib/Ur/Noun/Convert.hs similarity index 100% rename from pkg/hs/king/lib/Ur/Noun/Convert.hs rename to pkg/hs/urbit-king/lib/Ur/Noun/Convert.hs diff --git a/pkg/hs/king/lib/Ur/Noun/Core.hs b/pkg/hs/urbit-king/lib/Ur/Noun/Core.hs similarity index 100% rename from pkg/hs/king/lib/Ur/Noun/Core.hs rename to pkg/hs/urbit-king/lib/Ur/Noun/Core.hs diff --git a/pkg/hs/king/lib/Ur/Noun/Cue.hs b/pkg/hs/urbit-king/lib/Ur/Noun/Cue.hs similarity index 100% rename from pkg/hs/king/lib/Ur/Noun/Cue.hs rename to pkg/hs/urbit-king/lib/Ur/Noun/Cue.hs diff --git a/pkg/hs/king/lib/Ur/Noun/Jam.hs b/pkg/hs/urbit-king/lib/Ur/Noun/Jam.hs similarity index 100% rename from pkg/hs/king/lib/Ur/Noun/Jam.hs rename to pkg/hs/urbit-king/lib/Ur/Noun/Jam.hs diff --git a/pkg/hs/king/lib/Ur/Noun/TH.hs b/pkg/hs/urbit-king/lib/Ur/Noun/TH.hs similarity index 100% rename from pkg/hs/king/lib/Ur/Noun/TH.hs rename to pkg/hs/urbit-king/lib/Ur/Noun/TH.hs diff --git a/pkg/hs/king/lib/Ur/Noun/Tank.hs b/pkg/hs/urbit-king/lib/Ur/Noun/Tank.hs similarity index 100% rename from pkg/hs/king/lib/Ur/Noun/Tank.hs rename to pkg/hs/urbit-king/lib/Ur/Noun/Tank.hs diff --git a/pkg/hs/king/lib/Ur/Noun/Tree.hs b/pkg/hs/urbit-king/lib/Ur/Noun/Tree.hs similarity index 100% rename from pkg/hs/king/lib/Ur/Noun/Tree.hs rename to pkg/hs/urbit-king/lib/Ur/Noun/Tree.hs diff --git a/pkg/hs/king/lib/Ur/Prelude.hs b/pkg/hs/urbit-king/lib/Ur/Prelude.hs similarity index 100% rename from pkg/hs/king/lib/Ur/Prelude.hs rename to pkg/hs/urbit-king/lib/Ur/Prelude.hs diff --git a/pkg/hs/king/lib/Ur/Time.hs b/pkg/hs/urbit-king/lib/Ur/Time.hs similarity index 100% rename from pkg/hs/king/lib/Ur/Time.hs rename to pkg/hs/urbit-king/lib/Ur/Time.hs diff --git a/pkg/hs/king/lib/Ur/Timer.hs b/pkg/hs/urbit-king/lib/Ur/Timer.hs similarity index 100% rename from pkg/hs/king/lib/Ur/Timer.hs rename to pkg/hs/urbit-king/lib/Ur/Timer.hs diff --git a/pkg/hs/king/lib/Ur/Vere/Ames.hs b/pkg/hs/urbit-king/lib/Ur/Vere/Ames.hs similarity index 100% rename from pkg/hs/king/lib/Ur/Vere/Ames.hs rename to pkg/hs/urbit-king/lib/Ur/Vere/Ames.hs diff --git a/pkg/hs/king/lib/Ur/Vere/Behn.hs b/pkg/hs/urbit-king/lib/Ur/Vere/Behn.hs similarity index 100% rename from pkg/hs/king/lib/Ur/Vere/Behn.hs rename to pkg/hs/urbit-king/lib/Ur/Vere/Behn.hs diff --git a/pkg/hs/king/lib/Ur/Vere/Clay.hs b/pkg/hs/urbit-king/lib/Ur/Vere/Clay.hs similarity index 100% rename from pkg/hs/king/lib/Ur/Vere/Clay.hs rename to pkg/hs/urbit-king/lib/Ur/Vere/Clay.hs diff --git a/pkg/hs/king/lib/Ur/Vere/Dawn.hs b/pkg/hs/urbit-king/lib/Ur/Vere/Dawn.hs similarity index 100% rename from pkg/hs/king/lib/Ur/Vere/Dawn.hs rename to pkg/hs/urbit-king/lib/Ur/Vere/Dawn.hs diff --git a/pkg/hs/king/lib/Ur/Vere/Http.hs b/pkg/hs/urbit-king/lib/Ur/Vere/Http.hs similarity index 100% rename from pkg/hs/king/lib/Ur/Vere/Http.hs rename to pkg/hs/urbit-king/lib/Ur/Vere/Http.hs diff --git a/pkg/hs/king/lib/Ur/Vere/Http/Client.hs b/pkg/hs/urbit-king/lib/Ur/Vere/Http/Client.hs similarity index 100% rename from pkg/hs/king/lib/Ur/Vere/Http/Client.hs rename to pkg/hs/urbit-king/lib/Ur/Vere/Http/Client.hs diff --git a/pkg/hs/king/lib/Ur/Vere/Http/Server.hs b/pkg/hs/urbit-king/lib/Ur/Vere/Http/Server.hs similarity index 100% rename from pkg/hs/king/lib/Ur/Vere/Http/Server.hs rename to pkg/hs/urbit-king/lib/Ur/Vere/Http/Server.hs diff --git a/pkg/hs/king/lib/Ur/Vere/LMDB.hs b/pkg/hs/urbit-king/lib/Ur/Vere/LMDB.hs similarity index 100% rename from pkg/hs/king/lib/Ur/Vere/LMDB.hs rename to pkg/hs/urbit-king/lib/Ur/Vere/LMDB.hs diff --git a/pkg/hs/king/lib/Ur/Vere/LockFile.hs b/pkg/hs/urbit-king/lib/Ur/Vere/LockFile.hs similarity index 100% rename from pkg/hs/king/lib/Ur/Vere/LockFile.hs rename to pkg/hs/urbit-king/lib/Ur/Vere/LockFile.hs diff --git a/pkg/hs/king/lib/Ur/Vere/Log.hs b/pkg/hs/urbit-king/lib/Ur/Vere/Log.hs similarity index 100% rename from pkg/hs/king/lib/Ur/Vere/Log.hs rename to pkg/hs/urbit-king/lib/Ur/Vere/Log.hs diff --git a/pkg/hs/king/lib/Ur/Vere/NounServ.hs b/pkg/hs/urbit-king/lib/Ur/Vere/NounServ.hs similarity index 100% rename from pkg/hs/king/lib/Ur/Vere/NounServ.hs rename to pkg/hs/urbit-king/lib/Ur/Vere/NounServ.hs diff --git a/pkg/hs/king/lib/Ur/Vere/Pier.hs b/pkg/hs/urbit-king/lib/Ur/Vere/Pier.hs similarity index 100% rename from pkg/hs/king/lib/Ur/Vere/Pier.hs rename to pkg/hs/urbit-king/lib/Ur/Vere/Pier.hs diff --git a/pkg/hs/king/lib/Ur/Vere/Pier/Types.hs b/pkg/hs/urbit-king/lib/Ur/Vere/Pier/Types.hs similarity index 100% rename from pkg/hs/king/lib/Ur/Vere/Pier/Types.hs rename to pkg/hs/urbit-king/lib/Ur/Vere/Pier/Types.hs diff --git a/pkg/hs/king/lib/Ur/Vere/Serf.hs b/pkg/hs/urbit-king/lib/Ur/Vere/Serf.hs similarity index 100% rename from pkg/hs/king/lib/Ur/Vere/Serf.hs rename to pkg/hs/urbit-king/lib/Ur/Vere/Serf.hs diff --git a/pkg/hs/king/lib/Ur/Vere/Term.hs b/pkg/hs/urbit-king/lib/Ur/Vere/Term.hs similarity index 100% rename from pkg/hs/king/lib/Ur/Vere/Term.hs rename to pkg/hs/urbit-king/lib/Ur/Vere/Term.hs diff --git a/pkg/hs/king/lib/Ur/Vere/Term/API.hs b/pkg/hs/urbit-king/lib/Ur/Vere/Term/API.hs similarity index 100% rename from pkg/hs/king/lib/Ur/Vere/Term/API.hs rename to pkg/hs/urbit-king/lib/Ur/Vere/Term/API.hs diff --git a/pkg/hs/king/lib/Ur/Vere/Term/Demux.hs b/pkg/hs/urbit-king/lib/Ur/Vere/Term/Demux.hs similarity index 100% rename from pkg/hs/king/lib/Ur/Vere/Term/Demux.hs rename to pkg/hs/urbit-king/lib/Ur/Vere/Term/Demux.hs diff --git a/pkg/hs/king/lib/Ur/Vere/Term/Logic.hs b/pkg/hs/urbit-king/lib/Ur/Vere/Term/Logic.hs similarity index 100% rename from pkg/hs/king/lib/Ur/Vere/Term/Logic.hs rename to pkg/hs/urbit-king/lib/Ur/Vere/Term/Logic.hs diff --git a/pkg/hs/king/package.yaml b/pkg/hs/urbit-king/package.yaml similarity index 96% rename from pkg/hs/king/package.yaml rename to pkg/hs/urbit-king/package.yaml index 157ff9942..21aa63eef 100644 --- a/pkg/hs/king/package.yaml +++ b/pkg/hs/urbit-king/package.yaml @@ -1,4 +1,4 @@ -name: king +name: urbit-king version: 0.10.1 license: MIT license-file: LICENSE @@ -19,10 +19,10 @@ library: - -O2 tests: - king-tests: + urbit-king-tests: source-dirs: test main: Main.hs - dependencies: king + dependencies: urbit-king ghc-options: - -threaded - -rtsopts @@ -160,10 +160,11 @@ default-extensions: - ViewPatterns executables: - king: + urbit-king: main: Main.hs source-dirs: app - dependencies: ["king"] + dependencies: + - urbit-king when: - condition: flag(Release) then: diff --git a/pkg/hs/king/test/AmesTests.hs b/pkg/hs/urbit-king/test/AmesTests.hs similarity index 100% rename from pkg/hs/king/test/AmesTests.hs rename to pkg/hs/urbit-king/test/AmesTests.hs diff --git a/pkg/hs/king/test/ArvoTests.hs b/pkg/hs/urbit-king/test/ArvoTests.hs similarity index 100% rename from pkg/hs/king/test/ArvoTests.hs rename to pkg/hs/urbit-king/test/ArvoTests.hs diff --git a/pkg/hs/king/test/BehnTests.hs b/pkg/hs/urbit-king/test/BehnTests.hs similarity index 100% rename from pkg/hs/king/test/BehnTests.hs rename to pkg/hs/urbit-king/test/BehnTests.hs diff --git a/pkg/hs/king/test/ClayTests.hs b/pkg/hs/urbit-king/test/ClayTests.hs similarity index 100% rename from pkg/hs/king/test/ClayTests.hs rename to pkg/hs/urbit-king/test/ClayTests.hs diff --git a/pkg/hs/king/test/DawnTests.hs b/pkg/hs/urbit-king/test/DawnTests.hs similarity index 100% rename from pkg/hs/king/test/DawnTests.hs rename to pkg/hs/urbit-king/test/DawnTests.hs diff --git a/pkg/hs/king/test/DeriveNounTests.hs b/pkg/hs/urbit-king/test/DeriveNounTests.hs similarity index 100% rename from pkg/hs/king/test/DeriveNounTests.hs rename to pkg/hs/urbit-king/test/DeriveNounTests.hs diff --git a/pkg/hs/king/test/HoonMapSetTests.hs b/pkg/hs/urbit-king/test/HoonMapSetTests.hs similarity index 97% rename from pkg/hs/king/test/HoonMapSetTests.hs rename to pkg/hs/urbit-king/test/HoonMapSetTests.hs index 90e033bc5..ab9290adb 100644 --- a/pkg/hs/king/test/HoonMapSetTests.hs +++ b/pkg/hs/urbit-king/test/HoonMapSetTests.hs @@ -73,7 +73,7 @@ goldenFile :: String -> String -> (FilePath -> IO L.ByteString) -> TestTree goldenFile testName testFileName action = goldenVsString testName gold (action pill) where - root = "pkg/hs/king/test/gold" testFileName + root = "pkg/hs/urbit-king/test/gold" testFileName gold = root <.> "gold" pill = root <.> "pill" diff --git a/pkg/hs/king/test/JamTests.hs b/pkg/hs/urbit-king/test/JamTests.hs similarity index 100% rename from pkg/hs/king/test/JamTests.hs rename to pkg/hs/urbit-king/test/JamTests.hs diff --git a/pkg/hs/king/test/LogTests.hs b/pkg/hs/urbit-king/test/LogTests.hs similarity index 100% rename from pkg/hs/king/test/LogTests.hs rename to pkg/hs/urbit-king/test/LogTests.hs diff --git a/pkg/hs/king/test/Main.hs b/pkg/hs/urbit-king/test/Main.hs similarity index 100% rename from pkg/hs/king/test/Main.hs rename to pkg/hs/urbit-king/test/Main.hs diff --git a/pkg/hs/king/test/NounConversionTests.hs b/pkg/hs/urbit-king/test/NounConversionTests.hs similarity index 100% rename from pkg/hs/king/test/NounConversionTests.hs rename to pkg/hs/urbit-king/test/NounConversionTests.hs diff --git a/pkg/hs/king/test/gold/hoontree.gold b/pkg/hs/urbit-king/test/gold/hoontree.gold similarity index 100% rename from pkg/hs/king/test/gold/hoontree.gold rename to pkg/hs/urbit-king/test/gold/hoontree.gold diff --git a/pkg/hs/king/test/gold/hoontree.pill b/pkg/hs/urbit-king/test/gold/hoontree.pill similarity index 100% rename from pkg/hs/king/test/gold/hoontree.pill rename to pkg/hs/urbit-king/test/gold/hoontree.pill From 6977ae8d3f024d846d89fcdb4d6241632192e13b Mon Sep 17 00:00:00 2001 From: Benjamin Summers Date: Thu, 23 Jan 2020 21:28:38 -0800 Subject: [PATCH 2/3] Renamed modules Ur.** to Urbit.** to be consistent with urbit-{atom,hob} --- pkg/hs/proto/lib/SimpleNoun.hs | 2 +- pkg/hs/urbit-king/app/Main.hs | 4 +- pkg/hs/urbit-king/lib/Ur/Arvo.hs | 13 ----- pkg/hs/urbit-king/lib/Urbit/Arvo.hs | 13 +++++ .../lib/{Ur => Urbit}/Arvo/Common.hs | 4 +- .../lib/{Ur => Urbit}/Arvo/Effect.hs | 16 +++--- .../lib/{Ur => Urbit}/Arvo/Event.hs | 16 +++--- .../urbit-king/lib/{Ur => Urbit}/King/API.hs | 12 ++--- .../urbit-king/lib/{Ur => Urbit}/King/App.hs | 6 +-- .../urbit-king/lib/{Ur => Urbit}/King/CLI.hs | 2 +- .../lib/{Ur => Urbit}/King/Config.hs | 4 +- .../lib/{Ur => Urbit}/King/EventBrowser.hs | 15 +++--- .../urbit-king/lib/{Ur => Urbit}/King/Main.hs | 52 +++++++++---------- .../lib/{Ur => Urbit}/King/TryJamPill.hs | 4 +- pkg/hs/urbit-king/lib/{Ur => Urbit}/Noun.hs | 34 ++++++------ .../lib/{Ur => Urbit}/Noun/Conversions.hs | 12 ++--- .../lib/{Ur => Urbit}/Noun/Convert.hs | 4 +- .../urbit-king/lib/{Ur => Urbit}/Noun/Core.hs | 2 +- .../urbit-king/lib/{Ur => Urbit}/Noun/Cue.hs | 4 +- .../urbit-king/lib/{Ur => Urbit}/Noun/Jam.hs | 4 +- .../urbit-king/lib/{Ur => Urbit}/Noun/TH.hs | 6 +-- .../urbit-king/lib/{Ur => Urbit}/Noun/Tank.hs | 6 +-- .../urbit-king/lib/{Ur => Urbit}/Noun/Tree.hs | 10 ++-- .../urbit-king/lib/{Ur => Urbit}/Prelude.hs | 6 +-- pkg/hs/urbit-king/lib/{Ur => Urbit}/Time.hs | 4 +- pkg/hs/urbit-king/lib/{Ur => Urbit}/Timer.hs | 2 +- .../urbit-king/lib/{Ur => Urbit}/Vere/Ames.hs | 12 ++--- .../urbit-king/lib/{Ur => Urbit}/Vere/Behn.hs | 16 +++--- .../urbit-king/lib/{Ur => Urbit}/Vere/Clay.hs | 10 ++-- .../urbit-king/lib/{Ur => Urbit}/Vere/Dawn.hs | 8 +-- .../urbit-king/lib/{Ur => Urbit}/Vere/Http.hs | 6 +-- .../lib/{Ur => Urbit}/Vere/Http/Client.hs | 14 ++--- .../lib/{Ur => Urbit}/Vere/Http/Server.hs | 14 ++--- .../urbit-king/lib/{Ur => Urbit}/Vere/LMDB.hs | 6 +-- .../lib/{Ur => Urbit}/Vere/LockFile.hs | 4 +- .../urbit-king/lib/{Ur => Urbit}/Vere/Log.hs | 14 ++--- .../lib/{Ur => Urbit}/Vere/NounServ.hs | 4 +- .../urbit-king/lib/{Ur => Urbit}/Vere/Pier.hs | 44 ++++++++-------- .../lib/{Ur => Urbit}/Vere/Pier/Types.hs | 8 +-- .../urbit-king/lib/{Ur => Urbit}/Vere/Serf.hs | 22 ++++---- .../urbit-king/lib/{Ur => Urbit}/Vere/Term.hs | 26 +++++----- .../lib/{Ur => Urbit}/Vere/Term/API.hs | 6 +-- .../lib/{Ur => Urbit}/Vere/Term/Demux.hs | 12 ++--- .../lib/{Ur => Urbit}/Vere/Term/Logic.hs | 8 +-- pkg/hs/urbit-king/test/AmesTests.hs | 18 +++---- pkg/hs/urbit-king/test/ArvoTests.hs | 12 ++--- pkg/hs/urbit-king/test/BehnTests.hs | 20 +++---- pkg/hs/urbit-king/test/ClayTests.hs | 4 +- pkg/hs/urbit-king/test/DawnTests.hs | 10 ++-- pkg/hs/urbit-king/test/DeriveNounTests.hs | 8 +-- pkg/hs/urbit-king/test/HoonMapSetTests.hs | 2 +- pkg/hs/urbit-king/test/JamTests.hs | 10 ++-- pkg/hs/urbit-king/test/LogTests.hs | 10 ++-- pkg/hs/urbit-king/test/NounConversionTests.hs | 6 +-- 54 files changed, 295 insertions(+), 296 deletions(-) delete mode 100644 pkg/hs/urbit-king/lib/Ur/Arvo.hs create mode 100644 pkg/hs/urbit-king/lib/Urbit/Arvo.hs rename pkg/hs/urbit-king/lib/{Ur => Urbit}/Arvo/Common.hs (99%) rename pkg/hs/urbit-king/lib/{Ur => Urbit}/Arvo/Effect.hs (93%) rename pkg/hs/urbit-king/lib/{Ur => Urbit}/Arvo/Event.hs (96%) rename pkg/hs/urbit-king/lib/{Ur => Urbit}/King/API.hs (93%) rename pkg/hs/urbit-king/lib/{Ur => Urbit}/King/App.hs (97%) rename pkg/hs/urbit-king/lib/{Ur => Urbit}/King/CLI.hs (99%) rename pkg/hs/urbit-king/lib/{Ur => Urbit}/King/Config.hs (95%) rename pkg/hs/urbit-king/lib/{Ur => Urbit}/King/EventBrowser.hs (96%) rename pkg/hs/urbit-king/lib/{Ur => Urbit}/King/Main.hs (94%) rename pkg/hs/urbit-king/lib/{Ur => Urbit}/King/TryJamPill.hs (96%) rename pkg/hs/urbit-king/lib/{Ur => Urbit}/Noun.hs (67%) rename pkg/hs/urbit-king/lib/{Ur => Urbit}/Noun/Conversions.hs (99%) rename pkg/hs/urbit-king/lib/{Ur => Urbit}/Noun/Convert.hs (98%) rename pkg/hs/urbit-king/lib/{Ur => Urbit}/Noun/Core.hs (99%) rename pkg/hs/urbit-king/lib/{Ur => Urbit}/Noun/Cue.hs (99%) rename pkg/hs/urbit-king/lib/{Ur => Urbit}/Noun/Jam.hs (99%) rename pkg/hs/urbit-king/lib/{Ur => Urbit}/Noun/TH.hs (98%) rename pkg/hs/urbit-king/lib/{Ur => Urbit}/Noun/Tank.hs (98%) rename pkg/hs/urbit-king/lib/{Ur => Urbit}/Noun/Tree.hs (98%) rename pkg/hs/urbit-king/lib/{Ur => Urbit}/Prelude.hs (95%) rename pkg/hs/urbit-king/lib/{Ur => Urbit}/Time.hs (97%) rename pkg/hs/urbit-king/lib/{Ur => Urbit}/Timer.hs (96%) rename pkg/hs/urbit-king/lib/{Ur => Urbit}/Vere/Ames.hs (98%) rename pkg/hs/urbit-king/lib/{Ur => Urbit}/Vere/Behn.hs (78%) rename pkg/hs/urbit-king/lib/{Ur => Urbit}/Vere/Clay.hs (98%) rename pkg/hs/urbit-king/lib/{Ur => Urbit}/Vere/Dawn.hs (98%) rename pkg/hs/urbit-king/lib/{Ur => Urbit}/Vere/Http.hs (89%) rename pkg/hs/urbit-king/lib/{Ur => Urbit}/Vere/Http/Client.hs (94%) rename pkg/hs/urbit-king/lib/{Ur => Urbit}/Vere/Http/Server.hs (98%) rename pkg/hs/urbit-king/lib/{Ur => Urbit}/Vere/LMDB.hs (99%) rename pkg/hs/urbit-king/lib/{Ur => Urbit}/Vere/LockFile.hs (92%) rename pkg/hs/urbit-king/lib/{Ur => Urbit}/Vere/Log.hs (97%) rename pkg/hs/urbit-king/lib/{Ur => Urbit}/Vere/NounServ.hs (99%) rename pkg/hs/urbit-king/lib/{Ur => Urbit}/Vere/Pier.hs (93%) rename pkg/hs/urbit-king/lib/{Ur => Urbit}/Vere/Pier/Types.hs (96%) rename pkg/hs/urbit-king/lib/{Ur => Urbit}/Vere/Serf.hs (97%) rename pkg/hs/urbit-king/lib/{Ur => Urbit}/Vere/Term.hs (97%) rename pkg/hs/urbit-king/lib/{Ur => Urbit}/Vere/Term/API.hs (85%) rename pkg/hs/urbit-king/lib/{Ur => Urbit}/Vere/Term/Demux.hs (90%) rename pkg/hs/urbit-king/lib/{Ur => Urbit}/Vere/Term/Logic.hs (95%) diff --git a/pkg/hs/proto/lib/SimpleNoun.hs b/pkg/hs/proto/lib/SimpleNoun.hs index dd6736ab7..e8b63cb21 100644 --- a/pkg/hs/proto/lib/SimpleNoun.hs +++ b/pkg/hs/proto/lib/SimpleNoun.hs @@ -3,7 +3,7 @@ module SimpleNoun where import ClassyPrelude import Numeric.Natural -import qualified Ur.Noun as N +import qualified Urbit.Noun as N type Atom = Natural diff --git a/pkg/hs/urbit-king/app/Main.hs b/pkg/hs/urbit-king/app/Main.hs index 3bae07c0f..8a57e92a7 100644 --- a/pkg/hs/urbit-king/app/Main.hs +++ b/pkg/hs/urbit-king/app/Main.hs @@ -1,2 +1,2 @@ -module Main (module Ur.King.Main) where -import Ur.King.Main +module Main (module Urbit.King.Main) where +import Urbit.King.Main diff --git a/pkg/hs/urbit-king/lib/Ur/Arvo.hs b/pkg/hs/urbit-king/lib/Ur/Arvo.hs deleted file mode 100644 index 4d172ac39..000000000 --- a/pkg/hs/urbit-king/lib/Ur/Arvo.hs +++ /dev/null @@ -1,13 +0,0 @@ -module Ur.Arvo - ( module Ur.Arvo.Common - , module Ur.Arvo.Effect - , module Ur.Arvo.Event - , FX - ) where - -import Ur.Arvo.Common -import Ur.Arvo.Effect -import Ur.Arvo.Event -import Ur.Noun.Conversions (Lenient) - -type FX = [Lenient Ef] diff --git a/pkg/hs/urbit-king/lib/Urbit/Arvo.hs b/pkg/hs/urbit-king/lib/Urbit/Arvo.hs new file mode 100644 index 000000000..4b3834528 --- /dev/null +++ b/pkg/hs/urbit-king/lib/Urbit/Arvo.hs @@ -0,0 +1,13 @@ +module Urbit.Arvo + ( module Urbit.Arvo.Common + , module Urbit.Arvo.Effect + , module Urbit.Arvo.Event + , FX + ) where + +import Urbit.Arvo.Common +import Urbit.Arvo.Effect +import Urbit.Arvo.Event +import Urbit.Noun.Conversions (Lenient) + +type FX = [Lenient Ef] diff --git a/pkg/hs/urbit-king/lib/Ur/Arvo/Common.hs b/pkg/hs/urbit-king/lib/Urbit/Arvo/Common.hs similarity index 99% rename from pkg/hs/urbit-king/lib/Ur/Arvo/Common.hs rename to pkg/hs/urbit-king/lib/Urbit/Arvo/Common.hs index 81f1ac2cb..42f05c941 100644 --- a/pkg/hs/urbit-king/lib/Ur/Arvo/Common.hs +++ b/pkg/hs/urbit-king/lib/Urbit/Arvo/Common.hs @@ -1,7 +1,7 @@ {-| Types used in both Events and Effects. -} -module Ur.Arvo.Common +module Urbit.Arvo.Common ( KingId(..), ServId(..) , Json, JsonNode(..) , Desk(..), Mime(..) @@ -12,7 +12,7 @@ module Ur.Arvo.Common , AmesDest(..), Ipv4(..), Ipv6(..), Patp(..), Galaxy, AmesAddress(..) ) where -import Ur.Prelude hiding (Term) +import Urbit.Prelude hiding (Term) import qualified Network.HTTP.Types.Method as H import qualified Urbit.Ob as Ob diff --git a/pkg/hs/urbit-king/lib/Ur/Arvo/Effect.hs b/pkg/hs/urbit-king/lib/Urbit/Arvo/Effect.hs similarity index 93% rename from pkg/hs/urbit-king/lib/Ur/Arvo/Effect.hs rename to pkg/hs/urbit-king/lib/Urbit/Arvo/Effect.hs index 1babaa08d..e5c9be159 100644 --- a/pkg/hs/urbit-king/lib/Ur/Arvo/Effect.hs +++ b/pkg/hs/urbit-king/lib/Urbit/Arvo/Effect.hs @@ -1,16 +1,16 @@ {-| Effect Types and Their Noun Conversions -} -module Ur.Arvo.Effect where +module Urbit.Arvo.Effect where -import Ur.Prelude -import Ur.Time +import Urbit.Prelude +import Urbit.Time -import Ur.Arvo.Common (KingId(..), ServId(..)) -import Ur.Arvo.Common (Header, HttpEvent, HttpServerConf, Method, Mime) -import Ur.Arvo.Common (AmesDest, Turf) -import Ur.Arvo.Common (ReOrg(..), reorgThroughNoun) -import Ur.Arvo.Common (Desk) +import Urbit.Arvo.Common (KingId(..), ServId(..)) +import Urbit.Arvo.Common (Header, HttpEvent, HttpServerConf, Method, Mime) +import Urbit.Arvo.Common (AmesDest, Turf) +import Urbit.Arvo.Common (ReOrg(..), reorgThroughNoun) +import Urbit.Arvo.Common (Desk) -- Newt Effects ---------------------------------------------------------------- diff --git a/pkg/hs/urbit-king/lib/Ur/Arvo/Event.hs b/pkg/hs/urbit-king/lib/Urbit/Arvo/Event.hs similarity index 96% rename from pkg/hs/urbit-king/lib/Ur/Arvo/Event.hs rename to pkg/hs/urbit-king/lib/Urbit/Arvo/Event.hs index bfb6d2dc4..144c4668e 100644 --- a/pkg/hs/urbit-king/lib/Ur/Arvo/Event.hs +++ b/pkg/hs/urbit-king/lib/Urbit/Arvo/Event.hs @@ -1,16 +1,16 @@ {-| Event Types and Noun Conversion -} -module Ur.Arvo.Event where +module Urbit.Arvo.Event where -import Ur.Noun.Tree (HoonMap, HoonSet) -import Ur.Prelude hiding (Term) +import Urbit.Noun.Tree (HoonMap, HoonSet) +import Urbit.Prelude hiding (Term) -import Ur.Arvo.Common (KingId(..), ServId(..)) -import Ur.Arvo.Common (Desk, Mime) -import Ur.Arvo.Common (Header(..), HttpEvent) -import Ur.Arvo.Common (AmesDest, Ipv4, Ipv6, Port, Turf) -import Ur.Arvo.Common (ReOrg(..), reorgThroughNoun) +import Urbit.Arvo.Common (KingId(..), ServId(..)) +import Urbit.Arvo.Common (Desk, Mime) +import Urbit.Arvo.Common (Header(..), HttpEvent) +import Urbit.Arvo.Common (AmesDest, Ipv4, Ipv6, Port, Turf) +import Urbit.Arvo.Common (ReOrg(..), reorgThroughNoun) import qualified Crypto.Sign.Ed25519 as Ed import qualified Data.ByteString as BS diff --git a/pkg/hs/urbit-king/lib/Ur/King/API.hs b/pkg/hs/urbit-king/lib/Urbit/King/API.hs similarity index 93% rename from pkg/hs/urbit-king/lib/Ur/King/API.hs rename to pkg/hs/urbit-king/lib/Urbit/King/API.hs index 0f1790eaf..085130995 100644 --- a/pkg/hs/urbit-king/lib/Ur/King/API.hs +++ b/pkg/hs/urbit-king/lib/Urbit/King/API.hs @@ -4,23 +4,23 @@ ships. Do it or strip it out. -} -module Ur.King.API (King(..), kingAPI, readPortsFile) where +module Urbit.King.API (King(..), kingAPI, readPortsFile) where import RIO.Directory -import Ur.Prelude +import Urbit.Prelude import Network.Socket (Socket) import Prelude (read) -import Ur.Arvo (Belt) -import Ur.King.App (HasConfigDir(..)) +import Urbit.Arvo (Belt) +import Urbit.King.App (HasConfigDir(..)) import qualified Network.HTTP.Types as H import qualified Network.Wai as W import qualified Network.Wai.Handler.Warp as W import qualified Network.Wai.Handler.WebSockets as WS import qualified Network.WebSockets as WS -import qualified Ur.Vere.NounServ as NounServ -import qualified Ur.Vere.Term.API as Term +import qualified Urbit.Vere.NounServ as NounServ +import qualified Urbit.Vere.Term.API as Term -- Types ----------------------------------------------------------------------- diff --git a/pkg/hs/urbit-king/lib/Ur/King/App.hs b/pkg/hs/urbit-king/lib/Urbit/King/App.hs similarity index 97% rename from pkg/hs/urbit-king/lib/Ur/King/App.hs rename to pkg/hs/urbit-king/lib/Urbit/King/App.hs index 382b95b1d..b5b0fc94a 100644 --- a/pkg/hs/urbit-king/lib/Ur/King/App.hs +++ b/pkg/hs/urbit-king/lib/Urbit/King/App.hs @@ -1,7 +1,7 @@ {-| Code for setting up the RIO environment. -} -module Ur.King.App +module Urbit.King.App ( App , runApp , runAppLogFile @@ -10,8 +10,8 @@ module Ur.King.App , HasConfigDir(..) ) where -import Ur.King.Config -import Ur.Prelude +import Urbit.King.Config +import Urbit.Prelude import System.Directory (createDirectoryIfMissing, getHomeDirectory) diff --git a/pkg/hs/urbit-king/lib/Ur/King/CLI.hs b/pkg/hs/urbit-king/lib/Urbit/King/CLI.hs similarity index 99% rename from pkg/hs/urbit-king/lib/Ur/King/CLI.hs rename to pkg/hs/urbit-king/lib/Urbit/King/CLI.hs index 06b12367f..f17478514 100644 --- a/pkg/hs/urbit-king/lib/Ur/King/CLI.hs +++ b/pkg/hs/urbit-king/lib/Urbit/King/CLI.hs @@ -4,7 +4,7 @@ {-| Command line parsing. -} -module Ur.King.CLI where +module Urbit.King.CLI where import ClassyPrelude import Options.Applicative diff --git a/pkg/hs/urbit-king/lib/Ur/King/Config.hs b/pkg/hs/urbit-king/lib/Urbit/King/Config.hs similarity index 95% rename from pkg/hs/urbit-king/lib/Ur/King/Config.hs rename to pkg/hs/urbit-king/lib/Urbit/King/Config.hs index c8bf9a6da..b3dee84ad 100644 --- a/pkg/hs/urbit-king/lib/Ur/King/Config.hs +++ b/pkg/hs/urbit-king/lib/Urbit/King/Config.hs @@ -1,9 +1,9 @@ {-| Pier Configuration -} -module Ur.King.Config where +module Urbit.King.Config where -import Ur.Prelude +import Urbit.Prelude {-| All the configuration data revolving around a ship and the current diff --git a/pkg/hs/urbit-king/lib/Ur/King/EventBrowser.hs b/pkg/hs/urbit-king/lib/Urbit/King/EventBrowser.hs similarity index 96% rename from pkg/hs/urbit-king/lib/Ur/King/EventBrowser.hs rename to pkg/hs/urbit-king/lib/Urbit/King/EventBrowser.hs index c0b5a38e2..389728dcc 100644 --- a/pkg/hs/urbit-king/lib/Ur/King/EventBrowser.hs +++ b/pkg/hs/urbit-king/lib/Urbit/King/EventBrowser.hs @@ -4,21 +4,20 @@ TODO Handle CTRL-D -} -module Ur.King.EventBrowser (run) where +module Urbit.King.EventBrowser (run) where -import Ur.Prelude +import Urbit.Prelude import Data.Conduit -import Ur.Arvo -import Ur.Time -import Ur.Vere.Pier.Types +import Urbit.Arvo +import Urbit.Time +import Urbit.Vere.Pier.Types import Control.Monad.Trans.Maybe (MaybeT(..)) - -import Ur.Vere.Log (EventLog) +import Urbit.Vere.Log (EventLog) import qualified Data.Conduit.Combinators as C -import qualified Ur.Vere.Log as Log +import qualified Urbit.Vere.Log as Log -------------------------------------------------------------------------------- diff --git a/pkg/hs/urbit-king/lib/Ur/King/Main.hs b/pkg/hs/urbit-king/lib/Urbit/King/Main.hs similarity index 94% rename from pkg/hs/urbit-king/lib/Ur/King/Main.hs rename to pkg/hs/urbit-king/lib/Urbit/King/Main.hs index 9d00c916b..560f37c27 100644 --- a/pkg/hs/urbit-king/lib/Ur/King/Main.hs +++ b/pkg/hs/urbit-king/lib/Urbit/King/Main.hs @@ -53,9 +53,9 @@ - `Hashless`: Don't use hashboard for jets. -} -module Ur.King.Main (main) where +module Urbit.King.Main (main) where -import Ur.Prelude +import Urbit.Prelude import Data.Acquire import Data.Conduit @@ -63,25 +63,25 @@ import Data.Conduit.List hiding (catMaybes, map, replicate, take) import Data.RAcquire import Network.HTTP.Client.TLS import RIO.Directory -import Ur.Arvo -import Ur.King.Config -import Ur.Noun hiding (Parser) -import Ur.Noun.Conversions (cordToUW) -import Ur.Vere.Dawn -import Ur.Vere.Pier -import Ur.Vere.Pier.Types -import Ur.Vere.Serf +import Urbit.Arvo +import Urbit.King.Config +import Urbit.Noun hiding (Parser) +import Urbit.Noun.Conversions (cordToUW) +import Urbit.Vere.Dawn +import Urbit.Vere.Pier +import Urbit.Vere.Pier.Types +import Urbit.Vere.Serf -import Control.Concurrent (myThreadId, runInBoundThread) -import Control.Exception (AsyncException(UserInterrupt)) -import Control.Lens ((&)) -import Data.Default (def) -import RIO (logSticky, logStickyDone) -import Text.Show.Pretty (pPrint) -import Ur.King.App (runApp, runAppLogFile, runPierApp) -import Ur.King.App (HasConfigDir(..)) -import Ur.Time (Wen) -import Ur.Vere.LockFile (lockFile) +import Control.Concurrent (myThreadId, runInBoundThread) +import Control.Exception (AsyncException(UserInterrupt)) +import Control.Lens ((&)) +import Data.Default (def) +import RIO (logSticky, logStickyDone) +import Text.Show.Pretty (pPrint) +import Urbit.King.App (runApp, runAppLogFile, runPierApp) +import Urbit.King.App (HasConfigDir(..)) +import Urbit.Time (Wen) +import Urbit.Vere.LockFile (lockFile) import qualified Data.Set as Set import qualified Data.Text as T @@ -93,13 +93,13 @@ import qualified System.IO.LockFile.Internal as Lock import qualified System.Posix.Signals as Sys import qualified System.ProgressBar as PB import qualified System.Random as Sys -import qualified Ur.King.CLI as CLI -import qualified Ur.King.EventBrowser as EventBrowser -import qualified Ur.Vere.Log as Log -import qualified Ur.Vere.Pier as Pier -import qualified Ur.Vere.Serf as Serf -import qualified Ur.Vere.Term as Term +import qualified Urbit.King.CLI as CLI +import qualified Urbit.King.EventBrowser as EventBrowser import qualified Urbit.Ob as Ob +import qualified Urbit.Vere.Log as Log +import qualified Urbit.Vere.Pier as Pier +import qualified Urbit.Vere.Serf as Serf +import qualified Urbit.Vere.Term as Term -------------------------------------------------------------------------------- diff --git a/pkg/hs/urbit-king/lib/Ur/King/TryJamPill.hs b/pkg/hs/urbit-king/lib/Urbit/King/TryJamPill.hs similarity index 96% rename from pkg/hs/urbit-king/lib/Ur/King/TryJamPill.hs rename to pkg/hs/urbit-king/lib/Urbit/King/TryJamPill.hs index 301502206..73ead8b8e 100644 --- a/pkg/hs/urbit-king/lib/Ur/King/TryJamPill.hs +++ b/pkg/hs/urbit-king/lib/Urbit/King/TryJamPill.hs @@ -1,11 +1,11 @@ {-| Test jam/cue on pills. -} -module Ur.King.TryJamPill where +module Urbit.King.TryJamPill where import ClassyPrelude import Control.Lens -import Ur.Noun +import Urbit.Noun -------------------------------------------------------------------------------- diff --git a/pkg/hs/urbit-king/lib/Ur/Noun.hs b/pkg/hs/urbit-king/lib/Urbit/Noun.hs similarity index 67% rename from pkg/hs/urbit-king/lib/Ur/Noun.hs rename to pkg/hs/urbit-king/lib/Urbit/Noun.hs index 082613a84..7e443992a 100644 --- a/pkg/hs/urbit-king/lib/Ur/Noun.hs +++ b/pkg/hs/urbit-king/lib/Urbit/Noun.hs @@ -3,17 +3,17 @@ This module just re-exports things from submodules. -} -module Ur.Noun +module Urbit.Noun ( module Urbit.Atom , module Data.Word - , module Ur.Noun.Conversions - , module Ur.Noun.Convert - , module Ur.Noun.Core - , module Ur.Noun.Cue - , module Ur.Noun.Jam - , module Ur.Noun.Tank - , module Ur.Noun.TH - , module Ur.Noun.Tree + , module Urbit.Noun.Conversions + , module Urbit.Noun.Convert + , module Urbit.Noun.Core + , module Urbit.Noun.Cue + , module Urbit.Noun.Jam + , module Urbit.Noun.Tank + , module Urbit.Noun.TH + , module Urbit.Noun.Tree , _Cue , LoadErr(..) , loadFile @@ -24,14 +24,14 @@ import Control.Lens import Data.Word import Urbit.Atom -import Ur.Noun.Conversions -import Ur.Noun.Convert -import Ur.Noun.Core -import Ur.Noun.Cue -import Ur.Noun.Jam -import Ur.Noun.Tank -import Ur.Noun.TH -import Ur.Noun.Tree +import Urbit.Noun.Conversions +import Urbit.Noun.Convert +import Urbit.Noun.Core +import Urbit.Noun.Cue +import Urbit.Noun.Jam +import Urbit.Noun.Tank +import Urbit.Noun.TH +import Urbit.Noun.Tree -------------------------------------------------------------------------------- diff --git a/pkg/hs/urbit-king/lib/Ur/Noun/Conversions.hs b/pkg/hs/urbit-king/lib/Urbit/Noun/Conversions.hs similarity index 99% rename from pkg/hs/urbit-king/lib/Ur/Noun/Conversions.hs rename to pkg/hs/urbit-king/lib/Urbit/Noun/Conversions.hs index 4a0fa4fed..00aa20958 100644 --- a/pkg/hs/urbit-king/lib/Ur/Noun/Conversions.hs +++ b/pkg/hs/urbit-king/lib/Urbit/Noun/Conversions.hs @@ -4,7 +4,7 @@ Large Library of conversion between various types and Nouns. -} -module Ur.Noun.Conversions +module Urbit.Noun.Conversions ( Nullable(..), Jammed(..), AtomCell(..) , Word128, Word256, Word512 , Bytes(..), Octs(..), File(..) @@ -24,9 +24,9 @@ import Data.Word import Text.Regex.TDFA import Text.Regex.TDFA.Text () import Urbit.Atom -import Ur.Noun.Convert -import Ur.Noun.Core -import Ur.Noun.TH +import Urbit.Noun.Convert +import Urbit.Noun.Core +import Urbit.Noun.TH import Data.LargeWord (LargeKey, Word128, Word256) import GHC.Exts (chr#, isTrue#, leWord#, word2Int#) @@ -39,8 +39,8 @@ import RIO.FilePath (joinPath, splitDirectories, takeBaseName, takeDirectory, takeExtension, (<.>), ()) import System.IO.Unsafe (unsafePerformIO) import Text.Show.Pretty (ppShow) -import Ur.Noun.Cue (cue) -import Ur.Noun.Jam (jam) +import Urbit.Noun.Cue (cue) +import Urbit.Noun.Jam (jam) import qualified Data.Char as C import qualified Data.Text.Encoding as T diff --git a/pkg/hs/urbit-king/lib/Ur/Noun/Convert.hs b/pkg/hs/urbit-king/lib/Urbit/Noun/Convert.hs similarity index 98% rename from pkg/hs/urbit-king/lib/Ur/Noun/Convert.hs rename to pkg/hs/urbit-king/lib/Urbit/Noun/Convert.hs index 0d7d99f07..f72a465df 100644 --- a/pkg/hs/urbit-king/lib/Ur/Noun/Convert.hs +++ b/pkg/hs/urbit-king/lib/Urbit/Noun/Convert.hs @@ -1,7 +1,7 @@ {-| Framework for writing conversions between types and nouns. -} -module Ur.Noun.Convert +module Urbit.Noun.Convert ( ToNoun(toNoun) , FromNoun(parseNoun), fromNoun, fromNounErr, fromNounExn , Parser(..) @@ -12,7 +12,7 @@ module Ur.Noun.Convert import ClassyPrelude hiding (hash) -import Ur.Noun.Core +import Urbit.Noun.Core import qualified Control.Monad.Fail as Fail diff --git a/pkg/hs/urbit-king/lib/Ur/Noun/Core.hs b/pkg/hs/urbit-king/lib/Urbit/Noun/Core.hs similarity index 99% rename from pkg/hs/urbit-king/lib/Ur/Noun/Core.hs rename to pkg/hs/urbit-king/lib/Urbit/Noun/Core.hs index da51b8390..fba92b0c4 100644 --- a/pkg/hs/urbit-king/lib/Ur/Noun/Core.hs +++ b/pkg/hs/urbit-king/lib/Urbit/Noun/Core.hs @@ -9,7 +9,7 @@ the total number of nodes under the tree of the cell. This is used as a heuristic to choose a hash-table size for `jam` and `cue`. -} -module Ur.Noun.Core +module Urbit.Noun.Core ( Noun, nounSize , pattern Cell, pattern Atom , pattern C, pattern A diff --git a/pkg/hs/urbit-king/lib/Ur/Noun/Cue.hs b/pkg/hs/urbit-king/lib/Urbit/Noun/Cue.hs similarity index 99% rename from pkg/hs/urbit-king/lib/Ur/Noun/Cue.hs rename to pkg/hs/urbit-king/lib/Urbit/Noun/Cue.hs index 60dd90310..0bc122fb3 100644 --- a/pkg/hs/urbit-king/lib/Ur/Noun/Cue.hs +++ b/pkg/hs/urbit-king/lib/Urbit/Noun/Cue.hs @@ -5,12 +5,12 @@ Implementation is based on the approach used in `flat`. -} -module Ur.Noun.Cue (cue, cueExn, cueBS, cueBSExn, DecodeErr) where +module Urbit.Noun.Cue (cue, cueExn, cueBS, cueBSExn, DecodeErr) where import ClassyPrelude import Urbit.Atom -import Ur.Noun.Core +import Urbit.Noun.Core import Data.Bits (shiftL, shiftR, (.&.), (.|.)) import Data.Function ((&)) diff --git a/pkg/hs/urbit-king/lib/Ur/Noun/Jam.hs b/pkg/hs/urbit-king/lib/Urbit/Noun/Jam.hs similarity index 99% rename from pkg/hs/urbit-king/lib/Ur/Noun/Jam.hs rename to pkg/hs/urbit-king/lib/Urbit/Noun/Jam.hs index e6f566d88..34d828cbe 100644 --- a/pkg/hs/urbit-king/lib/Ur/Noun/Jam.hs +++ b/pkg/hs/urbit-king/lib/Urbit/Noun/Jam.hs @@ -5,13 +5,13 @@ This is based on the implementation of `flat`. -} -module Ur.Noun.Jam (jam, jamBS) where +module Urbit.Noun.Jam (jam, jamBS) where import ClassyPrelude hiding (hash) import Urbit.Atom import Urbit.Atom.Internal -import Ur.Noun.Core +import Urbit.Noun.Core import Data.Bits (clearBit, setBit, shiftL, shiftR, (.|.)) import Data.Vector.Primitive ((!)) diff --git a/pkg/hs/urbit-king/lib/Ur/Noun/TH.hs b/pkg/hs/urbit-king/lib/Urbit/Noun/TH.hs similarity index 98% rename from pkg/hs/urbit-king/lib/Ur/Noun/TH.hs rename to pkg/hs/urbit-king/lib/Urbit/Noun/TH.hs index 8e1d8c46e..641161d1d 100644 --- a/pkg/hs/urbit-king/lib/Ur/Noun/TH.hs +++ b/pkg/hs/urbit-king/lib/Urbit/Noun/TH.hs @@ -1,14 +1,14 @@ {-| Template Haskell Code to Generate FromNoun and ToNoun Instances -} -module Ur.Noun.TH (deriveNoun, deriveToNoun, deriveFromNoun) where +module Urbit.Noun.TH (deriveNoun, deriveToNoun, deriveFromNoun) where import ClassyPrelude hiding (fromList) import Language.Haskell.TH import Language.Haskell.TH.Syntax -import Ur.Noun.Convert +import Urbit.Noun.Convert -import Ur.Noun.Core (textToUtf8Atom) +import Urbit.Noun.Core (textToUtf8Atom) import qualified Data.Char as C diff --git a/pkg/hs/urbit-king/lib/Ur/Noun/Tank.hs b/pkg/hs/urbit-king/lib/Urbit/Noun/Tank.hs similarity index 98% rename from pkg/hs/urbit-king/lib/Ur/Noun/Tank.hs rename to pkg/hs/urbit-king/lib/Urbit/Noun/Tank.hs index 53f63ea1a..90a315ab6 100644 --- a/pkg/hs/urbit-king/lib/Ur/Noun/Tank.hs +++ b/pkg/hs/urbit-king/lib/Urbit/Noun/Tank.hs @@ -2,11 +2,11 @@ Pretty Printer Types -} -module Ur.Noun.Tank where +module Urbit.Noun.Tank where import ClassyPrelude -import Ur.Noun.Conversions -import Ur.Noun.TH +import Urbit.Noun.Conversions +import Urbit.Noun.TH -------------------------------------------------------------------------------- diff --git a/pkg/hs/urbit-king/lib/Ur/Noun/Tree.hs b/pkg/hs/urbit-king/lib/Urbit/Noun/Tree.hs similarity index 98% rename from pkg/hs/urbit-king/lib/Ur/Noun/Tree.hs rename to pkg/hs/urbit-king/lib/Urbit/Noun/Tree.hs index 5a04bfb5b..61751cca5 100644 --- a/pkg/hs/urbit-king/lib/Ur/Noun/Tree.hs +++ b/pkg/hs/urbit-king/lib/Urbit/Noun/Tree.hs @@ -4,7 +4,7 @@ {-| Hoon's `map` and `set` types and conversions to/from Nouns. -} -module Ur.Noun.Tree +module Urbit.Noun.Tree ( HoonSet, setToHoonSet, setFromHoonSet , HoonMap, mapToHoonMap, mapFromHoonMap , mug @@ -14,10 +14,10 @@ import ClassyPrelude import Control.Lens hiding (non) import Urbit.Atom -import Ur.Noun.Conversions () -import Ur.Noun.Convert -import Ur.Noun.Core -import Ur.Noun.TH +import Urbit.Noun.Conversions () +import Urbit.Noun.Convert +import Urbit.Noun.Core +import Urbit.Noun.TH import Data.Bits (shiftR, xor) import Data.Hash.Murmur (murmur3) diff --git a/pkg/hs/urbit-king/lib/Ur/Prelude.hs b/pkg/hs/urbit-king/lib/Urbit/Prelude.hs similarity index 95% rename from pkg/hs/urbit-king/lib/Ur/Prelude.hs rename to pkg/hs/urbit-king/lib/Urbit/Prelude.hs index 94fdd59af..a19d44cc5 100644 --- a/pkg/hs/urbit-king/lib/Ur/Prelude.hs +++ b/pkg/hs/urbit-king/lib/Urbit/Prelude.hs @@ -2,14 +2,14 @@ Convenient Re-Exports -} -module Ur.Prelude +module Urbit.Prelude ( module ClassyPrelude , module Control.Arrow , module Control.Lens , module Data.Acquire , module Data.RAcquire , module Data.Void - , module Ur.Noun + , module Urbit.Noun , module Text.Show.Pretty , module Text.Printf , module RIO @@ -18,7 +18,7 @@ module Ur.Prelude ) where import ClassyPrelude -import Ur.Noun +import Urbit.Noun import Control.Lens hiding (Each, Index, cons, index, snoc, uncons, unsnoc, (<.>), (<|)) diff --git a/pkg/hs/urbit-king/lib/Ur/Time.hs b/pkg/hs/urbit-king/lib/Urbit/Time.hs similarity index 97% rename from pkg/hs/urbit-king/lib/Ur/Time.hs rename to pkg/hs/urbit-king/lib/Urbit/Time.hs index 70d9013c2..ba9cbfb55 100644 --- a/pkg/hs/urbit-king/lib/Ur/Time.hs +++ b/pkg/hs/urbit-king/lib/Urbit/Time.hs @@ -2,7 +2,7 @@ TODO This is slow. -} -module Ur.Time where +module Urbit.Time where import Control.Lens import Prelude @@ -12,7 +12,7 @@ import Data.Time.Clock (DiffTime, UTCTime) import Data.Time.Clock (diffTimeToPicoseconds, picosecondsToDiffTime) import Data.Time.Clock.System (SystemTime(..), getSystemTime) import Data.Time.Clock.System (systemToUTCTime, utcToSystemTime) -import Ur.Noun (FromNoun, ToNoun) +import Urbit.Noun (FromNoun, ToNoun) -- Types ----------------------------------------------------------------------- diff --git a/pkg/hs/urbit-king/lib/Ur/Timer.hs b/pkg/hs/urbit-king/lib/Urbit/Timer.hs similarity index 96% rename from pkg/hs/urbit-king/lib/Ur/Timer.hs rename to pkg/hs/urbit-king/lib/Urbit/Timer.hs index 483971061..8664e8e88 100644 --- a/pkg/hs/urbit-king/lib/Ur/Timer.hs +++ b/pkg/hs/urbit-king/lib/Urbit/Timer.hs @@ -1,4 +1,4 @@ -module Ur.Timer ( Timer(..), init, stop, start +module Urbit.Timer ( Timer(..), init, stop, start , Sys.getSystemTime, sysTimeGapMicroSecs ) where diff --git a/pkg/hs/urbit-king/lib/Ur/Vere/Ames.hs b/pkg/hs/urbit-king/lib/Urbit/Vere/Ames.hs similarity index 98% rename from pkg/hs/urbit-king/lib/Ur/Vere/Ames.hs rename to pkg/hs/urbit-king/lib/Urbit/Vere/Ames.hs index 376313f60..31269c2e7 100644 --- a/pkg/hs/urbit-king/lib/Ur/Vere/Ames.hs +++ b/pkg/hs/urbit-king/lib/Urbit/Vere/Ames.hs @@ -2,21 +2,21 @@ Ames IO Driver -- UDP -} -module Ur.Vere.Ames (ames) where +module Urbit.Vere.Ames (ames) where -import Ur.Prelude +import Urbit.Prelude import Control.Monad.Extra hiding (mapM_) import Network.Socket hiding (recvFrom, sendTo) import Network.Socket.ByteString -import Ur.Arvo hiding (Fake) -import Ur.King.Config -import Ur.Vere.Pier.Types +import Urbit.Arvo hiding (Fake) +import Urbit.King.Config +import Urbit.Vere.Pier.Types import qualified Data.ByteString as BS import qualified Data.Map as M -import qualified Ur.Time as Time import qualified Urbit.Ob as Ob +import qualified Urbit.Time as Time -- Types ----------------------------------------------------------------------- diff --git a/pkg/hs/urbit-king/lib/Ur/Vere/Behn.hs b/pkg/hs/urbit-king/lib/Urbit/Vere/Behn.hs similarity index 78% rename from pkg/hs/urbit-king/lib/Ur/Vere/Behn.hs rename to pkg/hs/urbit-king/lib/Urbit/Vere/Behn.hs index e49f31bc0..5336534b0 100644 --- a/pkg/hs/urbit-king/lib/Ur/Vere/Behn.hs +++ b/pkg/hs/urbit-king/lib/Urbit/Vere/Behn.hs @@ -2,17 +2,17 @@ Behn: Timer Driver -} -module Ur.Vere.Behn (behn) where +module Urbit.Vere.Behn (behn) where -import Ur.Arvo hiding (Behn) -import Ur.Prelude -import Ur.Vere.Pier.Types +import Urbit.Arvo hiding (Behn) +import Urbit.Prelude +import Urbit.Vere.Pier.Types -import Ur.Time (Wen) -import Ur.Timer (Timer) +import Urbit.Time (Wen) +import Urbit.Timer (Timer) -import qualified Ur.Time as Time -import qualified Ur.Timer as Timer +import qualified Urbit.Time as Time +import qualified Urbit.Timer as Timer -- Behn Stuff ------------------------------------------------------------------ diff --git a/pkg/hs/urbit-king/lib/Ur/Vere/Clay.hs b/pkg/hs/urbit-king/lib/Urbit/Vere/Clay.hs similarity index 98% rename from pkg/hs/urbit-king/lib/Ur/Vere/Clay.hs rename to pkg/hs/urbit-king/lib/Urbit/Vere/Clay.hs index a4aa79b60..811586409 100644 --- a/pkg/hs/urbit-king/lib/Ur/Vere/Clay.hs +++ b/pkg/hs/urbit-king/lib/Urbit/Vere/Clay.hs @@ -2,12 +2,12 @@ UNIX Filesystem Driver -} -module Ur.Vere.Clay (clay) where +module Urbit.Vere.Clay (clay) where -import Ur.Arvo hiding (Term) -import Ur.King.Config -import Ur.Prelude -import Ur.Vere.Pier.Types +import Urbit.Arvo hiding (Term) +import Urbit.King.Config +import Urbit.Prelude +import Urbit.Vere.Pier.Types import Conduit import RIO.Directory diff --git a/pkg/hs/urbit-king/lib/Ur/Vere/Dawn.hs b/pkg/hs/urbit-king/lib/Urbit/Vere/Dawn.hs similarity index 98% rename from pkg/hs/urbit-king/lib/Ur/Vere/Dawn.hs rename to pkg/hs/urbit-king/lib/Urbit/Vere/Dawn.hs index d3e4120b5..ae79088da 100644 --- a/pkg/hs/urbit-king/lib/Ur/Vere/Dawn.hs +++ b/pkg/hs/urbit-king/lib/Urbit/Vere/Dawn.hs @@ -2,11 +2,11 @@ Use etherium to access PKI information. -} -module Ur.Vere.Dawn where +module Urbit.Vere.Dawn where -import Ur.Arvo.Common -import Ur.Arvo.Event hiding (Address) -import Ur.Prelude hiding (Call, rights, to) +import Urbit.Arvo.Common +import Urbit.Arvo.Event hiding (Address) +import Urbit.Prelude hiding (Call, rights, to) import Data.Bits (xor) import Data.List (nub) diff --git a/pkg/hs/urbit-king/lib/Ur/Vere/Http.hs b/pkg/hs/urbit-king/lib/Urbit/Vere/Http.hs similarity index 89% rename from pkg/hs/urbit-king/lib/Ur/Vere/Http.hs rename to pkg/hs/urbit-king/lib/Urbit/Vere/Http.hs index a90951687..51700a042 100644 --- a/pkg/hs/urbit-king/lib/Ur/Vere/Http.hs +++ b/pkg/hs/urbit-king/lib/Urbit/Vere/Http.hs @@ -2,11 +2,11 @@ HTTP Driver -} -module Ur.Vere.Http where +module Urbit.Vere.Http where import ClassyPrelude -import Ur.Arvo -import Ur.Noun +import Urbit.Arvo +import Urbit.Noun import qualified Data.CaseInsensitive as CI import qualified Network.HTTP.Types as HT diff --git a/pkg/hs/urbit-king/lib/Ur/Vere/Http/Client.hs b/pkg/hs/urbit-king/lib/Urbit/Vere/Http/Client.hs similarity index 94% rename from pkg/hs/urbit-king/lib/Ur/Vere/Http/Client.hs rename to pkg/hs/urbit-king/lib/Urbit/Vere/Http/Client.hs index 9e8f54263..23526467e 100644 --- a/pkg/hs/urbit-king/lib/Ur/Vere/Http/Client.hs +++ b/pkg/hs/urbit-king/lib/Urbit/Vere/Http/Client.hs @@ -5,15 +5,15 @@ already in use. -} -module Ur.Vere.Http.Client where +module Urbit.Vere.Http.Client where -import Ur.Arvo (BlipEv(..), Ev(..), HttpClientEf(..), - HttpClientEv(..), HttpClientReq(..), HttpEvent(..), - KingId, ResponseHeader(..)) -import Ur.Prelude hiding (Builder) -import Ur.Vere.Pier.Types +import Urbit.Arvo (BlipEv(..), Ev(..), HttpClientEf(..), + HttpClientEv(..), HttpClientReq(..), + HttpEvent(..), KingId, ResponseHeader(..)) +import Urbit.Prelude hiding (Builder) +import Urbit.Vere.Pier.Types -import Ur.Vere.Http +import Urbit.Vere.Http import qualified Data.Map as M import qualified Network.HTTP.Client as H diff --git a/pkg/hs/urbit-king/lib/Ur/Vere/Http/Server.hs b/pkg/hs/urbit-king/lib/Urbit/Vere/Http/Server.hs similarity index 98% rename from pkg/hs/urbit-king/lib/Ur/Vere/Http/Server.hs rename to pkg/hs/urbit-king/lib/Urbit/Vere/Http/Server.hs index 06d5f2a7c..c788818bf 100644 --- a/pkg/hs/urbit-king/lib/Ur/Vere/Http/Server.hs +++ b/pkg/hs/urbit-king/lib/Urbit/Vere/Http/Server.hs @@ -24,21 +24,21 @@ {-# OPTIONS_GHC -Wwarn #-} -module Ur.Vere.Http.Server where +module Urbit.Vere.Http.Server where import Data.Conduit -import Ur.Arvo hiding (ServerId, reqBody, reqUrl, secure) -import Ur.King.Config -import Ur.Noun -import Ur.Prelude hiding (Builder) -import Ur.Vere.Pier.Types +import Urbit.Arvo hiding (ServerId, reqBody, reqUrl, secure) +import Urbit.King.Config +import Urbit.Noun +import Urbit.Prelude hiding (Builder) +import Urbit.Vere.Pier.Types import Data.Binary.Builder (Builder, fromByteString) import Data.Bits (shiftL, (.|.)) import Network.Socket (SockAddr(..)) import System.Directory (doesFileExist, removeFile) import System.Random (randomIO) -import Ur.Vere.Http (convertHeaders, unconvertHeaders) +import Urbit.Vere.Http (convertHeaders, unconvertHeaders) import qualified Network.HTTP.Types as H import qualified Network.Socket as Net diff --git a/pkg/hs/urbit-king/lib/Ur/Vere/LMDB.hs b/pkg/hs/urbit-king/lib/Urbit/Vere/LMDB.hs similarity index 99% rename from pkg/hs/urbit-king/lib/Ur/Vere/LMDB.hs rename to pkg/hs/urbit-king/lib/Urbit/Vere/LMDB.hs index 065fa75e8..8e544647b 100644 --- a/pkg/hs/urbit-king/lib/Ur/Vere/LMDB.hs +++ b/pkg/hs/urbit-king/lib/Urbit/Vere/LMDB.hs @@ -2,15 +2,15 @@ Low-Level Inferface for LMDB Event Log. -} -module Ur.Vere.LMDB where +module Urbit.Vere.LMDB where -import Ur.Prelude hiding (init) +import Urbit.Prelude hiding (init) import Data.RAcquire import Database.LMDB.Raw import Foreign.Marshal.Alloc import Foreign.Ptr -import Ur.Vere.Pier.Types +import Urbit.Vere.Pier.Types import Foreign.Storable (peek, poke, sizeOf) diff --git a/pkg/hs/urbit-king/lib/Ur/Vere/LockFile.hs b/pkg/hs/urbit-king/lib/Urbit/Vere/LockFile.hs similarity index 92% rename from pkg/hs/urbit-king/lib/Ur/Vere/LockFile.hs rename to pkg/hs/urbit-king/lib/Urbit/Vere/LockFile.hs index dc8b40c93..aeaa8f325 100644 --- a/pkg/hs/urbit-king/lib/Ur/Vere/LockFile.hs +++ b/pkg/hs/urbit-king/lib/Urbit/Vere/LockFile.hs @@ -2,9 +2,9 @@ Acquire and release the vere lockfile. -} -module Ur.Vere.LockFile (lockFile) where +module Urbit.Vere.LockFile (lockFile) where -import Ur.Prelude +import Urbit.Prelude import Data.Default (def) import RIO.Directory (createDirectoryIfMissing) diff --git a/pkg/hs/urbit-king/lib/Ur/Vere/Log.hs b/pkg/hs/urbit-king/lib/Urbit/Vere/Log.hs similarity index 97% rename from pkg/hs/urbit-king/lib/Ur/Vere/Log.hs rename to pkg/hs/urbit-king/lib/Urbit/Vere/Log.hs index 1180bc4e6..cfa285dbf 100644 --- a/pkg/hs/urbit-king/lib/Ur/Vere/Log.hs +++ b/pkg/hs/urbit-king/lib/Urbit/Vere/Log.hs @@ -4,20 +4,20 @@ TODO Effects storage logic is messy. -} -module Ur.Vere.Log ( EventLog, identity, nextEv, lastEv - , new, existing - , streamEvents, appendEvents, trimEvents - , streamEffectsRows, writeEffectsRow - ) where +module Urbit.Vere.Log ( EventLog, identity, nextEv, lastEv + , new, existing + , streamEvents, appendEvents, trimEvents + , streamEffectsRows, writeEffectsRow + ) where -import Ur.Prelude hiding (init) +import Urbit.Prelude hiding (init) import Data.Conduit import Data.RAcquire import Database.LMDB.Raw import Foreign.Marshal.Alloc import Foreign.Ptr -import Ur.Vere.Pier.Types +import Urbit.Vere.Pier.Types import Foreign.Storable (peek, poke, sizeOf) diff --git a/pkg/hs/urbit-king/lib/Ur/Vere/NounServ.hs b/pkg/hs/urbit-king/lib/Urbit/Vere/NounServ.hs similarity index 99% rename from pkg/hs/urbit-king/lib/Ur/Vere/NounServ.hs rename to pkg/hs/urbit-king/lib/Urbit/Vere/NounServ.hs index 8e9d8c5cb..f82950da6 100644 --- a/pkg/hs/urbit-king/lib/Ur/Vere/NounServ.hs +++ b/pkg/hs/urbit-king/lib/Urbit/Vere/NounServ.hs @@ -2,7 +2,7 @@ Use websockets to pass nouns between a client and server. -} -module Ur.Vere.NounServ +module Urbit.Vere.NounServ ( Conn(..) , Server(..) , Client(..) @@ -14,7 +14,7 @@ module Ur.Vere.NounServ , wsConn ) where -import Ur.Prelude +import Urbit.Prelude import qualified Network.Wai.Handler.Warp as W import qualified Network.WebSockets as WS diff --git a/pkg/hs/urbit-king/lib/Ur/Vere/Pier.hs b/pkg/hs/urbit-king/lib/Urbit/Vere/Pier.hs similarity index 93% rename from pkg/hs/urbit-king/lib/Ur/Vere/Pier.hs rename to pkg/hs/urbit-king/lib/Urbit/Vere/Pier.hs index 4480a6da7..ddf24aead 100644 --- a/pkg/hs/urbit-king/lib/Ur/Vere/Pier.hs +++ b/pkg/hs/urbit-king/lib/Urbit/Vere/Pier.hs @@ -6,39 +6,39 @@ This is the code that starts the IO drivers and deals with communication between the serf, the log, and the IO drivers. -} -module Ur.Vere.Pier +module Urbit.Vere.Pier ( booted, resumed, pier, runPersist, runCompute, generateBootSeq ) where -import Ur.Prelude +import Urbit.Prelude import System.Random -import Ur.Arvo -import Ur.King.Config -import Ur.Vere.Pier.Types +import Urbit.Arvo +import Urbit.King.Config +import Urbit.Vere.Pier.Types -import Data.Text (append) -import System.Posix.Files (ownerModes, setFileMode) -import Ur.King.App (HasConfigDir(..)) -import Ur.Vere.Ames (ames) -import Ur.Vere.Behn (behn) -import Ur.Vere.Clay (clay) -import Ur.Vere.Http.Client (client) -import Ur.Vere.Http.Server (serv) -import Ur.Vere.Log (EventLog) -import Ur.Vere.Serf (Serf, SerfState(..), doJob, sStderr) +import Data.Text (append) +import System.Posix.Files (ownerModes, setFileMode) +import Urbit.King.App (HasConfigDir(..)) +import Urbit.Vere.Ames (ames) +import Urbit.Vere.Behn (behn) +import Urbit.Vere.Clay (clay) +import Urbit.Vere.Http.Client (client) +import Urbit.Vere.Http.Server (serv) +import Urbit.Vere.Log (EventLog) +import Urbit.Vere.Serf (Serf, SerfState(..), doJob, sStderr) import RIO.Directory import qualified System.Console.Terminal.Size as TSize import qualified System.Entropy as Ent -import qualified Ur.King.API as King -import qualified Ur.Time as Time -import qualified Ur.Vere.Log as Log -import qualified Ur.Vere.Serf as Serf -import qualified Ur.Vere.Term as Term -import qualified Ur.Vere.Term.API as Term -import qualified Ur.Vere.Term.Demux as Term +import qualified Urbit.King.API as King +import qualified Urbit.Time as Time +import qualified Urbit.Vere.Log as Log +import qualified Urbit.Vere.Serf as Serf +import qualified Urbit.Vere.Term as Term +import qualified Urbit.Vere.Term.API as Term +import qualified Urbit.Vere.Term.Demux as Term -------------------------------------------------------------------------------- diff --git a/pkg/hs/urbit-king/lib/Ur/Vere/Pier/Types.hs b/pkg/hs/urbit-king/lib/Urbit/Vere/Pier/Types.hs similarity index 96% rename from pkg/hs/urbit-king/lib/Ur/Vere/Pier/Types.hs rename to pkg/hs/urbit-king/lib/Urbit/Vere/Pier/Types.hs index ab03712f6..eaa8df10d 100644 --- a/pkg/hs/urbit-king/lib/Ur/Vere/Pier/Types.hs +++ b/pkg/hs/urbit-king/lib/Urbit/Vere/Pier/Types.hs @@ -3,12 +3,12 @@ TODO Most of these could probably find better homes. -} -module Ur.Vere.Pier.Types where +module Urbit.Vere.Pier.Types where -import Ur.Prelude hiding (Term) +import Urbit.Prelude hiding (Term) -import Ur.Arvo -import Ur.Time +import Urbit.Arvo +import Urbit.Time -- Avoid touching Nock values. ------------------------------------------------- diff --git a/pkg/hs/urbit-king/lib/Ur/Vere/Serf.hs b/pkg/hs/urbit-king/lib/Urbit/Vere/Serf.hs similarity index 97% rename from pkg/hs/urbit-king/lib/Ur/Vere/Serf.hs rename to pkg/hs/urbit-king/lib/Urbit/Vere/Serf.hs index 328c7c0ba..6462df6e5 100644 --- a/pkg/hs/urbit-king/lib/Ur/Vere/Serf.hs +++ b/pkg/hs/urbit-king/lib/Urbit/Vere/Serf.hs @@ -6,20 +6,20 @@ TODO: `recvLen` is not big-endian safe. -} -module Ur.Vere.Serf ( Serf, sStderr, SerfState(..), doJob - , run, shutdown, kill - , replay, bootFromSeq, snapshot - , collectFX - , Config(..), Flags, Flag(..) - ) where +module Urbit.Vere.Serf ( Serf, sStderr, SerfState(..), doJob + , run, shutdown, kill + , replay, bootFromSeq, snapshot + , collectFX + , Config(..), Flags, Flag(..) + ) where -import Ur.Prelude +import Urbit.Prelude import Data.Conduit import System.Process import System.ProgressBar -import Ur.Arvo -import Ur.Vere.Pier.Types +import Urbit.Arvo +import Urbit.Vere.Pier.Types import Data.Bits (setBit) import Data.ByteString (hGet) @@ -35,8 +35,8 @@ import qualified Data.ByteString.Unsafe as BS import qualified Data.Text as T import qualified System.IO as IO import qualified System.IO.Error as IO -import qualified Ur.Time as Time -import qualified Ur.Vere.Log as Log +import qualified Urbit.Time as Time +import qualified Urbit.Vere.Log as Log -- Serf Config ----------------------------------------------------------------- diff --git a/pkg/hs/urbit-king/lib/Ur/Vere/Term.hs b/pkg/hs/urbit-king/lib/Urbit/Vere/Term.hs similarity index 97% rename from pkg/hs/urbit-king/lib/Ur/Vere/Term.hs rename to pkg/hs/urbit-king/lib/Urbit/Vere/Term.hs index b019bb504..64578b911 100644 --- a/pkg/hs/urbit-king/lib/Ur/Vere/Term.hs +++ b/pkg/hs/urbit-king/lib/Urbit/Vere/Term.hs @@ -1,7 +1,7 @@ {-| Terminal Driver -} -module Ur.Vere.Term +module Urbit.Vere.Term ( module Term , localClient , connectToRemote @@ -17,24 +17,24 @@ import Foreign.Storable import RIO.FilePath import System.Posix.IO import System.Posix.Terminal -import Ur.Arvo hiding (Term) -import Ur.King.Config -import Ur.Prelude hiding (getCurrentTime) -import Ur.Time -import Ur.Vere.Pier.Types +import Urbit.Arvo hiding (Term) +import Urbit.King.Config +import Urbit.Prelude hiding (getCurrentTime) +import Urbit.Time +import Urbit.Vere.Pier.Types -import Data.List ((!!)) -import RIO.Directory (createDirectoryIfMissing) -import Ur.King.API (readPortsFile) -import Ur.King.App (HasConfigDir(..)) -import Ur.Vere.Term.API (Client(Client)) +import Data.List ((!!)) +import RIO.Directory (createDirectoryIfMissing) +import Urbit.King.API (readPortsFile) +import Urbit.King.App (HasConfigDir(..)) +import Urbit.Vere.Term.API (Client(Client)) import qualified Data.ByteString.Internal as BS import qualified Data.ByteString.UTF8 as BS import qualified System.Console.Terminal.Size as TSize import qualified System.Console.Terminfo.Base as T -import qualified Ur.Vere.NounServ as Serv -import qualified Ur.Vere.Term.API as Term +import qualified Urbit.Vere.NounServ as Serv +import qualified Urbit.Vere.Term.API as Term -- Types ----------------------------------------------------------------------- diff --git a/pkg/hs/urbit-king/lib/Ur/Vere/Term/API.hs b/pkg/hs/urbit-king/lib/Urbit/Vere/Term/API.hs similarity index 85% rename from pkg/hs/urbit-king/lib/Ur/Vere/Term/API.hs rename to pkg/hs/urbit-king/lib/Urbit/Vere/Term/API.hs index 712e9151e..0d38b8ffd 100644 --- a/pkg/hs/urbit-king/lib/Ur/Vere/Term/API.hs +++ b/pkg/hs/urbit-king/lib/Urbit/Vere/Term/API.hs @@ -1,11 +1,11 @@ {-| Interface Terminal API. -} -module Ur.Vere.Term.API (Ev(..), Client(..), trace, spin, stopSpin) where +module Urbit.Vere.Term.API (Ev(..), Client(..), trace, spin, stopSpin) where -import Ur.Prelude hiding (trace) +import Urbit.Prelude hiding (trace) -import Ur.Arvo (Belt, Blit) +import Urbit.Arvo (Belt, Blit) -- External Types -------------------------------------------------------------- diff --git a/pkg/hs/urbit-king/lib/Ur/Vere/Term/Demux.hs b/pkg/hs/urbit-king/lib/Urbit/Vere/Term/Demux.hs similarity index 90% rename from pkg/hs/urbit-king/lib/Ur/Vere/Term/Demux.hs rename to pkg/hs/urbit-king/lib/Urbit/Vere/Term/Demux.hs index a898004f6..5a7bd23e2 100644 --- a/pkg/hs/urbit-king/lib/Ur/Vere/Term/Demux.hs +++ b/pkg/hs/urbit-king/lib/Urbit/Vere/Term/Demux.hs @@ -4,15 +4,15 @@ given full event history since the creation of the demuxer. -} -module Ur.Vere.Term.Demux (Demux, mkDemux, addDemux, useDemux) where +module Urbit.Vere.Term.Demux (Demux, mkDemux, addDemux, useDemux) where -import Ur.Prelude +import Urbit.Prelude -import Ur.Arvo (Belt) -import Ur.Vere.Term.API (Client(Client)) +import Urbit.Arvo (Belt) +import Urbit.Vere.Term.API (Client(Client)) -import qualified Ur.Vere.Term.API as Term -import qualified Ur.Vere.Term.Logic as Logic +import qualified Urbit.Vere.Term.API as Term +import qualified Urbit.Vere.Term.Logic as Logic -- External -------------------------------------------------------------------- diff --git a/pkg/hs/urbit-king/lib/Ur/Vere/Term/Logic.hs b/pkg/hs/urbit-king/lib/Urbit/Vere/Term/Logic.hs similarity index 95% rename from pkg/hs/urbit-king/lib/Ur/Vere/Term/Logic.hs rename to pkg/hs/urbit-king/lib/Urbit/Vere/Term/Logic.hs index 4cdb42638..8e739b88a 100644 --- a/pkg/hs/urbit-king/lib/Ur/Vere/Term/Logic.hs +++ b/pkg/hs/urbit-king/lib/Urbit/Vere/Term/Logic.hs @@ -2,7 +2,7 @@ Tracks terminal state so that new terminal connections can be brought up to speed. -} -module Ur.Vere.Term.Logic +module Urbit.Vere.Term.Logic ( SpinnerCause(..), St, Ev(..), Ef(..) , init , step @@ -11,12 +11,12 @@ module Ur.Vere.Term.Logic , toTermEv ) where -import Ur.Prelude hiding (init) +import Urbit.Prelude hiding (init) import Data.Sequence (Seq((:<|))) -import qualified Ur.Arvo as Arvo -import qualified Ur.Vere.Term.API as Term +import qualified Urbit.Arvo as Arvo +import qualified Urbit.Vere.Term.API as Term -------------------------------------------------------------------------------- diff --git a/pkg/hs/urbit-king/test/AmesTests.hs b/pkg/hs/urbit-king/test/AmesTests.hs index 90600accf..f94c42074 100644 --- a/pkg/hs/urbit-king/test/AmesTests.hs +++ b/pkg/hs/urbit-king/test/AmesTests.hs @@ -7,21 +7,21 @@ import Test.QuickCheck hiding ((.&.)) import Test.Tasty import Test.Tasty.QuickCheck import Test.Tasty.TH -import Ur.Arvo -import Ur.King.Config -import Ur.Noun -import Ur.Prelude -import Ur.Time -import Ur.Vere.Ames -import Ur.Vere.Log -import Ur.Vere.Pier.Types +import Urbit.Arvo +import Urbit.King.Config +import Urbit.Noun +import Urbit.Prelude +import Urbit.Time +import Urbit.Vere.Ames +import Urbit.Vere.Log +import Urbit.Vere.Pier.Types import Control.Concurrent (runInBoundThread) import Data.LargeWord (LargeKey(..)) import GHC.Natural (Natural) import Network.Socket (tupleToHostAddress) -import qualified Ur.Vere.Log as Log +import qualified Urbit.Vere.Log as Log -- Utils ----------------------------------------------------------------------- diff --git a/pkg/hs/urbit-king/test/ArvoTests.hs b/pkg/hs/urbit-king/test/ArvoTests.hs index 6c8bf1b12..7dac215a3 100644 --- a/pkg/hs/urbit-king/test/ArvoTests.hs +++ b/pkg/hs/urbit-king/test/ArvoTests.hs @@ -9,18 +9,18 @@ import Test.QuickCheck hiding ((.&.)) import Test.Tasty import Test.Tasty.QuickCheck import Test.Tasty.TH -import Ur.Arvo -import Ur.Prelude -import Ur.Time -import Ur.Vere.Log -import Ur.Vere.Pier.Types +import Urbit.Arvo +import Urbit.Prelude +import Urbit.Time +import Urbit.Vere.Log +import Urbit.Vere.Pier.Types import Control.Concurrent (runInBoundThread, threadDelay) import Data.LargeWord (LargeKey(..)) import GHC.Natural (Natural) import Network.Socket (tupleToHostAddress) -import qualified Ur.Vere.Log as Log +import qualified Urbit.Vere.Log as Log -- Utils ----------------------------------------------------------------------- diff --git a/pkg/hs/urbit-king/test/BehnTests.hs b/pkg/hs/urbit-king/test/BehnTests.hs index ae39fe750..11b48ce48 100644 --- a/pkg/hs/urbit-king/test/BehnTests.hs +++ b/pkg/hs/urbit-king/test/BehnTests.hs @@ -8,22 +8,22 @@ import Test.QuickCheck hiding ((.&.)) import Test.Tasty import Test.Tasty.QuickCheck import Test.Tasty.TH -import Ur.Arvo -import Ur.Noun -import Ur.Prelude -import Ur.Time -import Ur.Vere.Behn -import Ur.Vere.Log -import Ur.Vere.Pier.Types +import Urbit.Arvo +import Urbit.Noun +import Urbit.Prelude +import Urbit.Time +import Urbit.Vere.Behn +import Urbit.Vere.Log +import Urbit.Vere.Pier.Types import Control.Concurrent (runInBoundThread, threadDelay) import Data.LargeWord (LargeKey(..)) import GHC.Natural (Natural) import Network.Socket (tupleToHostAddress) -import Ur.King.App (runApp) +import Urbit.King.App (runApp) -import qualified Ur.Time as Time -import qualified Ur.Vere.Log as Log +import qualified Urbit.Time as Time +import qualified Urbit.Vere.Log as Log -------------------------------------------------------------------------------- diff --git a/pkg/hs/urbit-king/test/ClayTests.hs b/pkg/hs/urbit-king/test/ClayTests.hs index 40ed94ed8..a6afc7f7e 100644 --- a/pkg/hs/urbit-king/test/ClayTests.hs +++ b/pkg/hs/urbit-king/test/ClayTests.hs @@ -1,7 +1,7 @@ module ClayTests (tests) where -import Ur.Noun.Conversions -import Ur.Prelude +import Urbit.Noun.Conversions +import Urbit.Prelude import Test.QuickCheck hiding ((.&.)) import Test.Tasty diff --git a/pkg/hs/urbit-king/test/DawnTests.hs b/pkg/hs/urbit-king/test/DawnTests.hs index d7748e761..eb8d8e201 100644 --- a/pkg/hs/urbit-king/test/DawnTests.hs +++ b/pkg/hs/urbit-king/test/DawnTests.hs @@ -1,14 +1,14 @@ module DawnTests (tests) where -import Ur.Arvo.Event -import Ur.Noun.Conversions -import Ur.Prelude +import Urbit.Arvo.Event +import Urbit.Noun.Conversions +import Urbit.Prelude import Test.Tasty import Test.Tasty.HUnit -import qualified Ur.Vere.Dawn as Dawn -import qualified Urbit.Ob as Ob +import qualified Urbit.Ob as Ob +import qualified Urbit.Vere.Dawn as Dawn -------------------------------------------------------------------------------- diff --git a/pkg/hs/urbit-king/test/DeriveNounTests.hs b/pkg/hs/urbit-king/test/DeriveNounTests.hs index 98deab107..1cb43abf5 100644 --- a/pkg/hs/urbit-king/test/DeriveNounTests.hs +++ b/pkg/hs/urbit-king/test/DeriveNounTests.hs @@ -7,15 +7,15 @@ import Test.QuickCheck hiding ((.&.)) import Test.Tasty import Test.Tasty.QuickCheck import Test.Tasty.TH -import Ur.Prelude -import Ur.Vere.Log -import Ur.Vere.Pier.Types +import Urbit.Prelude +import Urbit.Vere.Log +import Urbit.Vere.Pier.Types import Control.Concurrent (runInBoundThread, threadDelay) import Data.LargeWord (LargeKey(..)) import GHC.Natural (Natural) -import qualified Ur.Vere.Log as Log +import qualified Urbit.Vere.Log as Log -- Sum Types ------------------------------------------------------------------- diff --git a/pkg/hs/urbit-king/test/HoonMapSetTests.hs b/pkg/hs/urbit-king/test/HoonMapSetTests.hs index ab9290adb..f5b797a9a 100644 --- a/pkg/hs/urbit-king/test/HoonMapSetTests.hs +++ b/pkg/hs/urbit-king/test/HoonMapSetTests.hs @@ -1,7 +1,7 @@ module HoonMapSetTests (tests) where import RIO.Directory -import Ur.Prelude hiding (encodeUtf8) +import Urbit.Prelude hiding (encodeUtf8) import Data.Text.Lazy.Encoding (encodeUtf8) import Numeric.Natural (Natural) diff --git a/pkg/hs/urbit-king/test/JamTests.hs b/pkg/hs/urbit-king/test/JamTests.hs index b7890efd3..fd6b688fd 100644 --- a/pkg/hs/urbit-king/test/JamTests.hs +++ b/pkg/hs/urbit-king/test/JamTests.hs @@ -1,10 +1,10 @@ module JamTests (tests) where -import Ur.Arvo.Event -import Ur.Noun.Conversions -import Ur.Noun.Cue -import Ur.Noun.Jam -import Ur.Prelude +import Urbit.Arvo.Event +import Urbit.Noun.Conversions +import Urbit.Noun.Cue +import Urbit.Noun.Jam +import Urbit.Prelude import GHC.Natural (Natural(..)) import Test.QuickCheck hiding ((.&.)) diff --git a/pkg/hs/urbit-king/test/LogTests.hs b/pkg/hs/urbit-king/test/LogTests.hs index 12c05da46..3e6509288 100644 --- a/pkg/hs/urbit-king/test/LogTests.hs +++ b/pkg/hs/urbit-king/test/LogTests.hs @@ -7,16 +7,16 @@ import Test.QuickCheck hiding ((.&.)) import Test.Tasty import Test.Tasty.QuickCheck import Test.Tasty.TH -import Ur.Prelude -import Ur.Vere.Log -import Ur.Vere.Pier.Types +import Urbit.Prelude +import Urbit.Vere.Log +import Urbit.Vere.Pier.Types import Control.Concurrent (runInBoundThread, threadDelay) import Data.LargeWord (LargeKey(..)) import GHC.Natural (Natural) -import Ur.King.App (App, runApp) +import Urbit.King.App (App, runApp) -import qualified Ur.Vere.Log as Log +import qualified Urbit.Vere.Log as Log -- Utils ----------------------------------------------------------------------- diff --git a/pkg/hs/urbit-king/test/NounConversionTests.hs b/pkg/hs/urbit-king/test/NounConversionTests.hs index 5d7e9dd64..901afbcb9 100644 --- a/pkg/hs/urbit-king/test/NounConversionTests.hs +++ b/pkg/hs/urbit-king/test/NounConversionTests.hs @@ -1,8 +1,8 @@ module NounConversionTests (tests) where -import Ur.Arvo.Event -import Ur.Noun.Conversions -import Ur.Prelude +import Urbit.Arvo.Event +import Urbit.Noun.Conversions +import Urbit.Prelude import Data.Maybe import Test.QuickCheck hiding ((.&.)) From 7383f051777d671ddc4e53e2a67a12263379f76e Mon Sep 17 00:00:00 2001 From: Benjamin Summers Date: Thu, 23 Jan 2020 21:34:21 -0800 Subject: [PATCH 3/3] Update scripts to point to `urbit-king`. --- .travis.yml | 4 ++-- sh/ci-tests | 2 +- sh/release-king-darwin-dynamic | 4 ++-- sh/release-king-linux64-dynamic | 4 ++-- sh/release-king-linux64-static | 2 +- sh/test | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 41cab9bd8..c6dcc83c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ jobs: install: - nix-env -iA cachix -f https://cachix.org/api/v1/install - - stack --no-terminal --install-ghc build king --only-dependencies + - stack --no-terminal --install-ghc build urbit-king --only-dependencies script: - cachix use urbit2 @@ -29,7 +29,7 @@ jobs: - sh/travis-install-stack install: - - stack --no-terminal --install-ghc build king --only-dependencies + - stack --no-terminal --install-ghc build urbit-king --only-dependencies script: - sh/release-king-darwin-dynamic diff --git a/sh/ci-tests b/sh/ci-tests index 7c03f9a9f..1ca8f1b3c 100755 --- a/sh/ci-tests +++ b/sh/ci-tests @@ -4,7 +4,7 @@ set -ex export STACK_YAML="`pwd`/pkg/hs/stack.yaml" -stack test king +stack test urbit-king if [ "$TRAVIS_PULL_REQUEST" = false ] then diff --git a/sh/release-king-darwin-dynamic b/sh/release-king-darwin-dynamic index ff319c778..e5e5416ca 100755 --- a/sh/release-king-darwin-dynamic +++ b/sh/release-king-darwin-dynamic @@ -18,12 +18,12 @@ mkdir -p release stack clean # Make sure we optimize -stack install king \ +stack install urbit-king \ --local-bin-path "`pwd`/release" \ --test --no-run-tests out="release/king-darwin-dynamic-$ver" -mv release/king "$out" +mv release/urbit-king "$out" otool -L "$out" diff --git a/sh/release-king-linux64-dynamic b/sh/release-king-linux64-dynamic index d5db458a2..183904b24 100755 --- a/sh/release-king-linux64-dynamic +++ b/sh/release-king-linux64-dynamic @@ -18,12 +18,12 @@ mkdir -p release stack clean # Make sure we optimize -stack install king \ +stack install urbit-king \ --local-bin-path "`pwd`/release" \ --test --no-run-tests out="release/king-linux64-dynamic-$ver" -mv release/king "$out" +mv release/urbit-king "$out" ldd "$out" diff --git a/sh/release-king-linux64-static b/sh/release-king-linux64-static index ae25a02e5..e8c32a329 100755 --- a/sh/release-king-linux64-static +++ b/sh/release-king-linux64-static @@ -20,6 +20,6 @@ popd out="release/king-linux64-static-$ver" -cp "$king"/bin/king "$out" +cp "$king"/bin/urbit-king "$out" ldd "$out" diff --git a/sh/test b/sh/test index f94e5d285..dac77b5a8 100755 --- a/sh/test +++ b/sh/test @@ -2,7 +2,7 @@ set -e -stack test king --fast +stack test urbit-king --fast pkg=$(nix-build nix/ops -A test --no-out-link "$@")