Update all flake inputs and add texliveFull to the devShell

IntersectMBO · Oct 15, 2024 · 61673e7 · 61673e7
1 parent 9501fba
commit 61673e7
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 51 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -12,7 +12,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    nixpkgs.follows = "haskell-nix/nixpkgs";
+    nixpkgs.follows = "haskell-nix/nixpkgs-2405";
 
     hackage = {
       url = "github:input-output-hk/hackage.nix";

diff --git a/nix/agda-packages.nix b/nix/agda-packages.nix
@@ -18,15 +18,19 @@
 let
   Agda = repoRoot.nix.agda-project.hsPkgs.Agda;
 
-  frankenAgda = (pkgs.symlinkJoin {
+  frankenAgdaBin = pkgs.symlinkJoin {
     name = "agda";
+    version = Agda.identifier.version;
     paths = [
       Agda.components.exes.agda
       Agda.components.exes.agda-mode
     ];
-  }) //
-  {
-    version = Agda.identifier.version;
+  };
+
+  frankenAgda = frankenAgdaBin // {
+    # Newer Agda is built with enableSeparateBinOutput, hence this hacky workaround.
+    # https://github.com/NixOS/nixpkgs/commit/294245f7501e0a8e69b83346a4fa5afd4ed33ab3
+    bin = frankenAgdaBin;
   };
 
   frankenPkgs =

diff --git a/nix/outputs.nix b/nix/outputs.nix
@@ -35,6 +35,7 @@ in
   {
     packages.plutus-metatheory-site = repoRoot.nix.plutus-metatheory-site;
     packages.pre-commit-check = ghc96.pre-commit-check;
+    packages.agda-project = repoRoot.nix.agda-project.hsPkgs.Agda.components.exes.agda;
   }
 
   (lib.optionalAttrs (system == "x86_64-linux" || system == "x86_64-darwin")

diff --git a/nix/shell.nix b/nix/shell.nix
@@ -35,6 +35,9 @@ in
     repoRoot.nix.r-with-packages
     pkgs.R
 
+    # LaTeX environment
+    pkgs.texliveFull
+
     # Misc useful stuff, could make these commands but there's a lot already
     pkgs.jekyll
     pkgs.plantuml