Commit Graph

1432 Commits

Author SHA1 Message Date
Luca Bruno
a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Vladimír Čunát
ec980c7b1e hplip: fix evaluation errors on unsupported platforms
Evidently, `abort` is unrecoverable, and `throw` should be used instead.
Only partially tested, as I don't have enough RAM right now for it.
2015-11-23 15:42:22 +01:00
Tobias Geerinckx-Rice
15324dc7d4 hplip: remove duplicate platform definitions 2015-11-21 01:35:34 +01:00
Tobias Geerinckx-Rice
2e248040a6 hplip: fix broken platforms hack 2015-11-21 01:35:34 +01:00
Tobias Geerinckx-Rice
729b764c53 hplip: use lib.optionals for clarity 2015-11-21 01:34:48 +01:00
Tobias Geerinckx-Rice
612a0f248b hplip: under_scores -> camelCase 2015-11-21 01:34:29 +01:00
Tobias Geerinckx-Rice
97597d4f75 hplip: clean up & remove unused arguments 2015-11-21 01:33:15 +01:00
Edward Tjörnhammar
831593f709 retroarch: 20141224 -> 2015-11-20
libretro: 20141224 -> 2015-11-20
2015-11-20 15:52:58 +01:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Herwig Hochleitner
ec73ef4c2f wine: 1.7.53 -> 1.7.55 2015-11-18 09:33:57 +01:00
Matthew O'Gorman
7df0fefcbc xscreensaver: security update 5.33 -> 5.34 (close #10845)
Fixes a crash when hot-swapping monitors while locked.
2015-11-16 08:20:12 +01:00
Herwig Hochleitner
2145c99ae3 wine: fix infinite recursion in wine-staging build 2015-11-15 16:03:54 +03:00
Herwig Hochleitner
accc98ca7f wine: 1.7.52 -> 1.7.53 2015-11-15 16:03:54 +03:00
William A. Kennington III
6602f49495 Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
This reverts commit 741bf840dad05cd1728481045466811ae8ae8281.

This reverts the fallout from reverting the major changes.
2015-11-14 12:32:51 -08:00
William A. Kennington III
9579c9ec7f Merge commit 'cb21b77' into master.upstream
This is a partial merge of staging for builds which are working
2015-11-13 15:53:10 -08:00
Nikolay Amiantov
fc620ae093 winetricks: 20150706 -> 20151110 2015-11-12 03:41:51 +03:00
Michael Fellinger
cdb79acd0c seafile-*: 4.0.6 -> 4.4.2 (close #10755) 2015-11-09 18:43:20 +01:00
William A. Kennington III
4251612faa Merge branch 'master.upstream' into staging.upstream 2015-11-04 01:00:48 -08:00
Stéphane Jourdois
ffd26935cc lilypond: allow build on darwin 2015-10-31 12:24:25 +01:00
William A. Kennington III
dd2de66d61 Merge branch 'master.upstream' into staging.upstream 2015-10-30 17:16:07 -07:00
Stefan Junker
d8d3c1aba9 vim-plugins: add colorschemes and colorstepper 2015-10-30 16:21:37 +01:00
Arseniy Seroka
417c017840 Merge pull request #10578 from simonvandel/arc-theme
arc-gtk-theme: init at f4c71247cf9470037d052ae4a12b86073d0001ff
2015-10-29 17:59:42 +03:00
Simon Vandel Sillesen
18fe3bc1a1 arc-gtk-theme: init at f4c71247cf9470037d052ae4a12b86073d0001ff 2015-10-27 18:07:50 +01:00
Tuomas Tynkkynen
60ec9a557c U-Boot: 2015.07 -> 2015.10
Someone submitted conflicting (and non-complete) distro bootconfig
support for the Versatile board, so the patch needs changing, yet again.
But at least it's getting smaller.
2015-10-26 21:48:51 +02:00
Arseniy Seroka
c529bd85bb Merge pull request #10581 from matthiasbeyer/add-pipes
pipes.sh: Init at 1.1.0
2015-10-25 04:23:56 +03:00
Matthias Beyer
23982a4f16 pipes.sh: Init at 1.1.0 2015-10-24 22:29:33 +02:00
Cillian de Róiste
eacf656d6a mfcj470dw: tidy up 2015-10-24 22:29:11 +02:00
goibhniu
55d8076212 Merge pull request #10564 from yochai/master
mfcj470dw: init at 3.0.0-1
2015-10-24 22:23:46 +02:00
goibhniu
1bdf372a28 Merge pull request #10573 from simonvandel/paper-gtk-theme-init
paper-gtk-theme: init at 6a5f14c
2015-10-24 21:54:22 +02:00
Simon Vandel Sillesen
c5e8cd961c Make description conform to nixos standards 2015-10-24 19:01:57 +02:00
Simon Vandel Sillesen
138ecfa03b paper-gtk-theme: init at 6a5f14c 2015-10-24 13:02:39 +02:00
Yochai
837cdb03d3 mfcj470dw: init at 3.0.0-1 2015-10-23 19:51:05 +03:00
Vladimír Čunát
4917a4f8b3 Merge master into staging 2015-10-23 01:57:14 +02:00
Jude Taylor
d63f0d3a6b hplip: fix evaluation 2015-10-20 15:54:33 -07:00
Brandon Dimcheff
c0a963e3cc cups-filters: make shell string longer (close #10493)
The cstring for the shell path is too short for nixos in cups-filters,
causing it to be truncated.  This was previously fixed in #5428, but
regressed.

This is a permanent solution accepted even upstream
https://bugs.linuxfoundation.org/show_bug.cgi?id=1325
http://bzr.linuxfoundation.org/loggerhead/openprinting/cups-filters/revision/7401
2015-10-20 17:09:42 +02:00
S. Nordin
8fc076246b apulse: 0.1.5 -> 0.1.6 2015-10-17 20:48:21 -04:00
Rok Garbas
731bb36652 vimPlugins: some vim addons got removed in e206ea5b probably by accident 2015-10-16 12:55:56 +02:00
William A. Kennington III
8a44a36ca4 Merge branch 'master.upstream' into staging.upstream 2015-10-15 10:22:28 -07:00
Rinaldus
4c626f44d9 wine-{unstable,staging}: update 1.7.48 -> 1.7.52
Close #10238.
2015-10-15 12:01:16 +02:00
Vladimír Čunát
783c40eb68 dbus: split into multiple outputs and fix referrers 2015-10-13 20:19:01 +02:00
Vladimír Čunát
194f0e880f just add comments about outputs (cups, gdk-pixbuf) 2015-10-13 20:18:58 +02:00
Vladimír Čunát
9da12a6713 SDL: split the dev output and fix referrers 2015-10-13 20:18:56 +02:00
Vladimír Čunát
a6e4c87391 gtk3: split into multiple outputs
All references OK, hopefully. Seems surprisingly smooth.
2015-10-13 20:18:45 +02:00
Robert Helgesson
1c1b812e74 theme-vertex: 20150718 -> 20150923 2015-10-10 13:42:08 +02:00
Thomas Tuegel
2de259f574 lilypond: disable argv[0] passthrough
Fixes #10290. Lilypond finds its Guile libraries by looking at the path
in argv[0], so it should be hardcoded to the real absolute path to the
executable.
2015-10-09 07:18:41 -05:00
Eelco Dolstra
741bf840da Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
This reverts commit f61176c5396ed513f3d399f73f38ab78a066667f, reversing
changes made to a27ca029ee2b39e04d7d2a516a7228f4b62067fb.

Conflicts:
	pkgs/development/libraries/ncurses/default.nix
2015-10-06 15:24:20 +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