diff options
| author | Tim Steinbach <tim@nequissimus.com> | 2019-04-07 08:34:12 -0400 |
|---|---|---|
| committer | Tim Steinbach <tim@nequissimus.com> | 2019-04-07 08:34:12 -0400 |
| commit | 922c07d2d2a857a5cf1685a2178dd3fd122f8b46 (patch) | |
| tree | 2b89e5f57f159f150cd2eac153a3cb05aa0a6753 /pkgs | |
| parent | ba24e89d44302718f22375a1be2485590359669d (diff) | |
| download | nixpkgs-922c07d2d2a857a5cf1685a2178dd3fd122f8b46.tar nixpkgs-922c07d2d2a857a5cf1685a2178dd3fd122f8b46.tar.gz nixpkgs-922c07d2d2a857a5cf1685a2178dd3fd122f8b46.tar.bz2 nixpkgs-922c07d2d2a857a5cf1685a2178dd3fd122f8b46.tar.lz nixpkgs-922c07d2d2a857a5cf1685a2178dd3fd122f8b46.tar.xz nixpkgs-922c07d2d2a857a5cf1685a2178dd3fd122f8b46.tar.zst nixpkgs-922c07d2d2a857a5cf1685a2178dd3fd122f8b46.zip | |
linux: Fix update script
The script was wrecking `modDirVersion`, putting them back and ensuring it will not break again.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.14.nix | 1 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.19.nix | 1 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-5.0.nix | 1 | ||||
| -rwxr-xr-x | pkgs/os-specific/linux/kernel/update.sh | 5 |
4 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index d803817a03e..f49d7de1a53 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -6,6 +6,7 @@ buildLinux (args // rec { version = "4.14.111"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed + modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; # branchVersion needs to be x.y extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 9f8ebab4e91..85a8ff54df4 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -6,6 +6,7 @@ buildLinux (args // rec { version = "4.19.34"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed + modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; # branchVersion needs to be x.y extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); diff --git a/pkgs/os-specific/linux/kernel/linux-5.0.nix b/pkgs/os-specific/linux/kernel/linux-5.0.nix index aefac13e4e7..a418e4b4bcc 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.0.nix @@ -6,6 +6,7 @@ buildLinux (args // rec { version = "5.0.7"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed + modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; # branchVersion needs to be x.y extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); diff --git a/pkgs/os-specific/linux/kernel/update.sh b/pkgs/os-specific/linux/kernel/update.sh index 99f5ac31217..7a86b05dafc 100755 --- a/pkgs/os-specific/linux/kernel/update.sh +++ b/pkgs/os-specific/linux/kernel/update.sh @@ -48,10 +48,7 @@ ls $NIXPKGS/pkgs/os-specific/linux/kernel | while read FILE; do sed -i "s/sha256 = \".*\"/sha256 = \"$HASH\"/g" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE # Rewrite the expression - sed -i -e '/version = /d' -e '/modDirVersion = /d' $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE - if grep -q '^[0-9]\+.[0-9]\+$' <<< "$V"; then - sed -i "\#buildLinux (args // rec {#a \ modDirVersion = \"${V}.0\";" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE - fi + sed -i -e '/version = /d' $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE sed -i "\#buildLinux (args // rec {#a \ version = \"$V\";" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE # Commit the changes |