Sander van der Burg
0915f16167
androidsdk: add SDK option for Android API-level 23
2015-10-06 13:26:53 +00:00
Eelco Dolstra
741bf840da
Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
...
This reverts commit f61176c539 , reversing
changes made to a27ca029ee .
Conflicts:
pkgs/development/libraries/ncurses/default.nix
2015-10-06 15:24:20 +02:00
Eelco Dolstra
106738b196
Give more memory for the disk image builder
...
http://hydra.nixos.org/build/26480662
2015-10-06 15:03:26 +02:00
Pascal Wittmann
0f90d10d0b
Merge pull request #10243 from frlan/Update/Geany/1.25.x
...
Geany: Update to 1.25
2015-10-06 14:48:17 +02:00
Nikolay Amiantov
61381fa4a2
buildFHSUserEnv: pass extraBindMounts argument
2015-10-06 15:39:41 +03:00
Nikolay Amiantov
5897433b31
build-fhs-userenv: add extraBindMounts support
2015-10-06 15:32:37 +03:00
Sander van der Burg
aeabfbe846
androidsdk: bump to version 24.3.4 and update associated sub packages
2015-10-06 12:27:49 +00:00
Domen Kožar
a61e26a63d
Merge pull request #10227 from bjornfor/jenkins-envvars
...
nixos/jenkins: rework environment handling
2015-10-06 13:38:55 +02:00
Pascal Wittmann
5c66135b25
parallel: 20150822 -> 20150922
2015-10-06 13:13:57 +02:00
Pascal Wittmann
bf913a72b1
pdf2djvu: 0.8.2 -> 0.9.1
2015-10-06 13:13:57 +02:00
Pascal Wittmann
9d37d4cc9d
checkstyle: 6.10.1 -> 6.11.2
2015-10-06 13:13:57 +02:00
Eelco Dolstra
fe195af944
eaglemode: Don't build on Hydra
...
The build can loop forever generating an infinite amount of log data,
filling up Hydra's disk:
gcc -Llib -L/nix/store/0xb56zcqii361ksknjwh9m853zb886yq-glib-2.46.0/lib -L/nix/store/48hidn50ynp4kk4lsfzjvkbg30yhfgaq-gdk-pixbuf-2.32.0/lib -L/nix/store/dfxv36h389wvkblv3qjgfs2zyklgdlp4-cairo-1.14.2/lib -L/nix/store/wy5f8alalh681jbq3hjh93rcc87d6nch-freetype-2.5.4/lib -L/nix/store/b6kaw1i6fadgssn38xv4rkfsa7q70rfa-fontconfig-2.11.1/lib -L/nix/store/9n1ynjgcmxlhz75l1mnd07zb0pkgvpzi-gtk+-2.24.28/lib -L/nix/store/782agz0g2hn4n02a23vsaly2sr1kwxhd-pango-1.38.0/lib -L/nix/store/ljalzp7gjv76bqbxm6ia3vmw3vhfambr-atk-2.18.0/lib -L/nix/store/pkssk6q14y17q9jji5q5gk70sf3hz6hs-poppler-glib-0.34.0/lib obj/emPdfServerProc.o -lgtk-x11-2.0 -lgdk-x11-2.0 -lpangocairo-1.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangoft2-1.0 -lpango-1.0 -lfontconfig -lfreetype -lpoppler-glib -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lcairo
-lm -o lib/emPdf/emPdfServerProc
/nix/store/kxf1p7l7lgm6j5mjzkiwcwzc98s9f1az-binutils-2.23.1/bin/ld: cannot find -lcairo
collect2: error: ld returned 1 exit status
---
Building emPdf failed, but that project is not so essential.
So if you don't know how to solve the problem, then you could
continue the overall building now, and live without the features
the project provides. Continue? [y(es)/n(o)/a(lways)]: Use of uninitialized value $ln in pattern match (m//) at make.pl line 626.
Use of uninitialized value $ln in pattern match (m//) at make.pl line 629.
Use of uninitialized value $ln in pattern match (m//) at make.pl line 632.
Use of uninitialized value $ln in pattern match (m//) at make.pl line 636.
Say yes, no or always: Use of uninitialized value $ln in pattern match (m//) at make.pl line 626.
Use of uninitialized value $ln in pattern match (m//) at make.pl line 629.
Use of uninitialized value $ln in pattern match (m//) at make.pl line 632.
Use of uninitialized value $ln in pattern match (m//) at make.pl line 636.
...
@viric
http://hydra.nixos.org/build/26505594
2015-10-06 12:58:33 +02:00
lethalman
241821cbb4
Merge pull request #10195 from cleverca22/master
...
build the crontab localy, there is nothing to gain from building it remotely
2015-10-06 11:01:56 +02:00
Luca Bruno
eccd68eeb7
gnome3: add bgSupport=true. Closes #10242
2015-10-06 10:21:38 +02:00
lethalman
a776531e61
Merge pull request #10249 from Mathnerd314/patch-1
...
gnome3 test: increase timeout
2015-10-06 10:12:14 +02:00
Jude Taylor
7283bb7466
introduce separate cf-private package to account for no CLT
2015-10-06 00:11:10 -07:00
Frank Lanitz
8597245eac
Geany: Update from 1.24.1 to 1.25
2015-10-06 07:48:03 +02:00
Mathnerd314
faa82a676b
gnome3 test: increase timeout
...
The gnome3 test has been failing recently ([1](http://hydra.nixos.org/build/26608126/nixlog/1/raw ) [2](http://hydra.nixos.org/build/26605926/nixlog/1/raw )); this is due to exit code 124 which is [the command timing out](https://www.gnu.org/software/coreutils/manual/html_node/timeout-invocation.html ).
This increases the timeout to 900, to align with the similar timeout in https://github.com/NixOS/nixpkgs/blob/master/nixos/lib/test-driver/Machine.pm#L222
2015-10-05 22:10:40 -06:00
Arseniy Seroka
bcf536ff3f
Merge pull request #10194 from vbgl/ocaml-4.2.2
...
OCaml: 4.02.1 → 4.02.3
2015-10-06 02:07:54 +03:00
Arseniy Seroka
01df2bba04
Merge pull request #10206 from joachifm/torbrowser-5
...
torbrowser: 4.5.3 -> 5.0.3
2015-10-06 02:06:35 +03:00
Arseniy Seroka
b3796cd0e7
Merge pull request #10214 from henrytill/mozart-fix
...
mozart: fix tcl/tk issues and clean up
2015-10-06 02:05:51 +03:00
Arseniy Seroka
a5045e1b3c
Merge pull request #10239 from makefu/bepasty-server-init
...
pythonPackages.bepasty-server: init at 0.4.0
2015-10-06 02:01:48 +03:00
Ryan Scheel (Havvy)
d9819cf7b0
nodejs: 4.1.0 -> 4.1.2
2015-10-06 00:43:01 +02:00
John Wiegley
c4a32f6376
emacsMacport_24_5: upgrade 24.5-mac-5.10 -> 24.5-mac-5.11
2015-10-05 14:15:45 -07:00
Pascal Wittmann
35bd395606
calibre: 2.38 -> 2.40
2015-10-05 23:01:40 +02:00
Arseniy Seroka
c1ade58d0b
Merge pull request #10180 from regnat/vim_plugins
...
Added some vim plugins
2015-10-05 23:30:33 +03:00
William A. Kennington III
cbc1eaa1ea
pythonPackages.gevent: Fix unneeded libev patch
2015-10-05 11:26:28 -07:00
Thomas Tuegel
e639526cb4
Merge branch 'kf-5.14'
2015-10-05 13:08:35 -05:00
Thomas Tuegel
a5a031c8ff
wrapQtProgram: --set does not take separator
...
The --set flag to wrapProgram does not take a separator character, just
a value.
2015-10-05 13:08:26 -05:00
Thomas Tuegel
d14e55cc61
kdeApps_15_08: use KDE Frameworks 5.14
2015-10-05 13:08:26 -05:00
Thomas Tuegel
1a03a577f4
kf5Packages: use KDE Frameworks 5.14
2015-10-05 13:08:26 -05:00
Thomas Tuegel
398b01ed2a
plasma54: build with KDE Frameworks 5.14
2015-10-05 13:08:25 -05:00
Thomas Tuegel
b6b10e8df0
kdeApps_15_08: use latest versions
2015-10-05 13:08:25 -05:00
Thomas Tuegel
004448ca47
kf514: init at 5.14
2015-10-05 13:08:25 -05:00
Thomas Tuegel
c398216789
plasma54: take latest versions
2015-10-05 13:08:24 -05:00
William A. Kennington III
a3e7a84d36
libev: 4.19 -> 4.20
...
Tested using stdenv and clangStdenv
2015-10-05 11:06:26 -07:00
William A. Kennington III
d9813ed4ac
feh: 2.13.1 -> 2.14
2015-10-05 11:05:40 -07:00
William A. Kennington III
c46dd28ffd
linux-testing: 4.3.0-rc2 -> 4.3.0-rc4
2015-10-05 11:05:31 -07:00
Jude Taylor
0a32eab91e
fix LLVM packages to work in darwin stdenv
2015-10-05 08:46:56 -07:00
makefu
58d4ffc488
pythonPackages.bepasty-server: init at 0.4.0
2015-10-05 16:26:42 +02:00
makefu
a68d7db1c4
pythonPackages.xstatic-*: init at 2015-10-05
...
this commit contains build-inputs for bepasty-server but they can be used stand-alone
2015-10-05 16:01:18 +02:00
Théophane Hufschmitt
c3ed71b0f2
vimPlugins.vim-startify: init at 2015-08-20
2015-10-05 15:55:35 +02:00
Théophane Hufschmitt
aa84d62a93
vimPlugins.vim-nix: init at 2015-05-10
2015-10-05 15:55:35 +02:00
Théophane Hufschmitt
216a05175c
vimPlugins: added some plugins
2015-10-05 15:55:35 +02:00
Théophane Hufschmitt
2496ecc327
vimPlugins.ctrlp: fixed upstream url
2015-10-05 15:55:34 +02:00
Théophane Hufschmitt
e206ea5b0c
vimPlugins.gundo: fixed upstream url
2015-10-05 15:55:34 +02:00
Luca Bruno
3c45ef3627
gnome-common: fix derivation name for the patch
2015-10-05 15:17:53 +02:00
Peter Simons
7c516259e7
r-modules: update list of broken packages
2015-10-05 14:15:41 +02:00
Jascha Geerds
470e71abbd
pidgin-skypeweb: init at 2015-10-02
2015-10-05 13:40:54 +02:00
Ricardo M. Correia
ca9e807530
zfs: 0.6.5.1 -> 0.6.5.2
2015-10-05 12:58:19 +02:00