diff --git a/flake.lock b/flake.lock index 9c5a949..dfd6199 100644 --- a/flake.lock +++ b/flake.lock @@ -1,32 +1,12 @@ { "nodes": { - "easy-hls": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1637250802, - "narHash": "sha256-/crlHEVB148PGQLZCsHOR9L5qgvCAfRSocIoKgmMAhA=", - "owner": "jkachmar", - "repo": "easy-hls-nix", - "rev": "7c123399ef8a67dc0e505d9cf7f2c7f64f1cd847", - "type": "github" - }, - "original": { - "owner": "jkachmar", - "repo": "easy-hls-nix", - "type": "github" - } - }, "flake-utils": { "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "lastModified": 1649676176, + "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", "owner": "numtide", "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678", "type": "github" }, "original": { @@ -37,11 +17,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1644453163, - "narHash": "sha256-VPlXtIsShceYHUspnJSvuvucrX1OWVFmrqiofn69yCM=", + "lastModified": 1650440614, + "narHash": "sha256-7mF7gyS5P3UmZmQuo9jbikP2wMyRUnimI7HcKLJ9OZQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7e003d7fb9eff8ecb84405360c75c716cdd1f79f", + "rev": "0bbb65673c0ba31047c9ba6c4cd211556b534a4e", "type": "github" }, "original": { @@ -51,7 +31,6 @@ }, "root": { "inputs": { - "easy-hls": "easy-hls", "flake-utils": "flake-utils", "nixpkgs": "nixpkgs" } diff --git a/flake.nix b/flake.nix index 1a35f41..9e4d404 100644 --- a/flake.nix +++ b/flake.nix @@ -2,17 +2,13 @@ description = "A very basic flake"; inputs = { - easy-hls = { - url = "github:jkachmar/easy-hls-nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; flake-utils = { url = "github:numtide/flake-utils"; inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = { self, nixpkgs, flake-utils, easy-hls }: + outputs = { self, nixpkgs, flake-utils }: { overlay = final: prev: { haskellPackages = prev.haskellPackages.override ( old: { @@ -27,7 +23,6 @@ let pkgs = import nixpkgs { inherit system; overlays = [ self.overlay ]; }; hp = pkgs.haskellPackages; - hls = (easy-hls.withGhcs [ hp.ghc.version ] ).${system}; in rec { @@ -48,7 +43,6 @@ hp.hlint stylish-haskell ghcid - hls rrdtool jq sqlite-interactive @@ -58,6 +52,8 @@ hp.graphmod hp.dhall-nixpkgs + + hp.haskell-language-server ]; }; } diff --git a/reddit-pub.cabal b/reddit-pub.cabal index 965f9a7..a15a764 100644 --- a/reddit-pub.cabal +++ b/reddit-pub.cabal @@ -40,7 +40,7 @@ library -- LANGUAGE extensions used by modules in this package. -- other-extensions: - build-depends: base ^>=4.14.1.0 + build-depends: base ^>=4.15.1.0 , amqp , aeson , lens @@ -65,7 +65,7 @@ executable reddit-pub -- LANGUAGE extensions used by modules in this package. -- other-extensions: build-depends: - base ^>=4.14.1.0, + base ^>=4.15.1.0, reddit-pub hs-source-dirs: app @@ -82,7 +82,7 @@ test-suite reddit-tests -- LANGUAGE extensions used by modules in this package. -- other-extensions: build-depends: - base ^>=4.14.1.0, + base ^>=4.15.1.0, mtl, containers, bytestring,