Skip to content

Commit

Permalink
Fix some instances of #33166 correctly
Browse files Browse the repository at this point in the history
  • Loading branch information
@fpletz
fpletz committed Dec 29, 2017
1 parent 5997b4f commit 1fb0d3d
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/bbswitch/default.nix
View file
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, kernel, libelf }:
{ stdenv, fetchurl, fetchpatch, kernel }:

let
baseName = "bbswitch";
Expand All @@ -20,7 +20,7 @@ stdenv.mkDerivation {
sha256 = "1lbr6pyyby4k9rn2ry5qc38kc738d0442jhhq57vmdjb6hxjya7m";
}) ];

buildInputs = [ libelf ];
nativeBuildInputs = kernel.moduleBuildDependencies;

hardeningDisable = [ "pic" ];

Expand Down
6 changes: 2 additions & 4 deletions pkgs/os-specific/linux/nvidia-x11/generic.nix
View file
Expand Up @@ -12,7 +12,7 @@
}:

{ stdenv, callPackage, callPackage_i686, fetchurl, fetchpatch
, kernel ? null, libelf, xorg, zlib, perl, nukeReferences
, kernel ? null, xorg, zlib, perl, nukeReferences
, # Whether to build the libraries only (i.e. not the kernel module or
# nvidia-settings). Used to support 32-bit binaries on 64-bit
# Linux.
Expand Down Expand Up @@ -62,9 +62,7 @@ let

libPath = makeLibraryPath [ xorg.libXext xorg.libX11 xorg.libXv xorg.libXrandr zlib stdenv.cc.cc ];

nativeBuildInputs = [ perl nukeReferences ];

buildInputs = [ libelf ];
nativeBuildInputs = [ perl nukeReferences ] ++ kernel.moduleBuildDependencies;

disallowedReferences = optional (!libsOnly) [ kernel.dev ];

Expand Down
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/wireguard/default.nix
View file
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, libmnl, libelf, kernel ? null }:
{ stdenv, fetchurl, libmnl, kernel ? null }:

# module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements
assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10";
Expand Down Expand Up @@ -37,7 +37,7 @@ let

NIX_CFLAGS = ["-Wno-error=cpp"];

buildInputs = [ libelf ];
nativeBuildInputs = kernel.moduleBuildDependencies;

buildPhase = "make module";
};
Expand Down

9 comments on commit 1fb0d3d

@bendlas
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit makes my system configuration throw https://github.com/bendlas/nixos-config/blob/master/test-config.nix:

~/checkout/nixpkgs 1fb0d3d158c+* 1 ± nixos-rebuild -I "nixpkgs=`pwd`" -I "nixos=`pwd`/nixos" -I "nixos-config=`pwd`/../bendlas-nixos-config/test-config.nix" build --show-trace --option use-binary-caches false
building Nix...
building the system configuration...
error: while evaluating the attribute ‘activationScript’ of the derivation ‘nixos-system-nixos-18.03.git.1fb0d3d’ at /home/herwig/checkout/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:98:11:
while evaluating the attribute ‘system.activationScripts.script’ at /home/herwig/checkout/nixpkgs/nixos/modules/system/activation/activation-script.nix:62:9:
while evaluating ‘textClosureMap’ at /home/herwig/checkout/nixpkgs/lib/strings-with-deps.nix:70:35, called from /home/herwig/checkout/nixpkgs/nixos/modules/system/activation/activation-script.nix:83:18:
while evaluating ‘textClosureList’ at /home/herwig/checkout/nixpkgs/lib/strings-with-deps.nix:54:33, called from /home/herwig/checkout/nixpkgs/lib/strings-with-deps.nix:71:35:
while evaluating ‘f’ at /home/herwig/checkout/nixpkgs/lib/strings-with-deps.nix:56:17, called from /home/herwig/checkout/nixpkgs/lib/strings-with-deps.nix:68:9:
while evaluating ‘mapAttrs’ at /home/herwig/checkout/nixpkgs/lib/attrsets.nix:198:17, called from /home/herwig/checkout/nixpkgs/nixos/modules/system/activation/activation-script.nix:82:33:
while evaluating ‘mapAttrs’ at /home/herwig/checkout/nixpkgs/lib/attrsets.nix:198:17, called from /home/herwig/checkout/nixpkgs/nixos/modules/system/activation/activation-script.nix:81:24:
while evaluating the attribute ‘mergedValue’ at /home/herwig/checkout/nixpkgs/lib/modules.nix:339:5:
while evaluating anonymous function at /home/herwig/checkout/nixpkgs/lib/modules.nix:339:32, called from /home/herwig/checkout/nixpkgs/lib/modules.nix:339:19:
while evaluating ‘merge’ at /home/herwig/checkout/nixpkgs/lib/types.nix:263:20, called from /home/herwig/checkout/nixpkgs/lib/modules.nix:342:8:
while evaluating ‘mapAttrs’ at /home/herwig/checkout/nixpkgs/lib/attrsets.nix:198:17, called from /home/herwig/checkout/nixpkgs/lib/types.nix:264:9:
while evaluating ‘filterAttrs’ at /home/herwig/checkout/nixpkgs/lib/attrsets.nix:115:23, called from /home/herwig/checkout/nixpkgs/lib/types.nix:264:35:
while evaluating ‘concatMap’ at /home/herwig/checkout/nixpkgs/lib/lists.nix:102:18, called from /home/herwig/checkout/nixpkgs/lib/attrsets.nix:116:18:
while evaluating anonymous function at /home/herwig/checkout/nixpkgs/lib/attrsets.nix:116:29, called from undefined position:
while evaluating anonymous function at /home/herwig/checkout/nixpkgs/lib/types.nix:264:51, called from /home/herwig/checkout/nixpkgs/lib/attrsets.nix:116:62:
while evaluating the attribute ‘setup-opengl’ at /home/herwig/checkout/nixpkgs/lib/attrsets.nix:334:7:
while evaluating anonymous function at /home/herwig/checkout/nixpkgs/lib/types.nix:264:86, called from /home/herwig/checkout/nixpkgs/lib/attrsets.nix:334:15:
while evaluating the attribute ‘optionalValue’ at /home/herwig/checkout/nixpkgs/lib/modules.nix:346:5:
while evaluating ‘filterOverrides’ at /home/herwig/checkout/nixpkgs/lib/modules.nix:419:21, called from /home/herwig/checkout/nixpkgs/lib/modules.nix:328:18:
while evaluating ‘concatMap’ at /home/herwig/checkout/nixpkgs/lib/lists.nix:102:18, called from /home/herwig/checkout/nixpkgs/lib/modules.nix:425:8:
while evaluating ‘concatMap’ at /home/herwig/checkout/nixpkgs/lib/lists.nix:102:18, called from /home/herwig/checkout/nixpkgs/lib/modules.nix:323:17:
while evaluating anonymous function at /home/herwig/checkout/nixpkgs/lib/modules.nix:323:28, called from undefined position:
while evaluating ‘dischargeProperties’ at /home/herwig/checkout/nixpkgs/lib/modules.nix:386:25, called from /home/herwig/checkout/nixpkgs/lib/modules.nix:324:62:
while evaluating the attribute ‘value’ at /home/herwig/checkout/nixpkgs/lib/types.nix:269:55:
while evaluating the attribute ‘setup-opengl’ at /home/herwig/checkout/nixpkgs/nixos/modules/hardware/opengl.nix:123:5:
while evaluating the attribute ‘pkgs’ of the derivation ‘opengl-drivers-32bit’ at /home/herwig/checkout/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:98:11:
while evaluating the attribute ‘pkgs’ of the derivation ‘nvidia-libs’ at /home/herwig/checkout/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:98:11:
while evaluating the attribute ‘nativeBuildInputs’ of the derivation ‘nvidia-x11-387.34’ at /home/herwig/checkout/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:98:11:
while evaluating ‘chooseDevOutputs’ at /home/herwig/checkout/nixpkgs/lib/attrsets.nix:460:22, called from undefined position:
value is null while a set was expected, at /home/herwig/checkout/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix:65:52

Bisect Log (10)
git bisect start 'dev-master' 'afac8c61e95'
78c99ca9469 bad dropbox: 38.4.27 -> 40.4.46
afac8c61e95 good Merge pull request #33108 from mdorman/emacs-updates

git bisect good d003553bb64702f6d20d18121e992bfeedad8b17
d003553bb64 good Merge pull request #33162 from markuskowa/multimon-ng-pr

git bisect bad 0dd7d213c22857f4d4205a2f1009ce6947b33998
0dd7d213c22 bad home-manager:init at 2017-10-11 (#30330)

git bisect good 56518ff5ac232b41a96f3c191103e309309cbe9e
56518ff5ac2 good Merge pull request #32230 from bkchr/renderdoc

git bisect bad f056ec2f245db8a55a4fae1f6cc8e9a75c95f0f8
f056ec2f245 bad Merge pull request #33183 from mstarzyk/miller

git bisect good 77cc63950a034de3b58bd718f30ebf122e5f137f
77cc63950a0 good wxmaxima: build with cmake

git bisect bad 84d8ef6e2fc869b5405a9a2590d848283a48a10b
84d8ef6e2fc bad linuxPackages.spl: simplify expression

git bisect good 5997b4f3db89b738c498bb7786f2e95b3b9b5dcd
5997b4f3db8 good linuxPackages.rtlwifi_new: fix missing libelf

git bisect bad 1fb0d3d158c193af1ee7fa6b0f9744df9f5a1484
1fb0d3d158c bad Fix some instances of #33166 correctly

1fb0d3d158c193af1ee7fa6b0f9744df9f5a1484 is the first bad commit

Any idea how to fix that, @fpletz? cc #33166

@bendlas
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cc @dguibert @dezgeg

@dezgeg
Copy link
Contributor

@dezgeg dezgeg commented on 1fb0d3d Dec 30, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't it fixed in current master?

@bendlas
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, even with the 5 commits, that arrived since my bisect, it's still there

@dezgeg
Copy link
Contributor

@dezgeg dezgeg commented on 1fb0d3d Dec 30, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops my bad, indeed the 5 commits fixed ZFS but the issue is about NVIDIA.

@bendlas
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, sorry, I just followed the ticket link, to notify you. have you had a similar issue with zfs?

@dezgeg
Copy link
Contributor

@dezgeg dezgeg commented on 1fb0d3d Dec 30, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does 9fe81b5 fix it?

@bendlas
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It makes my system eval again, if the nvidia driver breaks for me, I'll check back. Thanks!

@FRidh
Copy link
Member

@FRidh FRidh commented on 1fb0d3d Dec 31, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See #33234. I've also backported this fix to 17.09.

Please sign in to comment.