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 0ab864c
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 137 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.

4 changes: 1 addition & 3 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 @@ -78,7 +76,7 @@
inherit pkgs;
ligo =
if system == "x86_64-linux"
then ligo.packages.${system}.ligoLight
then pkgs.ligo
else pkgs.hello;
deku = self'.packages.deku;
tuna = self'.packages.tuna;
Expand Down
4 changes: 2 additions & 2 deletions nix/deku-p/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@
ligo =
# TODO: support ligo on more systems in our flake
if system == "x86_64-linux"
then inputs.ligo.packages.${system}.ligoLight
then pkgs.ligo
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
2 changes: 1 addition & 1 deletion nix/shell.nix
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
pkgs,
deku,
ligo,
tuna,
deploy-rs,
ligo,
}:
with pkgs;
with ocamlPackages;
Expand Down

0 comments on commit 0ab864c

Please sign in to comment.