From c995c96437f4ef6bd2d09b115e1f4750ea842a8f Mon Sep 17 00:00:00 2001 From: Erik Post Date: Fri, 30 Aug 2019 15:44:12 +0200 Subject: [PATCH] Make subprojects depend on central /packages.dhall file. #198 --- .../packages.dhall | 9 ----- halogen-petrinet-editor-example/spago.dhall | 2 +- halogen-petrinet-editor/packages.dhall | 14 -------- halogen-petrinet-editor/spago.dhall | 2 +- packages.dhall | 35 +++++++++++++++++++ stbx-client-rest/packages.dhall | 8 ----- stbx-client-rest/spago.dhall | 2 +- stbx-core/packages.dhall | 8 ----- stbx-core/spago.dhall | 2 +- stbx-example-data/packages.dhall | 10 ------ stbx-example-data/spago.dhall | 2 +- stbx-service-rest/packages.dhall | 26 -------------- stbx-service-rest/spago.dhall | 2 +- studio-common/packages.dhall | 8 ----- studio-common/spago.dhall | 2 +- studio/packages.dhall | 21 ----------- studio/spago.dhall | 2 +- 17 files changed, 43 insertions(+), 112 deletions(-) delete mode 100644 halogen-petrinet-editor-example/packages.dhall delete mode 100644 halogen-petrinet-editor/packages.dhall create mode 100644 packages.dhall delete mode 100644 stbx-client-rest/packages.dhall delete mode 100644 stbx-core/packages.dhall delete mode 100644 stbx-example-data/packages.dhall delete mode 100644 stbx-service-rest/packages.dhall delete mode 100644 studio-common/packages.dhall delete mode 100644 studio/packages.dhall diff --git a/halogen-petrinet-editor-example/packages.dhall b/halogen-petrinet-editor-example/packages.dhall deleted file mode 100644 index 4ea07534..00000000 --- a/halogen-petrinet-editor-example/packages.dhall +++ /dev/null @@ -1,9 +0,0 @@ -let upstream = - https://github.com/purescript/package-sets/releases/download/psc-0.13.3-20190818/packages.dhall sha256:c95c4a8b8033a48a350106b759179f68a695c7ea2208228c522866fd43814dc8 - -let overrides = - { halogen-petrinet-editor = ../halogen-petrinet-editor/spago.dhall as Location } - -let additions = ../halogen-petrinet-editor/packages.dhall - -in upstream // overrides // additions diff --git a/halogen-petrinet-editor-example/spago.dhall b/halogen-petrinet-editor-example/spago.dhall index 5f2083f3..226883f4 100644 --- a/halogen-petrinet-editor-example/spago.dhall +++ b/halogen-petrinet-editor-example/spago.dhall @@ -11,7 +11,7 @@ , "studio-common" ] , packages = - ./packages.dhall + ../packages.dhall , sources = [ "src/**/*.purs", "test/**/*.purs" ] } diff --git a/halogen-petrinet-editor/packages.dhall b/halogen-petrinet-editor/packages.dhall deleted file mode 100644 index 6e8cb131..00000000 --- a/halogen-petrinet-editor/packages.dhall +++ /dev/null @@ -1,14 +0,0 @@ -let upstream = - https://github.com/purescript/package-sets/releases/download/psc-0.13.3-20190818/packages.dhall sha256:c95c4a8b8033a48a350106b759179f68a695c7ea2208228c522866fd43814dc8 - -let overrides = { studio-common = ../studio-common/spago.dhall as Location } - -let additions = - { halogen-svg = - { dependencies = [ "prelude", "halogen", "strings", "web-uievents", "effect" ] - , repo = "https://github.com/statebox/purescript-halogen-svg.git" - , version = "d0a4cbc79b5513296cb746576824dce967aedbab" - } - } - -in upstream // overrides // additions diff --git a/halogen-petrinet-editor/spago.dhall b/halogen-petrinet-editor/spago.dhall index bb3a8221..83320c2f 100644 --- a/halogen-petrinet-editor/spago.dhall +++ b/halogen-petrinet-editor/spago.dhall @@ -11,5 +11,5 @@ , "studio-common" ] , packages = - ./packages.dhall + ../packages.dhall } diff --git a/packages.dhall b/packages.dhall new file mode 100644 index 00000000..d724bf97 --- /dev/null +++ b/packages.dhall @@ -0,0 +1,35 @@ +let upstream = + https://github.com/purescript/package-sets/releases/download/psc-0.13.3-20190818/packages.dhall sha256:c95c4a8b8033a48a350106b759179f68a695c7ea2208228c522866fd43814dc8 + +let overrides = {=} + +let additions = + { stbx-core = ./stbx-core/spago.dhall as Location + , stbx-client-rest = ./stbx-client-rest/spago.dhall as Location + , stbx-example-data = ./stbx-example-data/spago.dhall as Location + , studio-common = ./studio-common/spago.dhall as Location + , halogen-petrinet-editor = ./halogen-petrinet-editor/spago.dhall as Location + , halogen-tree-menu = ./halogen-tree-menu/spago.dhall as Location + , pnpro = ./pnpro/spago.dhall as Location + , halogen-svg = + { dependencies = [ "prelude", "halogen", "strings", "web-uievents", "effect" ] + , repo = "https://github.com/statebox/purescript-halogen-svg.git" + , version = "d0a4cbc79b5513296cb746576824dce967aedbab" + } + , express = + { dependencies = + [ "aff" + , "effect" + , "console" + , "foreign" + , "foreign-generic" + , "node-http" + , "psci-support" + , "test-unit" + ] + , repo = "https://github.com/nkly/purescript-express.git" + , version = "v0.8.0" + } + } + +in upstream // overrides // additions diff --git a/stbx-client-rest/packages.dhall b/stbx-client-rest/packages.dhall deleted file mode 100644 index 3d74ddae..00000000 --- a/stbx-client-rest/packages.dhall +++ /dev/null @@ -1,8 +0,0 @@ -let upstream = - https://github.com/purescript/package-sets/releases/download/psc-0.13.3-20190818/packages.dhall sha256:c95c4a8b8033a48a350106b759179f68a695c7ea2208228c522866fd43814dc8 - -let overrides = {=} - -let additions = { stbx-core = ../stbx-core/spago.dhall as Location } - -in upstream // overrides // additions diff --git a/stbx-client-rest/spago.dhall b/stbx-client-rest/spago.dhall index 7d4dbd38..51bfbca5 100644 --- a/stbx-client-rest/spago.dhall +++ b/stbx-client-rest/spago.dhall @@ -13,5 +13,5 @@ , "stbx-core" ] , packages = - ./packages.dhall + ../packages.dhall } diff --git a/stbx-core/packages.dhall b/stbx-core/packages.dhall deleted file mode 100644 index 55ad0395..00000000 --- a/stbx-core/packages.dhall +++ /dev/null @@ -1,8 +0,0 @@ -let upstream = - https://github.com/purescript/package-sets/releases/download/psc-0.13.3-20190818/packages.dhall sha256:c95c4a8b8033a48a350106b759179f68a695c7ea2208228c522866fd43814dc8 - -let overrides = {=} - -let additions = {=} - -in upstream // overrides // additions diff --git a/stbx-core/spago.dhall b/stbx-core/spago.dhall index a1cc3eb4..e82b1854 100644 --- a/stbx-core/spago.dhall +++ b/stbx-core/spago.dhall @@ -15,5 +15,5 @@ , "spec" ] , packages = - ./packages.dhall + ../packages.dhall } diff --git a/stbx-example-data/packages.dhall b/stbx-example-data/packages.dhall deleted file mode 100644 index c62826e3..00000000 --- a/stbx-example-data/packages.dhall +++ /dev/null @@ -1,10 +0,0 @@ -let upstream = - https://github.com/purescript/package-sets/releases/download/psc-0.13.3-20190818/packages.dhall sha256:c95c4a8b8033a48a350106b759179f68a695c7ea2208228c522866fd43814dc8 - -let overrides = {=} - -let additions = - { stbx-core = ../stbx-core/spago.dhall as Location - } - -in upstream // overrides // additions diff --git a/stbx-example-data/spago.dhall b/stbx-example-data/spago.dhall index 080d1734..704beea6 100644 --- a/stbx-example-data/spago.dhall +++ b/stbx-example-data/spago.dhall @@ -3,5 +3,5 @@ , dependencies = [ "stbx-core" ] , packages = - ./packages.dhall + ../packages.dhall } diff --git a/stbx-service-rest/packages.dhall b/stbx-service-rest/packages.dhall deleted file mode 100644 index a9d85e7b..00000000 --- a/stbx-service-rest/packages.dhall +++ /dev/null @@ -1,26 +0,0 @@ -let upstream = - https://github.com/purescript/package-sets/releases/download/psc-0.13.3-20190818/packages.dhall sha256:c95c4a8b8033a48a350106b759179f68a695c7ea2208228c522866fd43814dc8 - -let overrides = {=} - -let additions = - { stbx-core = ../stbx-core/spago.dhall as Location - , stbx-client-rest = ../stbx-client-rest/spago.dhall as Location - , stbx-example-data = ../stbx-example-data/spago.dhall as Location - , express = - { dependencies = - [ "aff" - , "effect" - , "console" - , "foreign" - , "foreign-generic" - , "node-http" - , "psci-support" - , "test-unit" - ] - , repo = "https://github.com/nkly/purescript-express.git" - , version = "v0.8.0" - } - } - -in upstream // overrides // additions diff --git a/stbx-service-rest/spago.dhall b/stbx-service-rest/spago.dhall index 8b135146..6c7f9e1d 100644 --- a/stbx-service-rest/spago.dhall +++ b/stbx-service-rest/spago.dhall @@ -14,5 +14,5 @@ , "stbx-example-data" ] , packages = - ./packages.dhall + ../packages.dhall } diff --git a/studio-common/packages.dhall b/studio-common/packages.dhall deleted file mode 100644 index 55ad0395..00000000 --- a/studio-common/packages.dhall +++ /dev/null @@ -1,8 +0,0 @@ -let upstream = - https://github.com/purescript/package-sets/releases/download/psc-0.13.3-20190818/packages.dhall sha256:c95c4a8b8033a48a350106b759179f68a695c7ea2208228c522866fd43814dc8 - -let overrides = {=} - -let additions = {=} - -in upstream // overrides // additions diff --git a/studio-common/spago.dhall b/studio-common/spago.dhall index bbc960d7..6b90cd94 100644 --- a/studio-common/spago.dhall +++ b/studio-common/spago.dhall @@ -3,7 +3,7 @@ , dependencies = [ "effect", "console", "psci-support" ] , packages = - ./packages.dhall + ../packages.dhall , sources = [ "src/**/*.purs", "test/**/*.purs" ] } diff --git a/studio/packages.dhall b/studio/packages.dhall deleted file mode 100644 index 8be14e16..00000000 --- a/studio/packages.dhall +++ /dev/null @@ -1,21 +0,0 @@ -let upstream = - https://github.com/purescript/package-sets/releases/download/psc-0.13.3-20190818/packages.dhall sha256:c95c4a8b8033a48a350106b759179f68a695c7ea2208228c522866fd43814dc8 - -let overrides = - { stbx-core = ../stbx-core/spago.dhall as Location - , stbx-client-rest = ../stbx-client-rest/spago.dhall as Location - , studio-common = ../studio-common/spago.dhall as Location - , halogen-petrinet-editor = ../halogen-petrinet-editor/spago.dhall as Location - , halogen-tree-menu = ../halogen-tree-menu/spago.dhall as Location - , pnpro = ../pnpro/spago.dhall as Location - } - -let additions = - { halogen-svg = - { dependencies = [ "prelude", "halogen", "strings", "web-uievents", "effect" ] - , repo = "https://github.com/statebox/purescript-halogen-svg.git" - , version = "d0a4cbc79b5513296cb746576824dce967aedbab" - } - } - -in upstream // overrides // additions diff --git a/studio/spago.dhall b/studio/spago.dhall index 515924e2..4596c30c 100644 --- a/studio/spago.dhall +++ b/studio/spago.dhall @@ -25,5 +25,5 @@ , "web-uievents" ] , packages = - ./packages.dhall + ../packages.dhall }