diff --git a/flake.lock b/flake.lock index 985f918fd..481b86145 100644 --- a/flake.lock +++ b/flake.lock @@ -295,11 +295,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1705278263, - "narHash": "sha256-7y7BujULv8Wma0eOTVnki6wCRtZhpn3Iw+IXOI0yO+0=", + "lastModified": 1705450998, + "narHash": "sha256-3MfI/48FOfwSvWzJW89lF/cU9HJIw8swmQZzrHO/44M=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "5eba43fa91e04a2f5c9e81d545358624ffa2fe43", + "rev": "de3d2b30f3f149f338e533b111b38b6d03090931", "type": "github" }, "original": { @@ -325,6 +325,8 @@ "hls-2.2": "hls-2.2", "hls-2.3": "hls-2.3", "hls-2.4": "hls-2.4", + "hls-2.5": "hls-2.5", + "hls-2.6": "hls-2.6", "hpc-coveralls": "hpc-coveralls", "hydra": "hydra", "iserv-proxy": "iserv-proxy", @@ -344,11 +346,11 @@ "stackage": "stackage" }, "locked": { - "lastModified": 1705279792, - "narHash": "sha256-KFWdoXijISMsraaLT4JlxbPpRAH/ZhSi0Lb7CkX+utw=", + "lastModified": 1705452581, + "narHash": "sha256-ChsKoLK2PgNfn2b9jrkQVeCZeN+m0W+Hr+G+mfrERUk=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "a00e67fb67c525fef99210dfcd796e01dc3de782", + "rev": "03c0f0633d6fdcfdbb332bedbef5acd0b693ab04", "type": "github" }, "original": { @@ -442,6 +444,40 @@ "type": "github" } }, + "hls-2.5": { + "flake": false, + "locked": { + "lastModified": 1701080174, + "narHash": "sha256-fyiR9TaHGJIIR0UmcCb73Xv9TJq3ht2ioxQ2mT7kVdc=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "27f8c3d3892e38edaef5bea3870161815c4d014c", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.5.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.6": { + "flake": false, + "locked": { + "lastModified": 1705325287, + "narHash": "sha256-+P87oLdlPyMw8Mgoul7HMWdEvWP/fNlo8jyNtwME8E8=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "6e0b342fa0327e628610f2711f8c3e4eaaa08b1e", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.6.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, "hpc-coveralls": { "flake": false, "locked": { @@ -820,11 +856,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1705277424, - "narHash": "sha256-bZeoYKvngA6rpUJRp1Zvq1Vv7n7YoR2pRCTCpqzCBT4=", + "lastModified": 1705450182, + "narHash": "sha256-tUS+I8tuC42iH0atyyZq8dWAuWvTSutfSUgkj+TQWMA=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "3600059fe0448d98d811e9514497be44716d8966", + "rev": "ad9de7aee0b71bf8c4f7e3e3a1c60106cf3df4c8", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index acf592007..be6472546 100644 --- a/flake.nix +++ b/flake.nix @@ -126,30 +126,12 @@ }; }) - # (import ./nix/maildev) haskell-nix.overlay - (import ./nix/uniworx { inherit inputs frontendSource backendSource; gitRevision = if self ? rev then self.rev else null; }) - (import ./nix/docker { inherit self; }) - (import ./nix/parse-changelog.nix {}) ]; - haskellFlake = pkgs.uniworx.flake {}; - inherit (pkgs.lib) recursiveUpdate; in { packages = {}; - # packages = haskellFlake.packages // { - # inherit (pkgs) uniworxNodeDependencies uniworxWellKnown uniworxFrontend uniworxTestDocker uniworxDocker changelogJson; - #}; - - apps = haskellFlake.apps // { - calculateMaterializedSha = flake-utils.lib.mkApp { drv = pkgs.uniworx.stack-nix.passthru.calculateMaterializedSha; exePath = ""; }; - jqChangelogJson = flake-utils.lib.mkApp { drv = pkgs.jqChangelogJson; }; - }; - - checks = haskellFlake.checks // { - uniworxFrontend = pkgs.uniworxFrontend.check; - }; devShell = import ./shell.nix { pkgs = self.legacyPackages.${system}; nixpkgsPath = nixpkgs; };