Skip to content

Commit

Permalink
migrate from hslibdeps to nhm-tool [ci-skip]
Browse files Browse the repository at this point in the history
  • Loading branch information
@lyokha
lyokha committed Aug 25, 2023
1 parent ef77ec6 commit 0828bb0
Show file tree
Hide file tree
Showing 14 changed files with 14 additions and 28 deletions.
3 changes: 1 addition & 2 deletions test/Aggregate/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ all: $(DISTR)

$(DISTR): $(SRC)
cabal install --lib --only-dependencies --package-env .
cabal build $(PKGDISTR)
ifeq ($(INPLACE),1)
cabal build ngx-export-tools-extra
echo "package-db $$(pwd)/$(DISTV2DIR)/packagedb/ghc-$(GHCVER)" >> \
Expand All @@ -38,7 +37,7 @@ endif
--package-db=clear --package-db=global \
$$(sed -n 's/^\(package-db\)\s\+/--\1=/p' $(GHCENV)) \
--prefix=$(PREFIX)
hslibdeps -e | grep -v '.-e-ede-' >> $(GHCENV)
nhm-tool deps $(PKGNAME) >> $(GHCENV)
runhaskell --ghc-arg=-package=base \
--ghc-arg=-package=$(PKGDISTR) Setup.hs build \
--ghc-options="$(SRC) -o $(LIB) -ddump-splices $(LINKRTS)"
Expand Down
3 changes: 1 addition & 2 deletions test/Aggregate/README.md
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
##### Building and installation

The build tool requires Cabal, [*patchelf*](https://github.com/NixOS/patchelf),
[*hslibdeps*](https://github.com/lyokha/nginx-haskell-module/blob/master/utils/README.md#utility-hslibdeps),
and [*cabal-plan*](https://hackage.haskell.org/package/cabal-plan).
and utility *nhm-tool* which is shipped with package *ngx-export-distribution*.

```ShellSession
$ make
Expand Down
3 changes: 1 addition & 2 deletions test/EDE/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ all: $(DISTR)

$(DISTR): $(SRC)
cabal install --lib --only-dependencies --package-env .
cabal build $(PKGDISTR)
ifeq ($(INPLACE),1)
cabal build ngx-export-tools-extra
echo "package-db $$(pwd)/$(DISTV2DIR)/packagedb/ghc-$(GHCVER)" >> \
Expand All @@ -38,7 +37,7 @@ endif
--package-db=clear --package-db=global \
$$(sed -n 's/^\(package-db\)\s\+/--\1=/p' $(GHCENV)) \
--prefix=$(PREFIX)
hslibdeps -e | grep -v '.-e-ede-' >> $(GHCENV)
nhm-tool deps $(PKGNAME) >> $(GHCENV)
runhaskell --ghc-arg=-package=base \
--ghc-arg=-package=$(PKGDISTR) Setup.hs build \
--ghc-options="$(SRC) -o $(LIB) $(LINKRTS)"
Expand Down
3 changes: 1 addition & 2 deletions test/EDE/README.md
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
##### Building and installation

The build tool requires Cabal, [*patchelf*](https://github.com/NixOS/patchelf),
[*hslibdeps*](https://github.com/lyokha/nginx-haskell-module/blob/master/utils/README.md#utility-hslibdeps),
and [*cabal-plan*](https://hackage.haskell.org/package/cabal-plan).
and utility *nhm-tool* which is shipped with package *ngx-export-distribution*.

```ShellSession
$ make
Expand Down
3 changes: 1 addition & 2 deletions test/PCRE/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ all: $(DISTR)

$(DISTR): $(SRC)
cabal install --lib --only-dependencies --package-env .
cabal build $(PKGDISTR)
ifeq ($(INPLACE),1)
cabal build ngx-export-tools-extra
echo "package-db $$(pwd)/$(DISTV2DIR)/packagedb/ghc-$(GHCVER)" >> \
Expand All @@ -38,7 +37,7 @@ endif
--package-db=clear --package-db=global \
$$(sed -n 's/^\(package-db\)\s\+/--\1=/p' $(GHCENV)) \
--prefix=$(PREFIX)
hslibdeps -e | grep -v '.-e-ede-' >> $(GHCENV)
nhm-tool deps $(PKGNAME) >> $(GHCENV)
runhaskell --ghc-arg=-package=base \
--ghc-arg=-package=$(PKGDISTR) Setup.hs build \
--ghc-options="$(SRC) -o $(LIB) $(LINKRTS)"
Expand Down
3 changes: 1 addition & 2 deletions test/PCRE/README.md
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
##### Building and installation

The build tool requires Cabal, [*patchelf*](https://github.com/NixOS/patchelf),
[*hslibdeps*](https://github.com/lyokha/nginx-haskell-module/blob/master/utils/README.md#utility-hslibdeps),
and [*cabal-plan*](https://hackage.haskell.org/package/cabal-plan).
and utility *nhm-tool* which is shipped with package *ngx-export-distribution*.

```ShellSession
$ make
Expand Down
3 changes: 1 addition & 2 deletions test/Prometheus/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ all: $(DISTR)

$(DISTR): $(SRC)
cabal install --lib --only-dependencies --package-env .
cabal build $(PKGDISTR)
ifeq ($(INPLACE),1)
cabal build ngx-export-tools-extra
echo "package-db $$(pwd)/$(DISTV2DIR)/packagedb/ghc-$(GHCVER)" >> \
Expand All @@ -38,7 +37,7 @@ endif
--package-db=clear --package-db=global \
$$(sed -n 's/^\(package-db\)\s\+/--\1=/p' $(GHCENV)) \
--prefix=$(PREFIX)
hslibdeps -e | grep -v '.-e-ede-' >> $(GHCENV)
nhm-tool deps $(PKGNAME) >> $(GHCENV)
runhaskell --ghc-arg=-package=base \
--ghc-arg=-package=$(PKGDISTR) Setup.hs build \
--ghc-options="$(SRC) -o $(LIB) $(LINKRTS)"
Expand Down
3 changes: 1 addition & 2 deletions test/Prometheus/README.md
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
##### Building and installation

The build tool requires Cabal, [*patchelf*](https://github.com/NixOS/patchelf),
[*hslibdeps*](https://github.com/lyokha/nginx-haskell-module/blob/master/utils/README.md#utility-hslibdeps),
and [*cabal-plan*](https://hackage.haskell.org/package/cabal-plan).
and utility *nhm-tool* which is shipped with package *ngx-export-distribution*.

```ShellSession
$ make
Expand Down
3 changes: 1 addition & 2 deletions test/Resolve/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ all: $(DISTR)

$(DISTR): $(SRC)
cabal install --lib --only-dependencies --package-env .
cabal build $(PKGDISTR)
ifeq ($(INPLACE),1)
cabal build ngx-export-tools-extra
echo "package-db $$(pwd)/$(DISTV2DIR)/packagedb/ghc-$(GHCVER)" >> \
Expand All @@ -38,7 +37,7 @@ endif
--package-db=clear --package-db=global \
$$(sed -n 's/^\(package-db\)\s\+/--\1=/p' $(GHCENV)) \
--prefix=$(PREFIX)
hslibdeps -e | grep -v '.-e-ede-' >> $(GHCENV)
nhm-tool deps $(PKGNAME) >> $(GHCENV)
runhaskell --ghc-arg=-package=base \
--ghc-arg=-package=$(PKGDISTR) Setup.hs build \
--ghc-options="$(SRC) -o $(LIB) $(LINKRTS)"
Expand Down
3 changes: 1 addition & 2 deletions test/Resolve/README.md
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
##### Building and installation

The build tool requires Cabal, [*patchelf*](https://github.com/NixOS/patchelf),
[*hslibdeps*](https://github.com/lyokha/nginx-haskell-module/blob/master/utils/README.md#utility-hslibdeps),
and [*cabal-plan*](https://hackage.haskell.org/package/cabal-plan).
and utility *nhm-tool* which is shipped with package *ngx-export-distribution*.

```ShellSession
$ make
Expand Down
3 changes: 1 addition & 2 deletions test/ServiceHookAdaptor/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ all: $(DISTR)

$(DISTR): $(SRC)
cabal install --lib --only-dependencies --package-env .
cabal build $(PKGDISTR)
ifeq ($(INPLACE),1)
cabal build ngx-export-tools-extra
echo "package-db $$(pwd)/$(DISTV2DIR)/packagedb/ghc-$(GHCVER)" >> \
Expand All @@ -38,7 +37,7 @@ endif
--package-db=clear --package-db=global \
$$(sed -n 's/^\(package-db\)\s\+/--\1=/p' $(GHCENV)) \
--prefix=$(PREFIX)
hslibdeps -e | grep -v '.-e-ede-' >> $(GHCENV)
nhm-tool deps $(PKGNAME) >> $(GHCENV)
runhaskell --ghc-arg=-package=base \
--ghc-arg=-package=$(PKGDISTR) Setup.hs build \
--ghc-options="$(SRC) -o $(LIB) $(LINKRTS)"
Expand Down
3 changes: 1 addition & 2 deletions test/ServiceHookAdaptor/README.md
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
##### Building and installation

The build tool requires Cabal, [*patchelf*](https://github.com/NixOS/patchelf),
[*hslibdeps*](https://github.com/lyokha/nginx-haskell-module/blob/master/utils/README.md#utility-hslibdeps),
and [*cabal-plan*](https://hackage.haskell.org/package/cabal-plan).
and utility *nhm-tool* which is shipped with package *ngx-export-distribution*.

```ShellSession
$ make
Expand Down
3 changes: 1 addition & 2 deletions test/Subrequest/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ all: $(DISTR)

$(DISTR): $(SRC)
cabal install --lib --only-dependencies --package-env .
cabal build $(PKGDISTR)
ifeq ($(INPLACE),1)
cabal build ngx-export-tools-extra
echo "package-db $$(pwd)/$(DISTV2DIR)/packagedb/ghc-$(GHCVER)" >> \
Expand All @@ -38,7 +37,7 @@ endif
--package-db=clear --package-db=global \
$$(sed -n 's/^\(package-db\)\s\+/--\1=/p' $(GHCENV)) \
--prefix=$(PREFIX)
hslibdeps -e | grep -v '.-e-ede-' >> $(GHCENV)
nhm-tool deps $(PKGNAME) >> $(GHCENV)
runhaskell --ghc-arg=-package=base \
--ghc-arg=-package=$(PKGDISTR) Setup.hs build \
--ghc-options="$(SRC) -o $(LIB) $(LINKRTS)"
Expand Down
3 changes: 1 addition & 2 deletions test/Subrequest/README.md
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
##### Building and installation

The build tool requires Cabal, [*patchelf*](https://github.com/NixOS/patchelf),
[*hslibdeps*](https://github.com/lyokha/nginx-haskell-module/blob/master/utils/README.md#utility-hslibdeps),
and [*cabal-plan*](https://hackage.haskell.org/package/cabal-plan).
and utility *nhm-tool* which is shipped with package *ngx-export-distribution*.

```ShellSession
$ make
Expand Down

0 comments on commit 0828bb0

Please sign in to comment.