From bde456b8b564fa3086c08508063ec5ff170be47f Mon Sep 17 00:00:00 2001 From: David Smith Date: Tue, 11 Dec 2018 13:08:35 +0000 Subject: [PATCH 1/2] now builds using bazel --- .gitignore | 1 + BUILD.bazel | 8 ++++++++ WORKSPACE | 20 ++++++++++++++++++++ shell.nix | 16 ++++++++++++++++ 4 files changed, 45 insertions(+) create mode 100644 BUILD.bazel create mode 100644 WORKSPACE create mode 100644 shell.nix diff --git a/.gitignore b/.gitignore index 1b655e0..c2de9f3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *_doc/ *.ibc *~ +bazel-* diff --git a/BUILD.bazel b/BUILD.bazel new file mode 100644 index 0000000..9532688 --- /dev/null +++ b/BUILD.bazel @@ -0,0 +1,8 @@ +load("@rules_idris//idris:rules_idris.bzl", "idris_library") + +idris_library ( + name = "lightyear", + deps = ["@idris-effects//:effects"], + srcs = native.glob(["Lightyear.idr", "Lightyear/*.idr"]), + visibility = ["//visibility:public"], +) diff --git a/WORKSPACE b/WORKSPACE new file mode 100644 index 0000000..874c428 --- /dev/null +++ b/WORKSPACE @@ -0,0 +1,20 @@ +load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") +git_repository( + name = "rules_idris", + remote = "https://github.com/BryghtWords/rules_idris.git", + tag = "v0.3" +) + +load("@rules_idris//idris:idris_repos.bzl", "loadIdrisPackagerRepositories") + +loadIdrisPackagerRepositories() + +load("@rules_idris//idris:local_idris_loader.bzl", "loadIdris") + +loadIdris("/nix/store/iz7jahxg47hzhwapiwlc2xr2nqsixdkq-idris-1.3.1") + +git_repository( + name = "idris-effects", + remote = "https://github.com/shmish111/idris-effects.git", + commit = "89068f067085e8f342a8a7c8809a543fcffd3f5e", +) diff --git a/shell.nix b/shell.nix new file mode 100644 index 0000000..7191ff8 --- /dev/null +++ b/shell.nix @@ -0,0 +1,16 @@ +{ nixpkgs ? }: +let + pkgs = import (builtins.fetchTarball { + name = "nixos-unstable-2018-12-08"; + url = https://github.com/nixos/nixpkgs/archive/e85c1f586807b5acd244df4c45a5130aa3f0734d.tar.gz; + sha256 = "1xy1qgam0i2fyqhaczw0qrx8yv3hgdh9jp47wmln5ljiixr5ic5n"; + }) {}; + stdenv = pkgs.stdenv; + idrisWithPkgs = pkgs.idrisPackages.with-packages (with pkgs.idrisPackages; [ effects ]); +in +with pkgs; stdenv.mkDerivation { + name = "blodwen-shell-extras"; + buildInputs = [ + gmp idrisWithPkgs bazel + ]; +} From 9da02a121a17f0284ad2354fd809aea28847b6a8 Mon Sep 17 00:00:00 2001 From: David Smith Date: Tue, 11 Dec 2018 15:25:28 +0000 Subject: [PATCH 2/2] use smoke-hill for dependencies --- WORKSPACE | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 874c428..e6744c0 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -14,7 +14,9 @@ load("@rules_idris//idris:local_idris_loader.bzl", "loadIdris") loadIdris("/nix/store/iz7jahxg47hzhwapiwlc2xr2nqsixdkq-idris-1.3.1") git_repository( - name = "idris-effects", - remote = "https://github.com/shmish111/idris-effects.git", - commit = "89068f067085e8f342a8a7c8809a543fcffd3f5e", + name = "smoke-hill", + remote = "https://github.com/shmish111/smoke-hill.git", + commit = "73addb298b9b4d3cb7188c03627ff36ed16cd932", ) +load("@smoke-hill//:packages.bzl", "loadIdrisPackages") +loadIdrisPackages()