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: a6b6fe115eab
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: d8cb4ed910ce
Choose a head ref
  • 7 commits
  • 2 files changed
  • 6 contributors

Commits on Jan 22, 2020

  1. clang_7,clang_8,clang_9: fix compilation of HIP-code 

    This PR aims to fix the same problem as NixOS/nixpkgs PR #77476; enabling to
compile HIP-code using the packaged clang compiler, by also searching in $PATH
for required binaries.
The change is committed upstream (https://reviews.llvm.org/D72903), but will
not land in the clang versions in nixpkgs (only clang 10+). As such I have
created patches for the affected versions. To compile HIP-code lld is needed,
so I added it to the clang-package.<Paste>
    @DieGoldeneEnte
    DieGoldeneEnte committed Jan 22, 2020
    Copy the full SHA
    558af6f View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2020

  1. nixos/alertmanager: Fix startup 

    Fixed a problem with quotation marks introduced in commit
23d5d9b merged with #78358.
    Milan Pässler committed Jan 27, 2020
    Copy the full SHA
    9414f03 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2020

  1. python27Packages.pysrt: 1.1.1 -> 1.1.2

    @r-ryantm
    r-ryantm committed Jan 28, 2020
    Copy the full SHA
    d6464b8 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #78643 from petabyteboy/feature/alertmanager-startup 

    nixos/alertmanager: Fix startup
    @ryantm
    ryantm committed Jan 28, 2020
    Copy the full SHA
    288cfc7 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #78308 from DieGoldeneEnte/clang-hip-patch 

    clang_7,clang_8,clang_9: fix compilation of HIP-code
    @matthewbauer
    matthewbauer committed Jan 28, 2020
    Copy the full SHA
    d4ad868 View commit details
    Browse the repository at this point in the history

  4. Revert "clang_7,clang_8,clang_9: fix compilation of HIP-code" 

    This reverts commit 558af6f.

This was meant for staging. Will apply there.
    @matthewbauer
    matthewbauer committed Jan 28, 2020
    Copy the full SHA
    f14a4d6 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #78653 from r-ryantm/auto-update/python2.7-pysrt 

    python27Packages.pysrt: 1.1.1 -> 1.1.2
    @marsam
    marsam committed Jan 28, 2020
    Copy the full SHA
    d8cb4ed View commit details
    Browse the repository at this point in the history