mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-25 03:17:13 +00:00
Code Issues Wiki Activity
105454 commits 204 branches 125 tags 10 GiB
Commit graph

4625 commits

Author SHA1 Message Date
Michael Raskin e096d7c853 Merge pull request #23229 from juliendehos/gede 
gede: init at 2.0.3
 2017-03-18 17:57:28 +01:00
Frederik Rietdijk e67b979ab5 Merge remote-tracking branch 'upstream/master' into HEAD 2017-03-18 15:32:43 +01:00
Michael Raskin 266fb8845a xxdiff-tip: init at 4.0.1.20170111 
Supports Qt5
 2017-03-18 12:41:09 +01:00
Vladimír Čunát 742b120ddc
Merge branch 'master' into staging 
Nontrivial rebuilds from master, again :-/
 2017-03-18 11:00:31 +01:00
Daniel Brockman 5d6ea2d64e
jshon: fix null termination in read_stream. 
This fixes a somewhat critical (security?) bug.

We are trying to get it merged upstream but have had no response from
the ordinary maintainer in over a week.

(See <https://github.com/keenerd/jshon/issues/53>.)

fixes #23727
 2017-03-16 18:32:04 +01:00
Jörg Thalheim 6a6470386f Merge pull request #23923 from kamilchm/go2nix 
go2nix: 1.1.1 -> 1.2.0
 2017-03-16 12:54:05 +01:00
Kranium Gikos Mendoza 9bd988eb0f
sipp: 3.4-beta2 -> 3.5.1 
fixes #23945
 2017-03-16 11:29:38 +01:00
Pascal Wittmann 1ae9a7911c cligh: fix evaluation 2017-03-16 11:06:30 +01:00
Jörg Thalheim 26045faaaf
cligh: init at 0.3 
fixes #23914
 2017-03-16 01:00:21 +01:00
Sergii Paryzhskyi 18a272ef75 sbt-0.12.4: add an older stable version (#23933) 2017-03-15 21:17:23 +00:00
Vladimír Čunát e99bc64552
Merge branch 'master' into staging 
More larger rebuilds from master, unfortunately.
 2017-03-15 19:09:56 +01:00
Kamil Chmielewski d16b08ac85 go2nix: 1.1.1 -> 1.2.0 2017-03-15 16:09:55 +01:00
Will Dietz c766960150 lit: init at 0.5 2017-03-15 09:02:45 +01:00
Jörg Thalheim 496120c19f
travis: 1.8.2 -> 1.8.8 2017-03-14 21:03:58 +01:00
Vincent Laporte 8498f979a1 ocaml-top: 1.1.2 -> 1.1.3 2017-03-14 07:57:59 +00:00
Dan Peebles 25e75cd580 kube-aws: 0.8.1 -> 0.9.4 
Also, enable on Darwin
 2017-03-13 22:20:52 -04:00
Tim Steinbach 89c91c6e32 Merge pull request #23873 from NeQuissimus/gradle_3_4_1 
gradle: 3.4.0 -> 3.4.1
 2017-03-13 20:04:05 -04:00
Tim Steinbach 56fea1a8c0
gradle: 3.4.0 -> 3.4.1 2017-03-13 20:00:58 -04:00
Tuomas Tynkkynen aba0b45b86 Merge remote-tracking branch 'upstream/master' into staging 
Conflicts:
      pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
 2017-03-14 00:49:22 +02:00
Tim Steinbach 2c1876ec6c Merge pull request #23844 from frontsideair/flow-41 
flow: 0.39.0 -> 0.41.0
 2017-03-13 18:12:16 -04:00
Tim Steinbach bc1f692e49 Merge pull request #23846 from mayflower/jenkins_2.49 
jenkins: 2.44 -> 2.49
 2017-03-13 18:09:19 -04:00
Michael Raskin 90f2b24fd7 Merge pull request #23850 from makefu/update/radare2 
radare2: 0.10.6 -> 1.3.0
 2017-03-13 19:32:41 +01:00
makefu bc1011b330
radare2: 0.10.6 -> 1.3.0 2017-03-13 17:53:12 +01:00
Tristan Helmich 4efed1d0d4 jenkins: 2.44 -> 2.49 2017-03-13 15:43:06 +01:00
Fatih Altinok d23effdedf flow: 0.39.0 -> 0.41.0 2017-03-13 17:04:36 +03:00
Michael Raskin 7dc3edaa6a slimerjs: 0.10.2 -> 0.10.3 2017-03-13 08:23:52 +01:00
Peter Hoeg e18d518d66 heroku-cli: 5.6.14 -> 5.6.32 2017-03-12 14:48:17 +08:00
Periklis Tsirakidis 7c980f5e9c valgrind: enable darwin build 2017-03-11 20:29:52 +01:00
sternenseemann f3bf3a4318 redo-sh: init at 1.2.6 2017-03-10 21:50:25 +01:00
Vincent Laporte b34b4674d2 jbuilder: init at 1.0+beta2 
jbuilder is a fast, portable and opinionated build system

Homepage: https://github.com/janestreet/jbuilder
 2017-03-10 20:14:09 +00:00
Markus Hauck 1b1d85bf75 scalafmt: 0.5.8 -> 0.6.2 2017-03-10 21:11:18 +01:00
Joachim Fasting 5bf3b4c7ff
vndr: meta.licence -> license 2017-03-10 20:39:06 +01:00
Tuomas Tynkkynen 5bb99ca0f6 simavr: Disable parallel build 
http://hydra.nixos.org/build/49945319/nixlog/1/raw
 2017-03-10 01:57:59 +02:00
Vladimír Čunát e279358565
Merge #23591: binutils: 2.27 -> 2.28 2017-03-09 23:24:30 +01:00
Tuomas Tynkkynen 1508945755 treewide: Fix eval-release.nix for aarch64 2017-03-09 03:38:04 +02:00
Renaud 80dbc4df36 sqlitebrowser: 3.8.0 -> 3.9.1 
Now uses Qt5
The file CMakeLists.txt needs patching - known issue upstream
 2017-03-09 00:58:00 +01:00
Daniel Peebles 9dc3c904de Merge pull request #23646 from copumpkin/buildbot-cleanup-take-2 
buildbot: fix .withPlugins to propagate inputs
 2017-03-08 13:19:45 -05:00
Tuomas Tynkkynen a3a21a7245 delve: Disable on i686 2017-03-08 20:10:06 +02:00
Dan Peebles ca5a1d927f buildbot: fix .withPlugins to propagate inputs 
Before I was just grabbing the immediate dependencies. I _think_ this
will do the right thing by using the pre-existing setup hook to avoid
having to compute the transitive closure myself.
 2017-03-08 12:39:44 -05:00
Dan Peebles 49b20e5569 buildbot: assorted cleanups 
Some changes to be more idiomatic and use stdenv building blocks more.
I also added a `buildbot.withPlugins` instead of the current plugins
mechanism, which forces an unnecessary rebuild of the package and reruns
all the tests. This should be equivalent and more pleasant to use in
practice.
 2017-03-08 11:28:44 -05:00
zimbatm e50203bfde yarn: 0.21.3 -> 0.22.0 2017-03-07 16:25:09 +00:00
Lancelot SIX ecd849b267
binutils: 2.27 -> 2.28 
See http://lists.gnu.org/archive/html/info-gnu/2017-03/msg00002.html
for release announcement
 2017-03-07 12:09:41 +01:00
Frederik Rietdijk 03504f0150 Merge pull request #23565 from teh/mypy 
Mypy
 2017-03-07 10:09:11 +01:00
Fernando J Pando 9f062c2c0b buildbot: 0.9.3 -> 0.9.4 
- adds jwt
- adds module tests
- master.cfg as path in module
- fix systemd worker config
- builds on darwin
- tested on nixos
 2017-03-07 00:45:37 +01:00
Will Dietz 9614ebf137
coccinelle: 1.0.0-r23 -> 1.0.6 
* Remove camlp4 dependency, no longer needed
* Keep pycaml to use ours over bundled version
* Enable tests for sanity (broken on darwin)
* no longer need to force specific ocaml version
* don't create python wrappers, they don't seem to be needed
* remove deprecated configure flag.
* fix spgen by removing bytecode version.
 2017-03-06 17:50:11 -05:00
Tom Hunger 1a8a194186 mypy-lang: 0.4.5 -> 0.501 and rename to mypy 2017-03-06 21:29:05 +00:00
Markus Hauck 504dc9de29 scalafmt: 0.5.7 -> 0.5.8 2017-03-06 19:38:05 +01:00
Jörg Thalheim 7576bea49d Merge pull request #23551 from nthorne/clog-derivation 
clog-cli: init at 0.9.2
 2017-03-06 14:54:12 +01:00
Vincent Demeester 906afc7e74
delve: 0.11.0-alpha -> 0.12.1 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-03-06 08:03:40 -05:00
Gauthier POGAM--LE MONTAGNER 6dd19dc4e3
yarn: 0.20.3 -> 0.21.3 2017-03-06 07:59:42 -05:00
Niklas Thörne 8d87f8addd clog-cli: init at 0.9.2 
Updated with maintainer information.
 2017-03-06 13:45:39 +01:00
Niklas Thörne ae38cdad26 clog-cli: init at 0.9.2 2017-03-06 11:15:35 +01:00
Daiderd Jordan 0113a5ec29 Merge pull request #23340 from alibabzo/fix/msgpack-tools 
msgpack-tools: fix hydra build
 2017-03-05 15:15:26 +01:00
Peter Hoeg e6150d8be9 pmccabe: 2.4 -> 2.6 2017-03-05 10:36:22 +08:00
Vincent Laporte ad49932f8a camlp4: init at 4.05+1 2017-03-04 06:51:24 +00:00
Alistair Bill fa5ecc2d1a msgpack-tools: fix sandbox build 2017-03-02 17:51:17 +00:00
Graham Christensen 03549854ac Merge pull request #23385 from izuk/bazel 
bazel: add gcc to PATH and simplify patch
 2017-03-02 08:59:45 -05:00
Robin Gloster feffa1aabf
cuter: fix build 2017-03-02 13:00:44 +01:00
Robin Gloster eebb5f20a3
cuter: fix indentation 2017-03-02 13:00:44 +01:00
Domen Kožar bfe15ec83f
electron: 1.4.13 -> 1.4.15 2017-03-02 12:56:05 +01:00
Itai Zukerman 1f709ad136 bazel: add gcc to PATH and simplify patch 
Removed patches that are purely for testing.
Removed dependencies that seemed to not be needed.
Expand all instances of #!/bin/bash, not just those at the start of scripts.
 2017-03-02 00:09:10 -08:00
rnhmjoj 83462da296 eztrace: add missing dependency 2017-03-02 04:00:36 +02:00
Bjørn Forsman 96d774747b simavr: 1.3 -> 1.5 (fixes build) 2017-03-01 18:11:40 +01:00
Vladimír Čunát b43614a6bb
Merge branch 'staging' 
(Truly, this time :-)
 2017-03-01 11:34:44 +01:00
Benjamin Staffin 7c17c10bab bazel: Wrap so java is present at runtime 
Bazel can't start up without javac in $PATH.
 2017-02-28 12:44:44 -05:00
Benjamin Staffin 14ef7c0c59 bazel: consolidate bazel test invocations 
This way it can run them in parallel.
 2017-02-28 12:21:52 -05:00
Itai Zukerman 17835f14c5 bazel: replace patch with patchShebangs and substituteInPlace 2017-02-28 17:41:52 +01:00
Peter Simons 93c829d763 Merge pull request #23274 from robbinch/pkg-tinc 
haskellPackages.tinc: 20161119 -> 20170228
 2017-02-28 14:50:50 +01:00
Robbin C 256c4003e4 haskellPackages.tinc: 20161119 -> 20170228 2017-02-28 21:39:34 +08:00
Vincent Laporte 52507b3a9b ocamlPackages.ocp-build: 1.99.17-beta -> 1.99.18-beta 2017-02-28 02:38:21 +00:00
Benjamin Staffin d348b80f31 bazel: Log test errors to stderr during checkPhase 
Otherwise it's difficult or impossible to retrieve them, particularly
from a hydra build.
 2017-02-27 19:22:37 -05:00
Pascal Bach 7992ce65fc gitlab-runner: 1.10.4 -> 1.11.0 2017-02-27 21:56:02 +01:00
Vladimír Čunát a1919db7cd
Merge branch 'master' into staging 2017-02-27 20:15:27 +01:00
Vladimír Čunát e2e270d1e2
binutils: drop the $dev/bin symlink 
Fixes #18839.  I suspect I once added this just because of some
deficiencies in an early development version of the multiple-output
framework in stdenv.
 2017-02-27 20:08:26 +01:00
Thomas Tuegel 127bf18a35
extra-cmake-modules: Lift Qt dependency 2017-02-27 11:49:46 -06:00
Thomas Tuegel 4e36b374d0
heaptrack: Fix packaging errors 2017-02-27 11:49:08 -06:00
Julien Dehos f54b52f962 gede: init at 2.0.3 2017-02-27 10:08:27 +01:00
Vincent Laporte b2a4eb839a ppx_tools, camlp4, ocamlify, ocamlmod: don’t strip binaries 2017-02-26 21:18:42 +01:00
Jörg Thalheim 7b8a3b16b1 Merge pull request #23140 from leenaars/hexio 
hexio: unstable -> 1.0-RC1
 2017-02-26 09:17:47 +01:00
Benjamin Staffin 0c3afbd8a7 Merge pull request #23074 from izuk/bazel 
bazel: remove dependence on buildFHSUserEnv
 2017-02-25 23:11:27 -05:00
Thomas Tuegel 0ed156a216 Merge pull request #22977 from ttuegel/triage-kde4 
Remove KDE 4 desktop packages
 2017-02-25 12:21:44 -06:00
Markus Hauck e4d1b3fbfa scalafmt: 0.5.6 -> 0.5.7 2017-02-25 16:08:27 +01:00
Gauthier POGAM--LE MONTAGNER 870914fc41 yarn: 0.19.1 -> 0.20.3 2017-02-25 14:42:21 +01:00
Thomas Tuegel f28848cb4d
kde4.kdelibs -> kdelibs4 
Our kdelibs4 package does not come from KDE 4, so per upstream's request I am
moving it out of the kde4 set.
 2017-02-24 17:16:28 -06:00
Charles Strahan 4abbe3c5fc
gocode: 20150904 -> 20170219 
Go completion wasn't working (at least from youcompleteme); this fixes
that.
 2017-02-24 17:11:25 -05:00
Vincent Laporte 690968df54 ocamlPackages.utop: 1.19.2 -> 1.19.3 2017-02-24 19:21:29 +00:00
Michiel Leenaars 1fe6ed5392 hexio: unstable -> 1.0-RC1 2017-02-24 17:03:49 +01:00
Leon Isenberg 3211ff1b50 global: support universal-ctags 2017-02-24 07:51:39 +01:00
John Wiegley 6bbddcf7d1
xcbuild: Guard a glibc-only postPatch with \!isDarwin 2017-02-23 11:32:52 -08:00
Nikolay Amiantov a4353270c4 lttng-ust: 2.5.1 -> 2.9.0 2017-02-23 13:04:23 +03:00
Nikolay Amiantov ba43d6bdc9 lttng-tools: 2.5.2 -> 2.9.3 2017-02-23 13:04:23 +03:00
Itai Zukerman 59bb3d1f3f bazel: remove dependence on buildFHSUserEnv 2017-02-22 20:42:21 -08:00
Vladimír Čunát 145d3ea81c
Merge branch 'master' into staging 2017-02-22 17:47:49 +01:00
Vladimír Čunát fe8aa284c2
xcbuild: fixup build with glibc-2.25 2017-02-22 16:58:45 +01:00
Tim Steinbach 83f29e9b99
gradle: 3.3 -> 3.4 2017-02-21 19:02:42 -05:00
zimbatm 9c1399e476 packer: 0.12.1 -> 0.12.2 2017-02-21 14:10:15 +00:00
Arseniy Seroka c3aa109041 Merge pull request #22497 from andsild/vint 
vint: init at 0.3.11
 2017-02-21 16:19:13 +03:00
asildnes 88b8f38e71
vint: init at 0.3.11 2017-02-21 12:48:03 +01:00
Matthias Beyer d35695e3e1 Revert "sqlitebrowser: 3.8.0 -> 3.9.1" 
This reverts commit f9d7d29fa9.
 2017-02-21 10:48:00 +01:00
Peter Hoeg 8e5b630b49 Merge pull request #22264 from peterhoeg/m/modeswitch 
usb-modeswitch: 2.2.1 -> 2.5.0 and nixos module
 2017-02-21 16:49:04 +08:00
Vladimír Čunát 5cf7b7c109
cmake: 3.7.1 -> 3.7.2 2017-02-20 21:29:52 +01:00
Nikolay Amiantov ec2c9d57b5 Merge pull request #22568 from abbradar/chromium-updates 
Chromium updates
 2017-02-20 15:49:04 +03:00
vbgl d31577cfd3 Merge pull request #22871 from FlorentBecker/default_ocaml_402 
Default ocaml 402
 2017-02-19 15:54:54 +01:00
Florent Becker 9d57f1ae9a frama-c: fix compilation with ocaml 4.02+ 2017-02-19 13:05:47 +01:00
Vincent Laporte 203e3c5292 trv: fix the propagate build inputs 2017-02-19 11:38:29 +00:00
Will Dietz 798e0f50f4 creduce: Use wrapper instead of propagatedUserEnvPkgs 
Friendlier when installed,
fixes execution outside of NixOS.
 2017-02-18 19:49:53 -06:00
Frederik Rietdijk 8c3480f3b9 Merge pull request #22828 from matthiasbeyer/update-my-pkgs 
Updates for some of my packages
 2017-02-18 14:09:51 +01:00
Peter Hoeg cad335eb01 usb-modeswitch-data: 20160112 -> 20170205 
Plus some minor cleanups.
 2017-02-18 11:35:25 +08:00
Peter Hoeg 9097b9e34a usb-modeswitch: 2.2.1 -> 2.5.0 
We were carrying v2.2.1 and not v2.3.0 due to the update only touching
the version and not the sha256 sum.
 2017-02-18 11:35:02 +08:00
Joachim F fe4552420e Merge pull request #22680 from dtzWill/feature/creduce 
creduce: init at 2.6.0
 2017-02-17 16:58:37 +01:00
Vincent Demeester 834de6ebaa glide: output correct version (#22896) 
It currently displays `0.12.0-dev` instead of the specified
version.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-02-17 12:08:54 +01:00
Matthias Beyer f9d7d29fa9 sqlitebrowser: 3.8.0 -> 3.9.1 2017-02-15 14:18:53 +01:00
Jean-Pierre PRUNARET 59639ad8b0 opengrok: 0.12.1 (broken) -> 0.12.5 2017-02-15 10:22:02 +01:00
Franz Pletz f87eb8920c
grafana-old: outdated, probably without users 2017-02-15 00:42:29 +01:00
Daiderd Jordan 7929888e8d Merge pull request #22614 from cstrahan/ycm 
YouCompleteMe: use ycmd package
 2017-02-14 21:32:09 +01:00
Benjamin Staffin 40dc5e6982 Merge pull request #22771 from izuk/bazel 
bazel: 0.3.2 -> 0.4.4
 2017-02-14 11:49:20 -05:00
Eelco Dolstra 314dd9215b Merge pull request #16654 from awakenetworks/parnell/setcap-wrappers 
Adding setcap-wrapper functionality to Nix
 2017-02-14 16:25:06 +01:00
Gabriel Ebner 8493a2d060 heaptrack: init at 2017-02-14 2017-02-14 12:19:40 +01:00
Itai Zukerman 25121d4350 bazel: 0.3.2 -> 0.4.4 2017-02-13 16:12:26 -08:00
Daiderd Jordan 07c21bfaf7
ycmd: fix darwin build 2017-02-14 00:31:29 +01:00
Parnell Springmeyer 9e36a58649
Merging against upstream master 2017-02-13 17:16:28 -06:00
Rongcui Dong 9775a26da3 stlink: 1.1.0 -> 1.3.0 
[Bjørn: Upstream moved from autotools to cmake.]
 2017-02-13 22:05:40 +01:00
Graham Christensen 4450327c06
flow: pin ocaml to ocaml_4_02 2017-02-12 20:52:37 -05:00
Graham Christensen 8378afaf76 Merge pull request #22700 from holidaycheck/update-flow 
flow: 0.37.4 -> 0.39.0
 2017-02-12 20:39:17 -05:00
Will Dietz a82b3dd8e2 creduce: init at 2.6.0 
Also includes perl dependency 'GetOpt::Tabular'.
 2017-02-12 14:31:16 -06:00
Markus Hauck 06bacb10e5
scalafmt: 0.4.10 -> 0.5.6 2017-02-12 21:21:10 +01:00
Tobias Pflug 9960f7e9f8 flow: 0.37.4 -> 0.39.0 2017-02-12 11:41:47 +01:00
Vladimír Čunát 66fe4af226
Merge recent staging 
It's the version last built on Hydra, almost fully.
 2017-02-10 18:07:14 +01:00
Charles Strahan 4ca258e97a Merge pull request #22490 from cstrahan/ycmd 
ycmd: 2016-01-12 -> 2017-02-03
 2017-02-10 01:09:56 -05:00
Charles Strahan 53a5117cde
ycmd: use vendored python libs 
YouCompleteMe needs the packages to be available in ycmd's third_party
directory, and things start getting pretty complicated when we try to
use our package libs instead of the vendored ones. We can revisit this
at a later time, but we'll need to ensure that we don't break the vim
plugin.

Tested in vim.
 2017-02-10 01:01:22 -05:00
Daniel Peebles 7439fe083f Merge pull request #22297 from nand0p/buildbot-0.9.3 
buildbot: 0.9.0.post1 -> 0.9.3
 2017-02-09 11:15:03 -05:00
Pascal Wittmann b6cc6bd088 yodl: 3.08.01 -> 3.08.02 2017-02-09 09:11:28 +01:00
Vladimír Čunát 5efc5a4ede
pydb, libclc: fixup eval after pinning to python2 2017-02-09 08:52:22 +01:00
Vladimír Čunát 6bea415b5e
Merge branch 'master' into staging 2017-02-09 08:42:04 +01:00
Nikolay Amiantov 003fa8fed5 gn: remove 
Chromium depends on bundled versioon of gn. It's also chromium-specific build
tool, so it's not feasible to package.
 2017-02-08 22:52:40 +03:00
Frederik Rietdijk 4d51b6cda5 pydb: use python2 2017-02-08 19:53:23 +01:00
Fernando J Pando 34b5c9a4de buildbot: 0.9.0.post1 -> 0.9.3 
- Fixes unneeded patching
- Adds worker to build inputs now needed for tests
- Replaces enableworker option with worker configuration module
- Openssh required for tests
- Fixes worker hardcoded paths
- Tested on Nixos Unstable
 2017-02-07 11:14:42 -05:00
Bjørn Forsman d3c7a94b77 openocd: 0.9.0 -> 0.10.0 
Announcement:
http://openocd.org/2017/01/openocd-0-10-0-release-is-out/

The udev rules were renamed. Add code to automatically detect renames in
the future.
 2017-02-06 20:19:36 +01:00
Charles Strahan b27edc4537
ycmd: 2016-01-12 -> 2017-02-03 
Also, remove wrapper bash script and symlink completion backends to
ycmd can find them.
 2017-02-06 04:11:03 -05:00
Herwig Hochleitner 67ccc41a67 leiningen: 2.6.1 -> 2.7.1 (#22485) 2017-02-06 08:44:20 +01:00
Graham Christensen 5d8d1a5623 Merge pull request #22479 from Szczyp/rhc 
rhc: 1.36.4 -> 1.38.7
 2017-02-05 22:42:55 -05:00
Volth c771d499f9 systemtap: 2016-09-16 -> 2017-02-04 2017-02-06 01:54:19 +01:00
Szczyp 33c09a0e40 rhc: 1.36.4 -> 1.38.7 
Fix: CVE-2016-10173
 2017-02-06 01:10:51 +01:00
Aristid Breitkreuz 00517f1779 rr: 4.4.0 -> 4.5.0 2017-02-05 22:00:42 +01:00
Joachim F 8ba043a540 Merge pull request #22456 from peterhoeg/u/wp 
wp-cli: 1.0.0 -> 1.1.0
 2017-02-05 05:52:04 +01:00
Tuomas Tynkkynen 01d03cb5e7 binutils: Fix cross build 
Broken after commit 17a344a ("binutils: Add lib output").
 2017-02-04 23:39:25 +02:00
Vladimír Čunát a2c867fd39
Merge branch 'staging' 2017-02-04 21:02:46 +01:00
Joachim F 43453eb94b Merge pull request #22289 from frontsideair/flow-37.4 
flow: 0.37.1 -> 0.37.4
 2017-02-04 15:33:22 +01:00
Bjørn Forsman 5b4a857126 hydra: 2016-12-09 -> 2017-02-03 
Unbreaks the build since commit dea81956fc
("nixUnstable: 1.12pre4911_b30d1e7 -> 1.12pre4997_1351b0d").
 2017-02-04 14:23:41 +01:00
Jörg Thalheim f5db07b158 Merge pull request #22426 from khumba/squirrel-sql 
squirrel-sql: init at 3.7.1
 2017-02-04 08:40:36 +01:00