Skip to content

Commit

Permalink
Nix: Update ligo reference to the one in nix pkgs
Browse files Browse the repository at this point in the history
  • Loading branch information
Laucans committed Dec 19, 2022
1 parent ff46602 commit 1bdb0ff
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 148 deletions.
135 changes: 6 additions & 129 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 0 additions & 6 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
dream2nix.url = "github:nix-community/dream2nix";
dream2nix.inputs.nixpkgs.follows = "nixpkgs";

ligo.url = "gitlab:ligolang/ligo";
tezos.url = "github:marigold-dev/tezos-nix";
tezos.inputs = {
nixpkgs.follows = "nixpkgs";
Expand All @@ -33,7 +32,6 @@
dream2nix,
tezos,
deploy-rs,
ligo,
treefmt,
...
}:
Expand Down Expand Up @@ -76,10 +74,6 @@
};
devShells.default = import ./nix/shell.nix {
inherit pkgs;
ligo =
if system == "x86_64-linux"
then ligo.packages.${system}.ligoLight
else pkgs.hello;
deku = self'.packages.deku;
tuna = self'.packages.tuna;
deploy-rs = deploy-rs.packages.${system}.default;
Expand Down
8 changes: 1 addition & 7 deletions nix/deku-p/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,7 @@
static = true;
};

ligo =
# TODO: support ligo on more systems in our flake
if system == "x86_64-linux"
then inputs.ligo.packages.${system}.ligoLight
else pkgs.hello;

docker = pkgs.callPackage ./docker.nix {inherit deku ligo;};
docker = pkgs.callPackage ./docker.nix {inherit deku;};
in {
packages = {
default = deku;
Expand Down
3 changes: 1 addition & 2 deletions nix/deku-p/docker.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
pkgs,
deku,
ligo,
}: let
baseImage = pkgs.dockerTools.pullImage {
imageName = "node";
Expand Down Expand Up @@ -37,7 +36,7 @@ in
copyToRoot = pkgs.buildEnv {
name = "image-root";
pathsToLink = ["/app" "/bin" "/var/lib/deku"];
paths = [script pkgs.bash pkgs.curl ligo];
paths = [script pkgs.bash pkgs.curl pkgs.ligo];
};
config = {
author = "marigold.dev";
Expand Down
4 changes: 0 additions & 4 deletions nix/shell.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
pkgs,
deku,
ligo,
tuna,
deploy-rs,
}:
Expand All @@ -18,9 +17,6 @@ with ocamlPackages;
# Typescript for decookie
nodePackages.typescript

# Tezos tooling
ligo

# OCaml developer tooling
ocaml
dune_3
Expand Down

0 comments on commit 1bdb0ff

Please sign in to comment.