From cbc3112a99e40d045af10b41e34abdb3e6196cf0 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 18 Oct 2019 12:54:23 +0000 Subject: [PATCH] nix: update shell.nix and Pipfile.lock --- Pipfile.lock | 6 ++++-- shell.nix | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Pipfile.lock b/Pipfile.lock index 8a94d09ec3..901bb9f462 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -262,6 +262,7 @@ }, "hypothesis": { "hashes": [ + "sha256:6847df3ffb4aa52798621dd007e6b61dbcf2d76c30ba37dc2699720e2c734b7a", "sha256:acd47600deb55e9c2c98de6deef23384160ed0fdaafb6753146e556c077d3c78" ], "index": "pypi", @@ -394,9 +395,10 @@ }, "mypy-extensions": { "hashes": [ - "sha256:a161e3b917053de87dbe469987e173e49fb454eca10ef28b48b384538cc11458" + "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d", + "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8" ], - "version": "==0.4.2" + "version": "==0.4.3" }, "packaging": { "hashes": [ diff --git a/shell.nix b/shell.nix index 7119c3f7f7..3f617e51f5 100644 --- a/shell.nix +++ b/shell.nix @@ -11,8 +11,9 @@ stdenv.mkDerivation { gcc gnumake graphviz + libjpeg + libressl libusb1 - openssl pipenv pkgconfig protobuf3_6 @@ -34,7 +35,7 @@ stdenv.mkDerivation { darwin.libobjc libiconv ]; - LD_LIBRARY_PATH="${libusb1}/lib"; + LD_LIBRARY_PATH="${libjpeg.out}/lib:${libusb1}/lib:${libressl.out}/lib"; shellHook = '' pipenv shell exit