diff --git a/flake.lock b/flake.lock index a3edd9a0e..cb783bbf3 100644 --- a/flake.lock +++ b/flake.lock @@ -1,55 +1,15 @@ { "nodes": { - "coq-8_18": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1694096282, - "narHash": "sha256-WhiBs4nzPHQ0R24xAdM49kmxSCPOxiOVMA1iiMYunz4=", - "owner": "coq", - "repo": "coq", - "rev": "f022d5d194cb42c2321ea91cecbcce703a9bcad3", - "type": "github" - }, - "original": { - "owner": "coq", - "ref": "V8.18.0", - "repo": "coq", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -60,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1692494774, - "narHash": "sha256-noGVoOTyZ2Kr5OFglzKYOX48cx3hggdCPbXrYMG2FDw=", + "lastModified": 1706487304, + "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3476a10478587dec90acb14ec6bde0966c545cc0", + "rev": "90f456026d284c22b3e3497be980b2e47d0b28ac", "type": "github" }, "original": { @@ -74,8 +34,7 @@ }, "root": { "inputs": { - "coq-8_18": "coq-8_18", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": "nixpkgs" } }, @@ -93,21 +52,6 @@ "repo": "default", "type": "github" } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index c65aa36b6..f8680278e 100644 --- a/flake.nix +++ b/flake.nix @@ -5,21 +5,11 @@ flake-utils.url = "github:numtide/flake-utils"; - coq-8_18 = { - type = "github"; - owner = "coq"; - repo = "coq"; - ref = "V8.18.0"; - }; - - coq-8_18.inputs.nixpkgs.follows = "nixpkgs"; - }; - outputs = { self, nixpkgs, flake-utils, coq-8_18 }: + outputs = { self, nixpkgs, flake-utils }: flake-utils.lib.eachDefaultSystem (system: - let coq = coq-8_18.defaultPackage.${system}; in rec { packages.default = self.packages.${system}.vscoq-language-server; @@ -27,7 +17,7 @@ packages.vscoq-language-server = # Notice the reference to nixpkgs here. with import nixpkgs { inherit system; }; - + let ocamlPackages = ocaml-ng.ocamlPackages_4_14; in ocamlPackages.buildDunePackage { duneVersion = "3"; pname = "vscoq-language-server"; @@ -35,12 +25,8 @@ src = ./language-server; buildInputs = [ coq - bash - hostname - python3 - time dune_3 - ] ++ (with ocamlPackages; [ + ] ++ (with coq.ocamlPackages; [ lablgtk3-sourceview3 glib gnome.adwaita-icon-theme