diff --git a/byron/cddl-spec/default.nix b/byron/cddl-spec/default.nix index c9282be55c6..3f36543351c 100644 --- 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 index 1cd0e79b792..bb6019635bc 100644 --- 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 index b07fc808285..96d8a3de00e 100644 --- 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 index 8ac92afed34..fb7c11a32c1 100644 --- 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 index 4cac8ad2bfb..af4c702bc9f 100644 --- 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 index f1523d4da7d..7a0a24a21c0 100644 --- 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 index 1ebde10960b..c7fca4d87d1 100644 --- 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 index c8480c8107f..900c9467a31 100644 --- 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 index a5579a12fc1..a4c257a8e1e 100644 --- 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 index 44f0743ff5f..180c070ce1a 100644 --- 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 index c0b39ded938..1d1ab903ac4 100644 --- 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";