Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0c4cadfc2839
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9746c1ac170d
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 8, 2018

  1. stdenv: Put back isArm, with deprecation notice. 

    This was always meant to be deprecated rather than removed.
    @Ericson2314
    Ericson2314 committed May 8, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Moredread André-Patrick Bubel
    GPG key ID: 28925CBA8869FF29
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    302c4c5 View commit details

  2. Merge pull request #40185 from obsidiansystems/stdenv-arm-alias 

    stdenv: Put back isArm, with deprecation notice.

Back-port of #40154
    @Ericson2314
    Ericson2314 authored May 8, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Moredread André-Patrick Bubel
    GPG key ID: 28925CBA8869FF29
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9746c1a View commit details
Showing with 1 addition and 0 deletions.
  1. +1 −0 pkgs/stdenv/generic/default.nix
1 change: 1 addition & 0 deletions pkgs/stdenv/generic/default.nix
View file
Original file line number Diff line number Diff line change
@@ -118,6 +118,7 @@ let
inherit (hostPlatform)
isDarwin isLinux isSunOS isHurd isCygwin isFreeBSD isOpenBSD
isi686 isx86_64 is64bit isAarch32 isAarch64 isMips isBigEndian;
isArm = builtins.trace "stdenv.isArm is deprecated after 18.03" hostPlatform.isArm;

# Whether we should run paxctl to pax-mark binaries.
needsPax = isLinux;