Skip to content
This repository has been 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
base: a128dd3af8d5
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 649b8e1f0fd1
Choose a head ref
  • 8 commits
  • 4 files changed
  • 5 contributors

Commits on Mar 18, 2020

  1. nixos/release-combined.nix: fix eval for aarch64 

    The release-20.03-aarch64 jobset on hydra only evals for aarch64, so the
x86_64 jobs do not exists. We need to make sure that the tested job only
aggregates jobs that actually exist.

This commit solves the issue by generating the tested job constituents
names based on the supported systems.
    @bennofs
    bennofs committed Mar 18, 2020
    Copy the full SHA
    6d73360 View commit details
    Browse the repository at this point in the history

  2. nixos/release-combined.nix: fix tested for aarch64 

    This removes tests from the tested aggregate on aarch64 which are not
available for that platform.
    @bennofs
    bennofs committed Mar 18, 2020
    Copy the full SHA
    c5a9ee8 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2020

  1. nix: Patch config.nix.in to reference host platform binaries 

    (cherry picked from commit f1415f6)
    @eamsden @edolstra
    eamsden authored and edolstra committed Apr 6, 2020
    Copy the full SHA
    93c13ab View commit details
    Browse the repository at this point in the history

  2. nix: Drive-by cleanup: replace ifthenelse with lib.optionalString 

    (cherry picked from commit 3b72c55)
    @eamsden @edolstra
    eamsden authored and edolstra committed Apr 6, 2020
    Copy the full SHA
    0dda3d5 View commit details
    Browse the repository at this point in the history

  3. Remove Nix 1.x 

    (cherry picked from commit 5d583db)
    @edolstra
    edolstra committed Apr 6, 2020
    Copy the full SHA
    13cbfa8 View commit details
    Browse the repository at this point in the history

  4. nix: 2.4pre7250_94c93437 -> 2.4pre7346_5e7ccdc9, 2.4pre20200220_4a452… 

    …1f -> 2.4pre20200403_3473b19

(cherry picked from commit b23f697)
    @edolstra
    edolstra committed Apr 6, 2020
    Copy the full SHA
    b4e14e9 View commit details
    Browse the repository at this point in the history

  5. rockbox-utility: add wrapQtAppsHook 

    It seems like all QT apps which use dynamic plugins should be wrapped
with `wrapQtAppsHook`. However, rockbox-utility is still not wrapped,
therefore fails to launch.

This change adds `qt5.wrapQtAppsHook` to nativeBuildInputs of
rockbox-utility.

(cherry picked from commit 861df8a)
    @akhramov @Mic92
    akhramov authored and Mic92 committed Apr 6, 2020
    Copy the full SHA
    10d60f7 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #82886 from bennofs/fix-nixos-aarch64-eval 

    Fix evaluation of release-20.03-aarch64 jobset
    @worldofpeace
    worldofpeace committed Apr 6, 2020
    Copy the full SHA
    649b8e1 View commit details
    Browse the repository at this point in the history