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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7d5633ea7a38
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c13cf47e7971
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Sep 15, 2017

  1. linux-headers: Remove dead old version 

    This sat around unused for who knows how long
    @Ericson2314 @dezgeg
    Ericson2314 authored and dezgeg committed Sep 15, 2017
    Copy the full SHA
    baaed4c View commit details

  2. linux-headers 4.4: Remove arch fallback code 

    @dezgeg was right: The `platform` field of a linux platorm is already
manadatory---if not specified it is inferred, and all such inferences
include a `kernelArch` field. Therefore linux packages can indeed rely
on it being defined.
    @Ericson2314 @dezgeg
    Ericson2314 authored and dezgeg committed Sep 15, 2017
    Copy the full SHA
    c13cf47 View commit details
Showing with 1 addition and 35 deletions.
  1. +1 −6 pkgs/os-specific/linux/kernel-headers/4.4.nix
  2. +0 −29 pkgs/os-specific/linux/kernel-headers/default.nix
7 changes: 1 addition & 6 deletions pkgs/os-specific/linux/kernel-headers/4.4.nix
View file
Original file line number Diff line number Diff line change
@@ -20,12 +20,7 @@ stdenvNoCC.mkDerivation {

targetConfig = if hostPlatform != buildPlatform then hostPlatform.config else null;

platform = hostPlatform.platform.kernelArch or (
if hostPlatform.system == "i686-linux" then "i386" else
if hostPlatform.system == "x86_64-linux" then "x86_64" else
if hostPlatform.system == "powerpc-linux" then "powerpc" else
if hostPlatform.isArm then "arm" else
abort "don't know what the kernel include directory is called for this platform");
platform = hostPlatform.platform.kernelArch;

# It may look odd that we use `stdenvNoCC`, and yet explicit depend on a cc.
# We do this so we have a build->build, not build->host, C compiler.
29 changes: 0 additions & 29 deletions pkgs/os-specific/linux/kernel-headers/default.nix
View file

This file was deleted.