From 79b33b83ecc3176be7360303e90e6d035f7a2c3e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 3 Jun 2025 03:29:13 +0200 Subject: [PATCH] ligo: remove at 1.7.1 --- pkgs/development/compilers/ligo/default.nix | 133 ------------------ .../ligo/make-compatible-with-linol-0_6.patch | 13 -- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 15 -- 4 files changed, 1 insertion(+), 161 deletions(-) delete mode 100644 pkgs/development/compilers/ligo/default.nix delete mode 100644 pkgs/development/compilers/ligo/make-compatible-with-linol-0_6.patch diff --git a/pkgs/development/compilers/ligo/default.nix b/pkgs/development/compilers/ligo/default.nix deleted file mode 100644 index b83bb18c23bb..000000000000 --- a/pkgs/development/compilers/ligo/default.nix +++ /dev/null @@ -1,133 +0,0 @@ -{ - lib, - fetchFromGitLab, - git, - coq, - ocamlPackages, - cacert, - ocaml-crunch, - jq, - mustache-go, - yaml2json, - tezos-rust-libs, -}: - -ocamlPackages.buildDunePackage rec { - pname = "ligo"; - version = "1.7.1"; - src = fetchFromGitLab { - owner = "ligolang"; - repo = "ligo"; - rev = version; - hash = "sha256-pBoLgS/9MLMrc98niI+o2JoJ3gpvhyRY2o9GmVc5hIA="; - fetchSubmodules = true; - }; - - patches = [ ./make-compatible-with-linol-0_6.patch ]; - - # The build picks this up for ligo --version - LIGO_VERSION = version; - - # This is a hack to work around the hack used in the dune files - OPAM_SWITCH_PREFIX = "${tezos-rust-libs}"; - - nativeBuildInputs = [ - ocaml-crunch - git - coq - ocamlPackages.crunch - ocamlPackages.menhir - ocamlPackages.ocaml-recovery-parser - # deps for changelog - jq - mustache-go - yaml2json - ]; - - buildInputs = with ocamlPackages; [ - coq - menhir - menhirLib - qcheck - ocamlgraph - bisect_ppx - decompress - fileutils - ppx_deriving - ppx_deriving_yojson - ppx_yojson_conv - ppx_expect - ppx_import - terminal_size - ocaml-recovery-parser - yojson - getopt - core - core_unix - pprint - linenoise - crunch - semver - lambda-term - tar-unix - parse-argv - hacl-star - prometheus - lwt_ppx - msgpck - # lsp - linol - linol-lwt - ocaml-lsp - # Test helpers deps - qcheck - qcheck-alcotest - alcotest-lwt - # vendored tezos' deps - aches - aches-lwt - ctypes - ctypes_stubs_js - class_group_vdf - dune-configurator - hacl-star - hacl-star-raw - lwt-canceler - ipaddr - bls12-381 - bls12-381-signature - ptime - mtime - lwt_log - secp256k1-internal - resto - resto-directory - resto-cohttp-self-serving-client - irmin-pack - ezjsonm - data-encoding - pure-splitmix - zarith_stubs_js - simple-diff - seqes - stdint - tezt - ]; - - nativeCheckInputs = [ - cacert - ocamlPackages.ca-certs - ]; - - doCheck = false; # Tests fail, but could not determine the reason - - meta = with lib; { - homepage = "https://ligolang.org/"; - downloadPage = "https://ligolang.org/docs/intro/installation"; - description = "Friendly Smart Contract Language for Tezos"; - mainProgram = "ligo"; - license = licenses.mit; - platforms = ocamlPackages.ocaml.meta.platforms; - maintainers = with maintainers; [ ulrikstrid ]; - }; -} diff --git a/pkgs/development/compilers/ligo/make-compatible-with-linol-0_6.patch b/pkgs/development/compilers/ligo/make-compatible-with-linol-0_6.patch deleted file mode 100644 index 659ca3faaf73..000000000000 --- a/pkgs/development/compilers/ligo/make-compatible-with-linol-0_6.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/bin/cli.ml b/src/bin/cli.ml -index 36ee98cbec..960bfc85a0 100644 ---- a/src/bin/cli.ml -+++ b/src/bin/cli.ml -@@ -3537,7 +3537,7 @@ module Lsp_server = struct - ~session_id - ~skip_analytics - in -- let server = Linol_lwt.Jsonrpc2.create_stdio (s :> Linol_lwt.Jsonrpc2.server) in -+ let server = Linol_lwt.Jsonrpc2.create_stdio ~env:() (s :> Linol_lwt.Jsonrpc2.server) in - let shutdown () = Poly.(s#get_status = `ReceivedExit) in - let task = Linol_lwt.Jsonrpc2.run ~shutdown server in - let analytics_job = diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 58fd81d447cf..8878ce3fd2fb 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1050,6 +1050,7 @@ mapAliases { licensor = throw "'licensor' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 lightdm_gtk_greeter = lightdm-gtk-greeter; # Added 2022-08-01 lightstep-tracer-cpp = throw "lightstep-tracer-cpp is deprecated since 2022-08-29; the upstream recommends migration to opentelemetry projects."; + ligo = throw "ligo has been removed from nixpkgs for lack of maintainance"; # Added 2025-06-03 lima-bin = lib.warnOnInstantiate "lima-bin has been replaced by lima" lima; # Added 2025-05-13 lime3ds = throw "lime3ds is deprecated, use 'azahar' instead."; # Added 2025-03-22 limesctl = throw "limesctl has been removed because it is insignificant."; # Added 2024-11-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5accf1cff649..2059e78c69d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3488,21 +3488,6 @@ with pkgs; ksmoothdock = libsForQt5.callPackage ../applications/misc/ksmoothdock { }; - ligo = - let - ocaml_p = ocaml-ng.ocamlPackages_4_14.overrideScope ( - self: super: { - zarith = super.zarith.override { version = "1.13"; }; - } - ); - in - callPackage ../development/compilers/ligo { - coq = coq_8_13.override { - customOCamlPackages = ocaml_p; - }; - ocamlPackages = ocaml_p; - }; - leocad = callPackage ../applications/graphics/leocad { }; libcoap = callPackage ../applications/networking/libcoap {