···7878 {
7979 name = "foo";
8080 patch = ./foo.patch;
8181- structuredExtraConfig.FOO = lib.kernel.yes;
8181+ extraStructuredConfig.FOO = lib.kernel.yes;
8282 features.foo = true;
8383 }
8484 ]
···9696 # (required, but can be null if only config changes
9797 # are needed)
98989999- structuredExtraConfig = { # attrset of extra configuration parameters
9999+ extraStructuredConfig = { # attrset of extra configuration parameters
100100 FOO = lib.kernel.yes; # (without the CONFIG_ prefix, optional)
101101- }; # values should generally be lib.kernel.yes or lib.kernel.no
101101+ }; # values should generally be lib.kernel.yes,
102102+ # lib.kernel.no or lib.kernel.module
102103103104 features = { # attrset of extra "features" the kernel is considered to have
104105 foo = true; # (may be checked by other NixOS modules, optional)
105106 };
106107107108 extraConfig = "CONFIG_FOO y"; # extra configuration options in string form
108108- # (deprecated, use structuredExtraConfig instead, optional)
109109+ # (deprecated, use extraStructuredConfig instead, optional)
109110 }
110111 ```
111112
···11+Don't remove sys.path entries that come from PYTHONPATH, or else the app cannot
22+be used in Nixpkgs.
33+44+Author: Bjørn Forsman <bjorn.forsman@gmail.com>
55+diff -uNr spyder-5.4.0.orig/spyder/app/start.py spyder-5.4.0/spyder/app/start.py
66+--- spyder-5.4.0.orig/spyder/app/start.py 2022-08-30 02:02:28.000000000 +0200
77++++ spyder-5.4.0/spyder/app/start.py 2023-01-02 11:38:28.138744879 +0100
88+@@ -6,16 +6,8 @@
99+ # (see spyder/__init__.py for details)
1010+ # -----------------------------------------------------------------------------
1111+1212+-# Remove PYTHONPATH paths from sys.path before other imports to protect against
1313+-# shadowed standard libraries.
1414+ import os
1515+ import sys
1616+-if os.environ.get('PYTHONPATH'):
1717+- for path in os.environ['PYTHONPATH'].split(os.pathsep):
1818+- try:
1919+- sys.path.remove(path.rstrip(os.sep))
2020+- except ValueError:
2121+- pass
2222+2323+ # Standard library imports
2424+ import ctypes
···2233stdenv.mkDerivation rec {
44 pname = "directx-shader-compiler";
55- version = "1.7.2207";
55+ version = "1.7.2212";
6677 # Put headers in dev, there are lot of them which aren't necessary for
88 # using the compiler binary.
···1212 owner = "microsoft";
1313 repo = "DirectXShaderCompiler";
1414 rev = "v${version}";
1515- hash = "sha256-yvhraZPJ6ocsg7/22/AzDbl/Rz7qXRQiXBxE1zB1QPA=";
1515+ hash = "sha256-/FuG6ThvA3XMlHhnshRJpKC+vf4LM8/hurUoPagpTqA=";
1616 fetchSubmodules = true;
1717 };
1818