Commit Graph

5177 Commits

Author SHA1 Message Date
Frederik Rietdijk
d38ee5b46c Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-07 09:29:44 +02:00
Frederik Rietdijk
b1504b444b conan: 0.21.2 -> 0.26.2, and fix build 2017-09-07 09:28:03 +02:00
Frederik Rietdijk
9e27b88141 Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-06 20:17:53 +02:00
Joachim F
8eb195d0da Merge pull request #28852 from Balletie/fix/rtags-configure-prefix
rtags: Fix configure phase errors
2017-09-06 14:45:39 +00:00
Bernd Amend
b49b9da3ce
cmake: add withQt5 option and make it the default 2017-09-06 08:02:08 -05:00
Bernd Amend
f3ac052f24
cmake: 3.8.2 -> 3.9.1 2017-09-06 08:02:05 -05:00
Frederik Rietdijk
38dc9a870f Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-06 14:01:25 +02:00
John Ericson
40e917d35d Merge pull request #29023 from obsidiansystems/deps-reorg
misc pkgs: Reorganize dependencies ahead of #26805
2017-09-05 18:10:32 -04:00
Andreas Rammhold
14c3ce919b
rustup: 1.2.0 -> 1.3.0 2017-09-05 22:27:30 +02:00
Franz Pletz
bbeeee220a
Merge remote-tracking branch 'origin/master' into staging 2017-09-05 20:14:08 +02:00
Franz Pletz
1bed4773f5
postgresql92: remove last references 2017-09-05 18:20:56 +02:00
John Ericson
252b36a28d misc pkgs: Recategorize some dependencies 2017-09-05 11:37:10 -04:00
Fatih Altinok
ec39670290 flow: 0.49.1 -> 0.54.0 2017-09-05 16:03:37 +03:00
Robin Gloster
8502d94b31
jenkins: 2.73 -> 2.77 2017-09-05 14:42:46 +02:00
Franz Pletz
c6e5fc0b36
babeltrace: 1.2.4 -> 1.5.3 2017-09-05 14:24:58 +02:00
Franz Pletz
1c4d28539f
autoconf-archive: 2016.09.16 -> 2017.03.21 2017-09-05 14:24:57 +02:00
Frederik Rietdijk
d7ef196c26 Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-05 10:11:06 +02:00
Michele Catalano
e783c2b39c nexus: 2.12.0-01 -> 3.5.1-02
Update Nexus to version 3.5.1-02 and fix startup stript to run in nix
environment.
2017-09-04 22:32:02 +02:00
Daiderd Jordan
86696e07c7 Merge pull request #28868 from matthewbauer/xcbuild-fix-sdk
xcbuild: fix sdk dir name issue
2017-09-03 21:34:46 +02:00
John Ericson
0a944b345e Merge pull request #28557 from obsidiansystems/binutils-wrapper
Binutils-wrapper: Init by refactoring out of cc-wrapper
2017-09-03 10:37:27 -04:00
Tim Steinbach
aa59865333
sbt: 1.0.0 -> 1.0.1 2017-09-02 12:54:50 -04:00
Austin Seipp
e3bc5171df icestorm: 2016.11.01 -> 2017.08.31
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2017-09-02 04:19:11 -05:00
Matthew Bauer
f8f3384638
xcbuild: fix sdk dir name issue
Previously, this error was coming up in xcbuild:

ld: malformed 32-bit x.y.z version number: 1068638

It’s an interesting error because it only happens with certain hashes for the
nixpkgs sdk. For instance, on latest nixpkgs unstable channel, the hash for the
xcbuild sdk is:

/nix/store/w6mwbdaz9calyii0fyxspl51f1068638-nix.nixpkgs.sdk

that is an issue we pass -isysroot ${sdk} to clang where it will interpret that
hanging "1068638". It would probably go away as soon as the hash changes but
this hacky fix will solve the problem.
2017-09-01 15:11:12 -05:00
John Ericson
3f30cffa55 misc pkgs: Use $NIX_BINUTILS for when needed
Certain files are now only there instead of $NIX_CC (some are in both)
2017-09-01 11:44:55 -04:00
Balletie
311a1ee33a
rtags: Fix configure phase errors
Add pkgconfig as buildinput, so that the install path is correctly set
with cmake. PkgConfig is an optional dependency for rtags, but they
say it's necessary if you want to replace the prefix with
CMAKE_INSTALL_PREFIX. See:
caad9ac494/cmake/BashCompletion.cmake (L13)

Furthermore, I let the configurePhase of the rtags emacs package be a
noop.
2017-09-01 16:41:49 +02:00
Samuel Leathers
39154ab86f bossa: fix build with gcc6 2017-08-31 22:44:56 -04:00
Peter Simons
91054336ce multi-ghc-travis: update to latest git head 2017-08-31 21:42:55 +02:00
Jörg Thalheim
ed997b153c Merge pull request #28756 from disassembler/pulseview-sigrok
pulseview and sigrok updates
2017-08-31 09:28:44 +01:00
Frederik Rietdijk
6d4bd78fad Merge commit '2858c41' into HEAD 2017-08-30 21:07:07 +02:00
Samuel Leathers
902dc73ee2 sigrok-cli: 0.6.0 -> 0.7.0 2017-08-30 14:04:31 -04:00
Samuel Leathers
3e1fa824df libsigrokdecode: 0.4.1 -> 0.5.0 2017-08-30 13:52:17 -04:00
Samuel Leathers
afa5dcbd7d libsigrok: 0.4.0 -> 0.5.0 2017-08-30 13:52:12 -04:00
Dan Peebles
b8538c6801 chromedriver: fix on Darwin
A refactor broke it by forcing a bunch of Linux-specific dependencies on
Darwin that only get used in the patchelf invocation.
2017-08-30 11:49:34 -04:00
William Casarin
dfeb8bd4b5 stagit: init at 0.6
a git static site generator
2017-08-30 13:12:17 +02:00
Théo Zimmermann
a9be3c20d1 ocamlPackages.ppx_deriving: 4.1 -> 4.2
This fixes compilation of ppx_deriving with OCaml 4.05.

js_of_ocaml_2: mark as broken with OCaml 4.05

ocamlPackages.cohttp: propagates ppx_deriving
2017-08-30 02:33:23 +00:00
Will Dietz
5543e992f1 snowman: init at 2017-07-22 2017-08-30 02:30:19 +02:00
Will Dietz
1a16760bf0 massif-visualizer: 0.3.90 unstable -> 0.4.0 stable 2017-08-30 00:59:32 +02:00
Joachim Fasting
f2d1abf366
cppcheck: 1.79 -> 1.80 2017-08-29 21:35:22 +02:00
Jörg Thalheim
6a875034dc Merge pull request #28675 from calvertvl/update-loccount-1.1
loccount: 1.0 -> 1.1
2017-08-29 11:56:23 +01:00
Victor Calvert
51c713c538 loccount: 1.0 -> 1.1 2017-08-29 06:01:05 -04:00
Jörg Thalheim
6b93afd39f Merge pull request #28655 from dywedir/rust-bindgen
rust-bindgen: 0.29.0 -> 0.30.0
2017-08-29 10:50:49 +01:00
Vladimír Čunát
2858c41823
Merge branch 'master' into staging
There were some conflicts in python modules, commented at #28314.
2017-08-29 10:51:54 +02:00
Gabriel Ebner
92523344d1 tokei: 6.0.0 -> 6.0.1 2017-08-29 10:40:14 +02:00
dywedir
f71d121173 rust-bindgen: 0.29.0 -> 0.30.0 2017-08-29 00:14:20 +03:00
Bastian Köcher
0da61beee9 xxdiff-tip: 20170101 -> 20170623
Updates the xxdiff-tip version and fixes compilation errors by forcing qt5.6.
2017-08-28 22:14:11 +02:00
Vladimír Čunát
e0010cd1c3
pprof: init at 2017-08-28 2017-08-28 18:46:40 +02:00
Robin Gloster
556029c904
elfutils: 0.169 -> 1.170 2017-08-27 22:51:53 +02:00
Lukas Werling
f0a1ab78b4 meson/ninja: add setup hooks (#28444)
* Add setupHook for meson/ninja build

* libhttpseverywhere: Use meson/ninja setupHooks

* jamomacore: Remove superfluous ninja buildInput

* Remove obsolete ninja buildPhases

These are all handled by ninja's setup hook.

* lean2, xcbuild: fix build with ninja setup hook

Ninja is a runtime dependency here. However, cmake can generate Ninja
build files as well to satisfy the setup hook.

* qtwebengine: fix build with ninja setup hook
2017-08-27 19:42:21 +02:00
Vincent Laporte
935e991b72 js_of_ocaml: 2.8.4 -> 3.0.0
js_of_ocaml-camlp4: init at 3.0.0

js_of_ocaml-ppx: init at 3.0.0
2017-08-27 14:55:12 +00:00
Vincent Laporte
4b1a1c1846 js_of_ocaml-ocamlbuild: init at 3.0.0 2017-08-27 14:36:25 +00:00