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

Commits on Dec 4, 2018

  1. Copy the full SHA
    d9eb8c7 View commit details
  2. Copy the full SHA
    fa749ac View commit details
  3. Merge pull request #51504 from alyssais/patch-2

    doc: reminder to upgrade linux-libre with linux
    Mic92 authored Dec 4, 2018
    Copy the full SHA
    2758a38 View commit details
Showing with 6 additions and 1 deletion.
  1. +3 −0 pkgs/os-specific/linux/kernel/linux-libre.nix
  2. +3 −1 pkgs/top-level/all-packages.nix
3 changes: 3 additions & 0 deletions pkgs/os-specific/linux/kernel/linux-libre.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{ stdenv, lib, fetchsvn, linux
, scripts ? fetchsvn {
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/";

# Update this if linux_latest-libre fails to build.
# $ curl https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/ | grep -Eo 'Revision [0-9]+'
rev = "15715";
sha256 = "1mz1xv860ddxz7dfp4l6q25hlsh532aapvylq703jskgbzsfinxh";
}
4 changes: 3 additions & 1 deletion pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -14602,7 +14602,9 @@ in
linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9);
linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14);
linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19);
# Don't forget to update linuxPackages_latest!
# When adding to this list:
# - Update linuxPackages_latest to the latest version
# - Update the rev in ../os-specific/linux/kernel/linux-libre.nix to the latest one.

# Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds.
linuxPackages_testing = linuxPackagesFor pkgs.linux_testing;