summary refs log tree commit diff
Commit message (Collapse)AuthorAge
* nixos/docker-registry: add more configuration options for docker-registryMichele Catalano2018-05-01
|
* Merge pull request #36572 from ryantm/auto-update/gperftoolsJörg Thalheim2018-04-30
|\ | | | | gperftools: 2.6.1 -> 2.6.3
| * gperftools: suppress compilation warning on macOSJörg Thalheim2018-04-30
| |
| * gperftools: 2.6.1 -> 2.6.3Ryan Mulligan2018-03-08
| | | | | | | | | | | | | | | | | | | | Semi-automatic update. These checks were done: - built on NixOS - ran `/nix/store/ba54ymdab4y2jcxwbmn71sm698cy1wik-gperftools-2.6.3/bin/pprof --help` got 0 exit code - ran `/nix/store/ba54ymdab4y2jcxwbmn71sm698cy1wik-gperftools-2.6.3/bin/pprof --help` and found version 2.6.3 - found 2.6.3 with grep in /nix/store/ba54ymdab4y2jcxwbmn71sm698cy1wik-gperftools-2.6.3 - found 2.6.3 in filename of file in /nix/store/ba54ymdab4y2jcxwbmn71sm698cy1wik-gperftools-2.6.3
* | Merge pull request #39702 from samueldr/dbeaver/5.0.4Jörg Thalheim2018-04-30
|\ \ | | | | | | dbeaver: 5.0.3 -> 5.0.4
| * | dbeaver: 5.0.3 -> 5.0.4Samuel Dionne-Riel2018-04-29
| | |
* | | Merge pull request #39674 from pstn/dehydrated-bumpPascal Wittmann2018-04-30
|\ \ \ | | | | | | | | dehydrated: 0.6.1 -> 0.6.2
| * | | dehydrated: 0.6.1 -> 0.6.2Philipp Steinpass2018-04-29
| | | |
* | | | go-ethereum: 1.8.3 -> 1.8.6adisbladis2018-04-30
| | | |
* | | | Merge pull request #39147 from peterhoeg/u/toxPeter Hoeg2018-04-30
|\ \ \ \ | | | | | | | | | | tox: libtoxcore and assorted tox client updates
| * | | | toxvpn: 2017-06-25 -> 2018-04-17Peter Hoeg2018-04-30
| | | | |
| * | | | utox: 0.16.1 -> 0.17.0Peter Hoeg2018-04-30
| | | | |
| * | | | toxic: 0.7.2 -> 0.8.2Peter Hoeg2018-04-29
| | | | |
| * | | | qtox: 1.13.1 -> 1.15.0Peter Hoeg2018-04-29
| | | | |
| * | | | ratox: 0.4 -> 0.4.20180303Peter Hoeg2018-04-29
| | | | |
| * | | | libtoxcore: introduce 0.2.2 in addition to 0.1.11Peter Hoeg2018-04-29
| | |/ / | |/| |
* | | | linux: 4.17-rc2 -> 4.17-rc3Tim Steinbach2018-04-29
| | | |
* | | | Merge pull request #39649 from grahamc/hacking-docsGraham Christensen2018-04-29
|\ \ \ \ | | | | | | | | | | NixOS docs: making it easier to hack on
| * | | | nixos docs: include note about make for debugging the nixos docsGraham Christensen2018-04-28
| | | | |
| * | | | nixos manual: update xi:include for configuruation.nix's options-dbGraham Christensen2018-04-28
| | | | |
| * | | | nixos docs: Add a makefile for hacking on the nixos docsGraham Christensen2018-04-28
| | | | |
| * | | | nixos docs: Move generated XML in to a specific subdirectory to allow easier ↵Graham Christensen2018-04-27
| | | | | | | | | | | | | | | | | | | | hacking
* | | | | nixos/tests: Fix QEMU flags for SCSI disksaszlig2018-04-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ability to specify "-drive if=scsi" has been removed in QEMU version 2.12 (introduced in 3e3b39f173f9abc99da84084a1f4657c9de885bd). Quote from https://wiki.qemu.org/ChangeLog/2.12#Incompatible_changes: > The deprecated way of configuring SCSI devices with "-drive if=scsi" > on x86 has been removed. Use an appropriate SCSI controller together > "-device scsi-hd" or "-device scsi-cd" and a corresponding "-blockdev" > parameter instead. So whenever the diskInterface is "scsi" we use the new way to specify the drive and fall back to the deprecated way for the time being. The reason why I'm not using the new way for "virtio" and "ide" as well is because there is no simple generic way anymore to specify these. This also turns the type of the virtualisation.qemu.diskInterface option to be an enum, so the user knows which values are allowed but we can also make sure the right value is provided to prevent typos. I've tested this against a few non-disk-related NixOS VM tests but also the installer.grub1 test (because it uses "ide" as its drive interface), the installer.simple test (just to be sure it still works with "virtio") and all the tests in nixos/tests/boot.nix. In order to be able to run the grub1 test I had to go back to 8b1cf100cd8badad6e1b6d4650b904b88aa870db (which is a known commit where that test still works) and apply the QEMU update and this very commit, because right now the test is broken. Apart from the tests here in nixpkgs, I also ran another[1] test in another repository which uses the "scsi" disk interface as well (in comparison to most of the installer tests, this one actually failed prior to this commit). All of them now succeed. [1]: https://github.com/openlab-aux/vuizvui/blob/9b5a119972e9c2d327500638d89063f4fce243ec/tests/system/kernel/bfq.nix Signed-off-by: aszlig <aszlig@nix.build> Cc: @edostra, @grahamc, @dezgeg, @abbradar, @ts468
* | | | | nixos/tests/udisks2: Fix USB device hotplugaszlig2018-04-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The usb_add and usb_del monitor commands have been removed in QEMU version 2.12 (introduced in 3e3b39f173f9abc99da84084a1f4657c9de885bd). Quote from https://wiki.qemu.org/ChangeLog/2.12#Incompatible_changes: > The deprecated HMP commands "usb_add" and "usb_del" have been removed. > Use "device_add" and "device_del" as replacement instead. So we're doing exactly that and the udisks2 test now works again. Signed-off-by: aszlig <aszlig@nix.build> Cc: @edolstra
* | | | | Merge pull request #39695 from worldofpeace/patch-1Graham Christensen2018-04-29
|\ \ \ \ \ | | | | | | | | | | | | wire-desktop: correct desktopItem
| * | | | | wire-desktop: correct desktopItemworldofpeace2018-04-29
| | | | | |
* | | | | | Merge pull request #37986 from jtojnar/qpdfview-qt5Jan Tojnar2018-04-30
|\ \ \ \ \ \ | |/ / / / / |/| | | | | qpdfview: port to qt5
| * | | | | qpdfview: remove placeholder usageJan Tojnar2018-04-30
| | | | | |
| * | | | | qpdfview: port to qt5Jan Tojnar2018-04-30
| | | | | |
* | | | | | darling: fix srcMatthew Bauer2018-04-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Darling has a case conflict which means that its src hash will be different between case sensitive and case insensitive file systems. This is not ideal and the only way around it is basically to remove the offending files from the output. I use fetchzip here to do that but I hope there is a better fix available eventually.
* | | | | | rl-1809: add netcat noteMatthew Justin Bauer2018-04-29
| | | | | |
* | | | | | Merge pull request #39408 from timokau/cddlib-094iMichael Raskin2018-04-29
|\ \ \ \ \ \ | | | | | | | | | | | | | | cddlib: 0.94h -> 0.94i, add cdd_both_reps binary
| * | | | | | cddlib: 0.94h -> 0.94i, add cdd_both_reps binaryTimo Kaufmann2018-04-24
| | | | | | |
* | | | | | | Merge pull request #39652 from ajs124/makemkv_1_12_qt5xeji2018-04-30
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | makemkv: 1.10.8 -> 1.12.2, switch from qt4 to qt5
| * | | | | | | makemkv: 1.10.8 -> 1.12.2, switch from qt4 to qt5ajs1242018-04-28
| | | | | | | |
* | | | | | | | nixos/tests/hibernate: Fix netcat flagsaszlig2018-04-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm not sure why 024b501907eafbd89624e465ff21afbc96e9fec6 used -q 0 because even netcat-openbsd has the -N flag which IMO is the better way to shutdown the socket on EOF. Our default netcat implementation has changed once again[1] in 3c3b82234a6faa5a4c07323d0066452055d1ea81 and we're now using LibreSSL's implementation, which doesn't have a -q flag. See https://github.com/NixOS/nixpkgs/pull/39634 for the pull request introducing the switch. [1]: https://github.com/NixOS/nixpkgs/pull/19982 Signed-off-by: aszlig <aszlig@nix.build> Cc: @matthewbauer, @dtzWill, @Mic92
* | | | | | | | Merge pull request #39678 from Ma27/fix-awsclixeji2018-04-29
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | awscli: 1.14.50 -> 1.15.10; fix build
| * | | | | | | | awscli: 1.14.50 -> 1.15.10; fix buildMaximilian Bosch2018-04-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As reported in #39676 the build broke because of ca52152 as the bump of `pythonPackages.botocore` to 1.10.9 clashed with the wanted dependencies in `awscli`. In order to reduce the risk of accidental bugs because of loosened version constraints I bumped the AWS CLI to `1.15.10` which depends on `botocore@1.10` as well. Fixes #39676
* | | | | | | | | libressl: fix evalMatthew Justin Bauer2018-04-29
| | | | | | | | |
* | | | | | | | | Merge pull request #35361 from sconybeare/masterxeji2018-04-29
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | monkeysphere: wrap the monkeysphere executable with the necessary crypto libraries …
| * | | | | | | | | monkeysphere: wrap the monkeysphere executable with the necessary crypto ↵Sebastian Conybeare2018-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libraries for ssh-proxycommand
* | | | | | | | | | Merge pull request #39634 from matthewbauer/remove-openbsd-netcatMatthew Justin Bauer2018-04-29
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Replace netcat-openbsd with libressl
| * | | | | | | | | | libressl: move netcat stuff to '.nc' outputMatthew Bauer2018-04-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I still feel weird about doing this because it seems a little hacky but this was requested by @Mic92 and seems understandable to not want to mix up libressl outputs with netcat stuff.
| * | | | | | | | | | netcat-openbsd: removeMatthew Bauer2018-04-27
| | | | | | | | | | |
| * | | | | | | | | | libressl: build netcatMatthew Bauer2018-04-27
| | | | | | | | | | |
| * | | | | | | | | | netcat-gnu: move to pkgs/tools/networking/netcatMatthew Bauer2018-04-27
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #39636 from matthewbauer/netbsdMatthew Justin Bauer2018-04-29
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | netbsd: cleanups
| * | | | | | | | | | | netbsd.games: disable more games on darwinMatthew Bauer2018-04-29
| | | | | | | | | | | |
| * | | | | | | | | | | netbsd: improve darwin supportMatthew Bauer2018-04-27
| | | | | | | | | | | |
| * | | | | | | | | | | netbsd: cleanup and musl suppotMatthew Bauer2018-04-28
| | | | | | | | | | | |