Merge branch 'master' into staging

* master: (48 commits)
  Mathematica: 11.0.1 -> 11.2.0
  kbfs: 20170922.f76290 -> 20171004.40555d
  packer: 1.0.3 -> 1.1.0
  libxdg-basedir: 1.0.2 -> 1.2.0
  fscrypt: 0.2.1 -> 0.2.2
  devtodo: init at 0.1.20
  keybase: 1.0.30 -> 1.0.33
  elixir: Fix locale problem on NixOS
  keybase-gui: 1.0.25 -> 1.0.33
  terraform: 0.10.2 -> 0.10.7  (#30055)
  emby: 3.2.32.0 -> 3.2.33.0
  sbcl: 1.3.21 -> 1.4.0
  ardour: 5.11 -> 5.12
  axoloti: fix evaluation
  axoloti: init at 1.0.12-1
  melpa-packages: Add new lean packages
  fastlane: init at 2.60.1
  nixos/traefik: guard example path
  go-ethereum: 1.7.0 -> 1.7.1
  xzgv: 0.9.1 -> 0.9.2
  ...
This commit is contained in:
Orivej Desh
2017-10-05 07:41:39 +00:00
55 changed files with 1501 additions and 295 deletions
@@ -1,37 +1,20 @@
{stdenv, fetchgit, qt4, cmake, libxml2, libxslt}:
let
srcComponents = fetchgit {
url = git://caneda.git.sourceforge.net/gitroot/caneda/components;
rev = "34cd36b620e0dfc57ba2d2b6168734ea9a2cfa9a";
sha256 = "840f07921eecbf10e38e44e5c61c716295a16c98fbb75016d9a44e7dfee40e59";
};
in
{stdenv, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qwt }:
stdenv.mkDerivation rec {
name = "caneda-git-2012-02-16";
name = "caneda-${version}";
version = "0.3.1";
src = fetchgit {
url = git://caneda.git.sourceforge.net/gitroot/caneda/caneda;
rev = "fff9e2f7988fe5d062548cafeda1e5cd660769d1";
sha256 = "dfbcac97f5a1b41ad9a63392394f37fb294cbf78c576673c9bc4a5370957b2c8";
src = fetchFromGitHub {
owner = "Caneda";
repo = "Caneda";
rev = version;
sha256 = "0hx8qid50j9xvg2kpbpqmbdyakgyjn6m373m1cvhp70v2gp1v8l2";
};
hardeningDisable = [ "format" ];
nativeBuildInputs = [ cmake ];
buildInputs = [ qtbase qttools qtsvg qwt ];
buildInputs = [ cmake qt4 libxml2 libxslt ];
patches = [
./gcc6.patch
];
postInstall = ''
mkdir $out/share/caneda/components
cp -R ${srcComponents}/* $out/share/caneda/components
chmod u+w -R $out/share/caneda/components
'';
enableParallelBuilding = true;
meta = {
description = "Open source EDA software focused on easy of use and portability";