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
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
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
Andrew Kelley
3f47c2fb2c
add libjack2-git
...
closes #9467
2015-09-11 16:59:28 -07:00
Thomas Strobel
260be2cbf6
xtrlock-pam: init at 3.4
2015-09-10 09:13:06 +02:00
Simon Vandel Sillesen
d14669b9dc
sundtek: 28-07-2015 -> 2015-09-07 ( close #9723 )
2015-09-09 09:04:37 +02:00
Rok Garbas
747e0149cc
marking junit and dolphinEmu as broken
2015-09-08 14:05:40 +02:00
Domen Kožar
264a83c707
cups: 2.0.3 -> 2.0.4, fix transient failure
...
(cherry picked from commit cc06f9c0be051f7ef2e1fcbd2ce13b902acc8adc)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-09-06 16:01:22 +02:00
Cillian de Róiste
55d822c512
jack2: apply patch to fix build with gcc5
2015-09-03 11:22:28 -07:00
Cillian de Róiste
1e83055cd2
Revert "jack2: 1.9.10 -> 2015-06-02"
...
This reverts commit fd829968c7b6734e04d7c720d51a174b4e8a8412.
2015-09-03 11:22:23 -07:00
Arseniy Seroka
1c158ecdb4
vimPlugins: 2015-09-01 update
2015-09-01 05:10:53 +03:00
Arseniy Seroka
e04f23b332
Merge pull request #9507 from benley/vim-unity
...
vimPlugins.unite: Init at 2015-08-29
2015-09-01 04:41:26 +03:00
Nikolay Amiantov
4ce182c736
xlockmore: clean configure flags and add Xinerama and DPMS support
...
Close #9391 .
2015-08-31 16:35:26 +02:00
Cillian de Róiste
75f880b1d1
mednafen: fix src url (sourceforge -> mednafen.fobby.net)
...
Also bump the minor version 0.9.38.5 -> 0.9.38.6
2015-08-31 13:50:14 +02:00
Benjamin Staffin
cd142cea4f
vimPlugins.unite: Init at 2015-08-29
...
unite works nicely together with vimshell.
2015-08-30 15:31:52 -07:00
Arseniy Seroka
7cf4d2cf5b
Merge pull request #9556 from kamilchm/vim-go
...
vimPlugins: replace unmaintained vim-golang with vim-go
2015-08-31 00:58:54 +03:00
Kamil Chmielewski
25f19c2725
vimPlugins: replace unmaintained vim-golang with vim-go
2015-08-30 22:36:02 +02:00
Arseniy Seroka
984ca122f4
Merge pull request #9506 from benley/vim2nix
...
vimUtils.pluginnames2nix: fixes for non-nixos systems
2015-08-30 23:15:26 +03:00
Rok Garbas
33cb16104c
vimPlugins: adding css_color_5056, ctrlp-py-matcher, ctrlp-z, goyo, vim-signify, vim-webdevicons
2015-08-29 21:01:38 +02:00
Rok Garbas
c61ade7b52
vimPlugins: updated (and sorted alphabetically)
2015-08-29 21:01:28 +02:00
Domen Kožar
cbb7bc92b6
Merge pull request #9320 from kamilchm/vimPlugins-molokai
...
vimPlugins: add molokai
2015-08-29 14:09:51 +02:00
Benjamin Staffin
5fe9618a30
vimUtils.pluginnames2nix: fixes for non-nixos systems
...
Now referring to the nix prefetch scripts through their nixpkgs
derivation in order to make sure their shebang lines are rewritten
properly. Otherwise nix-prefetch-hg fails on Ubuntu (and probably
Debian) systems, where /bin/sh is not bash.
2015-08-28 19:27:33 -07:00
Benjamin Staffin
a166119486
vimproc: Fix when run on non-NixOS linux distros
...
Prior to this change, if there exists a /lib*/ld-linux*.so.2 on a
system, vimproc will try to load vimproc_linux64.so or
vimproc_linux32.so instead of vimproc_unix.so, which is what nix
actually builds.
2015-08-27 20:35:46 -07:00
Arseniy Seroka
096515656d
Merge pull request #9475 from dezgeg/pr-uboot-update
...
u-boot: 2015.04 -> 2015.07
2015-08-28 01:31:02 +03:00
Tuomas Tynkkynen
02f9f0c7e0
u-boot: 2015.04 -> 2015.07
...
A new regularly release. Some improvements I've noted:
- Keyboard on the pcDuino3 Nano now works without a hub.
- Ctrl-C now correctly cancels the 'sysboot' boot menu
Also, config_cmd_default.h is replaced by equivalents in the kconfig
system, so the vexpress patch needs some updating.
2015-08-26 22:07:18 +03:00
Bjørn Forsman
d61c46c1bd
libqglviewer: rename attrname and pkgname from libQGLViewer
...
Ref. http://nixos.org/nixpkgs/manual/#sec-package-naming
2015-08-26 16:50:55 +02:00
Domen Kožar
e4644a5b58
Merge branch 'staging'
2015-08-25 14:14:54 +02:00
Eelco Dolstra
60a0bb7f66
Make "nix-env -i wine" work again
...
Also, make wine32 the default again to prevent a huge closure size
regression. (It recently grew by ~1 GB:
http://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.wineStable.x86_64-linux#tabs-charts )
Issue #8990 .
2015-08-25 13:07:16 +02:00
William A. Kennington III
64cd711f5c
Merge branch 'master.upstream' into staging.upstream
2015-08-21 15:17:26 -07:00
Nikolay Amiantov
6d6eb1913a
Merge pull request #9025 from abbradar/zsnes
...
zsnes: use Debian patches, fix segfault on saving state
2015-08-21 23:53:44 +03:00
William A. Kennington III
4f22eadf2c
Merge branch 'master.upstream' into staging.upstream
2015-08-19 20:52:17 -07:00
Thomas Strobel
26ef514981
canon-cups-ufr2: init at 2.90
2015-08-20 01:22:10 +02:00
Kamil Chmielewski
86b34e3a0d
vimPlugins: add molokai
2015-08-19 14:44:20 +02:00
William A. Kennington III
2ac70270e8
Merge branch 'master.upstream' into staging.upstream
2015-08-18 11:36:32 -07:00
Vladimír Čunát
a732b1413f
ghostcript: work around a parallel check problem
...
http://hydra.nixos.org/build/24811657
Hopefully OK now - I couldn't reproduce it with 4 cores and HT.
2015-08-18 10:36:00 +02:00
Cray Elliott
e99167d7f1
new package: mgba 0.3.0
...
This is a new Gameboy Advance emulator which aims to run on lower
end hardware without sacrificing accuracy or portability.
2015-08-17 18:00:33 -07:00
Jan Malakhovski
c88e9deff4
cups: remove xdg_utils dependency
...
`cups.desktop` that depends on some fixed version of `xdg-open` is not
particularly useful; it should use `xdg-open` from the environment
it's being run from.
As a side effect, one can now fiddle with `xdg_utils` package without
rebuilding pretty much every single one of graphical packages (they
all depend on `cups` through their graphical toolkits).
2015-08-16 20:23:01 +02:00
William A. Kennington III
952def0e3c
Merge branch 'master.upstream' into staging.upstream
2015-08-13 11:55:02 -07:00
Simon Vandel Sillesen
a7648a2226
sundtek: 30-06-2015 -> 28-07-2015
...
Tested on local machine.
2015-08-12 17:25:08 +02:00
William A. Kennington III
4624985561
Merge branch 'master.upstream' into staging.upstream
2015-08-07 13:40:39 -07:00
Eric Sagnes
0abedda1cc
vimPlugins: add CheckAttach, vimwiki
2015-08-06 10:56:46 +09:00
Herwig Hochleitner
440dde6950
wine: cleanup and comment build script
2015-08-06 00:27:32 +02:00
Herwig Hochleitner
e15a4b0ee2
wine: 1.7.47 -> 1.7.48
2015-08-06 00:21:31 +02:00
William A. Kennington III
926f073f55
Merge branch 'master.upstream' into staging.upstream
2015-08-04 15:32:43 -07:00
Tobias Geerinckx-Rice
b62debe042
hplip: 3.15.7 -> 3.15.6
...
Version 3.15.7 breaks certain (but not all) PCL-based printers:
b0e46fc3ea
Forgetting to revert a failed patch hunk certainly didn't help. Grr.
2015-08-04 20:00:20 +02:00
Thomas Tuegel
b0e46fc3ea
hplip: remove ttuegel from maintainers
...
I no longer commit my changes to Nixpkgs because they are usually broken
by other maintainers.
2015-08-03 21:31:44 -05:00
William A. Kennington III
49adfe2ff9
ghostscript: Fix patches
2015-08-03 14:28:11 -07:00
William A. Kennington III
a2da9cfcaf
Merge branch 'master.upstream' into staging.upstream
2015-08-03 14:27:14 -07:00
Cray Elliott
84dc71ebe4
bump dolphinEmuMaster, remove no longer needed SDL dep
...
also add libevdev as a dep, read about all the changes at
https://dolphin-emu.org/blog/2015/08/01/dolphin-progress-report-july-2015/
2015-08-02 03:17:03 -07:00
Robert Scott
179cdbc62c
ghostscript: add patch fixing CVE-2015-3228 (from debian)
2015-08-02 09:40:05 +02:00
William A. Kennington III
09b4a7cc1b
Merge branch 'master.upstream' into staging.upstream
2015-07-31 17:26:20 -07:00
Mateusz Kowalczyk
7930150366
Merge pull request #9045 from AndersonTorres/PPSSPP
...
PPSSPP: 0.9.9.1 -> 1.1.0
2015-07-31 09:43:49 +01:00
William A. Kennington III
7ebe164ae0
Merge branch 'master.upstream' into staging.upstream
2015-07-30 15:03:10 -07:00