Skip to content
This repository was 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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 705986f5a986
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cdec6217d98b
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on May 19, 2019

  1. Merge #60201: neo.map: fix URL 

    Current URL is no longer available.

(cherry picked from commit 6e100ae)
Close #61698.
    @samsonan-it @vcunat
    samsonan-it authored and vcunat committed May 19, 2019
    Copy the full SHA
    3366e98 View commit details

Commits on May 20, 2019

  1. Merge #61715: linux_hardkernel_4_14: 4.14.102-156 -> 4.14.120-160 

    This contains fixes for the recent MDS vulnerabilities in Intel processors.

(cherry picked from commit 1741386)
    @vcunat
    vcunat committed May 20, 2019
    Copy the full SHA
    cdec621 View commit details
Showing with 5 additions and 4 deletions.
  1. +2 −1 pkgs/os-specific/linux/kbd/keymaps.nix
  2. +3 −3 pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
3 changes: 2 additions & 1 deletion pkgs/os-specific/linux/kbd/keymaps.nix
View file
Original file line number Diff line number Diff line change
@@ -24,7 +24,8 @@

src = fetchurl {
name = "neo.map";
url = "https://svn.neo-layout.org/linux/console/neo.map?r=${version}";
url = "https://raw.githubusercontent.com/neo-layout/neo-layout/"
+ "a0dee06fed824abfad658b7f10e6d907b270be0a/linux/console/neo.map";
sha256 = "19mfrd31vzpsjiwc7pshxm0b0sz5dd17xrz6k079cy4im1vf0r4g";
};

6 changes: 3 additions & 3 deletions pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{ stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, libelf, utillinux, ... } @ args:

buildLinux (args // rec {
version = "4.14.94-155";
version = "4.14.120-160";

# modDirVersion needs to be x.y.z.
modDirVersion = "4.14.94";
modDirVersion = "4.14.120";

# branchVersion needs to be x.y.
extraMeta.branch = "4.14";
@@ -13,7 +13,7 @@ buildLinux (args // rec {
owner = "hardkernel";
repo = "linux";
rev = version;
sha256 = "1jg4m17y5wkmfmw8y9y9nh14xzw6011gbzlckqabmbazcdpbmf9d";
sha256 = "0sb7k8kpbm4h98jsqjnjmj0ysp55n9cpczpw0jsg0x0sj9qp73nr";
};

defconfig = "odroidxu4_defconfig";