3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

1036 commits

Author SHA1 Message Date
obadz 57ddc155fc Merge branch 'master' into staging
Conflicts:
	pkgs/games/scummvm/default.nix
2016-08-28 12:20:59 +01:00
Gabriel Ebner 497b3cabcc libqalculate, qalculate-gtk: 0.9.8 -> 0.9.9 2016-08-28 10:40:33 +02:00
obadz 3de6e5be50 Merge branch 'master' into staging
Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix
2016-08-27 23:54:54 +01:00
Nikolay Amiantov 1db4cb750c gravit: fix build 2016-08-28 01:04:18 +03:00
Robin Gloster 9f80e55428
openmodelica: disable format hardening 2016-08-27 21:54:17 +00:00
Robin Gloster 191896e63a
qfsm: disable format hardening 2016-08-27 21:53:49 +00:00
Robin Gloster eddc0a5549
treewide: fix darwin builds by using getOutput
This fixes eval for pkgs referring to optional static output
2016-08-25 08:44:20 +00:00
Franz Pletz df275f5b85 treewide: fix darwin builds by referring to stdenv's libc 2016-08-25 02:56:25 +02:00
Robin Gloster f00c750014 qgroundcontrol: remove unused overrideCC and comment 2016-08-24 22:41:41 +00:00
Robin Gloster 13d7e83bf1 perseus: use default gcc 2016-08-24 22:41:41 +00:00
Robin Gloster bd44c7fd70 boolector: fix build with multiple outputs 2016-08-24 18:19:40 +00:00
obadz 0e8d2725dc Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
Tuomas Tynkkynen 282277dbc8 treewide: Use more makeBinPath 2016-08-23 01:18:10 +03:00
obadz 24a9183f90 Merge branch 'hardened-stdenv' into staging
Closes #12895

Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
2016-08-22 01:19:35 +01:00
Michael Raskin 14736fcf4c openmodelica: fix libgfortran.so search 2016-08-20 21:52:21 +02:00
Austin Seipp cc7b072157 nixpkgs: abc-verifier 20160813 -> 20160818
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2016-08-19 01:55:13 +00:00
Robin Gloster 99cb230b47 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-14 09:09:20 +00:00
Austin Seipp 97e5b88d06 nixpkgs: abc-verifier 20150614 -> 20160813
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2016-08-13 17:48:42 +00:00
Franz Pletz bd4490e277 Merge branch 'master' into hardened-stdenv 2016-08-13 16:59:55 +02:00
Luca Bruno 27f294f38d Merge pull request #17589 from cmfwyp/sagemath
sagemath: update mirrors, fix TeX Live dependency
2016-08-12 21:58:41 +01:00
Robin Gloster b7787d932e Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00:00
Robin Gloster 40d217b90e Merge pull request #17657 from matthewbauer/darwin-misc
Darwin misc. fixes
2016-08-11 16:41:34 +00:00
Michael Raskin d1951974df golly: 2.7 -> 2.8 2016-08-11 17:57:35 +02:00
Michael Raskin da4b7afea8 pari: 2.7.5 -> 2.7.6 2016-08-11 17:57:35 +02:00
Matthew Bauer 96322f6926 bcftools: fix darwin building
gcc not available
2016-08-10 22:48:19 -05:00
Matthew Bauer ee63056476 aspino: patch to use c++ instead of g++ 2016-08-10 22:29:18 -05:00
Matthew Bauer b3cb07e130 lie: only build on linux
Darwin build fails from conflicts in libSystem:

In file included from altdom.c:1:
In file included from /private/var/folders/7t/4vz31njj37b8y_bg6z3t7tk00000gn/T/nix-build-LiE-2.2.2.drv-0/LiE/lie.h:34:
In file included from /nix/store/9ll4m9yx854hr64fn1w9ra3qimm3pzdk-Libsystem-osx-10.9.5/include/string.h:176:
/nix/store/9ll4m9yx854hr64fn1w9ra3qimm3pzdk-Libsystem-osx-10.9.5/include/strings.h:73:7: error: redefinition of 'index' as different kind of symbol
char    *index(const char *, int) __POSIX_C_DEPRECATED(200112L);
         ^
/private/var/folders/7t/4vz31njj37b8y_bg6z3t7tk00000gn/T/nix-build-LiE-2.2.2.drv-0/LiE/lie.h:6:14: note: previous definition is here
typedef long index;
             ^
1 error generated.
2016-08-10 21:06:22 -05:00
Matthew Bauer d4b1289592 lie: LiE -> lie
Attributes need to be lowercase, see https://nixos.org/nixpkgs/manual/#sec-package-naming.
2016-08-10 21:04:16 -05:00
obadz 8df7571bbc geogebra: don't build on hydra since derivation just unpacks jars 2016-08-10 14:35:14 +01:00
Mohammed Yaseen Mowzer 04f0cb86d0 geogebra: init at 5.0.265.0
Closes #17400
2016-08-10 14:32:09 +01:00
cmfwyp 179d992427
sage: fix TeX Live input
The Sage derivation had texLive, the old TeX Live packaging which
is now marked as broken, as a build input. This replaces it by the
current TeX Live packaging.

However, the build remains broken. One of the problems can be
solved by patching the hashbangs at the beginning of build scripts,
but the build still gets stuck while building ncurses.
2016-08-07 23:18:47 -04:00
Tuomas Tynkkynen fdde95e096 msieve: Broken on i686
http://hydra.nixos.org/build/38236222
2016-08-06 17:06:45 +03:00
Tuomas Tynkkynen f87f37c1ee bwa: Broken on i686
http://hydra.nixos.org/build/38236956
2016-08-06 17:06:45 +03:00
Erik Rybakken 37aff96daf ripser: init at 1.0 (#17481) 2016-08-04 10:21:48 +02:00
Robin Gloster 1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Tuomas Tynkkynen 21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen 102ffa6be7 treewide: Wrap some really long package descriptions 2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen 59ce911810 treewide: Some EOF-whitespace fixes 2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen 1bf5ded193 treewide: Lots of meta.hydraPlatforms -> meta.platforms
In all of these files, there is no meta.platforms but only
meta.hydraPlatforms, which doesn't seem to have any purpose except being
inconsistent.
2016-08-02 21:17:44 +03:00
Robin Gloster 63c7b4f9a7 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-31 20:51:34 +00:00
Robert Helgesson 8878e8ec05 leo2: remove use of builderDefsPackage (#17398) 2016-07-31 13:57:29 +02:00
Ram Kromberg 78d82f33ac alliance: 5.0 -> 5.1.1 (#17353) 2016-07-30 15:35:51 +01:00
Dmitry Kalinkin 4449ecb617 root: 6.04.16 -> 6.04.18 (#17265)
root: compile against external gsl

Revert "Revert "root: enable parallel building""

This reverts commit ee1a10ee6b.

ROOT has no problems with parallel build. The problems that caused the
original commit were not related to parallel building.
2016-07-30 01:41:37 +01:00
Robin Gloster 154af9e67d Merge pull request #9499 from khumba/scilab-bin-5
scilab-bin: init at 5.5.2
2016-07-28 16:43:08 +02:00
Marco Maggesi c28eb6c2ba Update HOL Light to version 2016-07-23. 2016-07-28 15:56:20 +02:00
Bryan Gardiner ed071594e5
scilab-bin: init at 5.5.2
A built-from-source Scilab 5 package looks to be a lot more work, and some
dependencies are missing from Nixpkgs, but the binary version with bundled
dependencies works.
2016-07-27 21:30:12 -07:00
Gabriel Ebner f970bc67c7 lean: 20160117 -> 2016-07-05
Fixes #17260.
2016-07-27 11:01:45 +02:00
Robin Gloster f222d98746 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-25 12:47:13 +00:00
Gabriel Ebner 9082476478 cvc4: 1.4 -> 1.5pre-smtcomp2016 2016-07-24 13:11:17 +02:00
Robert Helgesson 1012508356 stellarium: 0.14.2 -> 0.14.3 2016-07-22 23:13:35 +02:00
Robert Helgesson 1bedecb4f9 stellarium: wrap binary using wrapQtProgram
Fixes #13582 where Stellarium segfaults when starting.
2016-07-22 22:21:17 +02:00
Gabriel Ebner 82f087944b metis-prover: 2.3.20160102 -> 2.3.20160713 2016-07-21 18:41:26 +02:00
Robin Gloster 203846b9de Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-19 10:37:02 +00:00
Gabriel Ebner 530a9ab981 Merge remote-tracking branch 'vbgl/why3-0.87.1' 2016-07-18 13:33:50 +02:00
Ben Darwin a896233396 jags: 3.4.0 -> 4.1.0 (#16804)
* jags: 3.4.0 -> 4.1.0
* unbreak rjags and dependent packages
2016-07-18 13:11:18 +02:00
vbgl d7cfdc581c coq: 8.5pl1 -> 8.5pl2 (#16863) 2016-07-18 11:33:51 +02:00
Nikolay Amiantov aefd8c420c Merge pull request #17043 from womfoo/fix/qmake4Hook-builds
reintroduce qmake .pro files after qmake4Hook changes
2016-07-18 00:11:24 +04:00
Kranium Gikos Mendoza dd778f1756 fritzing: fix qmake4Hook build
pass phoenix.pro and return unpack logic which were removed in 0b88755
2016-07-17 22:40:27 +08:00
Joachim F d9701350f9 Merge pull request #16951 from heilkn/lie
LiE: include forgotten file INFO.a by installation
2016-07-16 19:54:23 +02:00
Michael Raskin 61a3610853 tptp: 6.3.0 -> 6.4.0 2016-07-16 11:34:32 +02:00
Konstantin Heil c0656fe0c1 LiE: include forgotten file INFO.a by installation 2016-07-14 14:18:57 +02:00
Franz Pletz 26dd9acba5 Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-07-09 13:21:28 +02:00
Konstantin Heil b92c429799 LiE: init at 2.2.2 2016-06-30 21:04:41 +02:00
Vladimír Čunát 3afa246038 Merge branch 'staging'
This includes a security update of expat.
2016-06-29 07:47:04 +02:00
Austin Seipp 25bf4a5634 cryptoverif: init at 1.22
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2016-06-28 04:37:29 +00:00
Austin Seipp a69799c740 statverif: init at 1.86pl4
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2016-06-28 04:36:11 +00:00
Austin Seipp be19637b2a proverif: init at 1.94
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2016-06-28 04:36:11 +00:00
Ta'iř sj Ořit 3832ebde8b gephi: init at 0.9.1 (#16071) 2016-06-26 22:40:00 +02:00
mimadrid 5c7a75412e
igv: init at 2.3.77 2016-06-26 19:27:56 +02:00
Joachim Fasting 46b07b335b Merge pull request #16379 from mimadrid/init/bcftools-1.3.1
bcftools: init at 1.3.1
2016-06-24 22:15:51 +02:00
mimadrid d91d245f16
bcftools: init at 1.3.1 2016-06-24 21:08:17 +02:00
mimadrid 14feec44e4
samtools: refactoring 2016-06-24 21:08:17 +02:00
Vladimír Čunát 6b27ceb006 Merge 'master' into staging and re-revert merge
... from staging to master, reverted temporarily in aa9a04883e.
2016-06-23 12:09:03 +02:00
Vladimír Čunát aa9a04883e Revert "Merge branch 'staging'" due to glibc
The main output started to retain dependency on bootstrap-tools; see
https://github.com/NixOS/nixpkgs/pull/15867#issuecomment-227949096

This reverts commit c05d829598, reversing
changes made to f073df60d6.
2016-06-23 09:25:10 +02:00
Vladimír Čunát c05d829598 Merge branch 'staging' 2016-06-22 10:49:56 +02:00
Gabriel Ebner 0a8e613cea aspino: init at 2016-01-31 2016-06-21 13:55:28 +02:00
Gabriel Ebner 8f84a5cb08 glucose, glucose-syrup: init at 4.0 2016-06-21 13:26:51 +02:00
Gabriel Ebner 9c5588e99f spass: 3.7 -> 3.9 2016-06-21 08:18:20 +02:00
Michael Raskin ca495a53a5 tptp: fix hash 2016-06-20 18:38:08 +02:00
Bjørn Forsman bd01fad0ed Captialize meta.description of all packages
In line with the Nixpkgs manual.

A mechanical change, done with this command:

  find pkgs -name "*.nix" | \
      while read f; do \
          sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
      done

I manually skipped some:

* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
2016-06-20 13:55:52 +02:00
Gabriel Ebner 727716cd82 speedcrunch: 0.11-alpha -> 0.11 2016-06-19 18:45:04 +02:00
Gabriel Ebner e5b3b685f4 libqalculate, qalculate-gtk: 0.9.7 -> 0.9.8 2016-06-19 17:33:45 +02:00
Gabriel Ebner cc0b3bbcc2 minisat: support clang 2016-06-19 15:19:25 +02:00
Vladimír Čunát e757404555 Merge branch 'master' into staging
Hydra nixpkgs: ?compare=1279790
2016-06-19 12:33:04 +02:00
Vladimír Čunát 97c484a10f treewide: fix #include errors after gcc-5.4
They were mostly missing <cmath> or <math.h>.
2016-06-19 10:18:30 +02:00
mimadrid aa8eba9d95
weka: 3.6.12 -> 3.8.0
Closes #16055
2016-06-16 15:47:48 +02:00
mimadrid 9b7a53d9cb
cytoscape: init at 3.4.0
Closes #16197
2016-06-16 15:47:21 +02:00
Robin Gloster 8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Christopher Lübbemeier ac4903284c gmsh: init at 2.12.0 2016-06-09 18:54:26 +02:00
Vincent Laporte a577b3666e why3: 0.87.0 -> 0.87.1 2016-06-09 09:51:38 +02:00
Luis Pedro Coelho bd617cb185 init bwa at 0.7.15
Closes #16064
2016-06-08 17:25:20 +01:00
Tuomas Tynkkynen f1d83444a5 openmodelica: Use makeLibraryPath 2016-06-07 21:18:02 +03:00
Joachim Fasting e65698db0b Merge pull request #15939 from ChrisJefferson/fix-gap
gap : 4.4.12 -> 4.8.3
2016-06-04 01:14:09 +02:00
Chris Jefferson 75f793bbb2 gap : 4.4.12 -> 4.8.3 2016-06-03 19:01:12 +01:00
Tuomas Tynkkynen bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Robin Gloster 2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
Nikolay Amiantov 51f479465c qgroundcontrol: fix build 2016-05-29 19:51:22 +03:00
Moritz Ulrich 7b2fab05f3 Merge pull request #15606 from dvc94ch/fpga-toolchain-updates
FPGA toolchain updates
2016-05-28 15:41:10 +02:00
Vladimír Čunát e4832c7541 Merge branch 'staging'
Includes a security update of libxml2.
2016-05-27 15:58:40 +02:00
Vladimír Čunát 81039713fa Merge branch 'master' into staging
... to get the systemd update (rebuilding ~7k jobs).
2016-05-26 16:50:22 +02:00