Commit Graph

22822 Commits

Author SHA1 Message Date
Frederik Rietdijk
c1d79509a0
Merge pull request #34553 from NixOS/python-unstable
Python package updates
2018-02-04 13:29:23 +00:00
Frederik Rietdijk
aaa50d506e python.pkgs.spyder: fix expression
Note I still get
```
This application failed to start because it could not find or load the
Qt platform plugin "xcb"
in "".
```
but that may be because I run it from the store which is not support for
Qt5 applications.
2018-02-04 10:17:35 +01:00
Will Dietz
113b04ae28 qgit: 2.6 -> 2.7 (#34536)
Changelog:
http://libre.tibirna.org/projects/qgit/wiki/27
2018-02-03 23:58:39 +00:00
Bjørn Forsman
be40296afe qmmp: 1.1.10 -> 1.2.0
Fixes build failure since recent merge of staging branch:

$ nix-build -A qmmp
[...]
AutoMoc error
-------------
Included moc files with the same name will be generated from different sources.
Consider to
 - not include the "moc_<NAME>.cpp" file
 - add a directory prefix to a "<NAME>.moc" include (e.g "sub/<NAME>.moc")
 - rename the source file(s)
Include conflicts
-----------------
"moc_hotkeymanager.cpp" included in
 - "/tmp/nix-build-qmmp-1.1.10.drv-0/qmmp-1.1.10/src/plugins/General/hotkey/hotkeymanager_win.cpp"
 - "/tmp/nix-build-qmmp-1.1.10.drv-0/qmmp-1.1.10/src/plugins/General/hotkey/hotkeymanager_x11.cpp"
would be generated from
 - "/tmp/nix-build-qmmp-1.1.10.drv-0/qmmp-1.1.10/src/plugins/General/hotkey/hotkeymanager.h"
 - "/tmp/nix-build-qmmp-1.1.10.drv-0/qmmp-1.1.10/src/plugins/General/hotkey/hotkeymanager.h"

make[2]: *** [src/plugins/General/hotkey/CMakeFiles/hotkey_autogen.dir/build.make:58: src/plugins/General/hotkey/CMakeFiles/hotkey_autogen] Error 1
2018-02-03 21:26:41 +01:00
Bjørn Forsman
6b834384f6 bitscope: create derivations with version info
So far the store paths produced by the bitscope derivations have been
version-less. Fix it.
2018-02-03 21:14:50 +01:00
adisbladis
93be6c41aa
firefox-devedition-bin: 59.0b5 -> 59.0b6 2018-02-04 03:13:46 +08:00
adisbladis
d750b1a008
firefox-beta-bin: 59.0b5 -> 59.0b6 2018-02-04 03:13:45 +08:00
Graham Christensen
92b786a2fb
Merge pull request #30068 from mpickering/osm2xmap
libroxml: init at 2.3.0 and osm2xmap: init at 2.0 c1f7b68
2018-02-03 13:58:35 -05:00
Matthew Pickering
c8763ddc87 Remove whitespace 2018-02-03 18:38:00 +00:00
Matthew Pickering
9c7c640ae4 osm2xmap: init at 2.0 2018-02-03 18:37:08 +00:00
Frederik Rietdijk
c7f535c82d spyder: 3.2.4 -> 3.2.6 2018-02-03 17:43:30 +01:00
Jörg Thalheim
e493bf64cf
Merge pull request #34550 from jensbin/kitty_0.7.1
kitty: 0.6.0 -> 0.7.1
2018-02-03 10:16:34 +00:00
Jens Binkert
3ad34f9424 kitty: 0.6.0 -> 0.7.1 2018-02-03 11:06:38 +01:00
Frederik Rietdijk
9261f3b343
Merge pull request #34516 from dywedir/tiled
tiled: 1.1.1 -> 1.1.2
2018-02-03 10:03:34 +00:00
Frederik Rietdijk
55e0f12761 Merge remote-tracking branch 'upstream/master' into HEAD 2018-02-03 09:48:42 +01:00
Peter Hoeg
27a4a5511d terraform: 0.11.1 -> 0.11.3 2018-02-03 10:06:57 +08:00
Peter Hoeg
15d33a4c93 terragrunt: 0.13.23 -> 0.14.0 2018-02-03 10:06:57 +08:00
Tuomas Tynkkynen
10c8e6d0c5 Merge remote-tracking branch 'upstream/master' into staging 2018-02-03 02:50:21 +02:00
dywedir
490ae6a50e tiled: 1.1.1 -> 1.1.2 2018-02-02 10:09:53 +02:00
Kevin Liu
93532b0d3a
looking-glass-client: init at a10 2018-02-02 01:46:00 +01:00
Daiderd Jordan
fa56fc4be0
Merge pull request #34445 from vbgl/mpd_clientlib-darwin
mpd_clientlib, ncmpc: fix on Darwin
2018-02-02 00:34:21 +01:00
Daiderd Jordan
50e8c06cbd
Merge pull request #34495 from dtzWill/update/vim-8.0.1451
vim: 8.0.1428 -> 8.0.1451
2018-02-01 18:51:53 +01:00
Will Dietz
28f7f0794e vim: 8.0.1428 -> 8.0.1451
Changes:
https://github.com/vim/vim/compare/v8.0.1428...v8.0.1451
2018-02-01 07:20:07 -06:00
Andreas Rammhold
42b9b8f7c8
firefox{-esr,}: fix failing build due to the google-api-key
Since firefox 58.0.1 the google api key is now stored at an absolute
path ($TMPDIR/ga). Since variable expansion in `configureFlags` does not
really work (as expected) the build started failing when using the
legacy firefox build system. With the newer `./mach` based builds
firefox reads the configure flags from `.mozconfig` instead.

This commit moves the `with-google-api-keyfile=` setting into the
`preConfigure` phase where we can properly expand `$TMPDIR` into
whatever the path is.
2018-02-01 13:38:16 +01:00
Andreas Rammhold
ce08581088 firefox: enable official branding
As stated by Sylvestre Ledru (@sylvestre) on Nov 22, 2017 at
https://github.com/NixOS/nixpkgs/issues/31843#issuecomment-346372756 we
have permission to use the official firefox branding.

Fur purposes of documentation the statement of @sylvestre:
> As the person who did part of the work described in the LWN article
> and release manager working for Mozilla, I can confirm the statement
> that I made in
> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815006
>
> @garbas shared with me the list of patches applied for the Nix package.
> As they are just for portability and tiny modifications, they don't
> alter the experience of the product. In parallel, Rok also shared the
> build options. They seem good (even if I cannot judge the quality of the
> packaging of the underlying dependencies like sqlite, png, etc).
> Therefor, as long as you keep the patch queue sane and you don't alter
> the experience of Firefox users, you won't have any issues using the
> official branding.
2018-02-01 12:54:02 +01:00
adisbladis
fab26c6c72
Merge pull request #34465 from steveeJ/steveej-attempt-qtile-bump-0.10.7
qtile: 0.10.4 -> 0.10.7
2018-02-01 17:35:39 +08:00
Michael Weiss
f55fffc1cf android-studio-preview: 3.1.0.8 -> 3.1.0.9 2018-02-01 10:32:44 +01:00
Vladimír Čunát
2fb4606f38
Merge branch 'master' into staging
Haskell rebuild.
Hydra: ?compare=1430378
2018-02-01 09:36:23 +01:00
Stefan Junker
7c1e44f7b6 qtile: 0.10.4 -> 0.10.7 2018-02-01 09:04:08 +01:00
Andreas Rammhold
be4c6311f3
Merge pull request #34481 from andir/grv
grv: init at 0.1.0
2018-02-01 02:02:01 +00:00
Andreas Rammhold
e69f0053e6
grv: init at 0.1.0 2018-02-01 02:29:29 +01:00
aszlig
f96aafd403
virtualbox: 5.2.4 -> 5.2.6
Upstream changes without issue IDs:

 * GUI: fixed occasional screen corruption when host screen resolution
        is changed
 * User interface: increase proposed disk size when creating new VMs for
                   Windows 7 and newer
 * User interface: various improvements for high resolution screens
 * VMM: Fixed problems using 256MB VRAM in raw-mode VMs
 * Audio: implemented support for audio playback and recording for macOS
          guests
 * Audio: further timing improvements for Windows 10 guests
 * Linux hosts: fixed problem accessing mini-toolbar under XFCE

The full changelog including issue IDs can be found at:

https://www.virtualbox.org/wiki/Changelog#v6

What was not mentioned in the changelog is that this release fixes
compiling the VirtualBox modules against kernel 4.15, which was added in
commit 61043ad4d1.

Tested this by running all of the tests in nixos/tests/virtualbox.nix.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @flokli, @svanderburg
2018-01-31 23:38:35 +01:00
Pascal Wittmann
df45c65aae
homebank: 5.1.6 -> 5.1.7 2018-01-31 22:00:05 +01:00
aszlig
b3970e7f5c
mumble: Fix build with boost version 1.66
This is already tracked in upstream issue mumble-voip/mumble#3281 and a
fix has been merged in mumble-voip/mumble@caa187373e.

The patch I'm adding here is using the merged commit
mumble-voip/mumble@ea861fe867 and I've
only added it for the stable release because the patch is already
included in the git version.

@pbogdan also had a similar commit to this
(pbogdan/nixpkgs@8029edea29), but the
patch was applied to both stable and git and thus the git version would
have been broken.

Tested by building mumble and mumble_git and running the mumble NixOS VM
test.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @viric, @jgeerds, @abbradar
Fixes: #33655
2018-01-31 17:39:01 +01:00
Andreas Rammhold
d8d5beac65
Merge pull request #34436 from andir/firefox-58
Firefox 57.0.4 -> 58.0.1
2018-01-31 14:28:04 +00:00
Andreas Rammhold
495e2b0343
firefox: 57.0.4 -> 58.0.1 2018-01-31 14:44:35 +01:00
Vincent Laporte
dccd8a2685
ncmpc: fix build on darwin 2018-01-31 07:35:08 +00:00
Andreas Rammhold
34758f1d0b
Merge pull request #34424 from tokudan/ff-bin5801
firefox-bin: 58.0 -> 58.0.1 [security]
2018-01-30 23:09:34 +00:00
Vladimír Čunát
c9171e5a4c
Merge branch 'master' into staging
Hydra: ?compare=1430035
2018-01-30 19:51:33 +01:00
Joachim F
7e7477295e
Merge pull request #34403 from mdorman/semi-automated-emacs-package-updates
Semi automated emacs package updates
2018-01-30 18:06:52 +00:00
Joachim F
4cfa91ecfc
Merge pull request #34417 from dywedir/dunst
dunst: 1.3.0 -> 1.3.1
2018-01-30 18:05:57 +00:00
Daniel Frank
ba2008938d firefox-bin: 58.0 -> 58.0.1 [security] 2018-01-30 16:28:09 +01:00
Tim Steinbach
078fc69425
Merge pull request #33746 from NeQuissimus/docker_18_01
docker-edge: 17.12.0 -> 18.01.0
2018-01-30 14:06:19 +00:00
zimbatm
f7bb9f6777 vscode: 1.19.2 -> 1.19.3 2018-01-30 13:36:15 +00:00
dywedir
aa2e60744c dunst: 1.3.0 -> 1.3.1 2018-01-30 14:46:47 +02:00
Michael Alan Dorman
c00a10e75e melpa-packages: remove llvm-mode override
This package was removed from melpa, so there's no value in overriding
it, and in fact it won't evaluate. :)
2018-01-29 19:40:59 -05:00
Michael Alan Dorman
accbc72cee melpa-packages: 2018-01-29 2018-01-29 19:40:59 -05:00
Michael Alan Dorman
2b73676db8 melpa-stable-packages: 2018-01-29 2018-01-29 19:40:59 -05:00
Michael Alan Dorman
7d58054cf7 org-packages: 2018-01-29 2018-01-29 19:40:59 -05:00
Michael Alan Dorman
d19f29c1e1 elpa-packages: 2018-01-29 2018-01-29 19:40:59 -05:00