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

Commits on Aug 6, 2018

  1. cc-wrapper, bintools-wrapper: simply symlink man and info outputs 

    See discussion in #44516.
    @oxij
    oxij committed Aug 6, 2018
    Copy the full SHA
    02c09e0 View commit details

Commits on Aug 7, 2018

  1. Merge pull request #44558 from oxij/stdenv/symlink-propagated-docs 

    stdenv: symlink propagated docs
    @matthewbauer
    matthewbauer authored Aug 7, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f0fcbaf View commit details
Showing with 11 additions and 12 deletions.
  1. +6 −6 pkgs/build-support/bintools-wrapper/default.nix
  2. +5 −4 pkgs/build-support/cc-wrapper/default.nix
  3. +0 −1 pkgs/stdenv/darwin/default.nix
  4. +0 −1 pkgs/stdenv/linux/default.nix
12 changes: 6 additions & 6 deletions pkgs/build-support/bintools-wrapper/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,9 +6,10 @@
# compiler and the linker just "work".

{ name ? ""
, stdenvNoCC, nativeTools, propagateDoc ? !nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""
, bintools ? null, libc ? null
, coreutils ? null, shell ? stdenvNoCC.shell, gnugrep ? null
, stdenvNoCC
, bintools ? null, libc ? null, coreutils ? null, shell ? stdenvNoCC.shell, gnugrep ? null
, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""
, propagateDoc ? !nativeTools && bintools != null && bintools ? man
, extraPackages ? [], extraBuildCommands ? ""
, buildPackages ? {}
, useMacosReexportHack ? false
@@ -267,9 +268,8 @@ stdenv.mkDerivation {
## Man page and info support
##
mkdir -p $man/nix-support $info/nix-support
printWords ${bintools.man or ""} >> $man/nix-support/propagated-build-inputs
printWords ${bintools.info or ""} >> $info/nix-support/propagated-build-inputs
ln -s ${bintools.man} $man
ln -s ${bintools.info} $info
''

+ ''
9 changes: 5 additions & 4 deletions pkgs/build-support/cc-wrapper/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,8 +6,10 @@
# compiler and the linker just "work".

{ name ? ""
, stdenvNoCC, nativeTools, propagateDoc ? !nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""
, stdenvNoCC
, cc ? null, libc ? null, bintools, coreutils ? null, shell ? stdenvNoCC.shell
, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""
, propagateDoc ? !nativeTools && cc != null && cc ? man
, extraPackages ? [], extraBuildCommands ? ""
, isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null
, buildPackages ? {}
@@ -261,9 +263,8 @@ stdenv.mkDerivation {
## Man page and info support
##
mkdir -p $man/nix-support $info/nix-support
printWords ${cc.man or ""} >> $man/nix-support/propagated-build-inputs
printWords ${cc.info or ""} >> $info/nix-support/propagated-build-inputs
ln -s ${cc.man} $man
ln -s ${cc.info} $info
''

+ ''
1 change: 0 additions & 1 deletion pkgs/stdenv/darwin/default.nix
View file
Original file line number Diff line number Diff line change
@@ -88,7 +88,6 @@ in rec {
extraPackages = lib.optional (libcxx != null) libcxx;

nativeTools = false;
propagateDoc = false;
nativeLibc = false;
inherit buildPackages coreutils gnugrep bintools;
libc = last.pkgs.darwin.Libsystem;
1 change: 0 additions & 1 deletion pkgs/stdenv/linux/default.nix
View file
Original file line number Diff line number Diff line change
@@ -90,7 +90,6 @@ let
else lib.makeOverridable (import ../../build-support/cc-wrapper) {
name = "${name}-gcc-wrapper";
nativeTools = false;
propagateDoc = false;
nativeLibc = false;
buildPackages = lib.optionalAttrs (prevStage ? stdenv) {
inherit (prevStage) stdenv;