Merge master into staging-next

.github/workflows/basic-eval.yml

@@ -26,5 +26,6 @@ jobs:
         # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
         name: nixpkgs-ci
         signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
+    - run: nix --experimental-features 'nix-command flakes' flake check --all-systems --no-build
     # explicit list of supportedSystems is needed until aarch64-darwin becomes part of the trunk jobset
     - run: nix-build pkgs/top-level/release.nix -A release-checks --arg supportedSystems '[ "aarch64-darwin" "aarch64-linux" "x86_64-linux" "x86_64-darwin"  ]'

ci/OWNERS

@@ -27,7 +27,7 @@
 
 # Libraries
 /lib                        @infinisil
-/lib/systems                @alyssais @ericson2314
+/lib/systems                @alyssais @ericson2314 @NixOS/stdenv
 /lib/generators.nix         @infinisil @Profpatsch
 /lib/cli.nix                @infinisil @Profpatsch
 /lib/debug.nix              @infinisil @Profpatsch
@@ -49,10 +49,10 @@
 /pkgs/top-level/splice.nix                       @Ericson2314
 /pkgs/top-level/release-cross.nix                @Ericson2314
 /pkgs/top-level/by-name-overlay.nix              @infinisil @philiptaron
-/pkgs/stdenv                                     @philiptaron
+/pkgs/stdenv                                     @philiptaron @NixOS/stdenv
-/pkgs/stdenv/generic                             @Ericson2314
+/pkgs/stdenv/generic                             @Ericson2314 @NixOS/stdenv
-/pkgs/stdenv/generic/check-meta.nix              @Ericson2314
+/pkgs/stdenv/generic/check-meta.nix              @Ericson2314 @NixOS/stdenv
-/pkgs/stdenv/cross                               @Ericson2314
+/pkgs/stdenv/cross                               @Ericson2314 @NixOS/stdenv
 /pkgs/build-support                              @philiptaron
 /pkgs/build-support/cc-wrapper                   @Ericson2314
 /pkgs/build-support/bintools-wrapper             @Ericson2314
@@ -179,7 +179,7 @@ nixos/modules/installer/tools/nix-fallback-paths.nix  @NixOS/nix-team @raitobeza
 
 # C compilers
 /pkgs/development/compilers/gcc
-/pkgs/development/compilers/llvm @alyssais @RossComputerGuy
+/pkgs/development/compilers/llvm @alyssais @RossComputerGuy @NixOS/llvm
 /pkgs/development/compilers/emscripten @raitobezarius
 /doc/languages-frameworks/emscripten.section.md @raitobezarius
 

flake.nix

@@ -80,8 +80,17 @@
 
       checks = forAllSystems (system: {
         tarball = jobs.${system}.tarball;
-        # Exclude power64 due to "libressl is not available on the requested hostPlatform" with hostPlatform being power64
+      } // lib.optionalAttrs
-      } // lib.optionalAttrs (self.legacyPackages.${system}.stdenv.hostPlatform.isLinux && !self.legacyPackages.${system}.targetPlatform.isPower64) {
+        (
+          self.legacyPackages.${system}.stdenv.hostPlatform.isLinux
+          # Exclude power64 due to "libressl is not available on the requested hostPlatform" with hostPlatform being power64
+          && !self.legacyPackages.${system}.targetPlatform.isPower64
+          # Exclude armv6l-linux due to "cannot bootstrap GHC on this platform ('armv6l-linux' with libc 'defaultLibc')"
+          && system != "armv6l-linux"
+          # Exclude riscv64-linux due to "cannot bootstrap GHC on this platform ('riscv64-linux' with libc 'defaultLibc')"
+          && system != "riscv64-linux"
+        )
+      {
         # Test that ensures that the nixosSystem function can accept a lib argument
         # Note: prefer not to extend or modify `lib`, especially if you want to share reusable modules
         #       alternatives include: `import` a file, or put a custom library in an option or in `_module.args.<libname>`
@@ -111,10 +120,20 @@
         }).nixos.manual;
       };
 
-      devShells = forAllSystems (system: {
+      devShells = forAllSystems (system:
-        /** A shell to get tooling for Nixpkgs development. See nixpkgs/shell.nix. */
+        { } // lib.optionalAttrs
-        default = import ./shell.nix { inherit system; };
+          (
-      });
+            # Exclude armv6l-linux because "Package ‘ghc-9.6.6’ in .../pkgs/development/compilers/ghc/common-hadrian.nix:579 is not available on the requested hostPlatform"
+            system != "armv6l-linux"
+            # Exclude riscv64-linux because "Package ‘ghc-9.6.6’ in .../pkgs/development/compilers/ghc/common-hadrian.nix:579 is not available on the requested hostPlatform"
+            && system != "riscv64-linux"
+            # Exclude FreeBSD because "Package ‘ghc-9.6.6’ in .../pkgs/development/compilers/ghc/common-hadrian.nix:579 is not available on the requested hostPlatform"
+            && !self.legacyPackages.${system}.stdenv.hostPlatform.isFreeBSD
+          )
+        {
+          /** A shell to get tooling for Nixpkgs development. See nixpkgs/shell.nix. */
+          default = import ./shell.nix { inherit system; };
+        });
 
       /**
         A nested structure of [packages](https://nix.dev/manual/nix/latest/glossary#package-attribute-set) and other values.

maintainers/team-list.nix

@@ -967,6 +967,21 @@ with lib.maintainers;
     shortName = "Serokell employees";
   };
 
+  stdenv = {
+    members = [
+      artturin
+      emily
+      ericson2314
+      philiptaron
+      reckenrode
+      RossComputerGuy
+    ];
+    scope = "Maintain the standard environment and its surrounding logic.";
+    shortName = "stdenv";
+    enableFeatureFreezePing = true;
+    githubTeams = [ "stdenv" ];
+  };
+
   steam = {
     members = [
       atemu

nixos/doc/manual/release-notes/rl-2411.section.md

@@ -376,6 +376,11 @@
 
 - `matrix-sliding-sync` was removed because it has been replaced by the simplified sliding sync functionality introduced in matrix-synapse 114.0.
 
+- `nodePackages.coc-tslint`, `vimPlugins.coc-tslint`, `nodePackages.coc-tslint-plugin`,
+  and `vimPlugins.coc-tslint-plugin` were removed due to being deprecated upstream. The
+  `nodePackages.coc-eslint` and `vimPlugins.coc-eslint` packages offer comparable
+  features for `eslint`, which replaced `tslint`.
+
 - `teleport` has been upgraded from major version 15 to major version 16.
   Refer to upstream [upgrade instructions](https://goteleport.com/docs/management/operations/upgrading/)
   and [release notes for v16](https://goteleport.com/docs/changelog/#1600-061324).

pkgs/applications/editors/vim/plugins/overrides.nix

@@ -2761,8 +2761,6 @@ in
       "coc-tabnine"
       "coc-texlab"
       "coc-toml"
-      "coc-tslint"
-      "coc-tslint-plugin"
       "coc-tsserver"
       "coc-ultisnips"
       "coc-vetur"

pkgs/applications/networking/irc/epic5/default.nix

@@ -1,41 +0,0 @@
-{ lib, stdenv, fetchurl, openssl, ncurses, libiconv, tcl, coreutils, fetchpatch, libxcrypt }:
-
-stdenv.mkDerivation rec {
-  pname = "epic5";
-  version = "2.0.1";
-
-  src = fetchurl {
-    url = "http://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/${pname}-${version}.tar.xz";
-    sha256 = "1ap73d5f4vccxjaaq249zh981z85106vvqmxfm4plvy76b40y9jm";
-  };
-
-  # Darwin needs libiconv, tcl; while Linux build don't
-  buildInputs = [ openssl ncurses libxcrypt ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv tcl ];
-
-  patches = [
-    (fetchpatch {
-      url = "https://sources.debian.net/data/main/e/epic5/2.0.1-1/debian/patches/openssl-1.1.patch";
-      sha256 = "03bpsyv1sr5icajs2qkdvv8nnn6rz6yvvj7pgiq8gz9sbp6siyfv";
-    })
-  ];
-
-  configureFlags = [ "--disable-debug" "--with-ipv6" ];
-
-  postConfigure = ''
-    substituteInPlace bsdinstall \
-      --replace /bin/cp ${coreutils}/bin/cp \
-      --replace /bin/rm ${coreutils}/bin/rm \
-      --replace /bin/chmod ${coreutils}/bin/chmod \
-  '';
-
-  meta = with lib; {
-    homepage = "http://epicsol.org";
-    description = "IRC client that offers a great ircII interface";
-    license = licenses.bsd3;
-    maintainers = [ ];
-  };
-}
-
-
-

pkgs/by-name/ep/epic5/package.nix

@@ -0,0 +1,51 @@
+{
+  lib,
+  stdenv,
+  ruby,
+  fetchurl,
+  openssl,
+  ncurses,
+  libiconv,
+  tcl,
+  libxcrypt,
+  perl,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "epic5";
+  version = "3.0";
+
+  src = fetchurl {
+    url = "https://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/epic5-${finalAttrs.version}.tar.xz";
+    hash = "sha256-ltRzUME6PZkBnaDmoEsMf4Datt26WQvMZ527iswXeaE=";
+  };
+
+  buildInputs =
+    [
+      openssl
+      ncurses
+      libxcrypt
+      ruby
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      libiconv
+      tcl
+    ];
+
+  configureFlags = [
+    "--with-ipv6"
+  ];
+
+  nativeBuildInputs = [
+    perl
+  ];
+
+  meta = {
+    homepage = "https://epicsol.org";
+    description = "IRC client that offers a great ircII interface";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ bot-wxt1221 ];
+    platforms = lib.platforms.unix;
+    mainProgram = "epic5";
+  };
+})

pkgs/development/node-packages/aliases.nix

@@ -76,6 +76,8 @@ mapAliases {
   inherit (pkgs) coc-pyright; # added 2024-07-14
   coc-metals = throw "coc-metals was removed because it was deprecated upstream. vimPlugins.nvim-metals is its official replacement."; # Added 2024-10-16
   coc-python = throw "coc-python was removed because it was abandoned upstream on 2020-12-24. Upstream now recommends using coc-pyright or coc-jedi instead."; # added 2024-10-15
+  coc-tslint = throw "coc-tslint was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18
+  coc-tslint-plugin = throw "coc-tslint-plugin was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18
   coinmon = throw "coinmon was removed since it was abandoned upstream"; # added 2024-03-19
   coffee-script = pkgs.coffeescript; # added 2023-08-18
   inherit (pkgs) concurrently; # added 2024-08-05

pkgs/development/node-packages/node-packages.json

@@ -60,8 +60,6 @@
 , "coc-tabnine"
 , "coc-texlab"
 , "coc-toml"
-, "coc-tslint"
-, "coc-tslint-plugin"
 , "coc-tsserver"
 , "coc-ultisnips"
 , "coc-vetur"

pkgs/development/node-packages/node-packages.nix

@@ -61714,102 +61714,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  coc-tslint = nodeEnv.buildNodePackage {
-    name = "coc-tslint";
-    packageName = "coc-tslint";
-    version = "1.0.17";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-tslint/-/coc-tslint-1.0.17.tgz";
-      sha512 = "5Zxv2Adtb6Mlpv2YdKErhf8ntxiBl1UyrbEqo7gR9nFIAfi3o0Ue6TJTpZfOhQViFQxLjJAS65IQVRaNlbhkxw==";
-    };
-    dependencies = [
-      sources."@babel/code-frame-7.24.7"
-      sources."@babel/helper-validator-identifier-7.24.7"
-      sources."@babel/highlight-7.24.7"
-      sources."ansi-styles-3.2.1"
-      sources."argparse-1.0.10"
-      sources."balanced-match-1.0.2"
-      sources."brace-expansion-1.1.11"
-      sources."builtin-modules-1.1.1"
-      sources."chalk-2.4.2"
-      sources."color-convert-1.9.3"
-      sources."color-name-1.1.3"
-      sources."commander-2.20.3"
-      sources."concat-map-0.0.1"
-      sources."diff-4.0.2"
-      sources."escape-string-regexp-1.0.5"
-      sources."esprima-4.0.1"
-      sources."fs.realpath-1.0.0"
-      sources."function-bind-1.1.2"
-      sources."glob-7.2.3"
-      sources."has-flag-3.0.0"
-      sources."hasown-2.0.2"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."is-core-module-2.15.1"
-      sources."js-tokens-4.0.0"
-      sources."js-yaml-3.14.1"
-      sources."minimatch-3.1.2"
-      sources."minimist-1.2.8"
-      sources."mkdirp-0.5.6"
-      sources."once-1.4.0"
-      sources."path-is-absolute-1.0.1"
-      sources."path-parse-1.0.7"
-      sources."picocolors-1.1.0"
-      sources."resolve-1.22.8"
-      sources."semver-5.7.2"
-      sources."sprintf-js-1.0.3"
-      sources."supports-color-5.5.0"
-      sources."supports-preserve-symlinks-flag-1.0.0"
-      sources."tslib-1.14.1"
-      sources."tslint-5.20.1"
-      sources."tsutils-2.29.0"
-      sources."typescript-3.9.10"
-      sources."wrappy-1.0.2"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "tslint extension for coc.nvim";
-      homepage = "https://github.com/neoclide/coc-tslint#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  coc-tslint-plugin = nodeEnv.buildNodePackage {
-    name = "coc-tslint-plugin";
-    packageName = "coc-tslint-plugin";
-    version = "1.2.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-tslint-plugin/-/coc-tslint-plugin-1.2.0.tgz";
-      sha512 = "WEl0FM8ui0Oip6YqyOYApf8vErXFudj2ftjSYqm5WNLNuPq53JSNi+5w+WNqHwX2UWE8MOB2mQszqwU2fyE8Ag==";
-    };
-    dependencies = [
-      sources."balanced-match-1.0.2"
-      sources."brace-expansion-1.1.11"
-      sources."concat-map-0.0.1"
-      sources."get-caller-file-1.0.3"
-      sources."minimatch-3.1.2"
-      sources."mock-require-3.0.3"
-      sources."normalize-path-2.1.1"
-      sources."remove-trailing-separator-1.1.0"
-      sources."typescript-tslint-plugin-0.5.4"
-      sources."vscode-jsonrpc-4.0.0"
-      sources."vscode-languageserver-5.2.1"
-      sources."vscode-languageserver-protocol-3.14.1"
-      sources."vscode-languageserver-types-3.14.0"
-      sources."vscode-uri-1.0.8"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "TSLint extension for coc.nvim as tsserver plugin";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   coc-tsserver = nodeEnv.buildNodePackage {
     name = "coc-tsserver";
     packageName = "coc-tsserver";

pkgs/top-level/all-packages.nix

@@ -28936,8 +28936,6 @@ with pkgs;
 
   ephemeral = callPackage ../applications/networking/browsers/ephemeral { };
 
-  epic5 = callPackage ../applications/networking/irc/epic5 { };
-
   epick = callPackage ../applications/graphics/epick {
     inherit (darwin.apple_sdk.frameworks) AppKit;
   };