Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 465de5981f34
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b6aa5923854d
Choose a head ref
  • 11 commits
  • 2 files changed
  • 5 contributors

Commits on May 13, 2018

  1. nixos/tests/acme: fix on i686, improve timing (#40410) 

    ... to prevent non-deterministic failures

(cherry picked from commit 642bed4)
    @xeji
    xeji committed May 13, 2018
    Copy the full SHA
    a7be27a View commit details

  2. uboot: 2017.11 -> 2018.03, cross fixes 

    (cherry picked from commit 5804547)
(cherry picked from commit 7c46833)
    @lopsided98 @Ericson2314
    lopsided98 authored and Ericson2314 committed May 13, 2018
    Copy the full SHA
    d29202b View commit details

  3. uboot: add patch to increase maximum path length in extlinux.conf 

    This fixes problems with cross compiled kernels failing to boot.

(cherry picked from commit 1f4bb8c)
(cherry picked from commit 828fdd6)
    @lopsided98 @Ericson2314
    lopsided98 authored and Ericson2314 committed May 13, 2018
    Copy the full SHA
    2a450ce View commit details

  4. uboot: sheevplug and guruplug: use mainline U-Boot 

    These derivations have not seen any updates since they were created in 2010,
and some of their sources have disappeared. There are upstream configs for
these boards, so these are now used, and they build correctly. I have no way
of testing them, and I don't if anyone even uses either board with Nix anymore.

(cherry picked from commit 01020b3)
(cherry picked from commit 48ade50)
    @lopsided98 @Ericson2314
    lopsided98 authored and Ericson2314 committed May 13, 2018
    Copy the full SHA
    d50bcaa View commit details

  5. uboot: fix cross-build of ubootTools 

    (cherry picked from commit 28fd7d9)
(cherry picked from commit 4c669db)
    @lopsided98 @Ericson2314
    lopsided98 authored and Ericson2314 committed May 13, 2018
    Copy the full SHA
    b63124d View commit details

  6. U-Boot: Add AArch64 QEMU build 

    See

https://github.com/u-boot/u-boot/blob/master/doc/README.qemu-arm

on how to use it.

(cherry picked from commit 6b069c6)
(cherry picked from commit eff6d96)
    @dezgeg @Ericson2314
    dezgeg authored and Ericson2314 committed May 13, 2018
    Copy the full SHA
    7dffe0d View commit details

  7. U-Boot: Add SOPINE Baseboard build 

    This build is compatible with PINE A64-LTS.

[dezgeg changed the original device tree patch to v4 of the patch series
"sunxi: sync H3, H5, A64 DTs from mainline Linux" submitted to the
upstream mailing list by Andre Przywara. Also install the
u-boot-sunxi-with-spl.bin binary similar to 32-bit boards
since it's now being built by the upstream build system.]

(cherry picked from commit 2ff31f7)
(cherry picked from commit 176d151)
    @samueldr @Ericson2314
    samueldr authored and Ericson2314 committed May 13, 2018
    Copy the full SHA
    566d3fe View commit details

  8. U-Boot: Add Pine64 build 

    (cherry picked from commit 4b77663)
(cherry picked from commit 1896fcf)
    @dezgeg @Ericson2314
    dezgeg authored and Ericson2314 committed May 13, 2018
    Copy the full SHA
    f2ea9e0 View commit details

  9. U-Boot: Make ubootJetsonTK1 install even more files 

    (cherry picked from commit 4fe75d1)
(cherry picked from commit a68e60f)
    @dezgeg @Ericson2314
    dezgeg authored and Ericson2314 committed May 13, 2018
    Copy the full SHA
    d884ece View commit details

  10. U-Boot: Disable parallel build 

    https://hydra.nixos.org/build/71880710
(cherry picked from commit 50dc85e)
(cherry picked from commit 91b0942)
    @dezgeg @Ericson2314
    dezgeg authored and Ericson2314 committed May 13, 2018
    Copy the full SHA
    ba17246 View commit details

  11. Merge branch 'uboot-merge-base' into release-18.03

    @Ericson2314
    Ericson2314 committed May 13, 2018
    Copy the full SHA
    b6aa592 View commit details
Showing with 7 additions and 1 deletion.
  1. +3 −1 nixos/tests/acme.nix
  2. +4 −0 nixos/tests/common/letsencrypt.nix
4 changes: 3 additions & 1 deletion nixos/tests/acme.nix
View file
Original file line number Diff line number Diff line change
@@ -54,9 +54,11 @@ in import ./make-test.nix {
};

testScript = ''
$letsencrypt->waitForUnit("default.target");
$letsencrypt->waitForUnit("boulder.service");
startAll;
$webserver->waitForUnit("default.target");
$webserver->waitForUnit("acme-certificates.target");
$client->waitForUnit("default.target");
$client->succeed('curl https://example.com/ | grep -qF "hello world"');
'';
}
4 changes: 4 additions & 0 deletions nixos/tests/common/letsencrypt.nix
View file
Original file line number Diff line number Diff line change
@@ -386,6 +386,10 @@ in {

services.nginx.enable = true;
services.nginx.recommendedProxySettings = true;
# This fixes the test on i686
services.nginx.commonHttpConfig = ''
server_names_hash_bucket_size 64;
'';
services.nginx.virtualHosts.${wfeDomain} = {
onlySSL = true;
enableACME = false;