Merge branch 'master' into staging

* master: (39 commits)
  python.pkgs.pybfd: move to python-modules
  documentation: python 2.6 is no more
  documentation: python3Packages is python36Packages
  wireguard: 0.0.20171101 -> 0.0.20171111
  php_excel: init at 1.0.2
  libxl: init at 3.8.1
  matrix-synapse: 0.24.1 -> 0.25.1
  grafana: 4.6.1 -> 4.6.2
  linux: 4.4.98 -> 4.4.99
  linux: 4.9.62 -> 4.9.63
  linux: 4.13.13 -> 4.13.14
  nixos/zsh: add the type for enableAutosuggestions option
  zsh-powerlevel9k: init at 2017-11-10
  fio: 3.1 -> 3.2
  filebench: rehash source
  nano: 2.8.7 -> 2.9.0
  bonnie: replace dead source link
  less: 520 -> 529
  strace: 4.19 -> 4.20
  iperf: 3.2 -> 3.3
  ...
This commit is contained in:
Orivej Desh
2017-11-19 08:30:14 +00:00
41 changed files with 496 additions and 187 deletions

View File

@@ -1,18 +1,35 @@
{ stdenv, fetchgit, flex, bison }:
{ stdenv, fetchgit, fetchpatch, flex, bison, pkgconfig, python2, swig, which }:
stdenv.mkDerivation rec {
name = "dtc-${version}";
version = "1.4.4";
version = "1.4.5";
src = fetchgit {
url = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git";
rev = "refs/tags/v${version}";
sha256 = "1pxp7700b3za7q4fnsnxx6i8v66rnr8p6lyi7jf684y1hq5ynlnf";
sha256 = "10y5pbkcj5gkijcgnlvrh6q2prpnvsgihb9asz3zfp66mcjwzsy3";
};
nativeBuildInputs = [ flex bison ];
nativeBuildInputs = [ flex bison pkgconfig swig which ];
buildInputs = [ python2 ];
installFlags = [ "INSTALL=install" "PREFIX=$(out)" ];
patches = [
# Fix 32-bit build
(fetchpatch {
url = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git/patch/?id=497432fd2131967f349e69dc5d259072151cc4b4";
sha256 = "1hrvhvz0qkck53mhacrc4rxjrvp34d8dkw7xb5lr4gpg32grvkpq";
})
# Fix setup.py
(fetchpatch {
url = "https://github.com/dezgeg/dtc/commit/d94a745148ba5c9198143ccc0f7d877fe498ab73.patch";
sha256 = "0hpryx04j1swvmjisrfhvss08zzz4nxz9iv72lp4jdgg6vg0argl";
})
];
postPatch = ''
patchShebangs pylibfdt/
'';
installFlags = [ "INSTALL=install" "PREFIX=$(out)" "SETUP_PREFIX=$(out)" ];
meta = with stdenv.lib; {
description = "Device Tree Compiler";