JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
90,720 Commits 2 Branches 0 Tags 13 GiB
9f2c48a7a7
Commit Graph

25201 Commits

Author SHA1 Message Date
Frederik Rietdijk
514208cfb5 pythonPackages.cryptography: fix missing dependency 2016-08-30 21:36:33 +02:00
José Romildo Malaquias
cb4cd5d7f0 roboto: init at 2.134 (#18127) 2016-08-30 20:26:06 +02:00
Eric Sagnes
5af8e4b001 rainbowstream: 1.3.3 -> 1.3.5 2016-08-31 03:02:53 +09:00
Frederik Rietdijk
fcdee04c9e pythonPackages.cytoolz: 0.7.4 -> 0.8.0 2016-08-30 19:02:06 +02:00
Frederik Rietdijk
dc04f8a2f0 pythonPackages.toolz: 0.7.4 -> 0.8.0 2016-08-30 19:01:55 +02:00
Frederik Rietdijk
5e59a4b610 pythonPackages.traitlets: 4.2.1 -> 4.2.2 2016-08-30 18:58:11 +02:00
Frederik Rietdijk
704d413f82 pythonPackages.sounddevice: 0.3.1 -> 0.3.4 2016-08-30 18:56:48 +02:00
Frederik Rietdijk
0d8ccc9d29 pythonPackages.dask: 0.9.0 -> 0.11.0 2016-08-30 18:40:41 +02:00
Frederik Rietdijk
ec97b83851 pythonPackages.xarray: 0.7.2 -> 0.8.2 2016-08-30 18:38:56 +02:00
Frederik Rietdijk
4f5a349430 pythonPackages.tqdm: 3.7.1 -> 3.8.4 2016-08-30 18:38:42 +02:00
Frederik Rietdijk
31229ab3eb pythonPackages.llvmlite: 0.12.1 -> 0.13.0 2016-08-30 18:38:27 +02:00
Frederik Rietdijk
433681b1fc pythonPackages.jupyter_core: 4.1.0 -> 4.1.1 2016-08-30 18:38:12 +02:00
Frederik Rietdijk
27ed131128 pythonPackages.jupyter_client: 4.2.2 -> 4.3.0 2016-08-30 18:37:52 +02:00
Frederik Rietdijk
354f148ba5 pythonPackages.jupyter: no tests 2016-08-30 18:37:36 +02:00
Frederik Rietdijk
3b09cf7fc1 pythonPackages.requests2: 2.11.0 -> 2.11.1 2016-08-30 17:59:35 +02:00
Frederik Rietdijk
aedb9a8490 pythonPackages.pillow: 3.3.0 -> 3.3.1 2016-08-30 17:59:35 +02:00
Frederik Rietdijk
7adaf9868d pythonPackages.bcrypt: 2.0.0 -> 3.1.0 2016-08-30 17:59:35 +02:00
Julien Dehos
b72dfa7b7b cxxtest: init at 4.4 2016-08-30 16:18:07 +02:00
Frederik Rietdijk
29b5c72cbc pythonPackages.pytz: 2016.3 -> 2016.6.1 2016-08-30 16:08:12 +02:00
Fernando J Pando
cd838654ea sphinx-jinja: init 0.2.1 
Tested on Linux
 2016-08-30 14:45:54 +02:00
tomberek
e47a7424c9 libtelnet: init at 20160426 (#17936) 2016-08-30 14:41:17 +02:00
Profpatsch
e1e96a8210 youtube-dl: wrap with atomicparsley (#18066) 
Otherwise --embed-thumbnail will crash youtube-dl while running.
Rewrite the module arguments to be semantic and not fail with null
pointer errors.
 2016-08-30 14:36:16 +02:00
Ram Kromberg
f254db331e qweechat: init at 2016-07-29 (#18094) 2016-08-30 14:29:45 +02:00
Frederik Rietdijk
efd175699f pythonPackages.sphinxcontrib-spelling: fix maintainer and license 2016-08-30 13:44:49 +02:00
Frederik Rietdijk
bed7263503 pythonPackages.sphinxcontrib-blockdiag: fix maintainer and license 2016-08-30 13:44:33 +02:00
Frederik Rietdijk
dfe2b9e6ea pythonPackages.cryptography_vectors: 1.4 -> 1.5 2016-08-30 12:23:57 +02:00
Frederik Rietdijk
8651fa9969 pythonPackages.cryptography: 1.4 -> 1.5 2016-08-30 12:23:47 +02:00
Frederik Rietdijk
6f1d7d67c0 pythonPackages.cmdline: init at 0.1.6 2016-08-30 12:06:19 +02:00
Frederik Rietdijk
f5ce76c6d8 pythonPackages.process-tests: init at 1.2.1 2016-08-30 12:06:19 +02:00
Frederik Rietdijk
53e9993f4e pythonPackages.helper: init at 2.4.1 2016-08-30 12:06:19 +02:00
Frederik Rietdijk
ad633d39dd pythonPackages.pytestcov: 2.2.0 -> 2.3.1 2016-08-30 12:06:18 +02:00
Fernando J Pando
4b820b842b pythonPackages.pytest-fixture-config: init at 1.0.1 
Tested on Linux
Tested on Darwin
 2016-08-30 12:06:18 +02:00
Fernando J Pando
dcd21c775f pythonPackages.pytest-shutil: init at 1.1.1 
Tested on Linux
 2016-08-30 12:06:18 +02:00
Fernando J Pando
184cef18d9 pythonPackages.pytest-server-fixtures: init at 1.1.0 
Tested on Linux
Tested on Darwin
 2016-08-30 12:06:18 +02:00
Fernando J Pando
f3f975a0dd pythonPackages.pytest-mock: init at 1.2 
Tested on Linux
Tested on Darwin
 2016-08-30 12:06:18 +02:00
Fernando J Pando
251e67af5c pythonPackages.jsonref: init at 0.1 
Tested on Linux
Tested on Darwin
 2016-08-30 12:06:18 +02:00
Fernando J Pando
e8d326a438 pythonPackages.ramlfications: init at 0.1.9 
Tested on Linux
Tested on Darwin
 2016-08-30 12:06:18 +02:00
Fernando J Pando
f3a9980e19 pythonPackages.sphinxcontrib-spelling: init at 2.2.0 
Tested on Linux
 2016-08-30 12:06:18 +02:00
Frederik Rietdijk
21eb4972be pythonPackages.funcparserlib: build on Python 3.x 2016-08-30 12:06:18 +02:00
Frederik Rietdijk
e9dea3c02a pythonPackages.sphinx-testing: init at 0.7.1 2016-08-30 12:06:18 +02:00
Fernando J Pando
bb06f95cc8 pythonPackages.sphinxcontrib-blockdiag: init at 1.5.5 
Tested on linux
 2016-08-30 12:06:18 +02:00
Fernando J Pando
f59448add0 pythonPackages.autobahn: init at 0.16.0 
Tested on linux
 2016-08-30 12:06:18 +02:00
Fernando J Pando
17278243d8 pythonPackages.txaio: init at 2.5.1 
Tested on Linux
Tested on Darwin
 2016-08-30 12:06:18 +02:00
Shea Levy
d4e012780f rust{Beta,Unstable}: Remove lowPrio calls 
These are sets of derivations and there is no recurseIntoAttrs, so the
packages aren't exposed to nix-env by name at all.
 2016-08-30 05:56:15 -04:00
Tuomas Tynkkynen
d3dc3d4130 Merge remote-tracking branch 'dezgeg/shuffle-outputs' into staging 
https://github.com/NixOS/nixpkgs/pull/14766
 2016-08-30 12:43:37 +03:00
Luca Bruno
5c5fd1cb60 Merge pull request #18096 from leenaars/wavrsocvt 
wavrsocvt: init at 1.0.2.0
 2016-08-30 11:41:08 +02:00
Luca Bruno
cca72718b3 Merge pull request #18095 from Mic92/valauncher 
valauncher: init at 1.2
 2016-08-30 11:36:42 +02:00
Jörg Thalheim
2de7e30c0f valauncher: init at 1.2 2016-08-30 10:04:43 +02:00
aszlig
f19c961b4e
linux-testing: Fix arg list too long in modinst 
With the default kernel and thus with the build I have tested in
74ec94bfa2, we get an error during
modules_install:

make[2]: execvp: /nix/store/.../bin/bash: Argument list too long

I haven't noticed this build until I actually tried booting using this
kernel because make didn't fail here.

The reason this happens within Nix and probably didn't yet surface in
other distros is that programs only have a limited amount of memory
available for storing the environment and the arguments.

Environment variables however are quite common on Nix and thus we
stumble on problems like this way earlier - in this case Linux 4.8 - but
I have noticed this in 4.7-next as well already.

The fix is far from perfect and suffers performance overhead because we
now run grep for every *.mod file instead of passing all *.mod files
into one single invocation of grep.

But comparing the performance overhead (around 1s on my machine) with
the overall build time of the kernel I think the overhead really is
neglicible.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2016-08-30 06:55:52 +02:00
Tuomas Tynkkynen
c3bcb4e1ce treewide: Use explicit 'dev' references to glibc 2016-08-30 03:11:09 +03:00
Michiel Leenaars
b766e26aac xmlmirror: move README.md to better place 2016-08-29 23:08:46 +02:00
Michiel Leenaars
fe87145c58 wavrsocvt: init at 1.0.2.0 2016-08-29 22:57:14 +02:00
Vladimír Čunát
4f73633f26 treewide: stop using fontbhttf 2016-08-29 22:28:50 +02:00
Vladimír Čunát
f688ea37d8 bear: init at 2.2.0 2016-08-29 14:13:01 +02:00
obadz
b74793bd1c Merge branch 'master' into staging 
Conflicts:
	pkgs/tools/system/facter/default.nix
 2016-08-29 12:44:17 +01:00
Frederik Rietdijk
5da0b34591 liborc: init at 0.4.16 2016-08-29 10:35:21 +02:00
Gabriel Ebner
6a11b11a7d handbrake: 0.9.9 -> 0.10.5 2016-08-29 08:05:26 +02:00
Graham Christensen
7a073c1c6d Merge pull request #18057 from peterhoeg/kindlegen 
kindlegen: init at 2.9
 2016-08-28 22:24:21 -04:00
Joachim Fasting
22c9d8628c
grsecurity: remove legacy attributes 
No need to carry these into the next release.
 2016-08-29 04:08:38 +02:00
Robin Gloster
f81b2da3d4
go_1_4: rename to go_bootstrap and remove refs 
This has cgo disabled, so only use this for bootstrapping.
 2016-08-29 01:48:55 +00:00
Robin Gloster
df935b01e7
go_1_5: remove 2016-08-29 01:44:55 +00:00
Robin Gloster
4076f4d376 Merge pull request #18074 from womfoo/bump/facter-and-deps 
facter: 3.1.8 -> 3.4.1 and add/update related dependencies
 2016-08-29 01:22:28 +00:00
Kranium Gikos Mendoza
1bac115b05 cpp-hocon: init at 0.1.2 2016-08-29 08:55:40 +08:00
Robin Gloster
e17bc25943
Merge remote-tracking branch 'upstream/master' into staging 2016-08-29 00:24:47 +00:00
s1lvester
0b22104c1d keepassx2-http: init at 2.0.2 (#18039) 2016-08-29 00:02:19 +00:00
Robin Gloster
2958ec7d6f
pythonPackages.fake_factory: 0.5.7 -> 0.6.0 
fixes build
 2016-08-28 23:35:49 +00:00
Robin Gloster
db2582de81
pythonPackages.googleplaydownloader: remove 
Source and project homepage are offline
 2016-08-28 23:27:09 +00:00
Robin Gloster
9145ba0d90
docker: build with default go 
Fixes build after binutils update
 2016-08-28 22:51:34 +00:00
obadz
ec37e43c51 perlPackages.FileMimeInfo: 0.23 -> 0.27 2016-08-28 23:42:05 +01:00
Michal Rus
e734326c7c
airwave: init at 1.3.2 2016-08-28 23:46:49 +02:00
Robert Helgesson
979e4fe0c2
perl-Dist-Zilla-Plugin-Test-Pod-LinkCheck: 1.001 -> 1.002 2016-08-28 23:41:19 +02:00
Robert Helgesson
a0ca5d9cbb
perl-Test-Pod-LinkCheck: 0.007 -> 0.008 2016-08-28 23:41:19 +02:00
Robert Helgesson
dd93111823
perl-IO-Socket-SSL: 2.027 -> 2.037 2016-08-28 23:41:19 +02:00
Michiel Leenaars
d22bb26fb9
oxygenfonts: init at 20140213 2016-08-28 21:12:29 +02:00
Domen Kožar
5793a14c36 release.nix: tiny improvements on top of #18059 2016-08-28 18:18:44 +02:00
Tuomas Tynkkynen
3cd4808e7d release.nix: Remove lots of explicit package jobs 
These are all obsolete since for a long time, the meta.platforms fields
have been used to automatically create the Hydra jobs.
 2016-08-28 18:05:42 +03:00
Tuomas Tynkkynen
43f576ea19 mesa: Add meta.platforms 2016-08-28 18:04:09 +03:00
Domen Kožar
f976fa40a2 xfce: build all components 2016-08-28 16:51:20 +02:00
Domen Kožar
2daefaf457 release.nix: drop xorg whitelist to fix #11996 2016-08-28 16:46:46 +02:00
obadz
92d929c884 Merge branch 'master' into staging 2016-08-28 14:48:02 +01:00
Peter Hoeg
c08b9b039a kindlegen: init at 2.9 
Not tested on macOS/Windows
 2016-08-28 21:25:07 +08:00
Graham Christensen
1a64734bc6 Merge pull request #18031 from ambrop72/kdevelop5.0 
kdevelop: Init at 5.0
 2016-08-28 08:58:21 -04:00
Ambroz Bizjak
529fbe05a3 kdevelop: Init at 5.0 
Doesn't use Okteta yet.
 2016-08-28 14:15:54 +02:00
obadz
57ddc155fc Merge branch 'master' into staging 
Conflicts:
	pkgs/games/scummvm/default.nix
 2016-08-28 12:20:59 +01:00
Gabriel Ebner
9abbd6adc1 pythonPackages.vobject: 0.9.2 -> 0.9.3 2016-08-28 10:33:19 +02:00
Kovacsics Robert
5e76bc9c9d python-xlib: 0.15rc1 -> 0.17 (#18044) 2016-08-28 08:06:06 +00:00
Frederik Rietdijk
562027e6c2 pythonPackages.twisted: 16.2.0 -> 16.4.0 2016-08-28 08:45:39 +02:00
Graham Christensen
a29eb6bfe7 Merge pull request #18024 from cransom/blink1tool 
blink1-tool: init at 1.98
 2016-08-27 21:43:21 -04: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
Rok Garbas
1102352a79 Merge pull request #17906 from garbas/neovim-0.1.5-update 
neovim: 0.1.4 -> 0.1.5 (and related dependencies)
 2016-08-27 17:44:34 +02:00
Daniel Brockman
200fa32911 ethabi: init at 0.2.1 2016-08-27 16:08:17 +02:00
Michael Raskin
2a210e3430 neural-style: init at 0.0pre2016.08.15 2016-08-27 15:41:58 +02:00
Michael Raskin
f3a86cf599 loadcaffe: init at 0.0pre2016.08.01 2016-08-27 15:41:58 +02:00
Michael Raskin
2e0c1c3758 torch: find libjpeg and libpng, use compatible openblas 2016-08-27 15:41:58 +02:00
Casey Ransom
59b32b92e0 blink1-tool: init at 1.98 
The command line tool for the blink(1) notification light.
 2016-08-26 19:36:14 -04:00
Mathieu Boespflug
5f8891153b haskell.compiler.ghcHEAD: update to latest upstream (20160826). 2016-08-26 21:15:04 +02:00
Frederik Rietdijk
59f04899aa Merge pull request #17972 from phanimahesh/deluge 
python-pkgs:deluge: pin dependency libtorrent-rasterbar to 1.0.9
 2016-08-26 20:30:06 +02:00
Robert Helgesson
3e89ff44b3
perl-Data-Validate-Domain: 0.12 -> 0.14 2016-08-26 19:32:16 +02:00
Robert Helgesson
59dc4917f0
perl-Font-TTF: 1.05 -> 1.06 2016-08-26 19:32:16 +02:00
Robert Helgesson
223d235a71
perl-Redis: 1.982 -> 1.991 2016-08-26 19:32:16 +02:00
Joachim F
c30792ed43 Merge pull request #17947 from RamKromberg/init/rc 
rc: init at 1.7.4
 2016-08-26 18:34:32 +02:00
Robin Gloster
fee9b3410e Merge pull request #18014 from zimbatm/buildGoPackage-1.7 
Build go package 1.7
 2016-08-26 15:41:08 +00:00
Ram Kromberg
4c72c81e08 rc: init at 1.7.4 2016-08-26 16:24:43 +03:00
Joachim F
0cbba7c673 Merge pull request #17941 from romildo/upd.efl 
efl: 1.17.2 -> 1.18.0
 2016-08-26 15:04:29 +02:00
Michael Raskin
6b527ec517 liquidwar5: init at 5.6.4 2016-08-26 13:40:55 +02:00
zimbatm
4329958cf5 buildGoPackage: build with go 1.7 2016-08-26 11:49:59 +01:00
Shea Levy
c32ab50e0f Merge branch 'cpu-cgroup-v2' 2016-08-26 06:07:16 -04:00
Robin Gloster
b6dabe3df0
openssl_1_1_0: init at 1.1.0 2016-08-26 07:39:18 +00:00
Michael Stone
b9a4da47c0 go: fix on darwin, make go-1.7 build with clang-3.8. (#18001) 
The darwin stdenv currently provides clang-3.7; however,

  a) go-1.7 currently expects a compiler that supports "-fdebug-prefix-map"
     arguments (which clang-3.8 supports but clang-3.7 does not) and

  b) even with clang-3.8, go-1.7 misinterprets the result of its runtime probes
     for support for the "-no-pie" flag, thereby failing to build runtime/cgo.

This patch resolves (a) by building go-1.7 with clang-3.8 and resolves (b) by
teaching go how to correctly probe "-no-pie" error messages from clang.
 2016-08-26 07:36:06 +00:00
Bjørn Forsman
7e52ba4537 foomatic-filters: align attrname with pkgname 2016-08-26 08:45:16 +02:00
Nikolay Amiantov
211adbeb38 zathura: cleanup and hide zathuraCollection 
Fixes #17787.
 2016-08-26 03:45:58 +03:00
Graham Christensen
8d10928ad0 Merge pull request #17908 from Mic92/ferm 
Ferm
 2016-08-25 20:38:02 -04:00
Moritz Ulrich
78305bc5a1 Merge pull request #17944 from steveeJ/racerd-bump 
rust: bump registry and racerd
 2016-08-26 00:03:34 +02:00
Jörg Thalheim
7b354ce8cc
ferm: init at 2.3 2016-08-25 21:37:19 +02:00
Shea Levy
2b1fa9da8b Add initial patches for CPU Controller on Control Group v2 2016-08-25 13:01:40 -04:00
Lancelot SIX
d378f5fe11 Merge pull request #17938 from kevinmarsh/master 
pythonPackages.django: 1.9.5 -> 1.9.9 and 1.8.12 -> 1.8.14
 2016-08-25 18:08:37 +02:00
Bjørn Forsman
56f1ceecab cups-filters: align attrname with pkgname 2016-08-25 17:47:34 +02:00
Kevin Marsh
c9b29d4e5f pythonPackages.django_1_9: 1.9.5 -> 1.9.9 2016-08-25 15:15:51 +01:00
Kevin Marsh
dfb7d6c223 pythonPackages.django_1_8: 1.8.12 -> 1.8.14 2016-08-25 15:13:09 +01:00
Frederik Rietdijk
b71d71c576 Merge pull request #17963 from lancelotsix/update_django_raster_0_3 
django_raster: 0.2 -> 0.3
 2016-08-25 15:52:35 +02:00
Lancelot SIX
6e9d8efbd1
pythonPackages.django_raster: 0.2 -> 0.3 2016-08-25 15:18:23 +02:00
Lancelot SIX
37ad0f8e6a
pythonPackages.django: always build with the GIS componnents 
There is no reason for django derivation to contain invalid GIS
extensions. This makes sure that the gis componnents (which are always
installed) can function properly.
 2016-08-25 15:18:05 +02:00
Lancelot SIX
674aa05abc
pythonPackages.gdal: aliases pkgs.gdal 
`pkgs.gdal` ships python2 bindings. This allows to have a gdal package
for each python package set with the appropriate bindings installed.
 2016-08-25 15:17:49 +02:00
Graham Christensen
6bfe459355 Merge pull request #17983 from ericsagnes/pkg/groonga 
groonga: init at 6.0.7
 2016-08-25 08:02:08 -04:00
Frederik Rietdijk
5b3331ed2c pythonPackages.nxt-python: use upstream name 2016-08-25 12:38:36 +02:00
Frederik Rietdijk
24cd814dd8 Merge pull request #17875 from leenaars/nxt-python 
Nxt-python: init at  unstable-20160819 plus dependencies
 2016-08-25 12:36:50 +02:00
Bjørn Forsman
d6dd2ab324 qmmp: 0.9.9 -> 1.1.2 
This update makes the switch from Qt 4 to Qt 5.
 2016-08-25 11:54:49 +02:00
Eric Sagnes
5b8e4e2260 groonga: init at 6.0.7 2016-08-25 17:45:50 +09:00
Eric Sagnes
9dc5952bfa kytea: init at 0.4.7 2016-08-25 17:36:33 +09:00
Robin Gloster
07b8f53612
php55: remove unmaintained version 
Does not receive security updates from upstream
 2016-08-25 00:00:48 +00:00
Robin Gloster
cbb055c1d9
gcc46: remove unused package 2016-08-24 23:23:46 +00:00
Thomas Tuegel
df8dd670b5 keybase: replace obsolete client 
Fixes #17755.

As noted in the issue tracker, we have been carrying two versions of the
keybase client: the old node.js client and the new Go client. The old
client is unusable, but takes up the valuable `keybase` name. This
revision removes the old client entirely and replaces it with the new one.
 2016-08-24 17:21:36 -05:00
Jaka Hudoklin
bb21c377e7 Merge pull request #17651 from leenaars/argus 
Argus + Argus-clients: init at 3.0.8.2
 2016-08-24 23:48:20 +02:00
Jaka Hudoklin
dcebe6f8cc Merge pull request #17712 from mbrock/unclutter-xfixes 
unclutter-xfixes: init at 1.2
 2016-08-24 23:46:08 +02:00
Jaka Hudoklin
b0b02c848d Merge pull request #17668 from steveeJ/manuskript 
manuskript: init at 0.3.0
 2016-08-24 23:44:08 +02:00
Jaka Hudoklin
6e9c9b25c7 Merge pull request #17890 from schneefux/pflogsumm 
pflogsumm: init at 1.1.3
 2016-08-24 23:37:54 +02:00
Jaka Hudoklin
052a913bcd Merge pull request #17951 from juliendehos/cppcms 
cppcms: init at 1.0.5
 2016-08-24 23:35:54 +02:00
Jaka Hudoklin
d919184fad Merge pull request #17953 from juliendehos/cppdb 
cppdb: init at 0.3.1
 2016-08-24 23:35:24 +02:00
Robin Gloster
423e67b299 automake110x: remove unused package 2016-08-24 21:07:59 +00:00
J Phani Mahesh
f26edb5257 python-pkgs:deluge: pin dependency libtorrent-rasterbar to 1.0.9 
See https://github.com/NixOS/nixpkgs/issues/17924 for context
 2016-08-25 00:00:26 +05:30
Lancelot SIX
3614e950e4
pythonPackages.pyparsing: 2.1.4 -> 2.1.8 2016-08-24 17:47:15 +02:00
Jaka Hudoklin
274ff94974 kube-aws: init at 0.8.1 2016-08-24 14:25:57 +02:00
Shea Levy
8b9b9fad31 Revert "Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"" 
Revert a revert of a merge that shouldn't have been in master but was intentionally in staging.

Next time I'll do this right after the revert instead of so far down the line...

This reverts commit 9adad8612b.
 2016-08-24 07:35:30 -04:00
obadz
78b7529ee3 Merge branch 'master' into staging 2016-08-24 11:57:44 +01:00
zimbatm
4d4980d9f8 Merge pull request #17805 from avnik/update/golang-1.7 
go: add 1.7 compiler
 2016-08-24 11:28:25 +01:00
Daniel Peebles
3f337a2b23 Merge pull request #17685 from matthewbauer/darwin-misc2 
Darwin misc. fixes
 2016-08-24 11:52:27 +02:00
Julien Dehos
c35ce47143 cppdb: init at 0.3.1 2016-08-24 10:47:56 +02:00
Mikael Brockman
ffb3f0396c unclutter-xfixes: init at 1.2 2016-08-24 11:24:00 +03:00
Julien Dehos
eac69059fc cppcms: init at 1.0.5 2016-08-24 09:36:17 +02:00
Michiel Leenaars
378c7a26af argus-clients: init at 3.0.8.2 2016-08-24 00:13:38 +02:00