Skip to content
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
base: 2661d9378f9b
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 312f252ebac2
Choose a head ref
  • 4 commits
  • 2 files changed
  • 4 contributors

Commits on Jan 26, 2021

  1. lib/systems: fix linuxArch for power + riscv 

    Looks like these got left behind in the
kernelArch -> linuxArch migration.

Fixes:
* pkgsCross.powernv.linuxHeaders
* pkgsCross.riscv64.linuxHeaders
* pkgsCross.riscv32.linuxHeaders
and dependees
    @r-burns
    r-burns committed Jan 26, 2021
    Configuration menu
    Copy the full SHA
    8baac2a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #110828 from r-burns/ppc64-riscv-linux-arch 

    lib/systems: fix linuxArch for power + riscv
    @Ericson2314
    Ericson2314 committed Jan 26, 2021
    Configuration menu
    Copy the full SHA
    054f792 View commit details
    Browse the repository at this point in the history

  3. freetds: 1.1.42 -> 1.2

    @r-ryantm @peterhoeg
    r-ryantm authored and peterhoeg committed Jan 26, 2021
    Configuration menu
    Copy the full SHA
    38e23ae View commit details
    Browse the repository at this point in the history

  4. Merge master into staging-next

    @github-actions
    github-actions[bot] committed Jan 26, 2021
    Configuration menu
    Copy the full SHA
    312f252 View commit details
    Browse the repository at this point in the history