From 225966ea7cb10725d4098456df612748007bee9d Mon Sep 17 00:00:00 2001 From: Tomas Susanka Date: Wed, 30 Sep 2020 09:28:20 +0200 Subject: [PATCH] ci: fix date epoch in shell.nix not in Gitlab yml file This way we fix also local environments for devs with NixOS. Updates 988c7f65afa351714d45aae7e0599174a44f18fd. --- .gitlab-ci.yml | 3 --- ci/shell.nix | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 136c47058..52350d3ea 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,9 +21,6 @@ variables: PIPENV_VENV_IN_PROJECT: "true" PIPENV_CACHE_DIR: ".cache/" - # Fix bdist-wheel problem in NixOS by setting source date epoch to a more recent date - SOURCE_DATE_EPOCH: 1600000000 - # No need for TLS because everything runs on the same machine DOCKER_TLS_CERTDIR: "" stages: diff --git a/ci/shell.nix b/ci/shell.nix index 6ccdb0b99..6369698d9 100644 --- a/ci/shell.nix +++ b/ci/shell.nix @@ -44,4 +44,7 @@ stdenv.mkDerivation { ]; LD_LIBRARY_PATH = "${libffi}/lib:${libjpeg.out}/lib:${libusb1}/lib:${libressl.out}/lib"; NIX_ENFORCE_PURITY = 0; + + # Fix bdist-wheel problem by setting source date epoch to a more recent date + SOURCE_DATE_EPOCH = 1600000000; }