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

Commits on Apr 12, 2021

  1. gcc10: 10.2 -> 10.3

    @tobim
    tobim committed Apr 12, 2021

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    infinisil Silvan Mosberger
    GPG key ID: E8F1E9EAD284E17D
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d09936e View commit details

Commits on Apr 26, 2021

  1. linuxHeaders: 5.11 -> 5.12

    @TredwellGit
    TredwellGit committed Apr 26, 2021
    Copy the full SHA
    7ac9fcb View commit details

Commits on Apr 29, 2021

  1. Merge #120715: linuxHeaders: 5.11 -> 5.12 (into staging)

    @vcunat
    vcunat committed Apr 29, 2021
    Copy the full SHA
    4f38b53 View commit details

  2. Merge #119219: gcc10: 10.2 -> 10.3 (into staging)

    @vcunat
    vcunat committed Apr 29, 2021
    Copy the full SHA
    537d968 View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −2 pkgs/development/compilers/gcc/10/default.nix
  2. +2 −2 pkgs/os-specific/linux/kernel-headers/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/compilers/gcc/10/default.nix
View file
Original file line number Diff line number Diff line change
@@ -57,7 +57,7 @@ with lib;
with builtins;

let majorVersion = "10";
version = "${majorVersion}.2.0";
version = "${majorVersion}.3.0";

inherit (stdenv) buildPlatform hostPlatform targetPlatform;

@@ -90,7 +90,7 @@ stdenv.mkDerivation ({

src = fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
sha256 = "130xdkhmz1bc2kzx061s3sfwk36xah1fw5w332c0nzwwpdl47pdq";
sha256 = "0i6378ig6h397zkhd7m4ccwjx5alvzrf2hm27p1pzwjhlv0h9x34";
};

inherit patches;
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel-headers/default.nix
View file
Original file line number Diff line number Diff line change
@@ -69,12 +69,12 @@ let
in {
inherit makeLinuxHeaders;

linuxHeaders = let version = "5.11"; in
linuxHeaders = let version = "5.12"; in
makeLinuxHeaders {
inherit version;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1d37w0zvmf8c1l99xvy1hy6p55icjhmbsv7f0amxy2nly1a7pw04";
sha256 = "sha256-fQ328r8jhNaNC9jh/j4HHWQ2Tc3GAC57XIfJLUj6w2Y=";
};
patches = [
./no-relocs.patch # for building x86 kernel headers on non-ELF platforms