[DONTMERGE] stabilization branch for gcc13 upgrade

lib/customisation.nix

@@ -189,7 +189,9 @@ rec {
       # Only show the error for the first missing argument
       error = errorForArg (lib.head missingArgs);
 
-    in if missingArgs == [] then makeOverridable f allArgs else abort error;
+    in if missingArgs == []
+       then makeOverridable f allArgs
+       else throw "lib.customisation.callPackageWith: ${error}";
 
 
   /* Like callPackage, but for a function that returns an attribute

lib/tests/release.nix

@@ -60,6 +60,15 @@ let
       echo "Running lib/tests/systems.nix"
       [[ $(nix-instantiate --eval --strict lib/tests/systems.nix | tee /dev/stderr) == '[ ]' ]];
 
+      cp -r ${../../pkgs} pkgs
+      cp -r ${../../default.nix} default.nix
+      cp -r ${../../nixos} nixos
+      cp -r ${../../maintainers} maintainers
+      cp -r ${../../.version} .version
+      cp -r ${../../doc} doc
+      echo "Running pkgs/top-level/release-attrpaths-superset.nix"
+      nix-instantiate --eval --strict --json pkgs/top-level/release-attrpaths-superset.nix -A names > /dev/null
+
       mkdir $out
       echo success > $out/${nix.version}
     '';

lib/types.nix

@@ -67,6 +67,7 @@ let
     ;
   outer_types =
 rec {
+  __attrsFailEvaluation = true;
   isType = type: x: (x._type or "") == type;
 
   setType = typeName: value: value // {

nixos/tests/nixops/default.nix

@@ -1,4 +1,6 @@
-{ pkgs, ... }:
+{ pkgs
+, testers
+, ... }:
 let
   inherit (pkgs) lib;
 
@@ -19,7 +21,7 @@ let
     passthru.override = args': testsForPackage (args // args');
   };
 
-  testLegacyNetwork = { nixopsPkg, ... }: pkgs.nixosTest ({
+  testLegacyNetwork = { nixopsPkg, ... }: testers.nixosTest ({
     name = "nixops-legacy-network";
     nodes = {
       deployer = { config, lib, nodes, pkgs, ... }: {

pkgs/applications/editors/eclipse/default.nix

@@ -211,6 +211,6 @@ in rec {
 
   ### Plugins
 
-  plugins = callPackage ./plugins.nix { };
+  plugins = callPackage ./plugins.nix { } // { __attrsFailEvaluation = true; };
 
 }

pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix

@@ -85,4 +85,4 @@ self: let
 
   in elpaDevelPackages // { inherit elpaBuild; });
 
-in generateElpa { }
+in (generateElpa { }) // { __attrsFailEvaluation = true; }

pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix

@@ -181,4 +181,4 @@ self: let
 
   in elpaPackages // { inherit elpaBuild; });
 
-in generateElpa { }
+in (generateElpa { }) // { __attrsFailEvaluation = true; }

pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix

@@ -111,4 +111,6 @@ in
   emacsSessionManagement = self.session-management-for-emacs;
   rectMark = self.rect-mark;
   sunriseCommander = self.sunrise-commander;
+
+  __attrsFailEvaluation = true;
 }

pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix

@@ -714,4 +714,5 @@ let
     in lib.mapAttrs (n: v: if lib.hasAttr n overrides then overrides.${n} else v) super);
 
 in
-generateMelpa { }
+(generateMelpa { })
+// { __attrsFailEvaluation = true; }

pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix

@@ -20,12 +20,12 @@ self: let
     generated ? ./nongnu-generated.nix
   }: let
 
-    imported = import generated {
+    imported = (import generated {
       callPackage = pkgs: args: self.callPackage pkgs (args // {
         # Use custom elpa url fetcher with fallback/uncompress
         fetchurl = buildPackages.callPackage ./fetchelpa.nix { };
       });
-    };
+    }) // { __attrsFailEvaluation = true; };
 
     super = imported;
 

pkgs/applications/editors/jetbrains/default.nix

@@ -595,6 +595,6 @@ in
     update-channel = products.webstorm.update-channel;
   };
 
-  plugins = callPackage ./plugins { };
+  plugins = callPackage ./plugins { } // { __attrsFailEvaluation = true; };
 
 }

pkgs/applications/emulators/ccemux/default.nix

@@ -64,5 +64,6 @@ stdenv.mkDerivation rec {
     sourceProvenance = with sourceTypes; [ binaryBytecode ];
     license = licenses.mit;
     maintainers = with maintainers; [ CrazedProgrammer viluon ];
+    broken = true; # download of CCEmuX-cct.jar fails hash validation
   };
 }

pkgs/applications/graphics/tesseract/default.nix

@@ -1,12 +1,16 @@
-{ callPackage, lowPrio, Accelerate, CoreGraphics, CoreVideo}:
+{ callPackage, lowPrio, Accelerate, CoreGraphics, CoreVideo
+, gcc12Stdenv }:
 
 let
-  base3 = callPackage ./tesseract3.nix {};
-  base4 = callPackage ./tesseract4.nix {};
+  base3 = callPackage ./tesseract3.nix { stdenv = gcc12Stdenv; };
+  base4 = callPackage ./tesseract4.nix { stdenv = gcc12Stdenv; };
   base5 = callPackage ./tesseract5.nix {
     inherit Accelerate CoreGraphics CoreVideo;
+    stdenv = gcc12Stdenv;
+  };
+  languages = callPackage ./languages.nix {
+    stdenv = gcc12Stdenv;
   };
-  languages = callPackage ./languages.nix {};
 in
 {
   tesseract3 = callPackage ./wrapper.nix {

pkgs/applications/graphics/tesseract/tesseract4.nix

@@ -41,5 +41,6 @@ stdenv.mkDerivation rec {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ viric erikarvstedt ];
     platforms = with lib.platforms; linux ++ darwin;
+    broken = true;
   };
 }

pkgs/applications/misc/liberasurecode/default.nix

@@ -23,16 +23,18 @@ stdenv.mkDerivation rec {
   postPatch = ''
     substituteInPlace doc/doxygen.cfg.in \
       --replace "GENERATE_MAN           = NO" "GENERATE_MAN           = YES"
+
+    substituteInPlace Makefile.am src/Makefile.am \
+      --replace "-Werror" ""
   '';
 
   nativeBuildInputs = [ autoreconfHook doxygen installShellFiles ];
 
   buildInputs = [ zlib ];
 
   configureFlags = [
+    "--disable-werror"
     "--enable-doxygen"
-  ] ++ lib.optionals stdenv.cc.isClang [
-    "CFLAGS=-Wno-error=strict-prototypes"
   ];
 
   postInstall = ''

pkgs/applications/version-management/radicle-upstream/default.nix

@@ -76,6 +76,8 @@ let
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ d-xo ];
     platforms = [ "x86_64-linux" "x86_64-darwin" ];
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    broken = true;
   };
 in
 if stdenv.isDarwin

pkgs/by-name/wi/windowmaker/dockapps/wmsm-app.nix

@@ -12,7 +12,7 @@ stdenv.mkDerivation  (finalAttrs: {
 
   inherit (dockapps-sources) version src;
 
-  sourceRoot = "${src.name}/wmsm.app/wmsm";
+  sourceRoot = "${finalAttrs.src.name}/wmsm.app/wmsm";
 
   buildInputs = [
     libX11

pkgs/by-name/wi/windowmaker/dockapps/wmsystemtray.nix

@@ -33,8 +33,8 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "A system tray for Windowmaker";
     homepage = "http://wmsystemtray.sourceforge.net";
-    license = licenses.gpl2Only;
+    license = lib.licenses.gpl2Only;
     maintainers = [ ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 })

pkgs/desktops/deepin/default.nix

@@ -1,4 +1,4 @@
-{ lib, pkgs, libsForQt5 }:
+{ lib, pkgs, stdenv, libsForQt5 }:
 let
   packages = self:
   let

pkgs/desktops/gnome/extensions/default.nix

@@ -35,6 +35,7 @@ let
     lib.trivial.pipe extensions [
       (map (extension: lib.nameValuePair extension.extensionUuid extension))
       builtins.listToAttrs
+      (attrs: attrs // { __attrsFailEvaluation = true; })
     ];
 
   # Map the list of extensions to an attrset based on the pname as key, which is more human readable than the UUID
@@ -66,6 +67,7 @@ in rec {
 
   # Keep the last three versions in here
   gnomeExtensions = lib.trivial.pipe (gnome43Extensions // gnome44Extensions // gnome45Extensions) [
+    (v: builtins.removeAttrs v [ "__attrsFailEvaluation" ])
     # Apply some custom patches for automatically packaged extensions
     (callPackage ./extensionOverrides.nix {})
     # Add all manually packaged extensions
@@ -88,4 +90,5 @@ in rec {
     # Make the set "public"
     lib.recurseIntoAttrs
   ];
+
 }

pkgs/development/compilers/blueprint/default.nix

@@ -45,7 +45,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   # requires xvfb-run
-  doCheck = !stdenv.isDarwin;
+  doCheck = !stdenv.isDarwin
+  && false;  # tests time out
 
   checkPhase = ''
     runHook preCheck

pkgs/development/compilers/chicken/4/default.nix

@@ -3,7 +3,7 @@ let
   callPackage = newScope self;
 
   self = {
-    pkgs = self;
+    pkgs = self // { recurseForDerivations = false; };
 
     fetchegg = callPackage ./fetchegg { };
 

pkgs/development/compilers/cudatoolkit/flags.nix

@@ -108,7 +108,7 @@ let
 
     # archNames :: List String
     # E.g. [ "Turing" "Ampere" ]
-    archNames = lists.unique (builtins.map (cap: cudaComputeCapabilityToName.${cap}) cudaCapabilities);
+    archNames = lists.unique (builtins.map (cap: cudaComputeCapabilityToName.${cap} or (throw "missing cuda compute capability")) cudaCapabilities);
 
     # realArches :: List String
     # The real architectures are physical architectures supported by the CUDA version.

pkgs/development/compilers/rust/default.nix

@@ -61,7 +61,7 @@ in
       bootRustPlatform = makeRustPlatform bootstrapRustPackages;
     in {
       # Packages suitable for build-time, e.g. `build.rs`-type stuff.
-      buildRustPackages = (selectRustPackage buildPackages).packages.stable;
+      buildRustPackages = (selectRustPackage buildPackages).packages.stable // { __attrsFailEvaluation = true; };
       # Analogous to stdenv
       rustPlatform = makeRustPlatform self.buildRustPackages;
       rustc = self.callPackage ./rustc.nix ({

pkgs/development/compilers/spirv-llvm-translator/default.nix

@@ -7,6 +7,7 @@
 , llvm
 , spirv-headers
 , spirv-tools
+, disable-warnings-if-gcc13
 }:
 
 let
@@ -37,7 +38,7 @@ let
       hash = "sha256-NoIoa20+2sH41rEnr8lsMhtfesrtdPINiXtUnxYVm8s=";
     } else throw "Incompatible LLVM version.";
 in
-stdenv.mkDerivation {
+disable-warnings-if-gcc13 (stdenv.mkDerivation {
   pname = "SPIRV-LLVM-Translator";
   inherit (branch) version;
 
@@ -91,4 +92,4 @@ stdenv.mkDerivation {
     platforms   = platforms.unix;
     maintainers = with maintainers; [ gloaming ];
   };
-}
+})

pkgs/development/compilers/swift/default.nix

@@ -55,7 +55,8 @@ let
     darwin = pkgs.darwin.overrideScope (_: prev: {
       inherit apple_sdk;
       inherit (apple_sdk) Libsystem LibsystemCross libcharset libunwind objc4 configd IOKit Security;
-      CF = apple_sdk.CoreFoundation;
+      CF = apple_sdk.CoreFoundation // { __attrsFailEvaluation = true; };
+      __attrsFailEvaluation = true;
     });
     xcodebuild = pkgs.xcbuild.override {
       inherit (apple_sdk.frameworks) CoreServices CoreGraphics ImageIO;

pkgs/development/haskell-modules/default.nix

@@ -18,7 +18,8 @@ let
 
   haskellPackages = pkgs.callPackage makePackageSet {
     package-set = initialPackages;
-    inherit stdenv haskellLib ghc buildHaskellPackages extensible-self all-cabal-hashes;
+    inherit stdenv haskellLib ghc extensible-self all-cabal-hashes;
+    buildHaskellPackages = buildHaskellPackages // { __attrsFailEvaluation = true; };
   };
 
   platformConfigurations = lib.optionals stdenv.hostPlatform.isAarch [

pkgs/development/haskell-modules/make-package-set.nix

@@ -614,7 +614,7 @@ in package-set { inherit pkgs lib callPackage; } self // {
        Type: [str] -> drv -> drv
     */
     generateOptparseApplicativeCompletions =
-      self.callPackage (
+      (self.callPackage (
         { stdenv }:
 
         commands:
@@ -623,7 +623,7 @@ in package-set { inherit pkgs lib callPackage; } self // {
         if stdenv.buildPlatform.canExecute stdenv.hostPlatform
         then lib.foldr haskellLib.__generateOptparseApplicativeCompletion pkg commands
         else pkg
-      ) { };
+      ) { }) // { __attrsFailEvaluation = true; };
 
     /*
       Modify given Haskell package to force GHC to employ the LLVM

pkgs/development/interpreters/lua-5/default.nix

@@ -65,7 +65,8 @@ let
           inherit (luaPackages) requiredLuaModules;
         };
         withPackages = import ./with-packages.nix { inherit buildEnv luaPackages;};
-        pkgs = luaPackages;
+        pkgs = let lp = luaPackages;
+               in lp // { luaPackages = lp.luaPackages // { __attrsFailEvaluation = true; }; };
         interpreter = "${self}/bin/${executable}";
         inherit executable luaversion;
         luaOnBuild = luaOnBuildForHost.override { inherit packageOverrides; self = luaOnBuild; };

pkgs/development/libraries/gcc/libgcc/default.nix

@@ -10,6 +10,7 @@ let
     "--disable-intl"
     "--enable-threads=posix"
     "--with-glibc-version=${glibc.version}"
+    "--disable-plugin"
 
     # these are required in order to prevent inhibit_libc=true,
     # which will cripple libgcc's unwinder; see:

pkgs/development/libraries/qt-5/5.15/default.nix

@@ -23,7 +23,7 @@ Check for any minor version changes.
 
 let
 
-  srcs = import ./srcs.nix { inherit lib fetchgit fetchFromGitHub; };
+  srcs = import ./srcs.nix { inherit lib fetchgit fetchFromGitHub; } // { __attrsFailEvaluation = true; };
 
   qtCompatVersion = srcs.qtbase.version;
 

pkgs/development/nim-packages/eris/default.nix

@@ -32,5 +32,6 @@ buildNimPackage (final: prev: {
     maintainers = with lib.maintainers; [ ehmry ];
     mainProgram = "eriscmd";
     badPlatforms = lib.platforms.darwin;
+    broken = true; # goes into an infinite loop spamming stderr with junk
   };
 })

pkgs/development/python-modules/werkzeug/default.nix

@@ -78,5 +78,6 @@ buildPythonPackage rec {
     '';
     license = licenses.bsd3;
     maintainers = with maintainers; [ ];
+    broken = true;  # download returns 404
   };
 }