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: 24f13c23cc43
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2516c454c353
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jun 28, 2019

  1. linux_testing_hardened: fix modDirVersion 

    and bring the linux-testing expression closer to the other versions.

(cherry picked from commit 241ffca)
    @vcunat
    vcunat committed Jun 28, 2019
    Copy the full SHA
    2516c45 View commit details
Showing with 6 additions and 2 deletions.
  1. +6 −2 pkgs/os-specific/linux/kernel/linux-testing.nix
8 changes: 6 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-testing.nix
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:

with stdenv.lib;

buildLinux (args // rec {
version = "5.1-rc4";
modDirVersion = "5.1.0-rc4";
extraMeta.branch = "5.1";

# modDirVersion needs to be x.y.z, will always add .0
modDirVersion = if (modDirVersionArg == null) then builtins.replaceStrings ["-"] [".0-"] version else modDirVersionArg;

src = fetchurl {
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
sha256 = "1cqr80b3jfr4g48fpni0pj2p5zs9930q6k6m9xjjdnsrhax1isr6";