Update all Flake Inputs & Add texliveFull to the devShell (#6588)

IntersectMBO · Oct 25, 2024 · c3c9d29 · c3c9d29
1 parent fc89296
commit c3c9d29
Show file tree

Hide file tree

Showing 20 changed files with 251 additions and 172 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -1,7 +1,8 @@
 root = true
 
-[*]
-indent_style = space
+# TODO decide if we want this
+# [*]
+# indent_style = space
 
 [*.{nix, hs, lagda, agda}]
 charset = utf-8

diff --git a/cardano-constitution/cardano-constitution.cabal b/cardano-constitution/cardano-constitution.cabal
@@ -118,15 +118,16 @@ test-suite cardano-constitution-test
 
   build-depends:
     , aeson
-    , base                                            >=4.9   && <5
+    , base                             >=4.9   && <5
     , bytestring
     , cardano-constitution
     , containers
     , directory
     , filepath
-    , plutus-core:{plutus-core, plutus-core-testlib}  ^>=1.36
-    , plutus-ledger-api                               ^>=1.36
-    , plutus-tx                                       ^>=1.36
+    , plutus-core                      ^>=1.36
+    , plutus-core:plutus-core-testlib
+    , plutus-ledger-api                ^>=1.36
+    , plutus-tx                        ^>=1.36
     , QuickCheck
     , serialise
     , tasty

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -12,7 +12,8 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    nixpkgs.follows = "haskell-nix/nixpkgs";
+    nixpkgs.follows = "haskell-nix/nixpkgs-unstable";
+    nixpkgs-2405.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/latex-documents.nix b/nix/latex-documents.nix
@@ -46,11 +46,11 @@ let
       description = "Multi-currency paper";
     };
 
-    plutus-core-spec-old = build-latex-doc {
-      name = "plutus-core-spec-old";
-      description = "Plutus core specification (old version)";
-      src = inputs.self + /doc/plutus-core-spec-old;
-    };
+    # plutus-core-spec-old = build-latex-doc {
+    #   name = "plutus-core-spec-old";
+    #   description = "Plutus core specification (old version)";
+    #   src = inputs.self + /doc/plutus-core-spec-old;
+    # };
 
     plutus-core-spec = build-latex-doc {
       name = "plutus-core-spec";

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/plutus-metatheory-site.nix b/nix/plutus-metatheory-site.nix
@@ -35,7 +35,12 @@ let
 
   plutus-metatheory-site = pkgs.runCommand "plutus-metatheory-site"
     {
-      buildInputs = [ pkgs.jekyll pkgs.linkchecker ];
+      buildInputs = [
+        pkgs.jekyll
+        # TODO lickcheker is broke in nixpkgs-usnstable, remove this when it's fixed
+        # pkgs.linkchecker
+        inputs.nixpkgs-2405.legacyPackages.linkchecker
+      ];
     }
     ''
       mkdir "$out"

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
@@ -47,9 +50,12 @@ in
     pkgs.gawk
     pkgs.scriv
     pkgs.fswatch
-    pkgs.linkchecker
     pkgs.yarn
 
+    # TODO lickcheker is broke in nixpkgs-usnstable, remove this when it's fixed
+    # pkgs.linkchecker
+    inputs.nixpkgs-2405.legacyPackages.linkchecker
+
     # Needed to make building things work, not for commands
     pkgs.zlib
     pkgs.cacert

diff --git a/plutus-benchmark/nofib/src/PlutusBenchmark/NoFib/Queens.hs b/plutus-benchmark/nofib/src/PlutusBenchmark/NoFib/Queens.hs
@@ -16,10 +16,7 @@
 
 module PlutusBenchmark.NoFib.Queens where
 
-{- Andrew Tolmach and Thomas Nordin's contraint solver
-
-	See Proceedings of WAAAPL '99
--}
+{- Andrew Tolmach and Thomas Nordin's contraint solver. See Proceedings of WAAAPL '99 -}
 
 import Control.DeepSeq (NFData)
 import Control.Monad (forM_)