William A. Kennington III
6602f49495
Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
...
This reverts commit 741bf840da
.
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
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 f61176c539
, reversing
changes made to a27ca029ee
.
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
Théophane Hufschmitt
e206ea5b0c
vimPlugins.gundo: fixed upstream url
2015-10-05 15:55:34 +02:00
Luca Bruno
b3d1184693
jack2: do not propagate uuid
2015-10-02 16:33:40 +02:00
Arnold Krille
48f05f7b10
jackaudio: Add libuuid as propagatedBuildInput
...
The jack/jack.h includes uuid/uuid.h, therefox libuuid should be a propagated input for anything using jack.
2015-10-02 14:56:59 +02:00
laMudri
4138fa09fd
urbit: init at 2015.09.26
2015-09-28 13:25:23 +01:00
Thomas Tuegel
2e0589b4ca
kde414: build with kdelibs-4.14.12
...
Upstream changes to the build system required adjusting many packages'
dependencies. On the Nixpkgs side, we no longer propagate the dependency
on cmake (to reduce closure size), so downstream dependencies had to be
adjusted for most packages that depend on kdelibs.
2015-09-27 15:08:12 -05:00
Vladimír Čunát
77084d3056
lilypond: fix with new dblatex+texlive, fix meta
...
Also enableParallelBuilding, as it took quite some time to build.
/cc maintainer @MarcWeber.
2015-09-23 21:14:16 +02:00
Vladimír Čunát
76ef7a93e3
Merge: xlibs and x11 attribute cleanup
...
Frequently using multiple *almost* identical attributes is bad.
2015-09-23 10:42:34 +02:00
Arseniy Seroka
030fa33958
vimPlugins: 2015-09-21 update
2015-09-21 23:01:11 +03:00
Thomas Tuegel
8df4cbe20f
mgba: use Qt 5.4
2015-09-19 10:01:25 -05:00
Tobias Geerinckx-Rice
7eba250f55
hplip & plugin: 3.15.6 -> 3.15.9
2015-09-18 02:04:05 +02:00
Arseniy Seroka
6c6653a437
vimPlugins: 2015-09-17 update
2015-09-17 00:42:27 +03:00
Rehno Lindeque
b1d894e081
vimPlugins: add vim-jade
2015-09-16 00:38:20 +00:00
Vladimír Čunát
88c9f8b574
xlibs: replace occurrences by xorg
...
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
Vladimír Čunát
21e3ff658a
x11: replace its usage by xlibsWrapper directly
...
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
2015-09-15 12:08:24 +02:00
Vladimír Čunát
0c74f18e4c
xlibs.xlibs: remove
...
It was really ugly that `xlibs.xlibs` meant something else than `xlibs`,
especially when using `with xlibs`, such as in wine.
Also, now `xlibs` is the same as `xorg`.
2015-09-15 11:59:33 +02:00
Mathnerd314
eb7404d97a
all-packages: Use callPackage where possible
2015-09-14 22:27:19 -06:00
AndersonTorres
65e44c62de
Desmume: init at 0.9.11
2015-09-12 23:58:23 -03:00