Joachim Schiele
a3c6df24b9
Merge branch 'master' of github.com:NixOS/nixpkgs
2016-01-29 18:34:41 +01:00
Joachim Schiele
3c67935ec4
kgocode: added automoc4 to buildInputs
2016-01-29 18:33:50 +01:00
Rok Garbas
8c66751672
pythonPackages.py3status: 2.7 -> 2.9
2016-01-29 18:33:19 +01:00
vbgl
e89384aad0
Merge pull request #12669 from mogorman/platformio
...
platformio: 2.7.1 -> 2.8.1
2016-01-29 17:36:09 +01:00
aszlig
2a12e9dacc
python-packages/poezio: Fix tests
...
Poezio doesn't install the files required for running the tests, but
also while building with Nix we don't end up getting valid shared
objects within the temporary build directory.
So we now running "make test" (which does "py.test -v test/") with a
PYTHONPATH that adds the /poezio directory of the path in site-packages
to make sure that the test runner is able to import the shared objects.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @lancelotsix
2016-01-29 17:29:59 +01:00
Michiel Leenaars
313b88621b
synfigstudio: 1.0.1 -> 1.0.2 ( close #12308 )
...
vcunat cleaned autoreconf-related stuff and indentation.
2016-01-29 17:20:43 +01:00
Arseniy Seroka
718f316f6e
Merge pull request #12667 from mayflower/upstream-android-studio
...
android-studio: 1.5.0.4 -> 1.5.1.0
2016-01-29 17:43:37 +03:00
Matthew O'Gorman
afb8b091a2
platformio: 2.7.1 -> 2.8.1
2016-01-29 09:43:00 -05:00
Arseniy Seroka
fbd70d7823
Merge pull request #12636 from Beauhurst/kombu_amqp_update
...
Kombu & amqp version bumps
2016-01-29 17:43:00 +03:00
Sander van der Burg
e2cefce69a
titaniumenv: fix path to the IPA file in the hydra-build-products
2016-01-29 14:08:03 +00:00
Moritz Ulrich
4ee173e011
rr: 4.0.0 -> 4.0.3
2016-01-29 12:28:08 +01:00
Robert Scott
0e61e2a35f
kombu 3.0.30 -> 3.0.33
2016-01-29 11:23:33 +00:00
Robert Scott
a1566be54c
amqp 1.4.7 -> 1.4.9
2016-01-29 11:23:33 +00:00
Christian Albrecht
7884c3b95d
android-studio: 1.5.0.4 -> 1.5.1.0
2016-01-29 11:51:29 +01:00
Domen Kožar
c06cdea547
Merge pull request #12664 from gebner/tptp-6.3.0
...
tptp: 6.1.0 -> 6.3.0, and get rid of builderDefsPackage
2016-01-29 10:59:22 +01:00
Gabriel Ebner
73468cf4d4
tptp: replace use of builderDefsPackage
2016-01-29 10:33:35 +01:00
Vincent Laporte
4f8f5732fc
smtube: 15.11.0 -> 16.1.0
2016-01-29 10:08:29 +01:00
Vincent Laporte
ef8f074604
smplayer: 15.11.0 -> 16.1.0
2016-01-29 10:08:29 +01:00
Gabriel Ebner
462958b3b7
tptp: 6.1.0 -> 6.3.0
2016-01-29 09:37:11 +01:00
Robin Gloster
edad608f56
libressl_2_3: 2.3.1 -> 2.3.2
2016-01-29 03:42:14 +00:00
Robin Gloster
46c31fa675
libressl: 2.2.5 -> 2.2.6
2016-01-29 03:42:14 +00:00
Dan Peebles
5da15c6b76
botocore/awscli: upgrade to 1.3.23/1.10.1
...
I'm upgrading both at once because they need to be upgraded in tandem
2016-01-28 21:26:32 -05:00
Arseniy Seroka
7d2eb0c4ab
Merge pull request #12657 from romildo/new-eclipse-plugin-cup
...
eclipse-plugin-cup: init at 1.0.0.201412081321
2016-01-29 00:51:50 +03:00
Vladimír Čunát
a92c2cb994
openssl_1_0_2: high-severity security update e -> f
...
Fixes CVE-2016-0701 and CVE-2015-3197.
2016-01-28 20:35:00 +01:00
José Romildo Malaquias
a654e783c6
eclipse-plugin-cup: init at 1.0.0.201412081321
2016-01-28 17:21:29 -02:00
Charles Strahan
5583ecf361
mongodb: 3.0.7 -> 3.2.1
...
Fixes #12639
2016-01-28 14:15:59 -05:00
Thomas Tuegel
9e743fd151
qt54.qtbase: fix path typo in resolv patch
2016-01-28 11:15:58 -06:00
Thomas Tuegel
9695e139ec
qt55.qtbase: fix path typo in resolv patch
2016-01-28 11:15:14 -06:00
Charles Strahan
7b8cd1dce9
watchman: 4.1.0 -> 4.3.0
...
* improved handling of case insensitive filenames
* improved reliability of symlink change detection on osx
2016-01-28 11:58:33 -05:00
Robin Gloster
a83920c32d
Merge pull request #12652 from mayflower/upstream-vagrant
...
vagrant: 1.8.0 -> 1.8.1
2016-01-28 17:24:31 +01:00
Sander van der Burg
a1cd11aff4
titaniumenv: remove obsolete android configuration steps
2016-01-28 16:19:18 +00:00
Arseniy Seroka
6dcfd1a849
Merge pull request #12654 from mayflower/upstream-nodejs5
...
nodejs-5_x: 5.4.1 -> 5.5.0
2016-01-28 19:12:07 +03:00
Michael Alan Dorman
a9b0bfe3bb
ghc-imported-from: builds again
2016-01-28 16:47:22 +01:00
Peter Simons
81c8babb38
hackage-packages.nix: update Haskell package set
...
This update was generated by hackage2nix v20151217-9-geddefc2 using the following inputs:
- Nixpkgs: 34e1e2890f
- Hackage: 152c587fd1
- LTS Haskell: 9b9c0dc0e3
- Stackage Nightly: 486fdffc71
2016-01-28 16:45:46 +01:00
Pascal Wittmann
700ce710ed
Merge pull request #12646 from taku0/firefox-bin-44.0
...
firefox-bin: 43.0.4 -> 44.0
2016-01-28 16:05:58 +01:00
Sander van der Burg
b4e47d1ab8
titaniumenv: change identifier to 5.1.2.GA
2016-01-28 14:39:21 +00:00
Sander van der Burg
4dc36b1227
titaniumenv: use version 5.1.2 by default in the example
2016-01-28 14:36:51 +00:00
aszlig
ab84149c99
buildEnv: Pass the right number of args to addPkg
...
Regression introduced by 4529ed1259
.
I've missed this in #5096 , not because of a messed up rebase as I have
guessed from a comment on #12635 but missed this in the first place.
The testing I did while working on the pull request weren't exhaustive
enough to cover this, because I haven't tested with packages that use
the propagatedUserEnvPkgs attribute.
In order to make the test a bit more exhaustive this time, let's test it
using:
nix-build -E 'with import ./. {}; buildEnv {
name = "testenv";
paths = [
pkgs.hello pkgs.binutils pkgs.libsoup pkgs.gnome3.yelp
pkgs.gnome3.totem
];
}'
And with this commit the errors no longer show up and the environment is
built correctly.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Fixes : #12635
2016-01-28 14:50:44 +01:00
Sander van der Burg
b205b587e7
titaniumenv: remove obsolete iosWwdrCertificate parameter
2016-01-28 13:32:21 +00:00
Christian Albrecht
2dbd741009
nodejs-5_x: 5.4.1 -> 5.5.0
2016-01-28 13:27:40 +01:00
Vincent Laporte
c67c27dc82
pycairo: add darwin to meta.platforms
2016-01-28 11:02:26 +01:00
Luca Bruno
bed2cd5e32
Merge pull request #12651 from 0arthur/dockertools
...
dockerTools: private registry support
2016-01-28 10:22:46 +01:00
Damien Cassou
64d29d2f1b
Merge pull request #12501 from DamienCassou/gpaste-3.18.3
...
gpaste: 3.18.2 -> 3.18.3
2016-01-28 07:53:08 +01:00
Damien Cassou
06527f7783
gpaste: 3.18.2 -> 3.18.3
2016-01-28 06:56:21 +01:00
Christian Albrecht
8975148a16
vagrant: 1.8.0 -> 1.8.1
2016-01-28 01:01:56 +01:00
Sander van der Burg
a6bda1a62a
disnix: bump to version 0.5
2016-01-27 22:32:34 +00:00
Peter Simons
2c78c7b84b
Merge pull request #12649 from grwlf/urweb
...
urweb: version bump
2016-01-27 23:27:32 +01:00
Arthur Noel
903129f770
dockerTools: private registry support
...
* authorization token is optional
* registry url is taken from X-Docker-Endpoints header
* pull.sh correctly resumes partial layer downloads
* detjson.py does not fail on missing keys
2016-01-27 21:13:07 +00:00
Arseniy Seroka
189693327b
Merge pull request #12630 from hrdinka/add/b2
...
b2: init at git-26.01.2016
2016-01-28 00:01:05 +03:00
Sergey Mironov
f9ab62431c
urweb: version bump
2016-01-27 23:13:13 +03:00