Merge pull request #130 from mattpolzin/nix-buildIdris-update

Add idris2 to dev shell. update flake inputs. use new buildIdris flexibility around specifying libraries.
mattpolzin · Jun 26, 2024 · 0c6dedc · 0c6dedc
2 parents ff17474 + 1cef9ff
commit 0c6dedc
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/default.nix b/default.nix
@@ -7,10 +7,8 @@
  installShellFiles,
  makeWrapper,
  nodejs,
- stdenv,
 }: let
  inherit (idris2Packages) buildIdris;
- libraries = map (p: p.library {});
 
  nodeDependencies = (callPackage ./node2nix.nix {inherit nodejs;}).nodeDependencies;
  idrisAddsVersion = "0.4.1";
@@ -43,44 +41,44 @@
  hash = "sha256-ShwVAUsobrwmuYszYld1RqlRUvnrACpyyqK2JKaIWYM=";
  };
 
- idrisAddsPkg = buildIdris {
+ idrisAdds = buildIdris {
  ipkgName = "idris-adds";
  version = idrisAddsVersion;
  src = idrisAddsSrc;
  idrisLibraries = [];
  };
- elabUtilPkg = buildIdris {
+ elabUtil = buildIdris {
  ipkgName = "elab-util";
  version = elabUtilRev;
  src = elabUtilSrc;
  idrisLibraries = [];
  };
- idrisJsonPkg = buildIdris {
+ idrisJson = buildIdris {
  ipkgName = "json";
  version = idrisJsonRev;
  src = idrisJsonSrc;
- idrisLibraries = libraries [elabUtilPkg idrisParserPkg idrisParserJsonPkg];
+ idrisLibraries = [elabUtil idrisParser idrisParserJson];
  };
- idrisParserPkg = buildIdris {
+ idrisParser = buildIdris {
  ipkgName = "parser";
  version = idrisParserRev;
  src = idrisParserSrc;
- idrisLibraries = libraries [elabUtilPkg];
+ idrisLibraries = [elabUtil];
  };
- idrisParserJsonPkg = buildIdris rec {
+ idrisParserJson = buildIdris rec {
  ipkgName = "parser-json";
  version = idrisParserRev;
  src = idrisParserSrc;
  sourceRoot = "${src.name}/json";
- idrisLibraries = libraries [idrisParserPkg elabUtilPkg];
+ idrisLibraries = [idrisParser elabUtil];
  };
 
  harmonyPkg = buildIdris {
  version = "4.2.0";
  ipkgName = "harmony";
  src = ./.;
 
- idrisLibraries = libraries [idrisAddsPkg elabUtilPkg idrisParserPkg idrisParserJsonPkg idrisJsonPkg];
+ idrisLibraries = [idrisAdds elabUtil idrisJson idrisParserJson];
  nativeBuildInputs = [installShellFiles makeWrapper];
  buildInputs = [nodejs git];
 

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -35,6 +35,7 @@
  default = pkgs.mkShell {
  inputsFrom = [self.packages.${system}.harmony];
  packages = [
+ pkgs.idris2
  pkgs.idris2Packages.idris2Lsp
  ];
  };