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

Commits on Jan 11, 2020

  1. kernel/update.sh: always use -e

    @dtzWill
    dtzWill committed Jan 11, 2020
    Copy the full SHA
    84a6071 View commit details

Commits on Jan 26, 2020

  1. Merge pull request #77490 from dtzWill/fix/kernel-update-sed-e 

    kernel/update.sh: always use -e
    @dtzWill
    dtzWill authored Jan 26, 2020
    Copy the full SHA
    b856b24 View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/os-specific/linux/kernel/update.sh
6 changes: 3 additions & 3 deletions pkgs/os-specific/linux/kernel/update.sh
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ fi
# Inspect each file and see if it has the latest version
NIXPKGS="$(git rev-parse --show-toplevel)"
ls $NIXPKGS/pkgs/os-specific/linux/kernel | while read FILE; do
KERNEL="$(sed -n $LINUXSED <<< "$FILE")"
KERNEL="$(sed -n -e $LINUXSED <<< "$FILE")"
[ -z "$KERNEL" ] && continue

# Find the matching new kernel version
@@ -45,11 +45,11 @@ ls $NIXPKGS/pkgs/os-specific/linux/kernel | while read FILE; do
echo "Failed to get hash of $URL"
continue
fi
sed -i "s/sha256 = \".*\"/sha256 = \"$HASH\"/g" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE
sed -i -e "s/sha256 = \".*\"/sha256 = \"$HASH\"/g" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE

# Rewrite the expression
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
sed -i -e "\#buildLinux (args // rec {#a \ version = \"$V\";" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE

# Commit the changes
git add -u $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE