summary refs log tree commit diff
path: root/nixos
Commit message (Collapse)AuthorAge
* 18.09: Jackrabbit -> JellyfishVladimír Čunát2018-03-16
| | | | | | See eb0fa09232 and github discussion on that. My misgiving about the t-shirts was refuted. I don't think this flip may negatively affect anyone.
* Merge commit '3ab2949' from staging into masterTuomas Tynkkynen2018-03-15
|\ | | | | | | | | | | Conflicts: pkgs/development/compilers/llvm/6/llvm.nix pkgs/servers/home-assistant/component-packages.nix
| * Merge remote-tracking branch 'upstream/master' into stagingTuomas Tynkkynen2018-03-13
| |\ | | | | | | | | | | | | Conflicts: pkgs/development/tools/build-managers/conan/default.nix
| * \ Merge branch 'master' into stagingJan Malakhovski2018-03-10
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolved the following conflicts (by carefully applying patches from the both branches since the fork point): pkgs/development/libraries/epoxy/default.nix pkgs/development/libraries/gtk+/3.x.nix pkgs/development/python-modules/asgiref/default.nix pkgs/development/python-modules/daphne/default.nix pkgs/os-specific/linux/systemd/default.nix
| * \ \ Merge commit '618ac29687a650d854c8bea7efd4490387589ce2' into stagingTuomas Tynkkynen2018-03-03
| |\ \ \
| * | | | nixos: Add nixpkgs.crossSystem option for cross-compilationShea Levy2018-03-01
| | | | |
| * | | | Merge remote-tracking branch 'origin/staging' into cross-nixosShea Levy2018-03-01
| |\ \ \ \
| | * \ \ \ Merge remote-tracking branch 'upstream/master' into HEADFrederik Rietdijk2018-03-01
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'upstream/master' into stagingTuomas Tynkkynen2018-03-01
| | |\ \ \ \ \
| * | | | | | | nixos: Move uses of stdenv.shell to runtimeShell.Shea Levy2018-03-01
| | | | | | | |
| * | | | | | | stage-2-init: Use the host bash as SHELLShea Levy2018-03-01
| | | | | | | |
| * | | | | | | nixos: Fix initrd dependency detection when cross-compiling.Shea Levy2018-03-01
| | | | | | | |
| * | | | | | | nixos: manual: Fix cross-compilation.Shea Levy2018-03-01
| | | | | | | |
| * | | | | | | gobjectIntrospection: Enable building without X11 support.Shea Levy2018-03-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also disable it when noXlibs in NixOS.
| * | | | | | | Merge remote-tracking branch 'origin/master' into cross-nixosShea Levy2018-02-28
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | nixos: sudo: Use build-time visudo for syntax check.Shea Levy2018-02-28
| | | | | | | |
| * | | | | | | nixos: keymap: Fix cross-compilation.Shea Levy2018-02-28
| | | | | | | |
| * | | | | | | nixos: initrd-kmod-blacklist-ubuntu: Fix cross-compilation.Shea Levy2018-02-28
| | | | | | | |
| * | | | | | | nixos: stage-1: Don't try to test binaries when cross-compiling.Shea Levy2018-02-28
| | | | | | | |
| * | | | | | | nixos: Take glibcLocales from buildPackages.Shea Levy2018-02-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No need to cross-compile pure data...
| * | | | | | | nixos: udev: Generate hwdb with build-native udevadm.Shea Levy2018-02-28
| | | | | | | |
| * | | | | | | nixos: kexec: Disable on non-keexecable systems.Shea Levy2018-02-28
| | |/ / / / / | |/| | | | |
| * | | | | | Merge remote-tracking branch 'upstream/master' into stagingTuomas Tynkkynen2018-02-28
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: pkgs/applications/misc/pytrainer/default.nix pkgs/development/tools/pew/default.nix pkgs/tools/misc/you-get/default.nix
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into HEADFrederik Rietdijk2018-02-27
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into HEADFrederik Rietdijk2018-02-27
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge master into stagingVladimír Čunát2018-02-26
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to cleanup the (re-)revert of merge to master.
| * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into HEADFrederik Rietdijk2018-02-26
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into stagingTuomas Tynkkynen2018-02-24
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | cups service: fix client socketsNikolay Amiantov2018-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use systemd to create the directory for UNIX socket. Also use localhost instead of 127.0.0.1 as is done in default cupsd.conf so that IPv6 is enabled when available.
* | | | | | | | | | | | | Merge pull request #36924 from etu/gitea-postgres-autocreate-databaseSamuel Leathers2018-03-15
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitea postgres autocreate database
| * | | | | | | | | | | | | gitea: enable and configure postgres service if selected as databaseElis Hirwing2018-03-15
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | nixos: fix install-grub.pl dependenciesJan Malakhovski2018-03-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fallback from updates to perl
* | | | | | | | | | | | | | nixos/qemu-vm: Add virtualized display + HID devices on AArch64Tuomas Tynkkynen2018-03-14
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | 18.09: let's call it "Jackrabbit"Vladimír Čunát2018-03-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I was mainly considering Jellyfish and Jaguar (and Jackrabbit). Originally I was inclined for Jellyfish, but then I thought of the release T-shirts someone makes and it didn't seem suitable... Jaguar would keep the name referring to a car as well, but as a not-too-old (Mac) OS version is codenamed that way, I didn't go for it.
* | | | | | | | | | | | | | Merge pull request #36845 from jbedo/singularitylewo2018-03-14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | singularity: 2.4 -> 2.4.2
| * | | | | | | | | | | | | | singularity: 2.4 -> 2.4.2Justin Bedo2018-03-12
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #36706 from Ma27/xautolock-testcaseGraham Christensen2018-03-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | xautolock: implement basic test to confirm functionality
| * | | | | | | | | | | | | | xautolock: implement basic test to confirm functionalityMaximilian Bosch2018-03-13
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | nixos/tests/virtualbox: Work around test failuresaszlig2018-03-13
| |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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@88530e02b6fa. 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
* | | | | | | | | | | | | Merge pull request #36850 from teto/virtualisationMichael Raskin2018-03-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Virtualisation
| * | | | | | | | | | | | | grub-install.pl: more details on blkid failureMatthieu Coudron2018-03-12
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | build-vm: remove trailing dot from script pathMatthieu Coudron2018-03-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to double click/middle click paste path a bit quicker.
| * | | | | | | | | | | | | qemu-vm: removes warning when running build-vmMatthieu Coudron2018-03-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get rid of deprecated qemu commands
* | | | | | | | | | | | | | tests/docker-tools: add onTopOfPulledImage testAntoine Eiche2018-03-13
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | grafana: 5.0.0 -> 5.0.1WilliButz2018-03-12
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | nixos/tests/containers-tmpfs: fix test nameFranz Pletz2018-03-12
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #36571 from srhb/acme-test-fixFranz Pletz2018-03-12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | acme: Fix test
| * | | | | | | | | | | | | | nixos/tests/acme: use mail-test-srv tls certs from sourceSarah Brofeldt2018-03-08
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | nixos/tests/acme: go compat update, unvendor pkcs11Sarah Brofeldt2018-03-08
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #36783 from Infinisil/desciption/update/resilioJörg Thalheim2018-03-12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | resilio: Adjust option description to 3d17573
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-08-07 14:37:59 +0000