Commit Graph

5571 Commits

Author SHA1 Message Date
Tim Steinbach
5b84cdfd3c
Merge pull request #31362 from earldouglas/jenkins-2.88
jenkins: 2.87 -> 2.88
2017-11-07 16:02:29 +00:00
Vladimír Čunát
6ffafc78fb
Merge branch 'staging'
Main change: glibc: 2.25-x -> 2.26-y, containing security fixes,
and various features and deprecations.  Unfortunately, some of the
latter still cause (transitively) a couple hundred newly failing jobs.
I'm not delaying anymore, so that we have the security fix on master.
I mainly patched gcc, llvm and icu, but I can't fix everything...
2017-11-07 16:00:35 +01:00
James Earl Douglas
0e5014def9
jenkins: add earldouglas as a maintainer 2017-11-07 07:56:37 -07:00
James Earl Douglas
c7e3555d8b
jenkins: 2.87 -> 2.88 2017-11-07 07:56:14 -07:00
Thomas Tuegel
a8538307e5
Merge branch 'master' into qt-5-tmp 2017-11-07 07:33:47 -06:00
Thomas Tuegel
2522a72caf
phantomjs2: remove obsolete RPATH hack 2017-11-07 07:18:49 -06:00
Samuel Leathers
ada3bce8f5
Merge pull request #31345 from acowley/rtags-2.15
rtags: 2.12 -> 2.15
2017-11-07 03:09:11 -05:00
Samuel Leathers
4b95930322
Merge pull request #31321 from pbogdan/update-dfeet
dfeet: 0.3.11 -> 0.3.12
2017-11-07 02:41:25 -05:00
Vladimír Čunát
9aa37b159b
Merge branch 'master' into staging 2017-11-07 06:41:23 +01:00
Peter Hoeg
376516f335
Merge pull request #31120 from peterhoeg/f/sqlite
sqlitebrowser: 3.10.0 -> 3.10.1 and make it work with Qt 5.9
2017-11-07 10:28:47 +08:00
Anthony Cowley
37fc1fcd45 rtags: 2.12 -> 2.15 2017-11-06 20:57:56 -05:00
Vladimír Čunát
3562c2cfa7
flex: add notes about the glibc-2.26 patch 2017-11-06 19:25:14 +01:00
Vladimír Čunát
6535f0bca6
flex: fix with glibc-2.26
It caused segfaults, e.g. when building doxygen.
2017-11-06 19:20:21 +01:00
Piotr Bogdan
217257c835 dfeet: 0.3.11 -> 0.3.12 2017-11-06 14:40:12 +00:00
Vladimír Čunát
1d9a8e2289
Merge branch 'master' into staging 2017-11-06 13:24:06 +01:00
Vaibhav Sagar
eece8755d1 ihaskell: re-enable 2017-11-06 09:58:28 +01:00
Vincent Laporte
a1449ea180
omake: 0.10.2 -> 0.10.3 2017-11-06 06:47:48 +00:00
Orivej Desh
6e4fb7d0cb
Merge pull request #30038 from jbaum98/splint-darwin
splint: Add darwin support
2017-11-06 06:31:18 +00:00
Jake Waksbaum
03bcadd40c splint: Add darwin support 2017-11-06 06:30:02 +00:00
Orivej Desh
ad0c2d5a79
Merge pull request #31056 from purefn/master
make sure which and curl are available in the PATH for sbt-extras
2017-11-06 06:21:09 +00:00
Richard Wallace
29c182f2b2 sbt-extras: make sure which and curl are available in the PATH 2017-11-06 06:20:34 +00:00
Peter Hoeg
dd18e063ef sqlitebrowser: 3.10.0 -> 3.10.1 and make it work with Qt 5.9 2017-11-06 13:07:52 +08:00
Peter Hoeg
9b9dacb5fe
Merge pull request #31224 from peterhoeg/u/tds
freetds: 0.91 -> 1.00.70
2017-11-06 12:28:53 +08:00
Peter Hoeg
762f2ea4b0 sqsh: fix build with new freetds 2017-11-06 12:26:03 +08:00
John Ericson
70d91badf5 treewide: Depend on stdenv.cc.bintools instead of binutils directly
One should do this when needed executables at build time. It is more
honest and cross-friendly than refering to binutils directly.
2017-11-05 17:10:53 -05:00
Austin Seipp
5ccd5cded4 icestorm: 2017.10.16 -> 2017.11.05
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2017-11-05 12:49:38 -06:00
Orivej Desh
2fb0edd085 git-series: fix build after "source" name change 2017-11-05 18:43:30 +00:00
Michal 'BlessJah' Marzuchowski
6b7321c42c gotools: 20160519 -> 20170807 2017-11-04 01:22:40 +01:00
Tim Steinbach
a5847e8378
Merge pull request #31185 from pbogdan/kafkacat-fix-build
kafkacat: fix sandboxed build
2017-11-03 17:38:49 -04:00
Jörg Thalheim
8dc6338542
Merge pull request #31183 from frontsideair/yarn-1.3.2
yarn: 1.2.1 -> 1.3.2
2017-11-03 19:56:20 +00:00
c0bw3b
525380b472 treewide: abandon Google Code homepages 2017-11-03 18:52:28 +00:00
Piotr Bogdan
d83cfdc77f kafkacat: fix sandboxed build 2017-11-03 13:04:47 +00:00
Fatih Altinok
10169cc356 yarn: 1.2.1 -> 1.3.2 2017-11-03 15:48:31 +03:00
Raymond Gauthier
b2d6c63810 geckodriver: init at 0.19.1 2017-11-02 23:24:43 -04:00
Orivej Desh
cfafd6f5a8
Merge pull request #30910 from dywedir/rust-bindgen
rust-bindgen: 0.30.0 -> 0.31.1
2017-11-03 02:57:32 +00:00
Ruben Maher
5dc3ea4b31 flow: 0.57.3 -> 0.58.0 2017-11-03 09:51:33 +10:30
Peter Romfeld
3fb57fe0f8
jazzy: init at 0.9.0 2017-11-02 22:55:28 +08:00
Piotr Bogdan
8904ce343a fix source root locations.
These have changed following commit
c3255fe8ec.

See also:

- https://github.com/NixOS/nixpkgs/pull/31004
- https://github.com/NixOS/nixpkgs/pull/31106
2017-11-02 13:53:36 +00:00
Jörg Thalheim
fbb0b8eaaf
Merge pull request #31087 from andrestylianos/boot
boot: 2.5.2 -> 2.7.2
2017-11-02 09:10:05 +00:00
Gabriel Ebner
d0d9ed6fa0 tokei: fix build
See #30088.
2017-11-02 09:31:20 +01:00
Peter Hoeg
7b9d338c67 pypi2nix: fix build 2017-11-02 14:11:12 +08:00
Mateusz Kowalczyk
ac2976d829 bazel: 0.6.1 -> 0.7.0 2017-11-01 20:03:58 +00:00
Mateusz Kowalczyk
b902a88e80 buck: 2017.05.31.01 -> 2017.10.01.01 2017-11-01 19:34:19 +00:00
André Stylianos Ramos
8014307c64 boot: 2.5.2 -> 2.7.2 2017-11-01 14:10:07 +01:00
Vladimír Čunát
06d7e54d62
Merge branch 'staging'
- I can see some regressions, especially due to fetchzip rename c3255fe8ec.
- Darwin is only half-rebuilt on Hydra ATM.
- But there quite a few security fixes within.
2017-11-01 08:37:31 +01:00
Samuel Leathers
eb88e597b1
Merge pull request #31042 from pbogdan/update-wp-cli
wp-cli: 1.3.0 -> 1.4.0
2017-11-01 00:45:00 +01:00
Vladimír Čunát
447802a683
Merge branch 'master' into staging 2017-10-31 23:47:34 +01:00
Piotr Bogdan
bbb90b1113 wp-cli: 1.3.0 -> 1.4.0 2017-10-31 15:59:06 +00:00
Tim Steinbach
ec1f7a7e95
Merge pull request #31035 from cko/maven_3_5_2
maven: 3.5.0 -> 3.5.2
2017-10-31 08:56:20 -04:00
Christine Koppelt
2a09272b5b maven: 3.5.0 -> 3.5.2 2017-10-31 12:43:34 +01:00
Vladimír Čunát
53c6b01a81
Merge #30979: gnumake: fix occasional hangs 2017-10-30 22:31:03 +01:00
Vladimír Čunát
687943763c
Merge branch 'master' into staging 2017-10-30 22:30:14 +01:00
Tim Steinbach
25c8014a4b
gradle: 4.2.1 -> 4.3 2017-10-30 13:35:12 -04:00
Jörg Thalheim
283c271bf9
Merge pull request #30941 from ljli/rustup-update
rustup: patch and update
2017-10-30 16:32:23 +00:00
Ricardo M. Correia
029522249b gnumake: fix occasional hangs in parallel builds
https://savannah.gnu.org/bugs/?49014
https://savannah.gnu.org/bugs/?51159
2017-10-30 16:15:43 +01:00
James Earl Douglas
da866a6f29
jenkins: 2.86 -> 2.87 2017-10-30 08:57:54 -06:00
Vincent Laporte
dd0cdc2fb4
ocamlPackages.camlp5: 7.02 -> 7.03 2017-10-30 11:58:05 +00:00
Frederik Rietdijk
6d41ae55dd Merge remote-tracking branch 'upstream/master' into HEAD 2017-10-30 07:51:09 +01:00
Leon Isenberg
9e5ba4eb8b rustup: 1.3.0 -> 2017-10-29 2017-10-29 21:40:56 +01:00
Leon Isenberg
cbe326feb8 rustup: Patch rustup to patchelf binaries 2017-10-29 21:40:56 +01:00
Shea Levy
9e37df185c
fwupd: Remove manual rpath settings now that meson is fixed.
Thanks @yegortimoshenko!
2017-10-29 14:42:55 -04:00
Frederik Rietdijk
d0d0308876 Merge remote-tracking branch 'upstream/master' into HEAD 2017-10-29 14:08:20 +01:00
dywedir
4cbf66b578 rust-bindgen: 0.30.0 -> 0.31.1 2017-10-29 00:42:42 +03:00
Jörg Thalheim
1f765718a6
Merge pull request #30868 from bachp/gitlab-runner-10.1.0
gitlab-runner: 10.0.2 -> 10.1.0
2017-10-28 11:49:40 +01:00
Frederik Rietdijk
8634a2e2c5 Merge remote-tracking branch 'upstream/master' into HEAD 2017-10-27 21:35:58 +02:00
Frederik Rietdijk
7ce848309e python.pkgs: updates 2017-10-27 21:34:42 +02:00
Joachim F
b601d87cd6
Merge pull request #30554 from Ma27/init/shmig-2017-07-24
shmig: init at 2017-07-24
2017-10-27 17:45:36 +00:00
Tim Steinbach
a924cd2beb
sbt: No need for bc buildInput 2017-10-27 12:15:29 -04:00
Pascal Bach
41ba309136 gitlab-runner: 10.0.2 -> 10.1.0 2017-10-27 18:06:34 +02:00
Tim Steinbach
eae5dfe134
sbt: 1.0.2 -> 1.0.3 2017-10-27 08:03:25 -04:00
Stefan Lau
e6a3089ec4 selendroid: 0.11.0 -> 0.17.0 2017-10-26 17:56:16 +02:00
Stefan Lau
4cacf8699c selendroid: fix selendroid-selenium command 2017-10-26 17:56:16 +02:00
Daniel Peebles
c3760f664e Merge pull request #30811 from puffnfresh/package/sbt-extras
sbt-extras: init at 77686b3
2017-10-26 08:51:38 -04:00
Vincent Laporte
43d3b9d74c
jbuilder: 1.0+beta12 -> 1.0+beta14 2017-10-26 00:38:54 +00:00
Brian McKenna
c3d24791f5 sbt-extras: init at 77686b3
Fixes #21783
2017-10-26 11:30:45 +11:00
Maximilian Bosch
02b15a418a
shmig: init at 2017-07-24 2017-10-25 22:08:00 +02:00
Sebastian Jordan
c29f701db8 pypi2nix: 1.8.0 -> 1.8.1 (#30792)
* pypi2nix: 1.8.0 -> 1.8.1

* pypi2nix: use fetchFromGitHub
2017-10-25 15:10:57 +01:00
Daniel Peebles
5541a9c26f Merge pull request #30640 from matthewbauer/cmake-frameworks
cmake: setup CMAKE_FRAMEWORK_PATH
2017-10-25 09:59:40 -04:00
Renaud
35bf3b8072 apktool: 2.2.4 -> 2.3.0 2017-10-24 20:05:31 +02:00
James Earl Douglas
2c39cb9f40
jenkins: 2.85 -> 2.86 2017-10-23 15:39:26 -06:00
Tim Steinbach
e2e5979a1e
ammonite: 1.0.2 -> 1.0.3 2017-10-23 14:43:28 -04:00
Kevin Cox
5f8cf0048e rust: update cargo builder to fetch registry dynamically
The biggest benefit is that we no longer have to update the registry
package. This means that just about any cargo package can be built by
nix. No longer does `cargo update` need to be feared because it will
update to packages newer then what is available in nixpkgs.

Instead of fetching the cargo registry this bundles all the source code
into a "vendor/" folder.

This also uses the new --frozen and --locked flags which is nice.

Currently cargo-vendor only provides binaries for Linux and
macOS 64-bit. This can be solved by building it for the other
architectures and uploading it somewhere (like the NixOS cache).

This also has the downside that it requires a change to everyone's deps
hash. And if the old one is used because it was cached it will fail to
build as it will attempt to use the old version. For this reason the
attribute has been renamed to `cargoSha256`.

Authors:
* Kevin Cox <kevincox@kevincox.ca>
* Jörg Thalheim <Mic92@users.noreply.github.com>
* zimbatm <zimbatm@zimbatm.com>
2017-10-23 00:30:47 +01:00
Vincent Laporte
fe41e17631
ocamlPackages.merlin: fix homepage URL 2017-10-22 22:14:38 +00:00
Thomas Tuegel
6a44365573 Merge pull request #30208 from zraexy/massif-visualizer
massif-visualizer: 0.4.0 -> 0.7.0
2017-10-22 15:16:33 -05:00
Vincent Laporte
d6e423c400
ocamlPackages.merlin: 3.0.2 -> 3.0.3 2017-10-22 13:25:46 +00:00
Nikolay Amiantov
0ce09afcfa bazel_0_4: additonal fix for Darwin 2017-10-21 18:21:52 +03:00
Nikolay Amiantov
a86fe917b9 bazel_0_4: try to fix on Darwin
First round of fixes -- let's see how Hydra reacts.
2017-10-21 17:36:54 +03:00
zimbatm
96b339fbc9 buildkite-agent: 2.1.13 -> 2.6.6
Build the package from source

Re-organise the module a bit to allow custom version of the package
2017-10-21 11:23:30 +01:00
Matthew Bauer
24eb665695 cmake: setup CMAKE_FRAMEWORK_PATH
This tells cmake how to find macOS frameworks.

Fixes #26197
2017-10-21 02:27:09 -05:00
Vladimír Čunát
1d317bd84a
scons: fix meta eval 2017-10-20 23:50:27 +02:00
Thomas Mader
75a536459a dub: 1.1.0 -> 1.4.1 (#28396)
- gcc not needed at all as dependency
- other D compilers can be used instead of dmd, so it's not good to use it as a runtime dependency.
- Adding checkPhase (disabled for now because network access is limited in sandbox mode)
- Improve package description.
2017-10-20 20:12:17 +00:00
Michael Weiss
e40233e136 scons: 2.5.1 -> 3.0.0
"SCons release 3.0.0 now available from the download page at
SourceForge. This release should be used instead of 2.5.1. This release
fixes several issues.  TThis will be the first release to support Python
versions earlier than 2.7 as well as 3.5+."

"NOTE: This is a major release.  You should expect that some targets may
rebuild when upgrading.  Significant changes in some python action
signatures. Also switching between PY 2.7 and PY 3.5, 3.6 will cause
rebuilds."
2017-10-20 16:32:26 +02:00
Ignat Loskutov
05ac929444 scalafmt: fix platforms 2017-10-20 13:51:35 +03:00
Tim Steinbach
9d82aa696c Merge pull request #30583 from earldouglas/jenkins-2.85
jenkins: 2.84 -> 2.85
2017-10-19 11:21:54 -04:00
James Earl Douglas
9cf797408c
jenkins: 2.84 -> 2.85 2017-10-19 08:57:37 -06:00
Nikolay Amiantov
0d5ff53a15 bazel_0_4: build on Darwin 2017-10-19 16:38:06 +03:00
Nikolay Amiantov
e3afbd6d26 bazel_0_4: set absolute path to /usr/bin/env
Also cleanup TMPDIR.
2017-10-19 13:19:11 +03:00
Nikolay Amiantov
ba9cde1dd5 bazel_0_4: add optional Nix-specific hacks
* Skip verifying checksums for already fetched packages.
  Needed for two-staged building in Nix:
    1. Build a fixed derivation with `bazel fetch` (filtered out of non-reproducable bits).
    2. Build an actual derivation which uses fetched dependencies (skipping
       checksums needed here because they depend on the build directory).
* Don't clean environment variables for children processes.
  Needed for Nix compiler wrappers.
2017-10-19 13:19:11 +03:00
Vincent Laporte
182b357c9d ocamlPackages.camlp5: 7.01 -> 7.02 2017-10-17 09:01:22 +02:00
Samuel Dionne-Riel
bd87a3be2d vagrant: Adds bash-completion to the proper folder. (#30482) 2017-10-17 02:35:04 +01:00
Ruben Maher
8ec75ae403 flow: 0.57.2 -> 0.57.3 2017-10-17 11:09:04 +10:30
Austin Seipp
11cd2c52c4 nixpkgs: icestorm 2017.08.31 -> 2017.10.16
Also add myself to the maintainers list.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2017-10-16 12:01:17 -05:00
Dario Bertini
e55b99e840 pipenv: init at 8.2.7
fixes #30442
2017-10-16 08:59:14 +01:00
Dario Bertini
c6f90f9493 pew: 0.1.14 -> 1.1.0
Pew was actually broken, due to a SHELL PATH check that had been added
in the previous release (though this shouldn't have hampered users with
bash as their shell)
2017-10-16 08:59:06 +01:00
Ruben Maher
8c85edb446 flow: 0.57.0 -> 0.57.2 2017-10-16 02:35:45 +02:00
Yegor Timoshenko
8f95aef531 meson: do not strip RPATH
https://github.com/NixOS/nixpkgs/pull/28444#issuecomment-324033323
2017-10-15 12:13:58 -05:00
Vladimír Čunát
3ee33f35f8
Merge branch 'staging'
Contains security fixes in X server and X libs.
On Hydra, the amount to rebuild on master is now higher than on staging;
the comparison looks OK.
2017-10-15 13:59:18 +02:00
Daiderd Jordan
210731c7dd Merge pull request #30403 from matthewbauer/sqitch-fix
sqitch: fix on broken symlinks
2017-10-15 12:51:06 +02:00
Jörg Thalheim
4a01ad0e99 Merge pull request #29882 from Eisfreak7/master
sqldeveloper: 4.1.1 -> 17.2.0
2017-10-15 10:40:31 +01:00
Timo Kaufmann
6591a70812 sqldeveloper: 17.2 -> 17.3 2017-10-14 18:27:54 -05:00
Timo Kaufmann
1e6662dc6a sqldeveloper: Add a detailed requireFile message 2017-10-14 18:13:25 -05:00
Matthew Bauer
b5610ed3f0 sqitch: fix on Darwin
Fixes #30389.
2017-10-14 14:41:29 -05:00
Mathias Schreck
741e78804b jenkins: 2.77 -> 2.84 2017-10-14 18:13:23 +02:00
Vladimír Čunát
6525c22ef1
Merge branch 'master' into staging
Hydra: ?compare=1401528
2017-10-14 10:36:13 +02:00
Vincent Laporte
0bd108d2ce
ocamlmod: 0.0.8 -> 0.0.9 2017-10-14 07:31:13 +00:00
Vincent Laporte
cb61845c4a
ocamlbuild: remove unused arguments 2017-10-14 06:40:21 +00:00
Jörg Thalheim
93babf0c3b Merge pull request #30251 from selaux/chromedriver-2.33
chromedriver: 2.31 -> 2.33
2017-10-13 20:46:00 +01:00
Vincent Laporte
cdd3b97d15
camlp4: init at 4.06+1 2017-10-13 17:42:56 +00:00
Joerg Thalheim
998f087fea dbench: fix wrong client.txt location
(the path is hard-coded)
cc @bjornfor
2017-10-13 15:37:29 +01:00
Fatih Altinok
826d7d2e8d yarn: 1.0.1 -> 1.2.1 (#30346) 2017-10-13 11:23:45 +01:00
Ruben Maher
ba6f59ad70 flow: 0.56.0 -> 0.57.0 2017-10-13 09:31:34 +02:00
Dan Peebles
e86991e1e8 darwin: fix assorted xcbuild builds
This includes adding a new xcbuild-based libutil build to test the waters a bit there.
We'll need to get xcbuild into the stdenv bootstrap before we can make the main build,
but it's nice to see that it can work.
2017-10-12 07:16:22 -04:00
Daniel Peebles
dd53e65e2e Merge pull request #30306 from copumpkin/xcbuild-update
xcbuild: 0.1.1 -> 0.1.2-pre
2017-10-11 18:54:38 -04:00
Jörg Thalheim
6a404bba71 Merge pull request #30303 from jtojnar/meson
meson: 0.42.1 → 0.43.0
2017-10-11 13:25:47 +01:00
Felix Richter
8315c406a4 radare2: 1.6.0 -> 2.0.0 (#30274)
* radare2: 1.6.0 -> 2.0.0

* radare2: remove hotpatch for upstream
2017-10-11 12:21:21 +01:00
Franz Pletz
28407fad65 Merge pull request #29726 from stesie/v8
V8 6.2.414.15
2017-10-11 12:21:18 +02:00
Jörg Thalheim
0777eae1fb Merge pull request #30186 from selaux/selenium-3.6
selenium-server-standalone: 2.53.0 -> 3.6.0
2017-10-11 10:49:12 +01:00
Dan Peebles
5de4d19392 xcbuild: 0.1.1 -> 0.1.2-pre
Also, add some static library stuff to the platform spec
2017-10-11 01:18:13 -04:00
Jan Tojnar
15c34cf1d8
meson: 0.42.1 → 0.43.0 2017-10-10 23:11:38 +02:00
Dan Peebles
f92e097cd4 xcbuild: add SDKROOT by default to the wrappers
This fixes #30269 and lets us do things like `xcrun -find cc`, for
example.
2017-10-10 16:41:44 -04:00
Eelco Dolstra
30a1b94926
gdb: Remove --with-separate-debug-dir
We don't need this anymore since NixOS now sets $NIX_DEBUG_INFO_DIRS.
2017-10-10 12:05:00 +02:00
Vincent Laporte
b9d276bf4c
antlr4: enable more platforms 2017-10-10 07:21:58 +00:00
Peter Simons
d0e8806494 haskell-tinc: mark build as broken
https://hydra.nixos.org/build/62246306
2017-10-09 17:25:57 +02:00
Stefan Lau
f9672ea36d chromedriver: 2.31 -> 2.33 2017-10-09 15:47:38 +02:00
Vladimír Čunát
994036d857
Merge branch 'master' into staging
Hydra: ?compare=1400181
2017-10-09 11:24:35 +02:00
Stefan Lau
173d8db077 selenium-server-standalone: 2.53.0 -> 3.6.0 2017-10-09 10:19:29 +02:00
Vincent Laporte
701316450c ocamlPackages.oasis: remove unneeded dependencies 2017-10-09 05:34:02 +00:00
Daniel Peebles
416979f3f7 Merge pull request #30150 from copumpkin/no-rpath-nonsense
Get rid of most @rpath nonsense on Darwin
2017-10-08 16:21:27 -04:00
Dan Peebles
b426c85ce2 Get rid of most @rpath nonsense on Darwin
This requires some small changes in the stdenv, then working around the
weird choice LLVM made to hardcode @rpath in its install name, and then
lets us remove a ton of annoying workaround hacks in many of our Go
packages. With any luck this will mean less hackery going forward.
2017-10-08 16:13:46 -04:00
Frank Doepper
e50fdb1c03 devtodo: adjust platforms
devtodo: adjust platforms
unicode: adjust platforms
2017-10-08 18:53:28 +02:00
Vladimír Čunát
2aca029ed2
cmake: maintenance 3.9.2 -> 3.9.4 2017-10-08 18:24:12 +02:00
Unknown
40d9ebd969 massif-visualizer: 0.4.0 -> 0.7.0 2017-10-07 15:06:13 -08:00
Jan Tojnar
407db7b019
gtk_doc: replace catalog lookup hack
In the previous commit, we added a setup hook to docbook dtd and xsl
packages, that adds derivation’s catalog file to an environment variable.
That should, in theory, remove the need for declaring their catalogs manually.
Unfortunately, xmlcatalog utility expects exactly one catalog file, completely
disregarding the environment variable in non-interactive context. In the same
spirit, the design of gtk-doc m4 files only admits a single catalog file,
resulting in another ugly hack.
2017-10-07 23:37:35 +02:00
Frederik Rietdijk
acfec163b1 Merge remote-tracking branch 'upstream/master' into HEAD 2017-10-07 12:15:17 +02:00
Joachim F
d6123d3b92 Merge pull request #30136 from bachp/gitlab-runner-10.0.2
gitlab-runner: 10.0.0 -> 10.0.2
2017-10-07 08:23:16 +00:00
Vladimír Čunát
ef41fc7f51
Merge branch 'master' into staging
Hydra: ?compare=1399476
2017-10-07 10:17:42 +02:00
Orivej Desh
005210dfb3 Merge pull request #30169 from sigma/pr/bazel-0.6.1
bazel: 0.6.0 -> 0.6.1
2017-10-06 22:06:40 +00:00
Will Dietz
7637cb884c bloaty: 2016-12-28 -> 2017-10-05
* use fetchFromGitHub now that it supports submodules
* change version style to dashes per guidelines
  (https://nixos.org/nixpkgs/manual/#sec-package-naming)
* cmake
* prefer substituteInPlace
* run tests
2017-10-06 15:47:56 -05:00
Yann Hodique
3e37e20fa5 bazel: 0.6.0 -> 0.6.1 2017-10-06 08:33:57 -07:00
Orivej Desh
ebd14ee6f5 Merge pull request #30094 from zzamboni/vagrant-fix-darwin
vagrant: fix Ruby and libffi libraries on Darwin
2017-10-06 10:12:05 +00:00