Nix improvements

default.nix

@@ -1,91 +1,99 @@
-{ callPackage
-, fetchFromGitHub
-, git
-, idris2
-, lib
-, installShellFiles
-, makeWrapper
-, nodejs
-, stdenv
-}:
-let 
- nodeDependencies = (callPackage ./node2nix.nix { inherit nodejs; }).nodeDependencies;
+{
+ callPackage,
+ fetchFromGitHub,
+ git,
+ buildIdris,
+ lib,
+ installShellFiles,
+ makeWrapper,
+ nodejs,
+ stdenv,
+}: let
+ libraries = map (p: p.library {});
+
+ nodeDependencies = (callPackage ./node2nix.nix {inherit nodejs;}).nodeDependencies;
  idrisAddsVersion = "0.3.0";
  idrisAddsSrc = fetchFromGitHub {
  owner = "mattpolzin";
  repo = "idris-adds";
  rev = "${idrisAddsVersion}";
  hash = "sha256-OSu381nUNZqFJs4HzmMxGda60k7xsa1GulQq7kU/R2o=";
  };
+ idrisAddsPkg = buildIdris {
+ projectName = "idris-adds";
+ src = idrisAddsSrc;
+ idrisLibraries = [];
+ };
  elabUtilRev = "2fc2d188640ce6822b5e250db73b62f5a952ca4d";
  elabUtilSrc = fetchFromGitHub {
  owner = "stefan-hoeck";
  repo = "idris2-elab-util";
  rev = "${elabUtilRev}";
  hash = "sha256-CYPrhB9y4CMk2Wiecpk+5isybcf3ZsbmaKdKOyo0JWk=";
  };
+ elabUtilPkg = buildIdris {
+ projectName = "elab-util";
+ src = elabUtilSrc;
+ idrisLibraries = [];
+ };
  idrisJsonRev = "2e54a37ed3c35c2d12c8927c923ad253355812a8";
  idrisJsonSrc = fetchFromGitHub {
  owner = "stefan-hoeck";
  repo = "idris2-json";
  rev = "${idrisJsonRev}";
  hash = "sha256-+lwOdkovhOsvaSKH+jJY7uhr40JjXpUJ4ECR9qxZv14=";
  };
+ idrisJsonPkg = buildIdris {
+ projectName = "json";
+ src = idrisJsonSrc;
+ idrisLibraries = libraries [elabUtilPkg idrisParserPkg idrisParserJsonPkg];
+ };
  idrisParserRev = "0fde36cf11c12a61edcfe09d585c5a60426bc706";
  idrisParserSrc = fetchFromGitHub {
  owner = "stefan-hoeck";
  repo = "idris2-parser";
  rev = "${idrisParserRev}";
  hash = "sha256-ShwVAUsobrwmuYszYld1RqlRUvnrACpyyqK2JKaIWYM=";
  };
-in
-stdenv.mkDerivation (finalAttrs: {
- pname = "harmony";
- version = "3.2.0";
-
- nativeBuildInputs = [ idris2 installShellFiles makeWrapper ];
- buildInputs = [ nodejs git ];
-
- src = ./.;
-
- IDRIS_ADDS_SRC = "${idrisAddsSrc}";
- IDRIS_ELAB_UTIL_SRC = "${elabUtilSrc}";
- IDRIS_PARSER_SRC = "${idrisParserSrc}";
- IDRIS_JSON_SRC = "${idrisJsonSrc}";
-
- buildPhase = ''
- runHook preBuild
-
- ln -s ${nodeDependencies}/lib/node_modules ./node_modules
- export PATH="${nodeDependencies}/bin:$PATH"
-
- make build
-
- runHook postBuild
- '';
+ idrisParserPkg = buildIdris {
+ projectName = "parser";
+ src = idrisParserSrc;
+ idrisLibraries = libraries [elabUtilPkg];
+ };
+ idrisParserJsonPkg = buildIdris rec {
+ projectName = "parser-json";
+ src = idrisParserSrc;
+ sourceRoot = "${src.name}/json";
+ idrisLibraries = libraries [idrisParserPkg elabUtilPkg];
+ };
 
- installPhase = ''
- runHook preInstall
+ harmonyPkg = buildIdris {
+ version = "3.2.0";
+ projectName = "harmony";
+ src = ./.;
 
- mkdir -p $out/bin
- cp harmony $out/bin/
+ idrisLibraries = libraries [idrisAddsPkg elabUtilPkg idrisParserPkg idrisParserJsonPkg idrisJsonPkg];
+ nativeBuildInputs = [installShellFiles makeWrapper];
+ buildInputs = [nodejs git];
 
- wrapProgram $out/bin/harmony \
- --prefix PATH : ${lib.makeBinPath [ nodeDependencies git "$out" ]} \
- --prefix NODE_PATH : ${nodeDependencies}/lib/node_modules
+ IDRIS2_DATA = "./support";
 
- installShellCompletion --cmd harmony \
- --bash <($out/bin/harmony --bash-completion-script) \
- --zsh <($out/bin/harmony --zsh-completion-script) \
+ postInstall = ''
+ wrapProgram $out/bin/harmony \
+ --prefix PATH : ${lib.makeBinPath [nodeDependencies git "$out"]} \
+ --prefix NODE_PATH : ${nodeDependencies}/lib/node_modules
 
- runHook postInstall
- '';
+ installShellCompletion --cmd harmony \
+ --bash <($out/bin/harmony --bash-completion-script) \
+ --zsh <($out/bin/harmony --zsh-completion-script) \
+ '';
 
- meta = with lib; {
- description = "Harmony GitHub collaboration tool";
- homepage = "https://github.com/mattpolzin/harmony";
- license = licenses.mit;
- mainProgram = "harmony";
+ meta = with lib; {
+ description = "Harmony GitHub collaboration tool";
+ homepage = "https://github.com/mattpolzin/harmony";
+ license = licenses.mit;
+ mainProgram = "harmony";
+ };
  };
-
-})
+in
+ harmonyPkg.executable

flake.nix

@@ -2,22 +2,39 @@
  description = "Harmony GitHub collaboration tool";
 
  inputs = {
- nixpkgs.url = github:NixOS/nixpkgs;
+ nixpkgs.url = github:NixOS/nixpkgs/nixpkgs-unstable;
+
+ idris.url = github:mattpolzin/Idris2/fix-install-output-buildIdris;
+ idris.inputs.nixpkgs.follows = "nixpkgs";
+
+ alejandra.url = github:kamadorueda/alejandra;
+ alejandra.inputs.nixpkgs.follows = "nixpkgs";
  };
 
- outputs = { self, nixpkgs }:
- let 
+ # we grab Idris2 from nixpkgs unstable because it will already be built and cached.
+ # we use the idris2 compiler repo to grab the buildIdris function that isn't available
+ # in nixpkgs yet.
+ outputs = {
+ self,
+ nixpkgs,
+ alejandra,
+ idris,
+ }: let
  lib = nixpkgs.lib;
  forAllSystems = lib.genAttrs lib.systems.flakeExposed;
- in
- {
- packages = forAllSystems (system: 
- {
- harmony = with nixpkgs.legacyPackages.${system};
- callPackage ./default.nix {};
+ in {
+ packages = forAllSystems (
+ system: let
+ pkgs = nixpkgs.legacyPackages.${system};
+ buildIdris = idris.buildIdris.${system}.override {inherit (pkgs) idris2;};
+ in {
+ harmony = pkgs.callPackage ./default.nix {
+ inherit buildIdris;
+ };
 
  default = self.packages.${system}.harmony;
  }
  );
+ formatter = forAllSystems (system: alejandra.packages.${system}.default);
  };
 }