use nixpkgs idris2 but grab buildIdris from compiler flake

mattpolzin · Jan 11, 2024 · a8a60be · a8a60be
1 parent 0af1ca3
commit a8a60be
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/default.nix b/default.nix
@@ -2,7 +2,6 @@
  callPackage,
  fetchFromGitHub,
  git,
- idris2,
  buildIdris,
  lib,
  installShellFiles,

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,7 +2,7 @@
  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";
@@ -11,6 +11,9 @@
  alejandra.inputs.nixpkgs.follows = "nixpkgs";
  };
 
+ # 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,
@@ -21,12 +24,13 @@
  forAllSystems = lib.genAttrs lib.systems.flakeExposed;
  in {
  packages = forAllSystems (
- system: {
- harmony = with nixpkgs.legacyPackages.${system};
- callPackage ./default.nix {
- idris2 = idris.packages.${system}.idris2;
- buildIdris = idris.buildIdris.${system};
- };
+ 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;
  }