public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

buck: cleanup

Browse Source
This commit is contained in:
Tim Jäger
2017-06-08 11:26:42 -07:00
parent dffbe98dd6
commit 926f3eada8
2 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/build-managers/buck/default.nix
+3 -5
View File
@@ -1,8 +1,6 @@
{ stdenv, fetchFromGitHub, jdk, ant, python2, python2Packages, watchman, unzip, bash, jre, makeWrapper }: { stdenv, fetchFromGitHub, jdk, ant, python2, python2Packages, watchman, unzip, bash, makeWrapper }:
stdenv.mkDerivation rec {
let
in stdenv.mkDerivation rec {
name = "buck-${version}"; name = "buck-${version}";
version = "v2017.05.31.01"; version = "v2017.05.31.01";
@@ -31,7 +29,7 @@ in stdenv.mkDerivation rec {
install -D -m755 buck-out/gen/programs/buck.pex $out/bin/buck install -D -m755 buck-out/gen/programs/buck.pex $out/bin/buck
wrapProgram $out/bin/buck \ wrapProgram $out/bin/buck \
--prefix PYTHONPATH : $PYTHONPATH \ --prefix PYTHONPATH : $PYTHONPATH \
--prefix PATH : "${stdenv.lib.makeBinPath [jre watchman]}" --prefix PATH : "${stdenv.lib.makeBinPath [jdk watchman]}"
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
pkgs/development/tools/build-managers/buck/pex-mtime.patch
+6 -14
View File
@@ -1,21 +1,13 @@
diff --git a/third-party/py/pex/pex/common.py b/third-party/py/pex/pex/common.py diff --git a/third-party/py/pex/pex/common.py b/third-party/py/pex/pex/common.py
index 76459ce23..491dcfc0b 100644 index 76459ce23..eff411b20 100644
--- a/third-party/py/pex/pex/common.py --- a/third-party/py/pex/pex/common.py
+++ b/third-party/py/pex/pex/common.py +++ b/third-party/py/pex/pex/common.py
@@ -12,6 +12,7 @@ import stat @@ -328,4 +328,7 @@ class Chroot(object):
import sys
import tempfile
import threading
+import time
import zipfile
from collections import defaultdict
from uuid import uuid4
@@ -328,4 +329,7 @@ class Chroot(object):
def zip(self, filename, mode='wb'): def zip(self, filename, mode='wb'):
with contextlib.closing(zipfile.ZipFile(filename, mode)) as zf: with contextlib.closing(zipfile.ZipFile(filename, mode)) as zf:
for f in sorted(self.files()): for f in sorted(self.files()):
- zf.write(os.path.join(self.chroot, f), arcname=f, compress_type=zipfile.ZIP_DEFLATED) - zf.write(os.path.join(self.chroot, f), arcname=f, compress_type=zipfile.ZIP_DEFLATED)
+ file = os.path.join(self.chroot, f) + path = os.path.join(self.chroot, f)
+ instant = 315532800 + instant = 615532801
+ os.utime(file, (instant, instant)) + os.utime(path, (instant, instant))
+ zf.write(file, arcname=f, compress_type=zipfile.ZIP_DEFLATED) + zf.write(path, arcname=f, compress_type=zipfile.ZIP_DEFLATED)