Upgrade nixpkgs and add HLS to shell.nix (#1314)

This allows me to keep HLS built for different projects potentially using different versions of nixpkgs (and so c libraries) separate.
wireapp · Jan 6, 2021 · f000970 · f000970
1 parent 1a41bd0
commit f000970
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/nix/sources.json b/nix/sources.json
@@ -17,10 +17,10 @@
         "homepage": "https://github.com/NixOS/nixpkgs",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "502845c3e31ef3de0e424f3fcb09217df2ce6df6",
-        "sha256": "0fcqpsy6y7dgn0y0wgpa56gsg0b0p8avlpjrd79fp4mp9bl18nda",
+        "rev": "2080afd039999a58d60596d04cefb32ef5fcc2a2",
+        "sha256": "0i677swvj8fxfwg3jibd0xl33rn0rq0adnniim8jnp384whnh8ry",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs-channels/archive/502845c3e31ef3de0e424f3fcb09217df2ce6df6.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/2080afd039999a58d60596d04cefb32ef5fcc2a2.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }
diff --git a/shell.nix b/shell.nix
@@ -5,5 +5,6 @@ with pkgs; mkShell {
     docker-compose
     gnumake
     stack
+    haskell-language-server
   ];
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,5 +5,6 @@ with pkgs; mkShell { @@
         docker-compose
         gnumake
         stack
+        haskell-language-server
       ];
     }