Merge staging-next into staging

ci/OWNERS

@@ -267,9 +267,11 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
 /nixos/modules/services/mail/rspamd.nix     @peti
 
 # Emacs
-/pkgs/applications/editors/emacs/elisp-packages @adisbladis
-/pkgs/applications/editors/emacs                @adisbladis
-/pkgs/top-level/emacs-packages.nix              @adisbladis
+/pkgs/applications/editors/emacs/elisp-packages @NixOS/emacs
+/pkgs/applications/editors/emacs                @NixOS/emacs
+/pkgs/top-level/emacs-packages.nix              @NixOS/emacs
+/doc/packages/emacs.section.md                  @NixOS/emacs
+/nixos/modules/services/editors/emacs.md        @NixOS/emacs
 
 # Kakoune
 /pkgs/applications/editors/kakoune     @philiptaron

ci/request-reviews/get-reviewers.sh

@@ -35,6 +35,7 @@ log "This PR touches ${#touchedFiles[@]} files"
 git -C "$gitRepo" show "$baseRef":"$ownersFile" > "$tmp"/codeowners
 
 # Associative array with the user as the key for easy de-duplication
+# Make sure to always lowercase keys to avoid duplicates with different casings
 declare -A users=()
 
 for file in "${touchedFiles[@]}"; do
@@ -87,20 +88,20 @@ for file in "${touchedFiles[@]}"; do
             log "Team $entry has these members: ${members[*]}"
 
             for user in "${members[@]}"; do
-                users[$user]=
+                users[${user,,}]=
             done
         else
             # Everything else is a user
-            users[$entry]=
+            users[${entry,,}]=
         fi
     done
 
 done
 
 # Cannot request a review from the author
-if [[ -v users[$prAuthor] ]]; then
+if [[ -v users[${prAuthor,,}] ]]; then
     log "One or more files are owned by the PR author, ignoring"
-    unset 'users[$prAuthor]'
+    unset 'users[${prAuthor,,}]'
 fi
 
 gh api \
@@ -111,9 +112,9 @@ gh api \
 
 # And we don't want to rerequest reviews from people who already reviewed
 while read -r user; do
-    if [[ -v users[$user] ]]; then
+    if [[ -v users[${user,,}] ]]; then
         log "User $user is a code owner but has already left a review, ignoring"
-        unset 'users[$user]'
+        unset 'users[${user,,}]'
     fi
 done < "$tmp/already-reviewed-by"
 

maintainers/team-list.nix

@@ -281,7 +281,11 @@ with lib.maintainers;
   };
 
   emacs = {
-    members = [ adisbladis ];
+    members = [
+      AndersonTorres
+      adisbladis
+      linj
+    ];
     scope = "Maintain the Emacs editor and packages.";
     shortName = "Emacs";
   };

pkgs/applications/networking/lls/default.nix

@@ -5,21 +5,24 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "lls";
-  version = "0.2.0";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "jcaesar";
     repo = "lls";
     rev = "v${version}";
-    hash = "sha256-FtRPRR+/R3JTEI90mAEHFyhqloAbNEdR3jkquKa9Ahw=";
+    hash = "sha256-f2f09ptMBZfBY1jjOEc8ElAoEj4LKXXSdXLlYLf8Z3M=";
   };
 
-  cargoHash = "sha256-yjRbg/GzCs5d3zXL22j5U9c4BlOcRHyggHCovj4fMIs=";
+  cargoHash = "sha256-LS0azaKBFWW86R4XO5BkCHMEG2UwgkVQIwLELxewiu0=";
 
   meta = with lib; {
     description = "Tool to list listening sockets";
     license = licenses.mit;
-    maintainers = [ maintainers.k900 ];
+    maintainers = [
+      maintainers.k900
+      maintainers.jcaesar
+    ];
     platforms = platforms.linux;
     homepage = "https://github.com/jcaesar/lls";
     mainProgram = "lls";

pkgs/applications/radio/welle-io/default.nix

@@ -1,20 +1,40 @@
-{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config
-, qtbase, qtcharts, qtmultimedia, qtquickcontrols, qtquickcontrols2, qtgraphicaleffects
-, faad2, rtl-sdr, soapysdr-with-plugins, libusb-compat-0_1, fftwSinglePrec, lame, mpg123
-} :
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  wrapQtAppsHook,
+  qtbase,
+  qtcharts,
+  qtmultimedia,
+  qtdeclarative,
+  qt5compat,
+  faad2,
+  rtl-sdr,
+  soapysdr-with-plugins,
+  libusb-compat-0_1,
+  fftwSinglePrec,
+  lame,
+  mpg123,
+}:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "welle-io";
-  version = "2.4";
+  version = "2.5";
 
   src = fetchFromGitHub {
     owner = "AlbrechtL";
     repo = "welle.io";
     rev = "v${version}";
-    sha256 = "sha256-xXiCL/A2SwCSr5SA4AQQEdieRzBksXx9Z78bHtlFiW4=";
+    hash = "sha256-sSknzZiD9/MLyO+gAYopogOQu5HRcqaRcfqwq4Rld7A=";
   };
 
-  nativeBuildInputs = [ cmake pkg-config ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    wrapQtAppsHook
+  ];
 
   buildInputs = [
     faad2
@@ -25,22 +45,27 @@ mkDerivation rec {
     qtbase
     qtcharts
     qtmultimedia
-    qtquickcontrols
-    qtquickcontrols2
-    qtgraphicaleffects
+    qt5compat
     rtl-sdr
     soapysdr-with-plugins
   ];
 
   cmakeFlags = [
-    "-DRTLSDR=true" "-DSOAPYSDR=true"
+    "-DRTLSDR=true"
+    "-DSOAPYSDR=true"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "DAB/DAB+ Software Radio";
     homepage = "https://www.welle.io/";
-    maintainers = with maintainers; [ ck3d markuskowa ];
-    license = licenses.gpl2Only;
-    platforms = [ "x86_64-linux" "i686-linux" ] ++ platforms.darwin;
+    maintainers = with lib.maintainers; [
+      ck3d
+      markuskowa
+    ];
+    license = lib.licenses.gpl2Only;
+    platforms = [
+      "x86_64-linux"
+      "i686-linux"
+    ] ++ lib.platforms.darwin;
   };
 }

pkgs/build-support/dart/build-dart-application/default.nix

@@ -60,7 +60,25 @@ let
   generators = callPackage ./generators.nix { inherit dart; } { buildDrvArgs = args; };
 
   pubspecLockFile = builtins.toJSON pubspecLock;
-  pubspecLockData = pub2nix.readPubspecLock { inherit src packageRoot pubspecLock gitHashes sdkSourceBuilders customSourceBuilders; };
+  pubspecLockData = pub2nix.readPubspecLock {
+    inherit src packageRoot pubspecLock gitHashes customSourceBuilders;
+    sdkSourceBuilders  = {
+      # https://github.com/dart-lang/pub/blob/e1fbda73d1ac597474b82882ee0bf6ecea5df108/lib/src/sdk/dart.dart#L80
+      "dart" = name: runCommand "dart-sdk-${name}" { passthru.packageRoot = "."; } ''
+        for path in '${dart}/pkg/${name}'; do
+          if [ -d "$path" ]; then
+            ln -s "$path" "$out"
+            break
+          fi
+        done
+
+        if [ ! -e "$out" ]; then
+          echo 1>&2 'The Dart SDK does not contain the requested package: ${name}!'
+          exit 1
+        fi
+      '';
+    } // sdkSourceBuilders;
+  };
   packageConfig = generators.linkPackageConfig {
     packageConfig = pub2nix.generatePackageConfig {
       pname = if args.pname != null then "${args.pname}-${args.version}" else null;

pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix

@@ -59,15 +59,22 @@ runCommand "flutter-artifacts-${flutterPlatform}-${systemPlatform}"
   passthru = {
     inherit flutterPlatform;
   };
-} ''
+} (''
   export FLUTTER_ROOT="$NIX_BUILD_TOP"
   lndir -silent '${flutter'}' "$FLUTTER_ROOT"
   rm -rf "$FLUTTER_ROOT/bin/cache"
   mkdir "$FLUTTER_ROOT/bin/cache"
+'' + lib.optionalString (lib.versionAtLeast flutter'.version "3.26") ''
+  mkdir "$FLUTTER_ROOT/bin/cache/dart-sdk"
+  lndir -silent '${flutter'}/bin/cache/dart-sdk' "$FLUTTER_ROOT/bin/cache/dart-sdk"
+'' + ''
 
   HOME="$(mktemp -d)" flutter precache -v '--${flutterPlatform}' ${builtins.concatStringsSep " " (map (p: "'--no-${p}'") (lib.remove flutterPlatform flutterPlatforms))}
   rm -rf "$FLUTTER_ROOT/bin/cache/lockfile"
+'' + lib.optionalString (lib.versionAtLeast flutter'.version "3.26") ''
+  rm -rf "$FLUTTER_ROOT/bin/cache/dart-sdk"
+'' + ''
   find "$FLUTTER_ROOT" -type l -lname '${flutter'}/*' -delete
 
   cp -r bin/cache "$out"
-''
+'')

pkgs/development/compilers/flutter/artifacts/prepare-artifacts.nix

@@ -16,6 +16,7 @@
 
     mkdir -p "$out/bin"
     cp -r . "$out/bin/cache"
+    rm -f "$out/bin/cache/flutter.version.json"
 
     runHook postInstall
   '';