Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
argo
hnrm
Commits
efbc205b
Commit
efbc205b
authored
Jul 06, 2020
by
Valentin Reis
Browse files
[fix] Makefile fixes.
parent
95f48960
Pipeline
#10713
failed with stages
in 2 minutes and 37 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Makefile
View file @
efbc205b
...
...
@@ -52,7 +52,7 @@ dhrun/%:
let all = ./dev/dhrun/all-tests.dh
"../dev/dhrun/assets/"
"../hsnrm/resources/defaults/Cfg.dhall // { verbose=<Normal|Verbose|Debug>.Debug }"
"../hsnrm/resources/examples/"
"../hsnrm/resources/examples
-manifests
/"
in all.$*
'
...
...
@@ -160,7 +160,7 @@ ci:
done
'
ci
-
%
:
ci
/
%
:
@
nix-shell
--run
bash
<<<
'
gitlab-runner exec shell "$*"
'
...
...
hsnrm/Makefile
View file @
efbc205b
...
...
@@ -11,7 +11,7 @@ SHELL := $(shell which bash)
# https://github.com/NixOS/nix/issues/726#issuecomment-161215255
NIX_PATH
:=
nixpkgs
=
./.
all
:
hsnrm-extra/hsnrm-extra.cabal hsnrm-static/hsnrm-static.cabal hsnrm-bin/hsnrm-bin.cabal hsnrm/hsnrm.cabal
dist-newstyle/build/x86_64-linux/ghc-8.6.5/hsnrm-1.0.0/x/nrm.so/build/nrm.so/nrm.so
resources
all
:
hsnrm-extra/hsnrm-extra.cabal hsnrm-static/hsnrm-static.cabal hsnrm-bin/hsnrm-bin.cabal hsnrm/hsnrm.cabal
build
resources
dhall-to-cabal
:
../default.nix
rm
-rf
./dhall-to-cabal
...
...
@@ -34,9 +34,10 @@ dhall-to-cabal: ../default.nix
dhall-to-cabal --output-stdout <<< "./$*.dhall \"$$GHCDIR\" \"$$GHCVERSION\"" > $@
'
dist-newstyle/build/x86_64-linux/ghc-8.6.5/hsnrm-1.0.0/x/nrm.so/build/nrm.so/nrm.so
:
hsnrm/ hsnrm-bin/
.PHONY
:
build
build
:
hsnrm/ hsnrm-bin/
@
nix-shell
--pure
--run
bash
<<<
'
cabal v2-build hsnrm-bin
cabal v2-build hsnrm-bin
hsnrm-extra
'
resources
:
hsnrm/* hsnrm-bin/*
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment