From 0ab864ccab82741fd1deb9272c7ca0ed0d8b8f43 Mon Sep 17 00:00:00 2001 From: Laurent Canis Date: Mon, 19 Dec 2022 12:03:24 -0500 Subject: [PATCH] Nix: Update ligo reference to the one in nix pkgs --- flake.lock | 135 ++--------------------------------------- flake.nix | 4 +- nix/deku-p/default.nix | 4 +- nix/deku-p/docker.nix | 3 +- nix/shell.nix | 2 +- 5 files changed, 11 insertions(+), 137 deletions(-) diff --git a/flake.lock b/flake.lock index 2b0c6ef6a..a82d325e4 100644 --- a/flake.lock +++ b/flake.lock @@ -145,26 +145,6 @@ "type": "github" } }, - "esy": { - "inputs": { - "flake-utils": "flake-utils", - "nix-filter": "nix-filter", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1663071811, - "narHash": "sha256-coODH8m4bIHRoNVqWs02dQ6MbcHk4vx07JVF1jfTR/0=", - "owner": "esy", - "repo": "esy", - "rev": "1b73d114c3481bd6f96e44f64241476957750a62", - "type": "github" - }, - "original": { - "owner": "esy", - "repo": "esy", - "type": "github" - } - }, "fenix": { "inputs": { "nixpkgs": [ @@ -296,21 +276,6 @@ "type": "github" } }, - "flake-utils_2": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flakeCompat": { "flake": false, "locked": { @@ -359,25 +324,6 @@ "type": "github" } }, - "ligo": { - "inputs": { - "esy": "esy", - "nixpkgs": "nixpkgs_4" - }, - "locked": { - "lastModified": 1666385520, - "narHash": "sha256-8CxheRKzn6EsGPb1lEN5sEQTid9Mu7CCXv6l81rRf/k=", - "owner": "ligolang", - "repo": "ligo", - "rev": "88f20b57b9ff67df84763e4cf9c25d776b0bccbd", - "type": "gitlab" - }, - "original": { - "owner": "ligolang", - "repo": "ligo", - "type": "gitlab" - } - }, "mach-nix": { "flake": false, "locked": { @@ -408,21 +354,6 @@ "type": "github" } }, - "nix-filter_2": { - "locked": { - "lastModified": 1661201956, - "narHash": "sha256-RizGJH/buaw9A2+fiBf9WnXYw4LZABB5kMAZIEE5/T8=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "3b821578685d661a10b563cba30b1861eec05748", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nix-filter", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1648219316, @@ -459,62 +390,9 @@ }, "nixpkgs_2": { "inputs": { - "flake-utils": [ - "ligo", - "esy", - "flake-utils" - ], + "flake-utils": "flake-utils", "nixpkgs": "nixpkgs_3" }, - "locked": { - "lastModified": 1663021394, - "narHash": "sha256-VxSe7wcSbyXZEPhuJGKHKhXFtLqNAdTCVZvB20NqnOU=", - "owner": "nix-ocaml", - "repo": "nix-overlays", - "rev": "f2ce73bb011790a4f5b873b0eea430a7e7191539", - "type": "github" - }, - "original": { - "owner": "nix-ocaml", - "repo": "nix-overlays", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1662940775, - "narHash": "sha256-SIgHTMjM+PqXWaXDzXsy/XmrDuTu7zpPvizgS7C9n+M=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "faa93c4e19e79e7a6de31d6d3492b8f00760ca82", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "faa93c4e19e79e7a6de31d6d3492b8f00760ca82", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1662096612, - "narHash": "sha256-R+Q8l5JuyJryRPdiIaYpO5O3A55rT+/pItBrKcy7LM4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "21de2b973f9fee595a7a1ac4693efff791245c34", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_5": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_6" - }, "locked": { "lastModified": 1666367900, "narHash": "sha256-//6mUOaLaXfRrr4R+/bD/sKujAKcJ1oGs/uypgr+0ns=", @@ -529,7 +407,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_3": { "locked": { "lastModified": 1666333455, "narHash": "sha256-oHXIeLB/sPWxKNcSdV1DQi1ddNVoJ17T1yDiMMeygL4=", @@ -545,7 +423,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_4": { "locked": { "lastModified": 1663819708, "narHash": "sha256-nKyJpwzGoV+5BNLHlrEMawsDxR1i6WOXqTcHWrWE8y4=", @@ -608,9 +486,8 @@ "deploy-rs": "deploy-rs", "dream2nix": "dream2nix", "flake-parts": "flake-parts", - "ligo": "ligo", - "nix-filter": "nix-filter_2", - "nixpkgs": "nixpkgs_5", + "nix-filter": "nix-filter", + "nixpkgs": "nixpkgs_2", "tezos": "tezos", "treefmt": "treefmt" } @@ -711,7 +588,7 @@ "treefmt": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1669982764, diff --git a/flake.nix b/flake.nix index 14413bc95..86e253b56 100644 --- a/flake.nix +++ b/flake.nix @@ -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"; @@ -33,7 +32,6 @@ dream2nix, tezos, deploy-rs, - ligo, treefmt, ... }: @@ -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; diff --git a/nix/deku-p/default.nix b/nix/deku-p/default.nix index 2d8f3cf15..b42eb29ca 100644 --- a/nix/deku-p/default.nix +++ b/nix/deku-p/default.nix @@ -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; diff --git a/nix/deku-p/docker.nix b/nix/deku-p/docker.nix index ef3360081..6b6214178 100644 --- a/nix/deku-p/docker.nix +++ b/nix/deku-p/docker.nix @@ -1,7 +1,6 @@ { pkgs, deku, - ligo, }: let baseImage = pkgs.dockerTools.pullImage { imageName = "node"; @@ -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"; diff --git a/nix/shell.nix b/nix/shell.nix index 562fcae8e..d66076280 100644 --- a/nix/shell.nix +++ b/nix/shell.nix @@ -1,9 +1,9 @@ { pkgs, deku, - ligo, tuna, deploy-rs, + ligo, }: with pkgs; with ocamlPackages;