From e7592a4c04c59cbadb32037c87b74350d08b27e5 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 18 Apr 2019 00:26:04 +0200 Subject: [PATCH] nix: consolidate various shell.nix files into one --- common/shell.nix | 9 --------- core/shell.nix | 9 --------- crypto/shell.nix | 6 ------ python/shell.nix | 9 --------- shell.nix | 39 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 39 insertions(+), 33 deletions(-) delete mode 100644 common/shell.nix delete mode 100644 core/shell.nix delete mode 100644 crypto/shell.nix delete mode 100644 python/shell.nix create mode 100644 shell.nix diff --git a/common/shell.nix b/common/shell.nix deleted file mode 100644 index dd573f1f6..000000000 --- a/common/shell.nix +++ /dev/null @@ -1,9 +0,0 @@ -with import {}; - -let - myPython = python3.withPackages(p: [p.click p.graphviz p.trezor p.ed25519 p.pillow]) ; -in - stdenv.mkDerivation { - name = "trezor-common-dev"; - buildInputs = [ myPython python2Packages.demjson graphviz protobuf ]; - } diff --git a/core/shell.nix b/core/shell.nix deleted file mode 100644 index 1588cc3ca..000000000 --- a/core/shell.nix +++ /dev/null @@ -1,9 +0,0 @@ -with import {}; - -let - myPython = python3.withPackages(ps: [ps.trezor ps.pytest ps.flake8 ps.isort ps.black ps.Mako ps.munch ps.Pyro4 ps.pillow]); -in - stdenv.mkDerivation { - name = "trezor-core-dev"; - buildInputs = [ myPython protobuf scons gnumake gcc gcc-arm-embedded pkgconfig SDL2 SDL2_image autoflake clang-tools ]; - } diff --git a/crypto/shell.nix b/crypto/shell.nix deleted file mode 100644 index d4493bbb5..000000000 --- a/crypto/shell.nix +++ /dev/null @@ -1,6 +0,0 @@ -with import {}; - -stdenv.mkDerivation { - name = "trezor-crypto-dev"; - buildInputs = [ gnumake gcc pkgconfig openssl check valgrind clang-tools ]; -} diff --git a/python/shell.nix b/python/shell.nix deleted file mode 100644 index ed43d61b4..000000000 --- a/python/shell.nix +++ /dev/null @@ -1,9 +0,0 @@ -with import {}; - -let - myPython = python3.withPackages(p: [p.pytest p.black p.isort p.flake8 p.requests p.mnemonic p.construct p.pyblake2 p.mock p.ecdsa p.click p.libusb1 p.protobuf p.typing-extensions]); -in - stdenv.mkDerivation { - name = "python-trezor-dev"; - buildInputs = [ myPython autoflake protobuf ]; - } diff --git a/shell.nix b/shell.nix new file mode 100644 index 000000000..00d9ae5ba --- /dev/null +++ b/shell.nix @@ -0,0 +1,39 @@ +with import {}; + +let + MyPython = python3.withPackages(ps: [ + ps.Mako + ps.Pyro4 + ps.black + ps.ed25519 + ps.flake8 + ps.graphviz + ps.isort + ps.mock + ps.munch + ps.pillow + ps.pytest + ps.trezor + ]); +in + stdenv.mkDerivation { + name = "trezor-firmware-dev"; + buildInputs = [ + MyPython + SDL2 + SDL2_image + autoflake + check + clang-tools + gcc + gcc-arm-embedded + gnumake + graphviz + openssl + pkgconfig + protobuf + python2Packages.demjson + scons + valgrind + ]; + }