Less overlays

flake.lock

@@ -1,25 +1,5 @@
 {
   "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": 1637014545,
@@ -53,7 +33,6 @@
     },
     "root": {
       "inputs": {
-        "easy-hls": "easy-hls",
         "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs"
       }

flake.nix

@@ -4,54 +4,47 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     flake-utils.url = "github:numtide/flake-utils";
-    easy-hls = {
-      url = "github:jkachmar/easy-hls-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
-  outputs = { self, nixpkgs, flake-utils, easy-hls }:
+  outputs = { self, nixpkgs, flake-utils }:
   {
-    overlay = final: prev: {
-      deploy-rauhala-info = with final; runCommand "deploy-rauhala-info.sh" { inherit bash ipfs; }
+  }
+  //
+  flake-utils.lib.eachDefaultSystem (system:
+    let
+      # pkgs = import nixpkgs { inherit system; overlays = [ self.overlay ]; };
+      pkgs = nixpkgs.legacyPackages.${system};
+      hp = pkgs.haskellPackages.override ( old: {
+        overrides = pkgs.lib.composeExtensions ( old.overrides or (_: _: {})) (f: p: {
+          build-rauhala-info = f.callPackage ./site {};
+        });
+      } );
+    in
+    rec {
+      # packages = { inherit (pkgs) build-rauhala-info rauhala-info deploy-rauhala-info; };
+      packages.build-rauhala-info = pkgs.runCommand "site" { buildInputs = [pkgs.makeWrapper]; }
+      ''
+        mkdir -p $out/bin/
+        cp ${hp.build-rauhala-info}/bin/site $out/bin/
+        wrapProgram $out/bin/site --prefix PATH : ${ pkgs.lib.makeBinPath [ pkgs.ipfs ] }
+      '';
+      apps.build-rauhala-info = flake-utils.lib.mkApp {
+        drv = packages.build-rauhala-info;
+        exePath = "/bin/site";
+      };
+      packages.deploy-rauhala-info = with pkgs; runCommand "deploy-rauhala-info.sh" { inherit bash ipfs; }
       ''
         mkdir -p $out/bin/
         substituteAll ${./support/deploy-rauhala-info.sh} $out/bin/deploy-rauhala-info.sh
         chmod u+x $out/bin/deploy-rauhala-info.sh
       '';
-      build-rauhala-info = final.runCommand "site" { buildInputs = [final.makeWrapper]; }
-      ''
-        mkdir -p $out/bin/
-        cp ${final.haskellPackages.build-rauhala-info}/bin/site $out/bin/
-        wrapProgram $out/bin/site --prefix PATH : ${ final.lib.makeBinPath [ final.ipfs ] }
-      '';
-      rauhala-info = final.callPackage ./rauhala.info { site = final.build-rauhala-info; };
-      haskellPackages = prev.haskellPackages.override ( old: {
-        overrides = final.lib.composeExtensions ( old.overrides or (_: _: {})) (f: p: {
-          build-rauhala-info = f.callPackage ./site {};
-        });
-      } );
-    };
-  }
-  //
-  flake-utils.lib.eachDefaultSystem (system:
-    let
-      pkgs = import nixpkgs { inherit system; overlays = [ self.overlay ]; };
-      hp = pkgs.haskellPackages;
-      hls = easy-hls.defaultPackage.${system};
-    in
-    rec {
-      packages = { inherit (pkgs) build-rauhala-info rauhala-info deploy-rauhala-info; };
-      applications.build-rauhala-info = flake-utils.lib.mkApp {
-        drv = packages.build-rauhala-info;
-        exePath = "/bin/site";
-      };
-      applications.deploy-rauhala-info = flake-utils.lib.mkApp {
-        drv = packages.deploy-rauhala-info;
+      packages.rauhala-info = pkgs.callPackage ./rauhala.info { site = packages.build-rauhala-info; };
+      apps.deploy-rauhala-info = flake-utils.lib.mkApp {
+        drv = pkgs.deploy-rauhala-info;
         exePath = "/bin/deploy-rauhala-info.sh";
       };
       defaultPackage = packages.rauhala-info;
-      defaultApp = applications.build-rauhala-info;
+      defaultApp = packages.build-rauhala-info;
       devShell = hp.shellFor {
         packages = h: [h.build-rauhala-info];
         buildInputs = with pkgs; [
@@ -59,7 +52,7 @@
           cabal-install
           stylish-haskell
           entr
-          hls
+          haskell-language-server
           ipfs
         ];
       };