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

Commits on Jan 24, 2021

  1. stdenv: Remove stdenv.platform 

    This was not working after #110544 as caught by @r-burns in
#110544 (comment).
Thankfully it isn't used anymore and I believe wasn't documented either.
(I at least did not remember it existed.)
    @Ericson2314
    Ericson2314 committed Jan 24, 2021
    1

    Verified

    This commit was signed with the committer’s verified signature.
    kraenhansen Kræn Hansen
    SSH Key Fingerprint: Pl/0muSeAJtfZzXTskmf7NspKHTlgrI4SZS/qPTQ5Eg
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fa204a9 View commit details

Commits on Jan 25, 2021

  1. Merge pull request #110726 from Ericson2314/no-stdenv-dot-platform 

    stdenv: Remove stdenv.platform
    @Ericson2314
    Ericson2314 authored Jan 25, 2021

    Verified

    This commit was signed with the committer’s verified signature.
    kraenhansen Kræn Hansen
    SSH Key Fingerprint: Pl/0muSeAJtfZzXTskmf7NspKHTlgrI4SZS/qPTQ5Eg
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e8d39a9 View commit details
Showing with 5 additions and 10 deletions.
  1. +3 −3 pkgs/stdenv/darwin/default.nix
  2. +2 −7 pkgs/stdenv/linux/default.nix
6 changes: 3 additions & 3 deletions pkgs/stdenv/darwin/default.nix
View file
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
assert crossSystem == localSystem;

let
inherit (localSystem) system platform;
inherit (localSystem) system;

bootstrapClangVersion = "7.1.0";

@@ -148,7 +148,7 @@ in rec {
__extraImpureHostDeps = commonImpureHostDeps;

extraAttrs = {
inherit macosVersionMin platform;
inherit macosVersionMin;
};
overrides = self: super: (overrides self super) // {
inherit ccNoLibcxx;
@@ -522,7 +522,7 @@ in rec {
extraAttrs = {
libc = pkgs.darwin.Libsystem;
shellPackage = pkgs.bash;
inherit macosVersionMin platform bootstrapTools;
inherit macosVersionMin bootstrapTools;
};

allowedRequisites = (with pkgs; [
9 changes: 2 additions & 7 deletions pkgs/stdenv/linux/default.nix
View file
Original file line number Diff line number Diff line change
@@ -42,7 +42,7 @@
assert crossSystem == localSystem;

let
inherit (localSystem) system platform;
inherit (localSystem) system;

commonPreHook =
''
@@ -111,11 +111,6 @@ let
stdenvNoCC = prevStage.ccWrapperStdenv;
};

extraAttrs = {
# Having the proper 'platform' in all the stdenvs allows getting proper
# linuxHeaders for example.
inherit platform;
};
overrides = self: super: (overrides self super) // { fetchurl = thisStdenv.fetchurlBoot; };
};

@@ -369,7 +364,7 @@ in
# TODO: remove this!
inherit (prevStage) glibc;

inherit platform bootstrapTools;
inherit bootstrapTools;
shellPackage = prevStage.bash;
};