Merge pull request #2001 from input-output-hk/rvl/nix-shell-buildLatex

nix: Make it possible to get a nix-shell in latex spec directory
IntersectMBO · Nov 19, 2020 · 608b7fa · 608b7fa
2 parents 7c64ed8 + 9e32d81
commit 608b7fa
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 20 deletions.
diff --git a/byron/cddl-spec/default.nix b/byron/cddl-spec/default.nix
@@ -1,4 +1,6 @@
-{ lib, latex, texlive, gitMinimal, cddl, cbor-diag }:
+{ pkgs ? import ../../nix/default.nix {} }:
+
+with pkgs;
 
 latex.buildLatex {
   name = "blocks-cddl-spec";

diff --git a/byron/chain/formal-spec/default.nix b/byron/chain/formal-spec/default.nix
@@ -1,4 +1,6 @@
-{ lib, latex, texlive, gitMinimal }:
+{ pkgs ? import ../../../nix/default.nix {} }:
+
+with pkgs;
 
 latex.buildLatex {
   name = "byron-chain-spec";

diff --git a/byron/ledger/formal-spec/default.nix b/byron/ledger/formal-spec/default.nix
@@ -1,4 +1,6 @@
-{ lib, latex, texlive, gitMinimal }:
+{ pkgs ? import ../../../nix/default.nix {} }:
+
+with pkgs;
 
 latex.buildLatex {
   name = "byron-ledger-spec";

diff --git a/default.nix b/default.nix
@@ -54,16 +54,16 @@ let
     #  nix-build -A specs -o spec
     #
     specs = recurseIntoAttrs {
-      byron-ledger = pkgs.callPackage ./byron/ledger/formal-spec {};
-      byron-chain = pkgs.callPackage ./byron/chain/formal-spec {};
-      small-step-semantics = pkgs.callPackage ./semantics/formal-spec {};
-      shelley-ledger = pkgs.callPackage ./shelley/chain-and-ledger/formal-spec {};
-      pool-ranking = pkgs.callPackage ./shelley/pool-ranking {};
-      shelley-ma = pkgs.callPackage ./shelley-ma/formal-spec {};
-      goguen-ledger = pkgs.callPackage ./goguen/formal-spec {};
-      delegation-design = pkgs.callPackage ./shelley/design-spec {};
-      non-integer-calculations = pkgs.callPackage ./shelley/chain-and-ledger/dependencies/non-integer/doc {};
-      blocks-cddl = pkgs.callPackage ./byron/cddl-spec {};
+      byron-ledger = pkgs.callPackage ./byron/ledger/formal-spec/default.nix {};
+      byron-chain = pkgs.callPackage ./byron/chain/formal-spec/default.nix {};
+      small-step-semantics = pkgs.callPackage ./semantics/formal-spec/default.nix {};
+      shelley-ledger = pkgs.callPackage ./shelley/chain-and-ledger/formal-spec/default.nix {};
+      pool-ranking = pkgs.callPackage ./shelley/pool-ranking/default.nix {};
+      shelley-ma = pkgs.callPackage ./shelley-ma/formal-spec/default.nix {};
+      goguen-ledger = pkgs.callPackage ./goguen/formal-spec/default.nix {};
+      delegation-design = pkgs.callPackage ./shelley/design-spec/default.nix {};
+      non-integer-calculations = pkgs.callPackage ./shelley/chain-and-ledger/dependencies/non-integer/doc/default.nix {};
+      blocks-cddl = pkgs.callPackage ./byron/cddl-spec/default.nix {};
     };
 
     doc = {

diff --git a/goguen/formal-spec/default.nix b/goguen/formal-spec/default.nix
@@ -1,4 +1,6 @@
-{ lib, latex, texlive }:
+{ pkgs ? import ../../nix/default.nix {} }:
+
+with pkgs;
 
 latex.buildLatex {
   name = "goguen-spec";

diff --git a/semantics/formal-spec/default.nix b/semantics/formal-spec/default.nix
@@ -1,4 +1,6 @@
-{ lib, latex, texlive, gitMinimal }:
+{ pkgs ? import ../../nix/default.nix {} }:
+
+with pkgs;
 
 latex.buildLatex {
   name = "small-step-semantics-spec";

diff --git a/shelley-ma/formal-spec/default.nix b/shelley-ma/formal-spec/default.nix
@@ -1,4 +1,6 @@
-{ lib, latex, texlive }:
+{ pkgs ? import ../../nix/default.nix {} }:
+
+with pkgs;
 
 latex.buildLatex {
   name = "shelley-ma-spec";

diff --git a/shelley/chain-and-ledger/dependencies/non-integer/doc/default.nix b/shelley/chain-and-ledger/dependencies/non-integer/doc/default.nix
@@ -1,4 +1,6 @@
-{ lib, latex, texlive, gitMinimal }:
+{ pkgs ? import ../../../../../nix/default.nix {} }:
+
+with pkgs;
 
 latex.buildLatex {
   name = "non-integer-calculations-spec";

diff --git a/shelley/chain-and-ledger/formal-spec/default.nix b/shelley/chain-and-ledger/formal-spec/default.nix
@@ -1,4 +1,6 @@
-{ lib, latex, texlive, gitMinimal }:
+{ pkgs ? import ../../../nix/default.nix {} }:
+
+with pkgs;
 
 latex.buildLatex {
   name = "shelley-ledger-spec";

diff --git a/shelley/design-spec/default.nix b/shelley/design-spec/default.nix
@@ -1,4 +1,6 @@
-{ lib, latex, texlive, gitMinimal }:
+{ pkgs ? import ../../nix/default.nix {} }:
+
+with pkgs;
 
 latex.buildLatex {
   name = "delegation-design-spec";

diff --git a/shelley/pool-ranking/default.nix b/shelley/pool-ranking/default.nix
@@ -1,4 +1,6 @@
-{ lib, latex, texlive, gitMinimal }:
+{ pkgs ? import ../../nix/default.nix {} }:
+
+with pkgs;
 
 latex.buildLatex {
   name = "pool-ranking";