···78 {
79 name = "foo";
80 patch = ./foo.patch;
81- structuredExtraConfig.FOO = lib.kernel.yes;
82 features.foo = true;
83 }
84 ]
···96 # (required, but can be null if only config changes
97 # are needed)
9899- structuredExtraConfig = { # attrset of extra configuration parameters
100 FOO = lib.kernel.yes; # (without the CONFIG_ prefix, optional)
101- }; # values should generally be lib.kernel.yes or lib.kernel.no
0102103 features = { # attrset of extra "features" the kernel is considered to have
104 foo = true; # (may be checked by other NixOS modules, optional)
105 };
106107 extraConfig = "CONFIG_FOO y"; # extra configuration options in string form
108- # (deprecated, use structuredExtraConfig instead, optional)
109 }
110 ```
111
···78 {
79 name = "foo";
80 patch = ./foo.patch;
81+ extraStructuredConfig.FOO = lib.kernel.yes;
82 features.foo = true;
83 }
84 ]
···96 # (required, but can be null if only config changes
97 # are needed)
9899+ extraStructuredConfig = { # attrset of extra configuration parameters
100 FOO = lib.kernel.yes; # (without the CONFIG_ prefix, optional)
101+ }; # values should generally be lib.kernel.yes,
102+ # lib.kernel.no or lib.kernel.module
103104 features = { # attrset of extra "features" the kernel is considered to have
105 foo = true; # (may be checked by other NixOS modules, optional)
106 };
107108 extraConfig = "CONFIG_FOO y"; # extra configuration options in string form
109+ # (deprecated, use extraStructuredConfig instead, optional)
110 }
111 ```
112
···1+Don't remove sys.path entries that come from PYTHONPATH, or else the app cannot
2+be used in Nixpkgs.
3+4+Author: Bjørn Forsman <bjorn.forsman@gmail.com>
5+diff -uNr spyder-5.4.0.orig/spyder/app/start.py spyder-5.4.0/spyder/app/start.py
6+--- spyder-5.4.0.orig/spyder/app/start.py 2022-08-30 02:02:28.000000000 +0200
7++++ spyder-5.4.0/spyder/app/start.py 2023-01-02 11:38:28.138744879 +0100
8+@@ -6,16 +6,8 @@
9+ # (see spyder/__init__.py for details)
10+ # -----------------------------------------------------------------------------
11+12+-# Remove PYTHONPATH paths from sys.path before other imports to protect against
13+-# shadowed standard libraries.
14+ import os
15+ import sys
16+-if os.environ.get('PYTHONPATH'):
17+- for path in os.environ['PYTHONPATH'].split(os.pathsep):
18+- try:
19+- sys.path.remove(path.rstrip(os.sep))
20+- except ValueError:
21+- pass
22+23+ # Standard library imports
24+ import ctypes
···23stdenv.mkDerivation rec {
4 pname = "directx-shader-compiler";
5- version = "1.7.2207";
67 # Put headers in dev, there are lot of them which aren't necessary for
8 # using the compiler binary.
···12 owner = "microsoft";
13 repo = "DirectXShaderCompiler";
14 rev = "v${version}";
15- hash = "sha256-yvhraZPJ6ocsg7/22/AzDbl/Rz7qXRQiXBxE1zB1QPA=";
16 fetchSubmodules = true;
17 };
18
···23stdenv.mkDerivation rec {
4 pname = "directx-shader-compiler";
5+ version = "1.7.2212";
67 # Put headers in dev, there are lot of them which aren't necessary for
8 # using the compiler binary.
···12 owner = "microsoft";
13 repo = "DirectXShaderCompiler";
14 rev = "v${version}";
15+ hash = "sha256-/FuG6ThvA3XMlHhnshRJpKC+vf4LM8/hurUoPagpTqA=";
16 fetchSubmodules = true;
17 };
18