Tuomas Tynkkynen
2fec9c6e29
Merge remote-tracking branch 'upstream/master' into staging
...
Conflicts:
pkgs/development/tools/build-managers/conan/default.nix
2018-03-13 23:04:18 +02:00
aszlig
ba816ee087
nixos/tests/virtualbox: Work around test failures
...
I've started digging into the actual cause of the problem a week ago but
didn't continue fixing this.
The reason why the tests are failing is because
torvalds/linux/commit/72f5e08dbba2d01aa90b592cf76c378ea233b00b has
remapped the location of the TSS into the CPU entry area and we did
update our default kernel to version 4.14 in NixOS/nixpkgs@88530e02b6 .
Back to VirtualBox: The guru meditation happens in
selmRCGuestTssPostWriteCheck, which I think is only a followup error. I
believe the right location couldn't be determined by VirtualBox and thus
the write check function triggers that panic because it's reading from
the wrong location.
So the actual problem *only* surfaces whenever we use software
virtualization, which we do for our tests because we don't have nested
virtualization available.
Our tests are also for testing the functionality of VirtualBox itself
and not certain kernel versions or kernel features, so for the time
being and until this is fixed, let's actually use kernel version 4.9 for
the guests within the VM tests. Kernel 4.9 didn't have the mentioned
change of the TSS location and thus the tests succeed.
Signed-off-by: aszlig <aszlig@nix.build>
Cc: @dtzWill
2018-03-13 22:00:56 +01:00
Peter Simons
1aaed17244
hackage: update database snapshot to latest version
2018-03-13 21:42:54 +01:00
Peter Simons
79c97645b4
haskell-Cabal: version 2.2.x now accepts older versions of text
2018-03-13 21:41:54 +01:00
Peter Simons
a3a6918137
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.9-5-g32974fc from Hackage revision
3e784a7dcf
.
2018-03-13 21:41:54 +01:00
Franz Pletz
50fdcd414e
Merge pull request #36888 from volth/xfce-naming
...
xfce: do not use old names
2018-03-13 18:44:59 +00:00
Franz Pletz
6e55d83576
Merge pull request #36673 from averelld/upgrade-teamviewer
...
teamviewer: 12.0.85001 -> 12.0.90041
2018-03-13 18:42:37 +00:00
Franz Pletz
4e3b4b0acb
Merge pull request #36916 from magnetophon/qutebrowser
...
qutebrowser: 1.1.1 -> 1.2.0
2018-03-13 18:35:37 +00:00
Will Dietz
f1f9ac7a61
Merge pull request #36913 from efx/topic-timewarrior-darwin
...
timewarrior: enable for darwin
2018-03-13 13:31:16 -05:00
Will Dietz
29d46471e0
metrics: fix "values" to be count not bytes, to match prev behavior
...
https://github.com/NixOS/nixpkgs/pull/36896#discussion_r174163744
2018-03-13 13:29:15 -05:00
Daiderd Jordan
15ee5ff446
v8: only use -Wno-error=unused-lambda-capture with clang
2018-03-13 19:21:47 +01:00
Franz Pletz
134af4c5ac
Merge pull request #36659 from Ma27/fix-freeorion
...
freeorion: fix build
2018-03-13 17:55:08 +00:00
Jan Tojnar
2381bcd86f
maintainers/scripts/update.nix: use saner nubbing
2018-03-13 18:04:47 +01:00
Bart Brouns
f043e09e02
qutebrowser: 1.1.1 -> 1.2.0
2018-03-13 17:54:53 +01:00
Maximilian Bosch
7da70c0b87
freeorion: fix build
...
`boost::system::posix_error` is deprecated since v1.37, however the
default Boost version in NixOS is 1.66.
The following upstream patch fixed the issue:
c9b5b13fb8
See ticket #36453
2018-03-13 17:33:05 +01:00
Eli Flanagan
e0bf8113bf
timewarrior: enable for darwin
2018-03-13 12:30:51 -04:00
Franz Pletz
4f17851fb2
fetchurl: remove broken samba mirror
2018-03-13 17:15:33 +01:00
Franz Pletz
d2582dc92a
samba: 4.7.5 -> 4.7.6 for multiple CVEs
...
Fixes CVE-2018-1050, CVE-2018-1057.
2018-03-13 15:31:54 +01:00
Michael Raskin
9f4aaf11bd
Merge pull request #36891 from volth/aliases-2
...
treewide: s/saneBackends/sane-backends/g
2018-03-13 14:12:29 +00:00
Lassulus
bfc75b5198
altcoins.bitcoin-unlimited: 1.0.2.0 - > 1.0.3.0 ( #36715 )
...
* altcoins.bitcoin-unlimited: 1.0.2.0 - > 1.0.3.0
* Update default.nix
2018-03-13 13:57:58 +00:00
Michael Raskin
bfbc4951a6
Merge pull request #36850 from teto/virtualisation
...
Virtualisation
2018-03-13 13:40:33 +00:00
Frederik Rietdijk
d9d21b6734
diffoscope: fetch over https
2018-03-13 14:26:19 +01:00
Frederik Rietdijk
7e3d181160
netpbm: fetch over https
2018-03-13 14:26:18 +01:00
Frederik Rietdijk
0fe236dbf2
dtc: fetch over https
2018-03-13 14:26:18 +01:00
Franz Pletz
4b72196874
Merge pull request #36806 from timokau/conan-fix
...
conan: Fix build
2018-03-13 13:16:21 +00:00
Franz Pletz
b6990edfb3
Merge pull request #36874 from lukeadams/sambaMaster-update
...
sambaMaster: 4.8.0_2018-01-25 -> 2018-03-09
2018-03-13 13:16:03 +00:00
Nikolay Amiantov
d7470c1f1e
android-studio: fix GTK LaF
...
Closes #36887 .
2018-03-13 16:13:18 +03:00
lewo
a682ba23d4
Merge pull request #36352 from nlewo/pr-onTopOfPulledImage
...
Add dockerTools test: on top of pulled image
2018-03-13 13:34:25 +01:00
Peter Simons
54ade273e7
Merge pull request #36526 from idontgetoutmuch/master
...
Add sundials
2018-03-13 13:29:17 +01:00
Eelco Dolstra
2aa8a208b0
Merge pull request #36896 from dtzWill/fix/metrics-sed
...
metrics: fixup sed expr to work with Nix 2
2018-03-13 13:24:35 +01:00
Antoine Eiche
bc1e8f95d4
tests/docker-tools: add onTopOfPulledImage test
2018-03-13 11:59:22 +01:00
Antoine Eiche
e8f452f110
dockerTools: add an onTopOfPulledImage example
...
This allows to test if a pulled image can be updated by using our
Docker tools.
2018-03-13 11:59:22 +01:00
Timo Kaufmann
5fdfe61b35
conan: Fix build
...
conan has very strict requirements on the versions of its dependencies.
This patch adds downgraded versinos of node-semver and distro to
statisfy these requirements.
2018-03-13 11:36:45 +01:00
volth
7ec0471242
treewide: s/xlibs/xorg/g ( #36889 )
2018-03-13 10:16:03 +00:00
Sander van der Burg
ebb562d29a
airfield: regenerate with node2nix 1.5.3
2018-03-13 10:45:24 +01:00
adisbladis
ce78db79a3
overmind: init at 1.1.1
2018-03-13 17:44:00 +08:00
Sander van der Burg
e2cb020a27
nixui: regenerate with node2nix 1.5.3
2018-03-13 10:43:37 +01:00
Sander van der Burg
3a5e38fa00
remarkjs: regenerate dependencies with node2nix 1.5.3
2018-03-13 10:41:53 +01:00
Sander van der Burg
f9bb730d77
zed: regenerate packages with node2nix 1.5.3
2018-03-13 10:38:38 +01:00
volth
5a1da02976
frostwire-bin: update sha256
2018-03-13 09:54:51 +01:00
volth
b20fe4a99d
frostwire: a stricter regex, just in case
2018-03-13 09:54:51 +01:00
volth
cedfe31648
frostwire: restore download-and-unpack derivation as frostwire-bin
2018-03-13 09:54:51 +01:00
volth
0596a7c6d6
frostwire: fixed meta.platforms
2018-03-13 09:54:51 +01:00
volth
a28464cba7
frostwire: 6.4.5 -> 6.6.3-build-253
2018-03-13 09:54:51 +01:00
Jan Tojnar
9b94dd0999
maintainers/scripts/update.nix: fix error message
2018-03-13 09:04:12 +01:00
Samuel Leathers
a2d2d53295
Merge pull request #36890 from magnetophon/i3
...
i3: 4.14.1 -> 4.15
2018-03-13 00:03:40 -04:00
Will Dietz
5eb07e2396
metrics: fixup sed expr to work with Nix 2
2018-03-12 22:49:17 -05:00
Will Dietz
708e3fb160
zed: inherit libtool, fix eval
2018-03-12 22:47:47 -05:00
Samuel Leathers
85d22e7510
remarkjs: inherit libtool for derivation
2018-03-12 23:45:34 -04:00
Samuel Leathers
7b8fa3472f
Merge pull request #36895 from disassembler/nixui
...
nixui: inherit libtool for derivation
2018-03-12 23:32:15 -04:00