diff --git a/Idris2 b/Idris2 index c3239cb..3649821 160000 --- a/Idris2 +++ b/Idris2 @@ -1 +1 @@ -Subproject commit c3239cb4c0a6a001a59660111b5e3000db710d2b +Subproject commit 3649821625eccc4e08ab357e0dfe27534d993e47 diff --git a/LSP-lib b/LSP-lib index 03851da..056eae1 160000 --- a/LSP-lib +++ b/LSP-lib @@ -1 +1 @@ -Subproject commit 03851daae0c0274a02d94663d8f53143a94640da +Subproject commit 056eae1dc5466db653d853fd97a0898a3a7bc9d1 diff --git a/flake.lock b/flake.lock index 68ad336..4d11744 100644 --- a/flake.lock +++ b/flake.lock @@ -23,6 +23,31 @@ "type": "github" } }, + "alejandra_2": { + "inputs": { + "fenix": "fenix_2", + "flakeCompat": "flakeCompat_2", + "nixpkgs": [ + "lsp-lib", + "idris2Lsp", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1660592437, + "narHash": "sha256-xFumnivtVwu5fFBOrTxrv6fv3geHKF04RGP23EsDVaI=", + "owner": "kamadorueda", + "repo": "alejandra", + "rev": "e7eac49074b70814b542fee987af2987dd0520b5", + "type": "github" + }, + "original": { + "owner": "kamadorueda", + "ref": "3.0.0", + "repo": "alejandra", + "type": "github" + } + }, "fenix": { "inputs": { "nixpkgs": [ @@ -45,10 +70,52 @@ "type": "github" } }, + "fenix_2": { + "inputs": { + "nixpkgs": [ + "lsp-lib", + "idris2Lsp", + "alejandra", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src_2" + }, + "locked": { + "lastModified": 1657607339, + "narHash": "sha256-HaqoAwlbVVZH2n4P3jN2FFPMpVuhxDy1poNOR7kzODc=", + "owner": "nix-community", + "repo": "fenix", + "rev": "b814c83d9e6aa5a28d0cf356ecfdafb2505ad37d", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, "locked": { "lastModified": 1705309234, "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", @@ -79,6 +146,22 @@ "type": "github" } }, + "flakeCompat_2": { + "flake": false, + "locked": { + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "idris": { "inputs": { "flake-utils": "flake-utils", @@ -88,11 +171,11 @@ ] }, "locked": { - "lastModified": 1710014003, - "narHash": "sha256-+JG+u1ex2ZLCMITYS0eEkCntF79yC79oXW56S3rAK4E=", + "lastModified": 1719329838, + "narHash": "sha256-J/QmVnC7FhFB6OCeGa7tZKrG2rv+ieUxu1JJXLrAL5g=", "owner": "idris-lang", "repo": "Idris2", - "rev": "c3239cb4c0a6a001a59660111b5e3000db710d2b", + "rev": "3649821625eccc4e08ab357e0dfe27534d993e47", "type": "github" }, "original": { @@ -117,12 +200,104 @@ "type": "github" } }, + "idris-emacs-src_2": { + "flake": false, + "locked": { + "lastModified": 1666078909, + "narHash": "sha256-oYNHFIpcrFfPb4sXJwEBFKeH+PB4AGCrAFrfBrSTCeo=", + "owner": "redfish64", + "repo": "idris2-mode", + "rev": "3bcb52a65c488f31c99d20f235f6050418a84c9d", + "type": "github" + }, + "original": { + "owner": "redfish64", + "repo": "idris2-mode", + "type": "github" + } + }, + "idris2Lsp": { + "inputs": { + "alejandra": "alejandra_2", + "idris": "idris_2", + "lsp-lib": "lsp-lib_2", + "nixpkgs": [ + "lsp-lib", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1710049273, + "narHash": "sha256-B5Chc7Le/c7z5lUUXtmzp7g2jmqIGQE29pHMVR1fc3Y=", + "owner": "idris-community", + "repo": "idris2-lsp", + "rev": "07e751bb6372b496844ba0fc22c1692b22e98919", + "type": "github" + }, + "original": { + "owner": "idris-community", + "repo": "idris2-lsp", + "type": "github" + } + }, + "idris_2": { + "inputs": { + "flake-utils": "flake-utils_2", + "idris-emacs-src": "idris-emacs-src_2", + "nixpkgs": [ + "lsp-lib", + "idris2Lsp", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1710014003, + "narHash": "sha256-+JG+u1ex2ZLCMITYS0eEkCntF79yC79oXW56S3rAK4E=", + "owner": "idris-lang", + "repo": "Idris2", + "rev": "c3239cb4c0a6a001a59660111b5e3000db710d2b", + "type": "github" + }, + "original": { + "owner": "idris-lang", + "repo": "Idris2", + "type": "github" + } + }, "lsp-lib": { "inputs": { "idris": [ "idris" ], + "idris2Lsp": "idris2Lsp", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719331873, + "narHash": "sha256-eoK3QJu+z2mE9ZIVntN0r4yfrC5yoAg3z1i0sJ3M5fQ=", + "owner": "idris-community", + "repo": "LSP-lib", + "rev": "056eae1dc5466db653d853fd97a0898a3a7bc9d1", + "type": "github" + }, + "original": { + "owner": "idris-community", + "repo": "LSP-lib", + "type": "github" + } + }, + "lsp-lib_2": { + "inputs": { + "idris": [ + "lsp-lib", + "idris2Lsp", + "idris" + ], "nixpkgs": [ + "lsp-lib", + "idris2Lsp", "nixpkgs" ] }, @@ -142,11 +317,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1710013650, - "narHash": "sha256-vqHKH5XTNgZFzV9yssvoFbFeO9buqKnPHMRm8kK8POA=", + "lastModified": 1719331463, + "narHash": "sha256-qaQvb9Dvq1iBHSWmTJfHK7NTGVA5HjWp7y8hY9X8m/s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8a16f9a618b9aff6c2992f559500f62363635700", + "rev": "5ef104ab485523f3cb2665a068b6462dd4122521", "type": "github" }, "original": { @@ -180,6 +355,23 @@ "type": "github" } }, + "rust-analyzer-src_2": { + "flake": false, + "locked": { + "lastModified": 1657557289, + "narHash": "sha256-PRW+nUwuqNTRAEa83SfX+7g+g8nQ+2MMbasQ9nt6+UM=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "caf23f29144b371035b864a1017dbc32573ad56d", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -194,6 +386,21 @@ "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 6558f00..e9524f1 100644 --- a/flake.nix +++ b/flake.nix @@ -22,11 +22,11 @@ }; outputs = { - self, nixpkgs, alejandra, idris, lsp-lib, + ... }: let lib = nixpkgs.lib; # support the same systems as Idris2 @@ -71,7 +71,7 @@ --suffix IDRIS2_PACKAGE_PATH ':' "${globalLibrariesPath}" ''; }; - in rec { + in { packages = idrisPkgs // rec {